summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-19 00:49:58 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-19 00:49:58 +0000
commit2c18b7f7fb2885d27960657c60906ef0bac0681e (patch)
tree91c24c33362baf968c4c08f3a7220157b57a374f
parentbc7e0dbdbd194a8c2e09f82e1a5a4ea5e1b556f4 (diff)
gentoo auto-resync : 19:03:2024 - 00:49:58
-rw-r--r--Manifest30
-rw-r--r--Manifest.files.gzbin29739 -> 29736 bytes
-rw-r--r--acct-group/Manifest.gzbin72529 -> 72525 bytes
-rw-r--r--acct-group/adm/Manifest2
-rw-r--r--acct-group/adm/adm-0-r2.ebuild8
-rw-r--r--acct-group/adm/adm-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/airdcppd/Manifest2
-rw-r--r--acct-group/airdcppd/airdcppd-0-r2.ebuild9
-rw-r--r--acct-group/airdcppd/airdcppd-0-r3.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/amavis/Manifest2
-rw-r--r--acct-group/amavis/amavis-0-r2.ebuild9
-rw-r--r--acct-group/amavis/amavis-0-r3.ebuild9
-rw-r--r--acct-group/amule/Manifest2
-rw-r--r--acct-group/amule/amule-0-r2.ebuild9
-rw-r--r--acct-group/amule/amule-0-r3.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-r2.ebuild10
-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-r2.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/asterisk/Manifest2
-rw-r--r--acct-group/asterisk/asterisk-0-r2.ebuild9
-rw-r--r--acct-group/asterisk/asterisk-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/atheme-services/Manifest2
-rw-r--r--acct-group/atheme-services/atheme-services-0-r2.ebuild9
-rw-r--r--acct-group/atheme-services/atheme-services-0-r3.ebuild9
-rw-r--r--acct-group/audio/Manifest2
-rw-r--r--acct-group/audio/audio-0-r2.ebuild8
-rw-r--r--acct-group/audio/audio-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/automx2/Manifest2
-rw-r--r--acct-group/automx2/automx2-0-r2.ebuild9
-rw-r--r--acct-group/automx2/automx2-0-r3.ebuild9
-rw-r--r--acct-group/avahi-autoipd/Manifest2
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild9
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r3.ebuild9
-rw-r--r--acct-group/avahi/Manifest2
-rw-r--r--acct-group/avahi/avahi-0-r2.ebuild9
-rw-r--r--acct-group/avahi/avahi-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/bacula/Manifest2
-rw-r--r--acct-group/bacula/bacula-0-r2.ebuild9
-rw-r--r--acct-group/bacula/bacula-0-r3.ebuild9
-rw-r--r--acct-group/bareos/Manifest2
-rw-r--r--acct-group/bareos/bareos-0-r2.ebuild9
-rw-r--r--acct-group/bareos/bareos-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/bedrock/Manifest2
-rw-r--r--acct-group/bedrock/bedrock-0-r2.ebuild10
-rw-r--r--acct-group/bedrock/bedrock-0-r3.ebuild10
-rw-r--r--acct-group/bind_exporter/Manifest2
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r2.ebuild8
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/bitcoin/Manifest2
-rw-r--r--acct-group/bitcoin/bitcoin-0-r2.ebuild9
-rw-r--r--acct-group/bitcoin/bitcoin-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/bitlbee/Manifest2
-rw-r--r--acct-group/bitlbee/bitlbee-0-r2.ebuild8
-rw-r--r--acct-group/bitlbee/bitlbee-0-r3.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-r2.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/buildbot/Manifest2
-rw-r--r--acct-group/buildbot/buildbot-0-r2.ebuild10
-rw-r--r--acct-group/buildbot/buildbot-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/burp/Manifest2
-rw-r--r--acct-group/burp/burp-0-r2.ebuild9
-rw-r--r--acct-group/burp/burp-0-r3.ebuild9
-rw-r--r--acct-group/burrow_exporter/Manifest2
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild10
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r3.ebuild10
-rw-r--r--acct-group/cadvisor/Manifest2
-rw-r--r--acct-group/cadvisor/cadvisor-0-r2.ebuild8
-rw-r--r--acct-group/cadvisor/cadvisor-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/carbon/Manifest2
-rw-r--r--acct-group/carbon/carbon-0-r2.ebuild8
-rw-r--r--acct-group/carbon/carbon-0-r3.ebuild8
-rw-r--r--acct-group/cdrom/Manifest2
-rw-r--r--acct-group/cdrom/cdrom-0-r2.ebuild8
-rw-r--r--acct-group/cdrom/cdrom-0-r3.ebuild8
-rw-r--r--acct-group/ceph/Manifest2
-rw-r--r--acct-group/ceph/ceph-0-r2.ebuild8
-rw-r--r--acct-group/ceph/ceph-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/chronograf/Manifest2
-rw-r--r--acct-group/chronograf/chronograf-0-r2.ebuild8
-rw-r--r--acct-group/chronograf/chronograf-0-r3.ebuild8
-rw-r--r--acct-group/clair/Manifest2
-rw-r--r--acct-group/clair/clair-0-r2.ebuild8
-rw-r--r--acct-group/clair/clair-0-r3.ebuild8
-rw-r--r--acct-group/clamav/Manifest2
-rw-r--r--acct-group/clamav/clamav-0-r2.ebuild8
-rw-r--r--acct-group/clamav/clamav-0-r3.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-r2.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/consul-template/Manifest2
-rw-r--r--acct-group/consul-template/consul-template-0-r2.ebuild8
-rw-r--r--acct-group/consul-template/consul-template-0-r3.ebuild8
-rw-r--r--acct-group/consul/Manifest2
-rw-r--r--acct-group/consul/consul-0-r2.ebuild8
-rw-r--r--acct-group/consul/consul-0-r3.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-r2.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-r2.ebuild10
-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-r2.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-r2.ebuild8
-rw-r--r--acct-group/cvmfs/Manifest2
-rw-r--r--acct-group/cvmfs/cvmfs-0-r2.ebuild9
-rw-r--r--acct-group/cvmfs/cvmfs-0-r3.ebuild9
-rw-r--r--acct-group/davfs2/Manifest2
-rw-r--r--acct-group/davfs2/davfs2-0-r2.ebuild8
-rw-r--r--acct-group/davfs2/davfs2-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/ddclient/Manifest2
-rw-r--r--acct-group/ddclient/ddclient-0-r2.ebuild10
-rw-r--r--acct-group/ddclient/ddclient-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/deluge/Manifest2
-rw-r--r--acct-group/deluge/deluge-0-r2.ebuild8
-rw-r--r--acct-group/deluge/deluge-0-r3.ebuild8
-rw-r--r--acct-group/dhcp/Manifest2
-rw-r--r--acct-group/dhcp/dhcp-0-r2.ebuild8
-rw-r--r--acct-group/dhcp/dhcp-0-r3.ebuild8
-rw-r--r--acct-group/dhcpcd/Manifest2
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r2.ebuild8
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r3.ebuild8
-rw-r--r--acct-group/dialout/Manifest2
-rw-r--r--acct-group/dialout/dialout-0-r2.ebuild8
-rw-r--r--acct-group/dialout/dialout-0-r3.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/disk/Manifest2
-rw-r--r--acct-group/disk/disk-0-r2.ebuild8
-rw-r--r--acct-group/disk/disk-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/dnsdist/Manifest2
-rw-r--r--acct-group/dnsdist/dnsdist-0-r2.ebuild10
-rw-r--r--acct-group/dnsdist/dnsdist-0-r3.ebuild10
-rw-r--r--acct-group/dnsmasq/Manifest2
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r2.ebuild8
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r3.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/Manifest2
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild8
-rw-r--r--acct-group/docker/Manifest2
-rw-r--r--acct-group/docker/docker-0-r2.ebuild8
-rw-r--r--acct-group/docker/docker-0-r3.ebuild8
-rw-r--r--acct-group/docker_auth/Manifest2
-rw-r--r--acct-group/docker_auth/docker_auth-0-r2.ebuild8
-rw-r--r--acct-group/docker_auth/docker_auth-0-r3.ebuild8
-rw-r--r--acct-group/dovecot/Manifest2
-rw-r--r--acct-group/dovecot/dovecot-0-r2.ebuild8
-rw-r--r--acct-group/dovecot/dovecot-0-r3.ebuild8
-rw-r--r--acct-group/dovenull/Manifest2
-rw-r--r--acct-group/dovenull/dovenull-0-r2.ebuild8
-rw-r--r--acct-group/dovenull/dovenull-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/elasticsearch/Manifest2
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r2.ebuild9
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r3.ebuild9
-rw-r--r--acct-group/elasticsearch_exporter/Manifest2
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild10
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r3.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/epmd/Manifest2
-rw-r--r--acct-group/epmd/epmd-0-r2.ebuild9
-rw-r--r--acct-group/epmd/epmd-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/etcd/Manifest2
-rw-r--r--acct-group/etcd/etcd-0-r2.ebuild8
-rw-r--r--acct-group/etcd/etcd-0-r3.ebuild8
-rw-r--r--acct-group/exabgp/Manifest2
-rw-r--r--acct-group/exabgp/exabgp-0-r2.ebuild8
-rw-r--r--acct-group/exabgp/exabgp-0-r3.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-r2.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-r2.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/fetchmail/Manifest2
-rw-r--r--acct-group/fetchmail/fetchmail-0-r2.ebuild9
-rw-r--r--acct-group/fetchmail/fetchmail-0-r3.ebuild9
-rw-r--r--acct-group/fhem/Manifest2
-rw-r--r--acct-group/fhem/fhem-0-r2.ebuild10
-rw-r--r--acct-group/fhem/fhem-0-r3.ebuild10
-rw-r--r--acct-group/fingerprint/Manifest2
-rw-r--r--acct-group/fingerprint/fingerprint-0-r2.ebuild8
-rw-r--r--acct-group/fingerprint/fingerprint-0-r3.ebuild8
-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-r2.ebuild8
-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-r2.ebuild10
-rw-r--r--acct-group/fluentd/Manifest2
-rw-r--r--acct-group/fluentd/fluentd-0-r2.ebuild10
-rw-r--r--acct-group/fluentd/fluentd-0-r3.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-r2.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-r2.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/ftp/Manifest2
-rw-r--r--acct-group/ftp/ftp-0-r2.ebuild9
-rw-r--r--acct-group/ftp/ftp-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/fvwm-crystal/Manifest2
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild8
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/gamestat/Manifest2
-rw-r--r--acct-group/gamestat/gamestat-0-r2.ebuild9
-rw-r--r--acct-group/gamestat/gamestat-0-r3.ebuild9
-rw-r--r--acct-group/gatling/Manifest2
-rw-r--r--acct-group/gatling/gatling-0-r2.ebuild8
-rw-r--r--acct-group/gatling/gatling-0-r3.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/geneweb/Manifest2
-rw-r--r--acct-group/geneweb/geneweb-0-r2.ebuild10
-rw-r--r--acct-group/geneweb/geneweb-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/gerbera/Manifest2
-rw-r--r--acct-group/gerbera/gerbera-0-r2.ebuild9
-rw-r--r--acct-group/gerbera/gerbera-0-r3.ebuild9
-rw-r--r--acct-group/git/Manifest2
-rw-r--r--acct-group/git/git-0-r2.ebuild8
-rw-r--r--acct-group/git/git-0-r3.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/gkrellmd/Manifest2
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r2.ebuild8
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r3.ebuild8
-rw-r--r--acct-group/gluster/Manifest2
-rw-r--r--acct-group/gluster/gluster-0-r2.ebuild8
-rw-r--r--acct-group/gluster/gluster-0-r3.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-r2.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-r2.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-r2.ebuild10
-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-r2.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-r2.ebuild10
-rw-r--r--acct-group/gpib/Manifest2
-rw-r--r--acct-group/gpib/gpib-0-r2.ebuild8
-rw-r--r--acct-group/gpib/gpib-0-r3.ebuild8
-rw-r--r--acct-group/grafana/Manifest2
-rw-r--r--acct-group/grafana/grafana-0-r2.ebuild10
-rw-r--r--acct-group/grafana/grafana-0-r3.ebuild10
-rw-r--r--acct-group/graylog/Manifest2
-rw-r--r--acct-group/graylog/graylog-0-r2.ebuild9
-rw-r--r--acct-group/graylog/graylog-0-r3.ebuild9
-rw-r--r--acct-group/greetd/Manifest2
-rw-r--r--acct-group/greetd/greetd-0-r2.ebuild9
-rw-r--r--acct-group/greetd/greetd-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/gvm/Manifest2
-rw-r--r--acct-group/gvm/gvm-0-r2.ebuild9
-rw-r--r--acct-group/gvm/gvm-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/haproxy/Manifest2
-rw-r--r--acct-group/haproxy/haproxy-0-r2.ebuild8
-rw-r--r--acct-group/haproxy/haproxy-0-r3.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/i2p/Manifest2
-rw-r--r--acct-group/i2p/i2p-0-r2.ebuild9
-rw-r--r--acct-group/i2p/i2p-0-r3.ebuild9
-rw-r--r--acct-group/i2pd/Manifest2
-rw-r--r--acct-group/i2pd/i2pd-0-r2.ebuild9
-rw-r--r--acct-group/i2pd/i2pd-0-r3.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-r2.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/icinga/Manifest2
-rw-r--r--acct-group/icinga/icinga-0-r2.ebuild8
-rw-r--r--acct-group/icinga/icinga-0-r3.ebuild8
-rw-r--r--acct-group/icingacmd/Manifest2
-rw-r--r--acct-group/icingacmd/icingacmd-0-r2.ebuild8
-rw-r--r--acct-group/icingacmd/icingacmd-0-r3.ebuild8
-rw-r--r--acct-group/icingaweb2/Manifest2
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r2.ebuild8
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r3.ebuild8
-rw-r--r--acct-group/influxdb/Manifest2
-rw-r--r--acct-group/influxdb/influxdb-0-r2.ebuild8
-rw-r--r--acct-group/influxdb/influxdb-0-r3.ebuild8
-rw-r--r--acct-group/input/Manifest2
-rw-r--r--acct-group/input/input-0-r2.ebuild8
-rw-r--r--acct-group/input/input-0-r3.ebuild8
-rw-r--r--acct-group/inspircd/Manifest2
-rw-r--r--acct-group/inspircd/inspircd-0-r2.ebuild9
-rw-r--r--acct-group/inspircd/inspircd-0-r3.ebuild9
-rw-r--r--acct-group/ipfs/Manifest2
-rw-r--r--acct-group/ipfs/ipfs-0-r2.ebuild9
-rw-r--r--acct-group/ipfs/ipfs-0-r3.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-r2.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-r2.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/kafka/Manifest2
-rw-r--r--acct-group/kafka/kafka-0-r2.ebuild8
-rw-r--r--acct-group/kafka/kafka-0-r3.ebuild8
-rw-r--r--acct-group/kapacitor/Manifest2
-rw-r--r--acct-group/kapacitor/kapacitor-0-r2.ebuild8
-rw-r--r--acct-group/kapacitor/kapacitor-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/kibana/Manifest2
-rw-r--r--acct-group/kibana/kibana-0-r2.ebuild9
-rw-r--r--acct-group/kibana/kibana-0-r3.ebuild9
-rw-r--r--acct-group/kismet/Manifest2
-rw-r--r--acct-group/kismet/kismet-0-r2.ebuild9
-rw-r--r--acct-group/kismet/kismet-0-r3.ebuild9
-rw-r--r--acct-group/kmem/Manifest2
-rw-r--r--acct-group/kmem/kmem-0-r2.ebuild8
-rw-r--r--acct-group/kmem/kmem-0-r3.ebuild8
-rw-r--r--acct-group/knot/Manifest2
-rw-r--r--acct-group/knot/knot-0-r2.ebuild8
-rw-r--r--acct-group/knot/knot-0-r3.ebuild8
-rw-r--r--acct-group/kube-apiserver/Manifest2
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild8
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r3.ebuild8
-rw-r--r--acct-group/kube-controller-manager/Manifest2
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild8
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r3.ebuild8
-rw-r--r--acct-group/kube-scheduler/Manifest2
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild8
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r3.ebuild8
-rw-r--r--acct-group/kvm/Manifest2
-rw-r--r--acct-group/kvm/kvm-0-r2.ebuild8
-rw-r--r--acct-group/kvm/kvm-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/libvirt/Manifest2
-rw-r--r--acct-group/libvirt/libvirt-0-r2.ebuild8
-rw-r--r--acct-group/libvirt/libvirt-0-r3.ebuild8
-rw-r--r--acct-group/lighttpd/Manifest2
-rw-r--r--acct-group/lighttpd/lighttpd-0-r2.ebuild8
-rw-r--r--acct-group/lighttpd/lighttpd-0-r3.ebuild8
-rw-r--r--acct-group/lldpd/Manifest2
-rw-r--r--acct-group/lldpd/lldpd-0-r2.ebuild8
-rw-r--r--acct-group/lldpd/lldpd-0-r3.ebuild8
-rw-r--r--acct-group/locate/Manifest2
-rw-r--r--acct-group/locate/locate-0-r2.ebuild8
-rw-r--r--acct-group/locate/locate-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/logstash/Manifest2
-rw-r--r--acct-group/logstash/logstash-0-r2.ebuild9
-rw-r--r--acct-group/logstash/logstash-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/lp/Manifest2
-rw-r--r--acct-group/lp/lp-0-r2.ebuild8
-rw-r--r--acct-group/lp/lp-0-r3.ebuild8
-rw-r--r--acct-group/lpadmin/Manifest2
-rw-r--r--acct-group/lpadmin/lpadmin-0-r2.ebuild8
-rw-r--r--acct-group/lpadmin/lpadmin-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/lxd/Manifest2
-rw-r--r--acct-group/lxd/lxd-0-r2.ebuild9
-rw-r--r--acct-group/lxd/lxd-0-r3.ebuild9
-rw-r--r--acct-group/mail/Manifest2
-rw-r--r--acct-group/mail/mail-0-r2.ebuild9
-rw-r--r--acct-group/mail/mail-0-r3.ebuild9
-rw-r--r--acct-group/man/Manifest2
-rw-r--r--acct-group/man/man-0-r2.ebuild8
-rw-r--r--acct-group/man/man-0-r3.ebuild8
-rw-r--r--acct-group/maradns/Manifest2
-rw-r--r--acct-group/maradns/maradns-0-r2.ebuild8
-rw-r--r--acct-group/maradns/maradns-0-r3.ebuild8
-rw-r--r--acct-group/memcached/Manifest2
-rw-r--r--acct-group/memcached/memcached-0-r2.ebuild8
-rw-r--r--acct-group/memcached/memcached-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/messagebus/Manifest2
-rw-r--r--acct-group/messagebus/messagebus-0-r2.ebuild8
-rw-r--r--acct-group/messagebus/messagebus-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/milter-regex/Manifest2
-rw-r--r--acct-group/milter-regex/milter-regex-0-r2.ebuild9
-rw-r--r--acct-group/milter-regex/milter-regex-0-r3.ebuild9
-rw-r--r--acct-group/minecraft/Manifest2
-rw-r--r--acct-group/minecraft/minecraft-0-r2.ebuild10
-rw-r--r--acct-group/minecraft/minecraft-0-r3.ebuild10
-rw-r--r--acct-group/minetest/Manifest2
-rw-r--r--acct-group/minetest/minetest-0-r2.ebuild10
-rw-r--r--acct-group/minetest/minetest-0-r3.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/mongodb/Manifest2
-rw-r--r--acct-group/mongodb/mongodb-0-r2.ebuild9
-rw-r--r--acct-group/mongodb/mongodb-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/monitorix/Manifest2
-rw-r--r--acct-group/monitorix/monitorix-0-r2.ebuild9
-rw-r--r--acct-group/monitorix/monitorix-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/monkeysphere/Manifest2
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r2.ebuild10
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r3.ebuild10
-rw-r--r--acct-group/mosquitto/Manifest2
-rw-r--r--acct-group/mosquitto/mosquitto-0-r2.ebuild9
-rw-r--r--acct-group/mosquitto/mosquitto-0-r3.ebuild9
-rw-r--r--acct-group/motion/Manifest2
-rw-r--r--acct-group/motion/motion-0-r2.ebuild8
-rw-r--r--acct-group/motion/motion-0-r3.ebuild8
-rw-r--r--acct-group/msmtpd/Manifest2
-rw-r--r--acct-group/msmtpd/msmtpd-0-r2.ebuild8
-rw-r--r--acct-group/msmtpd/msmtpd-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/munin/Manifest2
-rw-r--r--acct-group/munin/munin-0-r2.ebuild8
-rw-r--r--acct-group/munin/munin-0-r3.ebuild8
-rw-r--r--acct-group/murmur/Manifest2
-rw-r--r--acct-group/murmur/murmur-0-r2.ebuild8
-rw-r--r--acct-group/murmur/murmur-0-r3.ebuild8
-rw-r--r--acct-group/mysql/Manifest2
-rw-r--r--acct-group/mysql/mysql-0-r2.ebuild10
-rw-r--r--acct-group/mysql/mysql-0-r3.ebuild10
-rw-r--r--acct-group/mysqld_exporter/Manifest2
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild8
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r3.ebuild8
-rw-r--r--acct-group/mythtv/Manifest2
-rw-r--r--acct-group/mythtv/mythtv-0-r2.ebuild10
-rw-r--r--acct-group/mythtv/mythtv-0-r3.ebuild10
-rw-r--r--acct-group/nagios/Manifest2
-rw-r--r--acct-group/nagios/nagios-0-r2.ebuild8
-rw-r--r--acct-group/nagios/nagios-0-r3.ebuild8
-rw-r--r--acct-group/named/Manifest2
-rw-r--r--acct-group/named/named-0-r2.ebuild8
-rw-r--r--acct-group/named/named-0-r3.ebuild8
-rw-r--r--acct-group/netdata/Manifest2
-rw-r--r--acct-group/netdata/netdata-0-r2.ebuild8
-rw-r--r--acct-group/netdata/netdata-0-r3.ebuild8
-rw-r--r--acct-group/netdev/Manifest2
-rw-r--r--acct-group/netdev/netdev-0-r2.ebuild9
-rw-r--r--acct-group/netdev/netdev-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/nginx-vts-exporter/Manifest2
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild8
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild8
-rw-r--r--acct-group/ngrep/Manifest2
-rw-r--r--acct-group/ngrep/ngrep-0-r2.ebuild10
-rw-r--r--acct-group/ngrep/ngrep-0-r3.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-r2.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/node_exporter/Manifest2
-rw-r--r--acct-group/node_exporter/node_exporter-0-r2.ebuild8
-rw-r--r--acct-group/node_exporter/node_exporter-0-r3.ebuild8
-rw-r--r--acct-group/nofiles/Manifest2
-rw-r--r--acct-group/nofiles/nofiles-0-r2.ebuild8
-rw-r--r--acct-group/nofiles/nofiles-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/nsd/Manifest2
-rw-r--r--acct-group/nsd/nsd-0-r2.ebuild8
-rw-r--r--acct-group/nsd/nsd-0-r3.ebuild8
-rw-r--r--acct-group/nslcd/Manifest2
-rw-r--r--acct-group/nslcd/nslcd-0-r2.ebuild8
-rw-r--r--acct-group/nslcd/nslcd-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/ntp/Manifest2
-rw-r--r--acct-group/ntp/ntp-0-r2.ebuild8
-rw-r--r--acct-group/ntp/ntp-0-r3.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-r2.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/oidentd/Manifest2
-rw-r--r--acct-group/oidentd/oidentd-0-r2.ebuild8
-rw-r--r--acct-group/oidentd/oidentd-0-r3.ebuild8
-rw-r--r--acct-group/openct/Manifest2
-rw-r--r--acct-group/openct/openct-0-r2.ebuild8
-rw-r--r--acct-group/openct/openct-0-r3.ebuild8
-rw-r--r--acct-group/opendkim/Manifest2
-rw-r--r--acct-group/opendkim/opendkim-0-r2.ebuild9
-rw-r--r--acct-group/opendkim/opendkim-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/openntpd/Manifest2
-rw-r--r--acct-group/openntpd/openntpd-0-r2.ebuild8
-rw-r--r--acct-group/openntpd/openntpd-0-r3.ebuild8
-rw-r--r--acct-group/openrct2/Manifest2
-rw-r--r--acct-group/openrct2/openrct2-0-r2.ebuild10
-rw-r--r--acct-group/openrct2/openrct2-0-r3.ebuild10
-rw-r--r--acct-group/openvpn/Manifest2
-rw-r--r--acct-group/openvpn/openvpn-0-r2.ebuild8
-rw-r--r--acct-group/openvpn/openvpn-0-r3.ebuild8
-rw-r--r--acct-group/openvpn_exporter/Manifest2
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild8
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r3.ebuild8
-rw-r--r--acct-group/oprofile/Manifest2
-rw-r--r--acct-group/oprofile/oprofile-0-r2.ebuild9
-rw-r--r--acct-group/oprofile/oprofile-0-r3.ebuild9
-rw-r--r--acct-group/ossec/Manifest2
-rw-r--r--acct-group/ossec/ossec-0-r2.ebuild9
-rw-r--r--acct-group/ossec/ossec-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/pcscd/Manifest2
-rw-r--r--acct-group/pcscd/pcscd-0-r2.ebuild8
-rw-r--r--acct-group/pcscd/pcscd-0-r3.ebuild8
-rw-r--r--acct-group/pdns/Manifest2
-rw-r--r--acct-group/pdns/pdns-0-r2.ebuild8
-rw-r--r--acct-group/pdns/pdns-0-r3.ebuild8
-rw-r--r--acct-group/pdnsd/Manifest2
-rw-r--r--acct-group/pdnsd/pdnsd-0-r2.ebuild8
-rw-r--r--acct-group/pdnsd/pdnsd-0-r3.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-r2.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/plex/Manifest2
-rw-r--r--acct-group/plex/plex-0-r2.ebuild9
-rw-r--r--acct-group/plex/plex-0-r3.ebuild9
-rw-r--r--acct-group/plugdev/Manifest2
-rw-r--r--acct-group/plugdev/plugdev-0-r2.ebuild9
-rw-r--r--acct-group/plugdev/plugdev-0-r3.ebuild9
-rw-r--r--acct-group/polkitd/Manifest2
-rw-r--r--acct-group/polkitd/polkitd-0-r2.ebuild8
-rw-r--r--acct-group/polkitd/polkitd-0-r3.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/postdrop/Manifest2
-rw-r--r--acct-group/postdrop/postdrop-0-r2.ebuild8
-rw-r--r--acct-group/postdrop/postdrop-0-r3.ebuild8
-rw-r--r--acct-group/postfix/Manifest2
-rw-r--r--acct-group/postfix/postfix-0-r2.ebuild8
-rw-r--r--acct-group/postfix/postfix-0-r3.ebuild8
-rw-r--r--acct-group/postfix_exporter/Manifest2
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild8
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/postgres/Manifest2
-rw-r--r--acct-group/postgres/postgres-0-r2.ebuild10
-rw-r--r--acct-group/postgres/postgres-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/privoxy/Manifest2
-rw-r--r--acct-group/privoxy/privoxy-0-r2.ebuild9
-rw-r--r--acct-group/privoxy/privoxy-0-r3.ebuild9
-rw-r--r--acct-group/prometheus/Manifest2
-rw-r--r--acct-group/prometheus/prometheus-0-r2.ebuild8
-rw-r--r--acct-group/prometheus/prometheus-0-r3.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/puppet/Manifest2
-rw-r--r--acct-group/puppet/puppet-0-r2.ebuild8
-rw-r--r--acct-group/puppet/puppet-0-r3.ebuild8
-rw-r--r--acct-group/puppetdb/Manifest2
-rw-r--r--acct-group/puppetdb/puppetdb-0-r2.ebuild8
-rw-r--r--acct-group/puppetdb/puppetdb-0-r3.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/qemu/Manifest2
-rw-r--r--acct-group/qemu/qemu-0-r2.ebuild8
-rw-r--r--acct-group/qemu/qemu-0-r3.ebuild8
-rw-r--r--acct-group/qmail/Manifest2
-rw-r--r--acct-group/qmail/qmail-0-r2.ebuild8
-rw-r--r--acct-group/qmail/qmail-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/radicale/Manifest2
-rw-r--r--acct-group/radicale/radicale-0-r2.ebuild9
-rw-r--r--acct-group/radicale/radicale-0-r3.ebuild9
-rw-r--r--acct-group/radius/Manifest2
-rw-r--r--acct-group/radius/radius-0-r2.ebuild9
-rw-r--r--acct-group/radius/radius-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/rbldns/Manifest2
-rw-r--r--acct-group/rbldns/rbldns-0-r2.ebuild8
-rw-r--r--acct-group/rbldns/rbldns-0-r3.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-r2.ebuild10
-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-r2.ebuild10
-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-r2.ebuild8
-rw-r--r--acct-group/redmine/Manifest2
-rw-r--r--acct-group/redmine/redmine-0-r2.ebuild8
-rw-r--r--acct-group/redmine/redmine-0-r3.ebuild8
-rw-r--r--acct-group/redsocks/Manifest2
-rw-r--r--acct-group/redsocks/redsocks-0-r2.ebuild10
-rw-r--r--acct-group/redsocks/redsocks-0-r3.ebuild10
-rw-r--r--acct-group/reg/Manifest2
-rw-r--r--acct-group/reg/reg-0-r2.ebuild10
-rw-r--r--acct-group/reg/reg-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/render/Manifest2
-rw-r--r--acct-group/render/render-0-r2.ebuild8
-rw-r--r--acct-group/render/render-0-r3.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-r2.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-r2.ebuild9
-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-r2.ebuild10
-rw-r--r--acct-group/rspamd/Manifest2
-rw-r--r--acct-group/rspamd/rspamd-0-r2.ebuild9
-rw-r--r--acct-group/rspamd/rspamd-0-r3.ebuild9
-rw-r--r--acct-group/rtkit/Manifest2
-rw-r--r--acct-group/rtkit/rtkit-0-r2.ebuild9
-rw-r--r--acct-group/rtkit/rtkit-0-r3.ebuild9
-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-r2.ebuild10
-rw-r--r--acct-group/sabnzbd/Manifest2
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r2.ebuild10
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r3.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-r2.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/sanlock/Manifest2
-rw-r--r--acct-group/sanlock/sanlock-0-r2.ebuild9
-rw-r--r--acct-group/sanlock/sanlock-0-r3.ebuild9
-rw-r--r--acct-group/sauerbraten/Manifest2
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r2.ebuild9
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/scponly/Manifest2
-rw-r--r--acct-group/scponly/scponly-0-r2.ebuild9
-rw-r--r--acct-group/scponly/scponly-0-r3.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-r2.ebuild8
-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-r2.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-r2.ebuild10
-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-r2.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-r2.ebuild9
-rw-r--r--acct-group/slurm/Manifest2
-rw-r--r--acct-group/slurm/slurm-0-r2.ebuild9
-rw-r--r--acct-group/slurm/slurm-0-r3.ebuild9
-rw-r--r--acct-group/smmsp/Manifest2
-rw-r--r--acct-group/smmsp/smmsp-0-r2.ebuild8
-rw-r--r--acct-group/smmsp/smmsp-0-r3.ebuild8
-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-r2.ebuild8
-rw-r--r--acct-group/smtpd/Manifest2
-rw-r--r--acct-group/smtpd/smtpd-0-r2.ebuild9
-rw-r--r--acct-group/smtpd/smtpd-0-r3.ebuild9
-rw-r--r--acct-group/smtpq/Manifest2
-rw-r--r--acct-group/smtpq/smtpq-0-r2.ebuild9
-rw-r--r--acct-group/smtpq/smtpq-0-r3.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-r2.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-r2.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-r2.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-r2.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/sogo/Manifest2
-rw-r--r--acct-group/sogo/sogo-0-r2.ebuild9
-rw-r--r--acct-group/sogo/sogo-0-r3.ebuild9
-rw-r--r--acct-group/spamd/Manifest2
-rw-r--r--acct-group/spamd/spamd-0-r2.ebuild9
-rw-r--r--acct-group/spamd/spamd-0-r3.ebuild9
-rw-r--r--acct-group/spectrum/Manifest2
-rw-r--r--acct-group/spectrum/spectrum-0-r2.ebuild10
-rw-r--r--acct-group/spectrum/spectrum-0-r3.ebuild10
-rw-r--r--acct-group/spire/Manifest2
-rw-r--r--acct-group/spire/spire-0-r2.ebuild8
-rw-r--r--acct-group/spire/spire-0-r3.ebuild8
-rw-r--r--acct-group/sqlgrey/Manifest2
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r2.ebuild9
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r3.ebuild9
-rw-r--r--acct-group/squid/Manifest2
-rw-r--r--acct-group/squid/squid-0-r2.ebuild8
-rw-r--r--acct-group/squid/squid-0-r3.ebuild8
-rw-r--r--acct-group/sshd/Manifest2
-rw-r--r--acct-group/sshd/sshd-0-r2.ebuild8
-rw-r--r--acct-group/sshd/sshd-0-r3.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-r2.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-r2.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-r2.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/steamcmd/Manifest2
-rw-r--r--acct-group/steamcmd/steamcmd-0-r2.ebuild10
-rw-r--r--acct-group/steamcmd/steamcmd-0-r3.ebuild10
-rw-r--r--acct-group/stubby/Manifest2
-rw-r--r--acct-group/stubby/stubby-0-r2.ebuild9
-rw-r--r--acct-group/stubby/stubby-0-r3.ebuild9
-rw-r--r--acct-group/stunnel/Manifest2
-rw-r--r--acct-group/stunnel/stunnel-0-r2.ebuild9
-rw-r--r--acct-group/stunnel/stunnel-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/supervisor/Manifest2
-rw-r--r--acct-group/supervisor/supervisor-0-r2.ebuild9
-rw-r--r--acct-group/supervisor/supervisor-0-r3.ebuild9
-rw-r--r--acct-group/suricata/Manifest2
-rw-r--r--acct-group/suricata/suricata-0-r2.ebuild9
-rw-r--r--acct-group/suricata/suricata-0-r3.ebuild9
-rw-r--r--acct-group/svnusers/Manifest2
-rw-r--r--acct-group/svnusers/svnusers-0-r2.ebuild8
-rw-r--r--acct-group/svnusers/svnusers-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/syncthing/Manifest2
-rw-r--r--acct-group/syncthing/syncthing-0-r2.ebuild9
-rw-r--r--acct-group/syncthing/syncthing-0-r3.ebuild9
-rw-r--r--acct-group/systemd-coredump/Manifest2
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild8
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r3.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/Manifest2
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild8
-rw-r--r--acct-group/systemd-journal/Manifest2
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r2.ebuild8
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r3.ebuild8
-rw-r--r--acct-group/systemd-network/Manifest2
-rw-r--r--acct-group/systemd-network/systemd-network-0-r2.ebuild8
-rw-r--r--acct-group/systemd-network/systemd-network-0-r3.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-r2.ebuild8
-rw-r--r--acct-group/systemd-resolve/Manifest2
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild8
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r3.ebuild8
-rw-r--r--acct-group/systemd-timesync/Manifest2
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild8
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r3.ebuild8
-rw-r--r--acct-group/tape/Manifest2
-rw-r--r--acct-group/tape/tape-0-r2.ebuild8
-rw-r--r--acct-group/tape/tape-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/teamspeak/Manifest2
-rw-r--r--acct-group/teamspeak/teamspeak-0-r2.ebuild10
-rw-r--r--acct-group/teamspeak/teamspeak-0-r3.ebuild10
-rw-r--r--acct-group/telegraf/Manifest2
-rw-r--r--acct-group/telegraf/telegraf-0-r2.ebuild8
-rw-r--r--acct-group/telegraf/telegraf-0-r3.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-r2.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/tor/Manifest2
-rw-r--r--acct-group/tor/tor-0-r2.ebuild9
-rw-r--r--acct-group/tor/tor-0-r3.ebuild9
-rw-r--r--acct-group/tox/Manifest2
-rw-r--r--acct-group/tox/tox-0-r2.ebuild7
-rw-r--r--acct-group/tox/tox-0-r3.ebuild7
-rw-r--r--acct-group/transmission/Manifest2
-rw-r--r--acct-group/transmission/transmission-0-r2.ebuild8
-rw-r--r--acct-group/transmission/transmission-0-r3.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/tsm/Manifest2
-rw-r--r--acct-group/tsm/tsm-0-r2.ebuild8
-rw-r--r--acct-group/tsm/tsm-0-r3.ebuild8
-rw-r--r--acct-group/tss/Manifest2
-rw-r--r--acct-group/tss/tss-0-r2.ebuild9
-rw-r--r--acct-group/tss/tss-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/tty/Manifest2
-rw-r--r--acct-group/tty/tty-0-r2.ebuild8
-rw-r--r--acct-group/tty/tty-0-r3.ebuild8
-rw-r--r--acct-group/turnserver/Manifest2
-rw-r--r--acct-group/turnserver/turnserver-0-r2.ebuild10
-rw-r--r--acct-group/turnserver/turnserver-0-r3.ebuild10
-rw-r--r--acct-group/ubridge/Manifest2
-rw-r--r--acct-group/ubridge/ubridge-0-r2.ebuild9
-rw-r--r--acct-group/ubridge/ubridge-0-r3.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-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-r2.ebuild8
-rw-r--r--acct-group/unbound/Manifest2
-rw-r--r--acct-group/unbound/unbound-0-r2.ebuild10
-rw-r--r--acct-group/unbound/unbound-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/unifi/Manifest2
-rw-r--r--acct-group/unifi/unifi-0-r2.ebuild10
-rw-r--r--acct-group/unifi/unifi-0-r3.ebuild10
-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-r2.ebuild9
-rw-r--r--acct-group/usb/Manifest2
-rw-r--r--acct-group/usb/usb-0-r2.ebuild8
-rw-r--r--acct-group/usb/usb-0-r3.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-r2.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-r2.ebuild9
-rw-r--r--acct-group/utmp/Manifest2
-rw-r--r--acct-group/utmp/utmp-0-r2.ebuild8
-rw-r--r--acct-group/utmp/utmp-0-r3.ebuild8
-rw-r--r--acct-group/uucp/Manifest2
-rw-r--r--acct-group/uucp/uucp-0-r2.ebuild8
-rw-r--r--acct-group/uucp/uucp-0-r3.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-r2.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-r2.ebuild10
-rw-r--r--acct-group/varnish/Manifest2
-rw-r--r--acct-group/varnish/varnish-0-r2.ebuild9
-rw-r--r--acct-group/varnish/varnish-0-r3.ebuild9
-rw-r--r--acct-group/vault/Manifest2
-rw-r--r--acct-group/vault/vault-0-r2.ebuild8
-rw-r--r--acct-group/vault/vault-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/vboxguest/Manifest2
-rw-r--r--acct-group/vboxguest/vboxguest-0-r2.ebuild8
-rw-r--r--acct-group/vboxguest/vboxguest-0-r3.ebuild8
-rw-r--r--acct-group/vboxsf/Manifest2
-rw-r--r--acct-group/vboxsf/vboxsf-0-r2.ebuild8
-rw-r--r--acct-group/vboxsf/vboxsf-0-r3.ebuild8
-rw-r--r--acct-group/vboxusers/Manifest2
-rw-r--r--acct-group/vboxusers/vboxusers-0-r2.ebuild8
-rw-r--r--acct-group/vboxusers/vboxusers-0-r3.ebuild8
-rw-r--r--acct-group/vdr/Manifest2
-rw-r--r--acct-group/vdr/vdr-0-r2.ebuild10
-rw-r--r--acct-group/vdr/vdr-0-r3.ebuild10
-rw-r--r--acct-group/vdradmin/Manifest2
-rw-r--r--acct-group/vdradmin/vdradmin-0-r2.ebuild10
-rw-r--r--acct-group/vdradmin/vdradmin-0-r3.ebuild10
-rw-r--r--acct-group/video/Manifest2
-rw-r--r--acct-group/video/video-0-r2.ebuild8
-rw-r--r--acct-group/video/video-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/vpopmail/Manifest2
-rw-r--r--acct-group/vpopmail/vpopmail-0-r2.ebuild8
-rw-r--r--acct-group/vpopmail/vpopmail-0-r3.ebuild8
-rw-r--r--acct-group/wesnoth/Manifest2
-rw-r--r--acct-group/wesnoth/wesnoth-0-r2.ebuild8
-rw-r--r--acct-group/wesnoth/wesnoth-0-r3.ebuild8
-rw-r--r--acct-group/wheel/Manifest2
-rw-r--r--acct-group/wheel/wheel-0-r2.ebuild8
-rw-r--r--acct-group/wheel/wheel-0-r3.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-r2.ebuild10
-rw-r--r--acct-group/x2goprint/Manifest2
-rw-r--r--acct-group/x2goprint/x2goprint-0-r2.ebuild9
-rw-r--r--acct-group/x2goprint/x2goprint-0-r3.ebuild9
-rw-r--r--acct-group/x2gouser/Manifest2
-rw-r--r--acct-group/x2gouser/x2gouser-0-r2.ebuild9
-rw-r--r--acct-group/x2gouser/x2gouser-0-r3.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-r2.ebuild9
-rw-r--r--acct-group/xrootd/Manifest2
-rw-r--r--acct-group/xrootd/xrootd-0-r2.ebuild9
-rw-r--r--acct-group/xrootd/xrootd-0-r3.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-r2.ebuild10
-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-r2.ebuild9
-rw-r--r--acct-group/zeppelin/Manifest2
-rw-r--r--acct-group/zeppelin/zeppelin-0-r2.ebuild9
-rw-r--r--acct-group/zeppelin/zeppelin-0-r3.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-r2.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-r2.ebuild8
-rw-r--r--acct-group/znc/Manifest2
-rw-r--r--acct-group/znc/znc-0-r2.ebuild9
-rw-r--r--acct-group/znc/znc-0-r3.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-r2.ebuild10
-rw-r--r--acct-user/Manifest.gzbin67606 -> 67575 bytes
-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-r2.ebuild13
-rw-r--r--acct-user/airdcppd/Manifest2
-rw-r--r--acct-user/airdcppd/airdcppd-0-r2.ebuild16
-rw-r--r--acct-user/airdcppd/airdcppd-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/alias/Manifest2
-rw-r--r--acct-user/alias/alias-0-r2.ebuild18
-rw-r--r--acct-user/alias/alias-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/amavis/Manifest2
-rw-r--r--acct-user/amavis/amavis-0-r2.ebuild13
-rw-r--r--acct-user/amavis/amavis-0-r3.ebuild13
-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-r2.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-r2.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-r2.ebuild13
-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-r2.ebuild13
-rw-r--r--acct-user/asterisk/Manifest2
-rw-r--r--acct-user/asterisk/asterisk-0-r2.ebuild12
-rw-r--r--acct-user/asterisk/asterisk-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/atheme-services/Manifest2
-rw-r--r--acct-user/atheme-services/atheme-services-0-r2.ebuild12
-rw-r--r--acct-user/atheme-services/atheme-services-0-r3.ebuild12
-rw-r--r--acct-user/automatic/Manifest2
-rw-r--r--acct-user/automatic/automatic-0-r1.ebuild12
-rw-r--r--acct-user/automatic/automatic-0-r2.ebuild12
-rw-r--r--acct-user/automx2/Manifest2
-rw-r--r--acct-user/automx2/automx2-0-r2.ebuild14
-rw-r--r--acct-user/automx2/automx2-0-r3.ebuild14
-rw-r--r--acct-user/avahi-autoipd/Manifest2
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild12
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r3.ebuild12
-rw-r--r--acct-user/avahi/Manifest2
-rw-r--r--acct-user/avahi/avahi-0-r2.ebuild12
-rw-r--r--acct-user/avahi/avahi-0-r3.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-r2.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-r2.ebuild15
-rw-r--r--acct-user/bacula/Manifest2
-rw-r--r--acct-user/bacula/bacula-0-r2.ebuild13
-rw-r--r--acct-user/bacula/bacula-0-r3.ebuild13
-rw-r--r--acct-user/bareos/Manifest2
-rw-r--r--acct-user/bareos/bareos-0-r2.ebuild13
-rw-r--r--acct-user/bareos/bareos-0-r3.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-r2.ebuild14
-rw-r--r--acct-user/bedrock/Manifest2
-rw-r--r--acct-user/bedrock/bedrock-0-r2.ebuild13
-rw-r--r--acct-user/bedrock/bedrock-0-r3.ebuild13
-rw-r--r--acct-user/bind_exporter/Manifest2
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r2.ebuild12
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/bitcoin/Manifest2
-rw-r--r--acct-user/bitcoin/bitcoin-0-r2.ebuild12
-rw-r--r--acct-user/bitcoin/bitcoin-0-r3.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-r2.ebuild14
-rw-r--r--acct-user/bitlbee/Manifest2
-rw-r--r--acct-user/bitlbee/bitlbee-0-r2.ebuild12
-rw-r--r--acct-user/bitlbee/bitlbee-0-r3.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-r2.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/buildbot/Manifest2
-rw-r--r--acct-user/buildbot/buildbot-0-r2.ebuild12
-rw-r--r--acct-user/buildbot/buildbot-0-r3.ebuild12
-rw-r--r--acct-user/burp/Manifest2
-rw-r--r--acct-user/burp/burp-0-r2.ebuild12
-rw-r--r--acct-user/burp/burp-0-r3.ebuild12
-rw-r--r--acct-user/burrow_exporter/Manifest2
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild12
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r3.ebuild12
-rw-r--r--acct-user/cadvisor/Manifest2
-rw-r--r--acct-user/cadvisor/cadvisor-0-r2.ebuild12
-rw-r--r--acct-user/cadvisor/cadvisor-0-r3.ebuild12
-rw-r--r--acct-user/cancd/Manifest2
-rw-r--r--acct-user/cancd/cancd-0-r2.ebuild13
-rw-r--r--acct-user/cancd/cancd-0-r3.ebuild13
-rw-r--r--acct-user/carbon/Manifest2
-rw-r--r--acct-user/carbon/carbon-0-r2.ebuild12
-rw-r--r--acct-user/carbon/carbon-0-r3.ebuild12
-rw-r--r--acct-user/ceph/Manifest2
-rw-r--r--acct-user/ceph/ceph-0-r2.ebuild14
-rw-r--r--acct-user/ceph/ceph-0-r3.ebuild14
-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-r2.ebuild13
-rw-r--r--acct-user/chronograf/Manifest2
-rw-r--r--acct-user/chronograf/chronograf-0-r2.ebuild13
-rw-r--r--acct-user/chronograf/chronograf-0-r3.ebuild13
-rw-r--r--acct-user/clair/Manifest2
-rw-r--r--acct-user/clair/clair-0-r2.ebuild12
-rw-r--r--acct-user/clair/clair-0-r3.ebuild12
-rw-r--r--acct-user/clamav/Manifest2
-rw-r--r--acct-user/clamav/clamav-0-r2.ebuild11
-rw-r--r--acct-user/clamav/clamav-0-r3.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-r2.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-r2.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/consul-template/Manifest2
-rw-r--r--acct-user/consul-template/consul-template-0-r2.ebuild12
-rw-r--r--acct-user/consul-template/consul-template-0-r3.ebuild12
-rw-r--r--acct-user/consul/Manifest2
-rw-r--r--acct-user/consul/consul-0-r2.ebuild13
-rw-r--r--acct-user/consul/consul-0-r3.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-r2.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-r2.ebuild14
-rw-r--r--acct-user/cron/Manifest2
-rw-r--r--acct-user/cron/cron-0-r2.ebuild16
-rw-r--r--acct-user/cron/cron-0-r3.ebuild16
-rw-r--r--acct-user/cvmfs/Manifest2
-rw-r--r--acct-user/cvmfs/cvmfs-0-r2.ebuild12
-rw-r--r--acct-user/cvmfs/cvmfs-0-r3.ebuild12
-rw-r--r--acct-user/cyrus/Manifest2
-rw-r--r--acct-user/cyrus/cyrus-0-r3.ebuild12
-rw-r--r--acct-user/cyrus/cyrus-0-r4.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-r2.ebuild12
-rw-r--r--acct-user/davfs2/Manifest2
-rw-r--r--acct-user/davfs2/davfs2-0-r2.ebuild11
-rw-r--r--acct-user/davfs2/davfs2-0-r3.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/ddclient/Manifest2
-rw-r--r--acct-user/ddclient/ddclient-0-r2.ebuild13
-rw-r--r--acct-user/ddclient/ddclient-0-r3.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-r2.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-r2.ebuild14
-rw-r--r--acct-user/deluge/Manifest2
-rw-r--r--acct-user/deluge/deluge-0-r2.ebuild13
-rw-r--r--acct-user/deluge/deluge-0-r3.ebuild13
-rw-r--r--acct-user/dhcp/Manifest2
-rw-r--r--acct-user/dhcp/dhcp-0-r2.ebuild12
-rw-r--r--acct-user/dhcp/dhcp-0-r3.ebuild12
-rw-r--r--acct-user/dhcpcd/Manifest2
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r2.ebuild13
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r3.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-r2.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-r2.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-r2.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-r2.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-r2.ebuild11
-rw-r--r--acct-user/dnsdist/Manifest2
-rw-r--r--acct-user/dnsdist/dnsdist-0-r2.ebuild13
-rw-r--r--acct-user/dnsdist/dnsdist-0-r3.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-r2.ebuild11
-rw-r--r--acct-user/dnsmasq/Manifest2
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r2.ebuild13
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r3.ebuild13
-rw-r--r--acct-user/dnsmasq_exporter/Manifest2
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild12
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild12
-rw-r--r--acct-user/docker_auth/Manifest2
-rw-r--r--acct-user/docker_auth/docker_auth-0-r2.ebuild12
-rw-r--r--acct-user/docker_auth/docker_auth-0-r3.ebuild12
-rw-r--r--acct-user/dovecot/Manifest2
-rw-r--r--acct-user/dovecot/dovecot-0-r2.ebuild12
-rw-r--r--acct-user/dovecot/dovecot-0-r3.ebuild12
-rw-r--r--acct-user/dovenull/Manifest2
-rw-r--r--acct-user/dovenull/dovenull-0-r2.ebuild12
-rw-r--r--acct-user/dovenull/dovenull-0-r3.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-r2.ebuild14
-rw-r--r--acct-user/duende/Manifest2
-rw-r--r--acct-user/duende/duende-0-r2.ebuild14
-rw-r--r--acct-user/duende/duende-0-r3.ebuild14
-rw-r--r--acct-user/elasticsearch/Manifest2
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r2.ebuild13
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r3.ebuild13
-rw-r--r--acct-user/elasticsearch_exporter/Manifest2
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild12
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/epmd/Manifest2
-rw-r--r--acct-user/epmd/epmd-0-r2.ebuild12
-rw-r--r--acct-user/epmd/epmd-0-r3.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-r2.ebuild11
-rw-r--r--acct-user/etcd/Manifest2
-rw-r--r--acct-user/etcd/etcd-0-r2.ebuild14
-rw-r--r--acct-user/etcd/etcd-0-r3.ebuild14
-rw-r--r--acct-user/exabgp/Manifest2
-rw-r--r--acct-user/exabgp/exabgp-0-r2.ebuild13
-rw-r--r--acct-user/exabgp/exabgp-0-r3.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-r2.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-r2.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/fetchmail/Manifest2
-rw-r--r--acct-user/fetchmail/fetchmail-0-r2.ebuild14
-rw-r--r--acct-user/fetchmail/fetchmail-0-r3.ebuild14
-rw-r--r--acct-user/fhem/Manifest2
-rw-r--r--acct-user/fhem/fhem-0-r2.ebuild14
-rw-r--r--acct-user/fhem/fhem-0-r3.ebuild14
-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-r2.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-r2.ebuild13
-rw-r--r--acct-user/fluentd/Manifest2
-rw-r--r--acct-user/fluentd/fluentd-0-r2.ebuild12
-rw-r--r--acct-user/fluentd/fluentd-0-r3.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-r2.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-r2.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-r2.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-r2.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-r2.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-r2.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-r2.ebuild11
-rw-r--r--acct-user/ftp/Manifest2
-rw-r--r--acct-user/ftp/ftp-0-r4.ebuild15
-rw-r--r--acct-user/ftp/ftp-0-r5.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-r2.ebuild15
-rw-r--r--acct-user/gatling/Manifest2
-rw-r--r--acct-user/gatling/gatling-0-r2.ebuild12
-rw-r--r--acct-user/gatling/gatling-0-r3.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/geneweb/Manifest2
-rw-r--r--acct-user/geneweb/geneweb-0-r2.ebuild14
-rw-r--r--acct-user/geneweb/geneweb-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/gerbera/Manifest2
-rw-r--r--acct-user/gerbera/gerbera-0-r2.ebuild13
-rw-r--r--acct-user/gerbera/gerbera-0-r3.ebuild13
-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-r2.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-r2.ebuild16
-rw-r--r--acct-user/gkrellmd/Manifest2
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r2.ebuild12
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r3.ebuild12
-rw-r--r--acct-user/gluster/Manifest2
-rw-r--r--acct-user/gluster/gluster-0-r2.ebuild14
-rw-r--r--acct-user/gluster/gluster-0-r3.ebuild14
-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-r2.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-r2.ebuild13
-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-r2.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-r2.ebuild14
-rw-r--r--acct-user/gpsd/Manifest2
-rw-r--r--acct-user/gpsd/gpsd-0-r3.ebuild13
-rw-r--r--acct-user/gpsd/gpsd-0-r4.ebuild13
-rw-r--r--acct-user/grafana/Manifest2
-rw-r--r--acct-user/grafana/grafana-0-r2.ebuild13
-rw-r--r--acct-user/grafana/grafana-0-r3.ebuild13
-rw-r--r--acct-user/graylog/Manifest2
-rw-r--r--acct-user/graylog/graylog-0-r2.ebuild11
-rw-r--r--acct-user/graylog/graylog-0-r3.ebuild11
-rw-r--r--acct-user/greetd/Manifest2
-rw-r--r--acct-user/greetd/greetd-0-r2.ebuild12
-rw-r--r--acct-user/greetd/greetd-0-r3.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/gvm/Manifest2
-rw-r--r--acct-user/gvm/gvm-0-r2.ebuild13
-rw-r--r--acct-user/gvm/gvm-0-r3.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-r2.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-r2.ebuild14
-rw-r--r--acct-user/haproxy/Manifest2
-rw-r--r--acct-user/haproxy/haproxy-0-r2.ebuild11
-rw-r--r--acct-user/haproxy/haproxy-0-r3.ebuild11
-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-r2.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-r2.ebuild14
-rw-r--r--acct-user/i2p/Manifest2
-rw-r--r--acct-user/i2p/i2p-0-r2.ebuild13
-rw-r--r--acct-user/i2p/i2p-0-r3.ebuild13
-rw-r--r--acct-user/i2pd/Manifest2
-rw-r--r--acct-user/i2pd/i2pd-0-r2.ebuild14
-rw-r--r--acct-user/i2pd/i2pd-0-r3.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-r2.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/icinga/Manifest2
-rw-r--r--acct-user/icinga/icinga-0-r2.ebuild13
-rw-r--r--acct-user/icinga/icinga-0-r3.ebuild13
-rw-r--r--acct-user/influxdb/Manifest2
-rw-r--r--acct-user/influxdb/influxdb-0-r2.ebuild13
-rw-r--r--acct-user/influxdb/influxdb-0-r3.ebuild13
-rw-r--r--acct-user/inspircd/Manifest2
-rw-r--r--acct-user/inspircd/inspircd-0-r2.ebuild12
-rw-r--r--acct-user/inspircd/inspircd-0-r3.ebuild12
-rw-r--r--acct-user/ipfs/Manifest2
-rw-r--r--acct-user/ipfs/ipfs-0-r2.ebuild14
-rw-r--r--acct-user/ipfs/ipfs-0-r3.ebuild14
-rw-r--r--acct-user/ippl/Manifest2
-rw-r--r--acct-user/ippl/ippl-0-r2.ebuild12
-rw-r--r--acct-user/ippl/ippl-0-r3.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-r2.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-r2.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-r2.ebuild11
-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-r2.ebuild14
-rw-r--r--acct-user/kafka/Manifest2
-rw-r--r--acct-user/kafka/kafka-0-r2.ebuild15
-rw-r--r--acct-user/kafka/kafka-0-r3.ebuild15
-rw-r--r--acct-user/kapacitor/Manifest2
-rw-r--r--acct-user/kapacitor/kapacitor-0-r2.ebuild13
-rw-r--r--acct-user/kapacitor/kapacitor-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/kibana/Manifest2
-rw-r--r--acct-user/kibana/kibana-0-r2.ebuild13
-rw-r--r--acct-user/kibana/kibana-0-r3.ebuild13
-rw-r--r--acct-user/kismet/Manifest2
-rw-r--r--acct-user/kismet/kismet-0-r2.ebuild15
-rw-r--r--acct-user/kismet/kismet-0-r3.ebuild15
-rw-r--r--acct-user/knot/Manifest2
-rw-r--r--acct-user/knot/knot-0-r2.ebuild13
-rw-r--r--acct-user/knot/knot-0-r3.ebuild13
-rw-r--r--acct-user/kube-apiserver/Manifest2
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild12
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r3.ebuild12
-rw-r--r--acct-user/kube-controller-manager/Manifest2
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild12
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r3.ebuild12
-rw-r--r--acct-user/kube-scheduler/Manifest2
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild12
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r3.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-r2.ebuild16
-rw-r--r--acct-user/lighttpd/Manifest2
-rw-r--r--acct-user/lighttpd/lighttpd-0-r2.ebuild12
-rw-r--r--acct-user/lighttpd/lighttpd-0-r3.ebuild12
-rw-r--r--acct-user/lldpd/Manifest2
-rw-r--r--acct-user/lldpd/lldpd-0-r2.ebuild13
-rw-r--r--acct-user/lldpd/lldpd-0-r3.ebuild13
-rw-r--r--acct-user/logstash/Manifest2
-rw-r--r--acct-user/logstash/logstash-0-r2.ebuild13
-rw-r--r--acct-user/logstash/logstash-0-r3.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-r2.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-r2.ebuild12
-rw-r--r--acct-user/mail/Manifest2
-rw-r--r--acct-user/mail/mail-0-r2.ebuild15
-rw-r--r--acct-user/mail/mail-0-r3.ebuild15
-rw-r--r--acct-user/man/Manifest2
-rw-r--r--acct-user/man/man-1-r2.ebuild11
-rw-r--r--acct-user/man/man-1-r3.ebuild11
-rw-r--r--acct-user/maradns/Manifest2
-rw-r--r--acct-user/maradns/maradns-0-r2.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r3.ebuild11
-rw-r--r--acct-user/memcached/Manifest2
-rw-r--r--acct-user/memcached/memcached-0-r2.ebuild12
-rw-r--r--acct-user/memcached/memcached-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/messagebus/Manifest2
-rw-r--r--acct-user/messagebus/messagebus-0-r2.ebuild11
-rw-r--r--acct-user/messagebus/messagebus-0-r3.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-r2.ebuild14
-rw-r--r--acct-user/milter-regex/Manifest2
-rw-r--r--acct-user/milter-regex/milter-regex-0-r2.ebuild13
-rw-r--r--acct-user/milter-regex/milter-regex-0-r3.ebuild13
-rw-r--r--acct-user/minecraft/Manifest2
-rw-r--r--acct-user/minecraft/minecraft-0-r2.ebuild14
-rw-r--r--acct-user/minecraft/minecraft-0-r3.ebuild14
-rw-r--r--acct-user/minetest/Manifest2
-rw-r--r--acct-user/minetest/minetest-1-r2.ebuild14
-rw-r--r--acct-user/minetest/minetest-1-r3.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-r2.ebuild11
-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-r2.ebuild13
-rw-r--r--acct-user/mongodb/Manifest2
-rw-r--r--acct-user/mongodb/mongodb-0-r2.ebuild13
-rw-r--r--acct-user/mongodb/mongodb-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/monitorix/Manifest2
-rw-r--r--acct-user/monitorix/monitorix-0-r2.ebuild12
-rw-r--r--acct-user/monitorix/monitorix-0-r3.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-r2.ebuild15
-rw-r--r--acct-user/monkeysphere/Manifest2
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r2.ebuild16
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r3.ebuild16
-rw-r--r--acct-user/mosquitto/Manifest2
-rw-r--r--acct-user/mosquitto/mosquitto-0-r2.ebuild12
-rw-r--r--acct-user/mosquitto/mosquitto-0-r3.ebuild12
-rw-r--r--acct-user/motion/Manifest2
-rw-r--r--acct-user/motion/motion-0-r2.ebuild12
-rw-r--r--acct-user/motion/motion-0-r3.ebuild12
-rw-r--r--acct-user/mpd/Manifest2
-rw-r--r--acct-user/mpd/mpd-0-r2.ebuild13
-rw-r--r--acct-user/mpd/mpd-0-r3.ebuild13
-rw-r--r--acct-user/msmtpd/Manifest2
-rw-r--r--acct-user/msmtpd/msmtpd-0-r2.ebuild12
-rw-r--r--acct-user/msmtpd/msmtpd-0-r3.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-r2.ebuild14
-rw-r--r--acct-user/munin-async/Manifest2
-rw-r--r--acct-user/munin-async/munin-async-0-r2.ebuild15
-rw-r--r--acct-user/munin-async/munin-async-0-r3.ebuild15
-rw-r--r--acct-user/munin/Manifest2
-rw-r--r--acct-user/munin/munin-0-r2.ebuild14
-rw-r--r--acct-user/munin/munin-0-r3.ebuild14
-rw-r--r--acct-user/murmur/Manifest2
-rw-r--r--acct-user/murmur/murmur-0-r2.ebuild15
-rw-r--r--acct-user/murmur/murmur-0-r3.ebuild15
-rw-r--r--acct-user/mysql/Manifest2
-rw-r--r--acct-user/mysql/mysql-0-r2.ebuild12
-rw-r--r--acct-user/mysql/mysql-0-r3.ebuild12
-rw-r--r--acct-user/mysqld_exporter/Manifest2
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild14
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r3.ebuild14
-rw-r--r--acct-user/mythtv/Manifest2
-rw-r--r--acct-user/mythtv/mythtv-0-r2.ebuild14
-rw-r--r--acct-user/mythtv/mythtv-0-r3.ebuild14
-rw-r--r--acct-user/nagios/Manifest2
-rw-r--r--acct-user/nagios/nagios-0-r2.ebuild11
-rw-r--r--acct-user/nagios/nagios-0-r3.ebuild11
-rw-r--r--acct-user/named/Manifest2
-rw-r--r--acct-user/named/named-0-r2.ebuild14
-rw-r--r--acct-user/named/named-0-r3.ebuild14
-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-r2.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-r2.ebuild13
-rw-r--r--acct-user/nginx-vts-exporter/Manifest2
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild12
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild12
-rw-r--r--acct-user/ngrep/Manifest2
-rw-r--r--acct-user/ngrep/ngrep-0-r2.ebuild13
-rw-r--r--acct-user/ngrep/ngrep-0-r3.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-r2.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-r2.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-r2.ebuild17
-rw-r--r--acct-user/node_exporter/Manifest2
-rw-r--r--acct-user/node_exporter/node_exporter-0-r2.ebuild12
-rw-r--r--acct-user/node_exporter/node_exporter-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/nsd/Manifest2
-rw-r--r--acct-user/nsd/nsd-0-r2.ebuild12
-rw-r--r--acct-user/nsd/nsd-0-r3.ebuild12
-rw-r--r--acct-user/nslcd/Manifest2
-rw-r--r--acct-user/nslcd/nslcd-0-r2.ebuild13
-rw-r--r--acct-user/nslcd/nslcd-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/ntp/Manifest2
-rw-r--r--acct-user/ntp/ntp-0-r2.ebuild12
-rw-r--r--acct-user/ntp/ntp-0-r3.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-r2.ebuild14
-rw-r--r--acct-user/nut/Manifest2
-rw-r--r--acct-user/nut/nut-0-r2.ebuild14
-rw-r--r--acct-user/nut/nut-0-r3.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-r2.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-r2.ebuild16
-rw-r--r--acct-user/oidentd/Manifest2
-rw-r--r--acct-user/oidentd/oidentd-0-r2.ebuild11
-rw-r--r--acct-user/oidentd/oidentd-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/opendkim/Manifest2
-rw-r--r--acct-user/opendkim/opendkim-0-r2.ebuild13
-rw-r--r--acct-user/opendkim/opendkim-0-r3.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/openntpd/Manifest2
-rw-r--r--acct-user/openntpd/openntpd-0-r2.ebuild14
-rw-r--r--acct-user/openntpd/openntpd-0-r3.ebuild14
-rw-r--r--acct-user/openrct2/Manifest2
-rw-r--r--acct-user/openrct2/openrct2-0-r2.ebuild13
-rw-r--r--acct-user/openrct2/openrct2-0-r3.ebuild13
-rw-r--r--acct-user/openvpn/Manifest2
-rw-r--r--acct-user/openvpn/openvpn-0-r2.ebuild13
-rw-r--r--acct-user/openvpn/openvpn-0-r3.ebuild13
-rw-r--r--acct-user/openvpn_exporter/Manifest2
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild13
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r3.ebuild13
-rw-r--r--acct-user/oprofile/Manifest2
-rw-r--r--acct-user/oprofile/oprofile-0-r2.ebuild12
-rw-r--r--acct-user/oprofile/oprofile-0-r3.ebuild12
-rw-r--r--acct-user/ossec/Manifest2
-rw-r--r--acct-user/ossec/ossec-0-r2.ebuild13
-rw-r--r--acct-user/ossec/ossec-0-r3.ebuild13
-rw-r--r--acct-user/ossecm/Manifest2
-rw-r--r--acct-user/ossecm/ossecm-0-r2.ebuild12
-rw-r--r--acct-user/ossecm/ossecm-0-r3.ebuild12
-rw-r--r--acct-user/ossecr/Manifest2
-rw-r--r--acct-user/ossecr/ossecr-0-r2.ebuild12
-rw-r--r--acct-user/ossecr/ossecr-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/pcscd/Manifest2
-rw-r--r--acct-user/pcscd/pcscd-0-r2.ebuild12
-rw-r--r--acct-user/pcscd/pcscd-0-r3.ebuild12
-rw-r--r--acct-user/pdns/Manifest2
-rw-r--r--acct-user/pdns/pdns-0-r2.ebuild11
-rw-r--r--acct-user/pdns/pdns-0-r3.ebuild11
-rw-r--r--acct-user/pdnsd/Manifest2
-rw-r--r--acct-user/pdnsd/pdnsd-0-r2.ebuild14
-rw-r--r--acct-user/pdnsd/pdnsd-0-r3.ebuild14
-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-r2.ebuild12
-rw-r--r--acct-user/pipewire/Manifest3
-rw-r--r--acct-user/pipewire/pipewire-0-r1.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-1-r1.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-1-r2.ebuild13
-rw-r--r--acct-user/plex/Manifest2
-rw-r--r--acct-user/plex/plex-0-r2.ebuild13
-rw-r--r--acct-user/plex/plex-0-r3.ebuild13
-rw-r--r--acct-user/polkitd/Manifest2
-rw-r--r--acct-user/polkitd/polkitd-0-r2.ebuild12
-rw-r--r--acct-user/polkitd/polkitd-0-r3.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-r2.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-r2.ebuild12
-rw-r--r--acct-user/portage/Manifest2
-rw-r--r--acct-user/portage/portage-0-r2.ebuild12
-rw-r--r--acct-user/portage/portage-0-r3.ebuild12
-rw-r--r--acct-user/postfix/Manifest2
-rw-r--r--acct-user/postfix/postfix-0-r2.ebuild12
-rw-r--r--acct-user/postfix/postfix-0-r3.ebuild12
-rw-r--r--acct-user/postfix_exporter/Manifest2
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild13
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/postgres/Manifest2
-rw-r--r--acct-user/postgres/postgres-0-r2.ebuild15
-rw-r--r--acct-user/postgres/postgres-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/postmaster/Manifest2
-rw-r--r--acct-user/postmaster/postmaster-0-r2.ebuild15
-rw-r--r--acct-user/postmaster/postmaster-0-r3.ebuild15
-rw-r--r--acct-user/privoxy/Manifest2
-rw-r--r--acct-user/privoxy/privoxy-0-r2.ebuild12
-rw-r--r--acct-user/privoxy/privoxy-0-r3.ebuild12
-rw-r--r--acct-user/prometheus/Manifest2
-rw-r--r--acct-user/prometheus/prometheus-0-r2.ebuild13
-rw-r--r--acct-user/prometheus/prometheus-0-r3.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/puppet/Manifest2
-rw-r--r--acct-user/puppet/puppet-0-r2.ebuild14
-rw-r--r--acct-user/puppet/puppet-0-r3.ebuild14
-rw-r--r--acct-user/puppetdb/Manifest2
-rw-r--r--acct-user/puppetdb/puppetdb-0-r2.ebuild14
-rw-r--r--acct-user/puppetdb/puppetdb-0-r3.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-r2.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-r2.ebuild12
-rw-r--r--acct-user/qemu/Manifest2
-rw-r--r--acct-user/qemu/qemu-0-r2.ebuild11
-rw-r--r--acct-user/qemu/qemu-0-r3.ebuild11
-rw-r--r--acct-user/qmaild/Manifest2
-rw-r--r--acct-user/qmaild/qmaild-0-r2.ebuild12
-rw-r--r--acct-user/qmaild/qmaild-0-r3.ebuild12
-rw-r--r--acct-user/qmaill/Manifest2
-rw-r--r--acct-user/qmaill/qmaill-0-r2.ebuild12
-rw-r--r--acct-user/qmaill/qmaill-0-r3.ebuild12
-rw-r--r--acct-user/qmailp/Manifest2
-rw-r--r--acct-user/qmailp/qmailp-0-r2.ebuild12
-rw-r--r--acct-user/qmailp/qmailp-0-r3.ebuild12
-rw-r--r--acct-user/qmailq/Manifest2
-rw-r--r--acct-user/qmailq/qmailq-0-r2.ebuild12
-rw-r--r--acct-user/qmailq/qmailq-0-r3.ebuild12
-rw-r--r--acct-user/qmailr/Manifest2
-rw-r--r--acct-user/qmailr/qmailr-0-r2.ebuild12
-rw-r--r--acct-user/qmailr/qmailr-0-r3.ebuild12
-rw-r--r--acct-user/qmails/Manifest2
-rw-r--r--acct-user/qmails/qmails-0-r2.ebuild12
-rw-r--r--acct-user/qmails/qmails-0-r3.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-r2.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-r2.ebuild12
-rw-r--r--acct-user/radicale/Manifest2
-rw-r--r--acct-user/radicale/radicale-0-r3.ebuild13
-rw-r--r--acct-user/radicale/radicale-0-r4.ebuild13
-rw-r--r--acct-user/radius/Manifest2
-rw-r--r--acct-user/radius/radius-0-r2.ebuild11
-rw-r--r--acct-user/radius/radius-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/rbldns/Manifest2
-rw-r--r--acct-user/rbldns/rbldns-0-r2.ebuild11
-rw-r--r--acct-user/rbldns/rbldns-0-r3.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-r2.ebuild14
-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-r2.ebuild14
-rw-r--r--acct-user/redmine/Manifest2
-rw-r--r--acct-user/redmine/redmine-0-r2.ebuild11
-rw-r--r--acct-user/redmine/redmine-0-r3.ebuild11
-rw-r--r--acct-user/redsocks/Manifest2
-rw-r--r--acct-user/redsocks/redsocks-0-r2.ebuild13
-rw-r--r--acct-user/redsocks/redsocks-0-r3.ebuild13
-rw-r--r--acct-user/reg/Manifest2
-rw-r--r--acct-user/reg/reg-0-r2.ebuild13
-rw-r--r--acct-user/reg/reg-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/root/Manifest2
-rw-r--r--acct-user/root/root-0-r2.ebuild24
-rw-r--r--acct-user/root/root-0-r3.ebuild24
-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-r2.ebuild15
-rw-r--r--acct-user/rspamd/Manifest2
-rw-r--r--acct-user/rspamd/rspamd-0-r2.ebuild12
-rw-r--r--acct-user/rspamd/rspamd-0-r3.ebuild12
-rw-r--r--acct-user/rtkit/Manifest2
-rw-r--r--acct-user/rtkit/rtkit-0-r2.ebuild12
-rw-r--r--acct-user/rtkit/rtkit-0-r3.ebuild12
-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-r2.ebuild14
-rw-r--r--acct-user/sabnzbd/Manifest2
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r2.ebuild15
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r3.ebuild15
-rw-r--r--acct-user/sagan/Manifest2
-rw-r--r--acct-user/sagan/sagan-0-r2.ebuild12
-rw-r--r--acct-user/sagan/sagan-0-r3.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-r2.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/sanlock/Manifest2
-rw-r--r--acct-user/sanlock/sanlock-0-r2.ebuild13
-rw-r--r--acct-user/sanlock/sanlock-0-r3.ebuild13
-rw-r--r--acct-user/sauerbraten/Manifest2
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r2.ebuild12
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/scponly/Manifest2
-rw-r--r--acct-user/scponly/scponly-0-r2.ebuild15
-rw-r--r--acct-user/scponly/scponly-0-r3.ebuild15
-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-r2.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-r2.ebuild14
-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-r2.ebuild12
-rw-r--r--acct-user/slurm/Manifest2
-rw-r--r--acct-user/slurm/slurm-0-r2.ebuild14
-rw-r--r--acct-user/slurm/slurm-0-r3.ebuild14
-rw-r--r--acct-user/smmsp/Manifest2
-rw-r--r--acct-user/smmsp/smmsp-0-r3.ebuild12
-rw-r--r--acct-user/smmsp/smmsp-0-r4.ebuild12
-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-r2.ebuild12
-rw-r--r--acct-user/smtpd/Manifest2
-rw-r--r--acct-user/smtpd/smtpd-0-r2.ebuild13
-rw-r--r--acct-user/smtpd/smtpd-0-r3.ebuild13
-rw-r--r--acct-user/smtpq/Manifest2
-rw-r--r--acct-user/smtpq/smtpq-0-r2.ebuild13
-rw-r--r--acct-user/smtpq/smtpq-0-r3.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-r2.ebuild15
-rw-r--r--acct-user/snapserver/Manifest2
-rw-r--r--acct-user/snapserver/snapserver-0-r1.ebuild14
-rw-r--r--acct-user/snapserver/snapserver-0-r2.ebuild14
-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-r2.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-r2.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-r2.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-r2.ebuild12
-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-r2.ebuild13
-rw-r--r--acct-user/sockd/Manifest2
-rw-r--r--acct-user/sockd/sockd-0-r2.ebuild13
-rw-r--r--acct-user/sockd/sockd-0-r3.ebuild13
-rw-r--r--acct-user/sogo/Manifest2
-rw-r--r--acct-user/sogo/sogo-0-r2.ebuild14
-rw-r--r--acct-user/sogo/sogo-0-r3.ebuild14
-rw-r--r--acct-user/spamd/Manifest2
-rw-r--r--acct-user/spamd/spamd-0-r2.ebuild25
-rw-r--r--acct-user/spamd/spamd-0-r3.ebuild25
-rw-r--r--acct-user/spectrum/Manifest2
-rw-r--r--acct-user/spectrum/spectrum-0-r2.ebuild14
-rw-r--r--acct-user/spectrum/spectrum-0-r3.ebuild14
-rw-r--r--acct-user/spire/Manifest2
-rw-r--r--acct-user/spire/spire-0-r2.ebuild12
-rw-r--r--acct-user/spire/spire-0-r3.ebuild12
-rw-r--r--acct-user/sqlgrey/Manifest2
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r2.ebuild14
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r3.ebuild14
-rw-r--r--acct-user/squid/Manifest2
-rw-r--r--acct-user/squid/squid-0-r2.ebuild13
-rw-r--r--acct-user/squid/squid-0-r3.ebuild13
-rw-r--r--acct-user/sshd/Manifest2
-rw-r--r--acct-user/sshd/sshd-0-r2.ebuild15
-rw-r--r--acct-user/sshd/sshd-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/steamcmd/Manifest2
-rw-r--r--acct-user/steamcmd/steamcmd-0-r2.ebuild14
-rw-r--r--acct-user/steamcmd/steamcmd-0-r3.ebuild14
-rw-r--r--acct-user/stubby/Manifest2
-rw-r--r--acct-user/stubby/stubby-0-r2.ebuild12
-rw-r--r--acct-user/stubby/stubby-0-r3.ebuild12
-rw-r--r--acct-user/stunnel/Manifest2
-rw-r--r--acct-user/stunnel/stunnel-0-r2.ebuild12
-rw-r--r--acct-user/stunnel/stunnel-0-r3.ebuild12
-rw-r--r--acct-user/subsonic/Manifest2
-rw-r--r--acct-user/subsonic/subsonic-0-r2.ebuild14
-rw-r--r--acct-user/subsonic/subsonic-0-r3.ebuild14
-rw-r--r--acct-user/suricata/Manifest2
-rw-r--r--acct-user/suricata/suricata-0-r2.ebuild12
-rw-r--r--acct-user/suricata/suricata-0-r3.ebuild12
-rw-r--r--acct-user/svn/Manifest2
-rw-r--r--acct-user/svn/svn-0-r2.ebuild11
-rw-r--r--acct-user/svn/svn-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/syncthing/Manifest2
-rw-r--r--acct-user/syncthing/syncthing-0-r2.ebuild14
-rw-r--r--acct-user/syncthing/syncthing-0-r3.ebuild14
-rw-r--r--acct-user/systemd-coredump/Manifest2
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild11
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r3.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/Manifest2
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild11
-rw-r--r--acct-user/systemd-network/Manifest2
-rw-r--r--acct-user/systemd-network/systemd-network-0-r2.ebuild11
-rw-r--r--acct-user/systemd-network/systemd-network-0-r3.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-r2.ebuild11
-rw-r--r--acct-user/systemd-resolve/Manifest2
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild11
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r3.ebuild11
-rw-r--r--acct-user/systemd-timesync/Manifest2
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild11
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r3.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-r2.ebuild15
-rw-r--r--acct-user/teamspeak/Manifest2
-rw-r--r--acct-user/teamspeak/teamspeak-0-r2.ebuild14
-rw-r--r--acct-user/teamspeak/teamspeak-0-r3.ebuild14
-rw-r--r--acct-user/telegraf/Manifest2
-rw-r--r--acct-user/telegraf/telegraf-0-r2.ebuild12
-rw-r--r--acct-user/telegraf/telegraf-0-r3.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-r2.ebuild14
-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-r2.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-r2.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-r2.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-r2.ebuild12
-rw-r--r--acct-user/tor/Manifest2
-rw-r--r--acct-user/tor/tor-0-r2.ebuild12
-rw-r--r--acct-user/tor/tor-0-r3.ebuild12
-rw-r--r--acct-user/tox/Manifest2
-rw-r--r--acct-user/tox/tox-0-r2.ebuild13
-rw-r--r--acct-user/tox/tox-0-r3.ebuild13
-rw-r--r--acct-user/transmission/Manifest2
-rw-r--r--acct-user/transmission/transmission-1-r2.ebuild11
-rw-r--r--acct-user/transmission/transmission-1-r3.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-r2.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-r2.ebuild12
-rw-r--r--acct-user/tss/Manifest2
-rw-r--r--acct-user/tss/tss-0-r2.ebuild12
-rw-r--r--acct-user/tss/tss-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/turnserver/Manifest2
-rw-r--r--acct-user/turnserver/turnserver-0-r2.ebuild13
-rw-r--r--acct-user/turnserver/turnserver-0-r3.ebuild13
-rw-r--r--acct-user/tvheadend/Manifest2
-rw-r--r--acct-user/tvheadend/tvheadend-0-r2.ebuild14
-rw-r--r--acct-user/tvheadend/tvheadend-0-r3.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-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-r2.ebuild12
-rw-r--r--acct-user/unbound/Manifest2
-rw-r--r--acct-user/unbound/unbound-0-r2.ebuild16
-rw-r--r--acct-user/unbound/unbound-0-r3.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-r2.ebuild12
-rw-r--r--acct-user/unifi/Manifest2
-rw-r--r--acct-user/unifi/unifi-0-r2.ebuild14
-rw-r--r--acct-user/unifi/unifi-0-r3.ebuild14
-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-r2.ebuild12
-rw-r--r--acct-user/usbmux/Manifest2
-rw-r--r--acct-user/usbmux/usbmux-0-r2.ebuild12
-rw-r--r--acct-user/usbmux/usbmux-0-r3.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-r2.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-r2.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-r2.ebuild13
-rw-r--r--acct-user/varnish/Manifest2
-rw-r--r--acct-user/varnish/varnish-0-r2.ebuild14
-rw-r--r--acct-user/varnish/varnish-0-r3.ebuild14
-rw-r--r--acct-user/vault/Manifest2
-rw-r--r--acct-user/vault/vault-0-r2.ebuild12
-rw-r--r--acct-user/vault/vault-0-r3.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-r2.ebuild13
-rw-r--r--acct-user/vboxguest/Manifest2
-rw-r--r--acct-user/vboxguest/vboxguest-0-r2.ebuild13
-rw-r--r--acct-user/vboxguest/vboxguest-0-r3.ebuild13
-rw-r--r--acct-user/vdradmin/Manifest2
-rw-r--r--acct-user/vdradmin/vdradmin-0-r2.ebuild16
-rw-r--r--acct-user/vdradmin/vdradmin-0-r3.ebuild16
-rw-r--r--acct-user/vpopmail/Manifest2
-rw-r--r--acct-user/vpopmail/vpopmail-0-r2.ebuild13
-rw-r--r--acct-user/vpopmail/vpopmail-0-r3.ebuild13
-rw-r--r--acct-user/wesnoth/Manifest2
-rw-r--r--acct-user/wesnoth/wesnoth-0-r2.ebuild13
-rw-r--r--acct-user/wesnoth/wesnoth-0-r3.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-r2.ebuild14
-rw-r--r--acct-user/x2goprint/Manifest2
-rw-r--r--acct-user/x2goprint/x2goprint-0-r2.ebuild13
-rw-r--r--acct-user/x2goprint/x2goprint-0-r3.ebuild13
-rw-r--r--acct-user/x2gouser/Manifest2
-rw-r--r--acct-user/x2gouser/x2gouser-0-r2.ebuild13
-rw-r--r--acct-user/x2gouser/x2gouser-0-r3.ebuild13
-rw-r--r--acct-user/xrootd/Manifest2
-rw-r--r--acct-user/xrootd/xrootd-0-r2.ebuild12
-rw-r--r--acct-user/xrootd/xrootd-0-r3.ebuild12
-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-r2.ebuild15
-rw-r--r--acct-user/zeppelin/Manifest2
-rw-r--r--acct-user/zeppelin/zeppelin-0-r2.ebuild14
-rw-r--r--acct-user/zeppelin/zeppelin-0-r3.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-r2.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-r2.ebuild11
-rw-r--r--acct-user/znc/Manifest2
-rw-r--r--acct-user/znc/znc-0-r2.ebuild16
-rw-r--r--acct-user/znc/znc-0-r3.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-r2.ebuild14
-rw-r--r--app-admin/Manifest.gzbin32028 -> 32030 bytes
-rw-r--r--app-admin/salt/Manifest2
-rw-r--r--app-admin/salt/salt-3007.0-r1.ebuild610
-rw-r--r--app-admin/salt/salt-3007.0.ebuild611
-rw-r--r--app-containers/Manifest.gzbin8745 -> 8740 bytes
-rw-r--r--app-containers/earthly/Manifest9
-rw-r--r--app-containers/earthly/earthly-0.8.3.ebuild2
-rw-r--r--app-containers/earthly/earthly-0.8.4.ebuild2
-rw-r--r--app-containers/earthly/earthly-0.8.5.ebuild2
-rw-r--r--app-containers/earthly/earthly-0.8.6.ebuild71
-rw-r--r--app-editors/Manifest.gzbin13955 -> 13956 bytes
-rw-r--r--app-editors/retext/Manifest4
-rw-r--r--app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch15
-rw-r--r--app-editors/retext/retext-8.0.1-r1.ebuild85
-rw-r--r--app-editors/retext/retext-9999.ebuild19
-rw-r--r--app-shells/Manifest.gzbin10299 -> 10628 bytes
-rw-r--r--app-shells/irregular/Manifest3
-rw-r--r--app-shells/irregular/irregular-0.7.8.ebuild34
-rw-r--r--app-shells/irregular/metadata.xml13
-rw-r--r--app-shells/ugit/Manifest3
-rw-r--r--app-shells/ugit/metadata.xml13
-rw-r--r--app-shells/ugit/ugit-0.4.3.ebuild36
-rw-r--r--dev-ada/Manifest.gzbin4749 -> 4745 bytes
-rw-r--r--dev-ada/VSS/Manifest4
-rw-r--r--dev-ada/VSS/VSS-24.0.0-r1.ebuild84
-rw-r--r--dev-ada/VSS/VSS-24.0.0.ebuild43
-rw-r--r--dev-ada/VSS/metadata.xml4
-rw-r--r--dev-java/Manifest.gzbin59637 -> 59639 bytes
-rw-r--r--dev-java/commons-httpclient/Manifest1
-rw-r--r--dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch369
-rw-r--r--dev-lang/Manifest.gzbin21829 -> 21830 bytes
-rw-r--r--dev-lang/dafny/Manifest2
-rw-r--r--dev-lang/dafny/dafny-4.5.0.ebuild3
-rw-r--r--dev-lang/moarvm/Manifest1
-rw-r--r--dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch22
-rw-r--r--dev-libs/Manifest.gzbin98204 -> 98206 bytes
-rw-r--r--dev-libs/rocksdb/Manifest1
-rw-r--r--dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch40
-rw-r--r--dev-python/Manifest.gzbin270932 -> 270928 bytes
-rw-r--r--dev-python/build/Manifest1
-rw-r--r--dev-python/build/files/build-1.0.3-setuptools-69.patch102
-rw-r--r--dev-python/pipenv/Manifest1
-rw-r--r--dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch28
-rw-r--r--dev-tcltk/Manifest.gzbin5475 -> 5473 bytes
-rw-r--r--dev-tcltk/itk/Manifest1
-rw-r--r--dev-tcltk/itk/files/itk-4.2.3-install.patch11
-rw-r--r--dev-util/Manifest.gzbin65124 -> 65123 bytes
-rw-r--r--dev-util/perf/Manifest1
-rw-r--r--dev-util/perf/files/perf-6.6-ia64.patch12
-rw-r--r--metadata/Manifest.gzbin10346 -> 10350 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.gzbin28433 -> 28398 bytes
-rw-r--r--metadata/md5-cache/acct-group/Manifest.gzbin72506 -> 72586 bytes
-rw-r--r--metadata/md5-cache/acct-group/adm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/adm-0-r38
-rw-r--r--metadata/md5-cache/acct-group/aerospike-amc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/aerospike-amc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/airdcppd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/airdcppd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/alertmanager-0-r18
-rw-r--r--metadata/md5-cache/acct-group/alertmanager-0-r28
-rw-r--r--metadata/md5-cache/acct-group/amanda-0-r18
-rw-r--r--metadata/md5-cache/acct-group/amanda-0-r28
-rw-r--r--metadata/md5-cache/acct-group/amavis-0-r28
-rw-r--r--metadata/md5-cache/acct-group/amavis-0-r38
-rw-r--r--metadata/md5-cache/acct-group/amule-0-r28
-rw-r--r--metadata/md5-cache/acct-group/amule-0-r38
-rw-r--r--metadata/md5-cache/acct-group/android-0-r18
-rw-r--r--metadata/md5-cache/acct-group/android-0-r28
-rw-r--r--metadata/md5-cache/acct-group/apt-cacher-ng-0-r18
-rw-r--r--metadata/md5-cache/acct-group/apt-cacher-ng-0-r28
-rw-r--r--metadata/md5-cache/acct-group/argus-0-r18
-rw-r--r--metadata/md5-cache/acct-group/argus-0-r28
-rw-r--r--metadata/md5-cache/acct-group/arpwatch-0-r18
-rw-r--r--metadata/md5-cache/acct-group/arpwatch-0-r28
-rw-r--r--metadata/md5-cache/acct-group/aspnet-0-r18
-rw-r--r--metadata/md5-cache/acct-group/aspnet-0-r28
-rw-r--r--metadata/md5-cache/acct-group/asterisk-0-r28
-rw-r--r--metadata/md5-cache/acct-group/asterisk-0-r38
-rw-r--r--metadata/md5-cache/acct-group/at-0-r18
-rw-r--r--metadata/md5-cache/acct-group/at-0-r28
-rw-r--r--metadata/md5-cache/acct-group/atheme-services-0-r28
-rw-r--r--metadata/md5-cache/acct-group/atheme-services-0-r38
-rw-r--r--metadata/md5-cache/acct-group/audio-0-r28
-rw-r--r--metadata/md5-cache/acct-group/audio-0-r38
-rw-r--r--metadata/md5-cache/acct-group/automatic-0-r18
-rw-r--r--metadata/md5-cache/acct-group/automatic-0-r28
-rw-r--r--metadata/md5-cache/acct-group/automx2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/automx2-0-r38
-rw-r--r--metadata/md5-cache/acct-group/avahi-0-r28
-rw-r--r--metadata/md5-cache/acct-group/avahi-0-r38
-rw-r--r--metadata/md5-cache/acct-group/avahi-autoipd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/avahi-autoipd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/axtls-0-r18
-rw-r--r--metadata/md5-cache/acct-group/axtls-0-r28
-rw-r--r--metadata/md5-cache/acct-group/backuppc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/backuppc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bacula-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bacula-0-r38
-rw-r--r--metadata/md5-cache/acct-group/bareos-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bareos-0-r38
-rw-r--r--metadata/md5-cache/acct-group/beanstalk-0-r18
-rw-r--r--metadata/md5-cache/acct-group/beanstalk-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bedrock-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bedrock-0-r38
-rw-r--r--metadata/md5-cache/acct-group/bind_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bind_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/bird-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bird-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bitcoin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bitcoin-0-r38
-rw-r--r--metadata/md5-cache/acct-group/bitflu-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bitflu-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bitlbee-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bitlbee-0-r38
-rw-r--r--metadata/md5-cache/acct-group/blackbox_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/blackbox_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/boinc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/boinc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/brlapi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/brlapi-0-r28
-rw-r--r--metadata/md5-cache/acct-group/brltty-0-r18
-rw-r--r--metadata/md5-cache/acct-group/brltty-0-r28
-rw-r--r--metadata/md5-cache/acct-group/buildbot-0-r28
-rw-r--r--metadata/md5-cache/acct-group/buildbot-0-r38
-rw-r--r--metadata/md5-cache/acct-group/bumblebee-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bumblebee-0-r28
-rw-r--r--metadata/md5-cache/acct-group/burp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/burp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/burrow_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/burrow_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/cadvisor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cadvisor-0-r38
-rw-r--r--metadata/md5-cache/acct-group/cancd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cancd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/carbon-0-r28
-rw-r--r--metadata/md5-cache/acct-group/carbon-0-r38
-rw-r--r--metadata/md5-cache/acct-group/cdrom-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cdrom-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ceph-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ceph-0-r38
-rw-r--r--metadata/md5-cache/acct-group/cgit-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cgit-0-r28
-rw-r--r--metadata/md5-cache/acct-group/chronograf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/chronograf-0-r38
-rw-r--r--metadata/md5-cache/acct-group/clair-0-r28
-rw-r--r--metadata/md5-cache/acct-group/clair-0-r38
-rw-r--r--metadata/md5-cache/acct-group/clamav-0-r28
-rw-r--r--metadata/md5-cache/acct-group/clamav-0-r38
-rw-r--r--metadata/md5-cache/acct-group/cntlm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cntlm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cockroach-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cockroach-0-r28
-rw-r--r--metadata/md5-cache/acct-group/collectd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/collectd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/colord-0-r18
-rw-r--r--metadata/md5-cache/acct-group/colord-0-r28
-rw-r--r--metadata/md5-cache/acct-group/consul-0-r28
-rw-r--r--metadata/md5-cache/acct-group/consul-0-r38
-rw-r--r--metadata/md5-cache/acct-group/consul-template-0-r28
-rw-r--r--metadata/md5-cache/acct-group/consul-template-0-r38
-rw-r--r--metadata/md5-cache/acct-group/consul_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/consul_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/coredns-0-r18
-rw-r--r--metadata/md5-cache/acct-group/coredns-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cron-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cron-0-r28
-rw-r--r--metadata/md5-cache/acct-group/crontab-0-r18
-rw-r--r--metadata/md5-cache/acct-group/crontab-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cvmfs-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cvmfs-0-r38
-rw-r--r--metadata/md5-cache/acct-group/davfs2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/davfs2-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dbmail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dbmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dbskkd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dbskkd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ddclient-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ddclient-0-r38
-rw-r--r--metadata/md5-cache/acct-group/defang-0-r18
-rw-r--r--metadata/md5-cache/acct-group/defang-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dehydrated-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dehydrated-0-r28
-rw-r--r--metadata/md5-cache/acct-group/deluge-0-r28
-rw-r--r--metadata/md5-cache/acct-group/deluge-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dhcp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dhcp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dhcpcd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dhcpcd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dialout-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dialout-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dictd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dictd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dirsrv-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dirsrv-0-r28
-rw-r--r--metadata/md5-cache/acct-group/disk-0-r28
-rw-r--r--metadata/md5-cache/acct-group/disk-0-r38
-rw-r--r--metadata/md5-cache/acct-group/distcc-1-r18
-rw-r--r--metadata/md5-cache/acct-group/distcc-1-r28
-rw-r--r--metadata/md5-cache/acct-group/dnrd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dnrd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dnsdist-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dnsdist-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/docker-0-r28
-rw-r--r--metadata/md5-cache/acct-group/docker-0-r38
-rw-r--r--metadata/md5-cache/acct-group/docker_auth-0-r28
-rw-r--r--metadata/md5-cache/acct-group/docker_auth-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dovecot-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dovecot-0-r38
-rw-r--r--metadata/md5-cache/acct-group/dovenull-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dovenull-0-r38
-rw-r--r--metadata/md5-cache/acct-group/drone-0-r18
-rw-r--r--metadata/md5-cache/acct-group/drone-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ejabberd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ejabberd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch-0-r28
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch-0-r38
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/energi3-0-r18
-rw-r--r--metadata/md5-cache/acct-group/energi3-0-r28
-rw-r--r--metadata/md5-cache/acct-group/epam-0-r18
-rw-r--r--metadata/md5-cache/acct-group/epam-0-r28
-rw-r--r--metadata/md5-cache/acct-group/epmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/epmd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/err-0-r18
-rw-r--r--metadata/md5-cache/acct-group/err-0-r28
-rw-r--r--metadata/md5-cache/acct-group/etcd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/etcd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/exabgp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/exabgp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ez-ipupd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ez-ipupd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fax-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fax-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fcron-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fcron-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fdm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fdm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fetchmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fetchmail-0-r38
-rw-r--r--metadata/md5-cache/acct-group/fhem-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fhem-0-r38
-rw-r--r--metadata/md5-cache/acct-group/fingerprint-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fingerprint-0-r38
-rw-r--r--metadata/md5-cache/acct-group/flatpak-0-r18
-rw-r--r--metadata/md5-cache/acct-group/flatpak-0-r28
-rw-r--r--metadata/md5-cache/acct-group/flows-0-r18
-rw-r--r--metadata/md5-cache/acct-group/flows-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fluentd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fluentd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/foldingathome-0-r18
-rw-r--r--metadata/md5-cache/acct-group/foldingathome-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fp-multiuser-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fp-multiuser-0-r28
-rw-r--r--metadata/md5-cache/acct-group/freenet-0-r18
-rw-r--r--metadata/md5-cache/acct-group/freenet-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/frr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/frr-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ftp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ftp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ftpproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ftpproxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fvwm-crystal-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fvwm-crystal-0-r38
-rw-r--r--metadata/md5-cache/acct-group/gamemode-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gamemode-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gamestat-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gamestat-0-r38
-rw-r--r--metadata/md5-cache/acct-group/gatling-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gatling-0-r38
-rw-r--r--metadata/md5-cache/acct-group/gauth-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gauth-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gdm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gdm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/geneweb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/geneweb-0-r38
-rw-r--r--metadata/md5-cache/acct-group/geoclue-0-r18
-rw-r--r--metadata/md5-cache/acct-group/geoclue-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gerbera-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gerbera-0-r38
-rw-r--r--metadata/md5-cache/acct-group/git-0-r28
-rw-r--r--metadata/md5-cache/acct-group/git-0-r38
-rw-r--r--metadata/md5-cache/acct-group/github-exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/github-exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gitlab-runner-1-r18
-rw-r--r--metadata/md5-cache/acct-group/gitlab-runner-1-r28
-rw-r--r--metadata/md5-cache/acct-group/gkrellmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gkrellmd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/gluster-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gluster-0-r38
-rw-r--r--metadata/md5-cache/acct-group/gnump3d-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gnump3d-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gopher-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gopher-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gopherd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gopherd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gpib-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gpib-0-r38
-rw-r--r--metadata/md5-cache/acct-group/grafana-0-r28
-rw-r--r--metadata/md5-cache/acct-group/grafana-0-r38
-rw-r--r--metadata/md5-cache/acct-group/graylog-0-r28
-rw-r--r--metadata/md5-cache/acct-group/graylog-0-r38
-rw-r--r--metadata/md5-cache/acct-group/greetd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/greetd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/grok_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/grok_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/groonga-0-r18
-rw-r--r--metadata/md5-cache/acct-group/groonga-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gvm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gvm-0-r38
-rw-r--r--metadata/md5-cache/acct-group/h2o-0-r18
-rw-r--r--metadata/md5-cache/acct-group/h2o-0-r28
-rw-r--r--metadata/md5-cache/acct-group/haclient-0-r18
-rw-r--r--metadata/md5-cache/acct-group/haclient-0-r28
-rw-r--r--metadata/md5-cache/acct-group/haproxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/haproxy-0-r38
-rw-r--r--metadata/md5-cache/acct-group/hsqldb-0-r18
-rw-r--r--metadata/md5-cache/acct-group/hsqldb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/http-0-r18
-rw-r--r--metadata/md5-cache/acct-group/http-0-r28
-rw-r--r--metadata/md5-cache/acct-group/i2c-0-r18
-rw-r--r--metadata/md5-cache/acct-group/i2c-0-r28
-rw-r--r--metadata/md5-cache/acct-group/i2p-0-r28
-rw-r--r--metadata/md5-cache/acct-group/i2p-0-r38
-rw-r--r--metadata/md5-cache/acct-group/i2pd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/i2pd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/icecast-0-r18
-rw-r--r--metadata/md5-cache/acct-group/icecast-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icecream-0-r18
-rw-r--r--metadata/md5-cache/acct-group/icecream-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ices-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ices-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icinga-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icinga-0-r38
-rw-r--r--metadata/md5-cache/acct-group/icingacmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icingacmd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/icingaweb2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icingaweb2-0-r38
-rw-r--r--metadata/md5-cache/acct-group/influxdb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/influxdb-0-r38
-rw-r--r--metadata/md5-cache/acct-group/input-0-r28
-rw-r--r--metadata/md5-cache/acct-group/input-0-r38
-rw-r--r--metadata/md5-cache/acct-group/inspircd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/inspircd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ipfs-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ipfs-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ipsec-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ipsec-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ipsentinel-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ipsentinel-0-r28
-rw-r--r--metadata/md5-cache/acct-group/iroffer-0-r18
-rw-r--r--metadata/md5-cache/acct-group/iroffer-0-r28
-rw-r--r--metadata/md5-cache/acct-group/jenkins-0-r18
-rw-r--r--metadata/md5-cache/acct-group/jenkins-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kafka-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kafka-0-r38
-rw-r--r--metadata/md5-cache/acct-group/kapacitor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kapacitor-0-r38
-rw-r--r--metadata/md5-cache/acct-group/karma-0-r18
-rw-r--r--metadata/md5-cache/acct-group/karma-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kibana-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kibana-0-r38
-rw-r--r--metadata/md5-cache/acct-group/kismet-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kismet-0-r38
-rw-r--r--metadata/md5-cache/acct-group/kmem-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kmem-0-r38
-rw-r--r--metadata/md5-cache/acct-group/knot-0-r28
-rw-r--r--metadata/md5-cache/acct-group/knot-0-r38
-rw-r--r--metadata/md5-cache/acct-group/kube-apiserver-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kube-apiserver-0-r38
-rw-r--r--metadata/md5-cache/acct-group/kube-controller-manager-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kube-controller-manager-0-r38
-rw-r--r--metadata/md5-cache/acct-group/kube-scheduler-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kube-scheduler-0-r38
-rw-r--r--metadata/md5-cache/acct-group/kvm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kvm-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ldap-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ldap-0-r28
-rw-r--r--metadata/md5-cache/acct-group/libvirt-0-r28
-rw-r--r--metadata/md5-cache/acct-group/libvirt-0-r38
-rw-r--r--metadata/md5-cache/acct-group/lighttpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lighttpd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/lldpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lldpd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/locate-0-r28
-rw-r--r--metadata/md5-cache/acct-group/locate-0-r38
-rw-r--r--metadata/md5-cache/acct-group/logcheck-0-r18
-rw-r--r--metadata/md5-cache/acct-group/logcheck-0-r28
-rw-r--r--metadata/md5-cache/acct-group/logstash-0-r28
-rw-r--r--metadata/md5-cache/acct-group/logstash-0-r38
-rw-r--r--metadata/md5-cache/acct-group/logsurfer-0-r18
-rw-r--r--metadata/md5-cache/acct-group/logsurfer-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/lpadmin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lpadmin-0-r38
-rw-r--r--metadata/md5-cache/acct-group/lxc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lxc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lxd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lxd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/mail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mail-0-r38
-rw-r--r--metadata/md5-cache/acct-group/man-0-r28
-rw-r--r--metadata/md5-cache/acct-group/man-0-r38
-rw-r--r--metadata/md5-cache/acct-group/maradns-0-r28
-rw-r--r--metadata/md5-cache/acct-group/maradns-0-r38
-rw-r--r--metadata/md5-cache/acct-group/memcached-0-r28
-rw-r--r--metadata/md5-cache/acct-group/memcached-0-r38
-rw-r--r--metadata/md5-cache/acct-group/memcached_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/memcached_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/messagebus-0-r28
-rw-r--r--metadata/md5-cache/acct-group/messagebus-0-r38
-rw-r--r--metadata/md5-cache/acct-group/mgraph-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mgraph-0-r28
-rw-r--r--metadata/md5-cache/acct-group/milter-regex-0-r28
-rw-r--r--metadata/md5-cache/acct-group/milter-regex-0-r38
-rw-r--r--metadata/md5-cache/acct-group/minecraft-0-r28
-rw-r--r--metadata/md5-cache/acct-group/minecraft-0-r38
-rw-r--r--metadata/md5-cache/acct-group/minetest-0-r28
-rw-r--r--metadata/md5-cache/acct-group/minetest-0-r38
-rw-r--r--metadata/md5-cache/acct-group/minidlna-0-r18
-rw-r--r--metadata/md5-cache/acct-group/minidlna-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mogile-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mogile-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mongodb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mongodb-0-r38
-rw-r--r--metadata/md5-cache/acct-group/mongodb_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mongodb_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/monitorix-0-r28
-rw-r--r--metadata/md5-cache/acct-group/monitorix-0-r38
-rw-r--r--metadata/md5-cache/acct-group/monkeyd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/monkeyd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/monkeysphere-0-r28
-rw-r--r--metadata/md5-cache/acct-group/monkeysphere-0-r38
-rw-r--r--metadata/md5-cache/acct-group/mosquitto-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mosquitto-0-r38
-rw-r--r--metadata/md5-cache/acct-group/motion-0-r28
-rw-r--r--metadata/md5-cache/acct-group/motion-0-r38
-rw-r--r--metadata/md5-cache/acct-group/msmtpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/msmtpd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/munge-0-r18
-rw-r--r--metadata/md5-cache/acct-group/munge-0-r28
-rw-r--r--metadata/md5-cache/acct-group/munin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/munin-0-r38
-rw-r--r--metadata/md5-cache/acct-group/murmur-0-r28
-rw-r--r--metadata/md5-cache/acct-group/murmur-0-r38
-rw-r--r--metadata/md5-cache/acct-group/mysql-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mysql-0-r38
-rw-r--r--metadata/md5-cache/acct-group/mysqld_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mysqld_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/mythtv-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mythtv-0-r38
-rw-r--r--metadata/md5-cache/acct-group/nagios-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nagios-0-r38
-rw-r--r--metadata/md5-cache/acct-group/named-0-r28
-rw-r--r--metadata/md5-cache/acct-group/named-0-r38
-rw-r--r--metadata/md5-cache/acct-group/netdata-0-r28
-rw-r--r--metadata/md5-cache/acct-group/netdata-0-r38
-rw-r--r--metadata/md5-cache/acct-group/netdev-0-r28
-rw-r--r--metadata/md5-cache/acct-group/netdev-0-r38
-rw-r--r--metadata/md5-cache/acct-group/netperf-0-r18
-rw-r--r--metadata/md5-cache/acct-group/netperf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nginx-vts-exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nginx-vts-exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ngrep-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ngrep-0-r38
-rw-r--r--metadata/md5-cache/acct-group/nm-openconnect-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nm-openconnect-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nm-openvpn-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nm-openvpn-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nobody-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nobody-0-r28
-rw-r--r--metadata/md5-cache/acct-group/node_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/node_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/nofiles-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nofiles-0-r38
-rw-r--r--metadata/md5-cache/acct-group/notary-0-r18
-rw-r--r--metadata/md5-cache/acct-group/notary-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nsd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nsd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/nslcd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nslcd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ntopng-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ntopng-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ntp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ntp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/nullmail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nullmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nut-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nut-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nzbget-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nzbget-0-r28
-rw-r--r--metadata/md5-cache/acct-group/oidentd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/oidentd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/openct-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openct-0-r38
-rw-r--r--metadata/md5-cache/acct-group/opendkim-0-r28
-rw-r--r--metadata/md5-cache/acct-group/opendkim-0-r38
-rw-r--r--metadata/md5-cache/acct-group/opendnssec-0-r18
-rw-r--r--metadata/md5-cache/acct-group/opendnssec-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openntpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openntpd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/openrct2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openrct2-0-r38
-rw-r--r--metadata/md5-cache/acct-group/openvpn-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openvpn-0-r38
-rw-r--r--metadata/md5-cache/acct-group/openvpn_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openvpn_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/oprofile-0-r28
-rw-r--r--metadata/md5-cache/acct-group/oprofile-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ossec-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ossec-0-r38
-rw-r--r--metadata/md5-cache/acct-group/p2p-0-r18
-rw-r--r--metadata/md5-cache/acct-group/p2p-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pcscd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pcscd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/pdns-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pdns-0-r38
-rw-r--r--metadata/md5-cache/acct-group/pdnsd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pdnsd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/pgagent-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pgagent-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pipewire-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pipewire-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pkcs11-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pkcs11-0-r28
-rw-r--r--metadata/md5-cache/acct-group/plex-0-r28
-rw-r--r--metadata/md5-cache/acct-group/plex-0-r38
-rw-r--r--metadata/md5-cache/acct-group/plugdev-0-r28
-rw-r--r--metadata/md5-cache/acct-group/plugdev-0-r38
-rw-r--r--metadata/md5-cache/acct-group/polkitd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/polkitd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/polw-0-r18
-rw-r--r--metadata/md5-cache/acct-group/polw-0-r28
-rw-r--r--metadata/md5-cache/acct-group/popa3d-0-r18
-rw-r--r--metadata/md5-cache/acct-group/popa3d-0-r28
-rw-r--r--metadata/md5-cache/acct-group/portage-0-r18
-rw-r--r--metadata/md5-cache/acct-group/portage-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postdrop-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postdrop-0-r38
-rw-r--r--metadata/md5-cache/acct-group/postfix-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postfix-0-r38
-rw-r--r--metadata/md5-cache/acct-group/postfix_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postfix_exporter-0-r38
-rw-r--r--metadata/md5-cache/acct-group/postfwd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postfwd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postgres-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postgres-0-r38
-rw-r--r--metadata/md5-cache/acct-group/postgres_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postgres_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/privoxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/privoxy-0-r38
-rw-r--r--metadata/md5-cache/acct-group/prometheus-0-r28
-rw-r--r--metadata/md5-cache/acct-group/prometheus-0-r38
-rw-r--r--metadata/md5-cache/acct-group/psybnc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/psybnc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pulse-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pulse-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pulse-access-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pulse-access-0-r28
-rw-r--r--metadata/md5-cache/acct-group/puppet-0-r28
-rw-r--r--metadata/md5-cache/acct-group/puppet-0-r38
-rw-r--r--metadata/md5-cache/acct-group/puppetdb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/puppetdb-0-r38
-rw-r--r--metadata/md5-cache/acct-group/pushgateway-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pushgateway-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pvpgn-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pvpgn-0-r28
-rw-r--r--metadata/md5-cache/acct-group/qemu-0-r28
-rw-r--r--metadata/md5-cache/acct-group/qemu-0-r38
-rw-r--r--metadata/md5-cache/acct-group/qmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/qmail-0-r38
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/radicale-0-r28
-rw-r--r--metadata/md5-cache/acct-group/radicale-0-r38
-rw-r--r--metadata/md5-cache/acct-group/radius-0-r28
-rw-r--r--metadata/md5-cache/acct-group/radius-0-r38
-rw-r--r--metadata/md5-cache/acct-group/radvd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/radvd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rbldns-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rbldns-0-r38
-rw-r--r--metadata/md5-cache/acct-group/rbot-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rbot-0-r28
-rw-r--r--metadata/md5-cache/acct-group/realtime-0-r18
-rw-r--r--metadata/md5-cache/acct-group/realtime-0-r28
-rw-r--r--metadata/md5-cache/acct-group/redis_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/redis_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/redmine-0-r28
-rw-r--r--metadata/md5-cache/acct-group/redmine-0-r38
-rw-r--r--metadata/md5-cache/acct-group/redsocks-0-r28
-rw-r--r--metadata/md5-cache/acct-group/redsocks-0-r38
-rw-r--r--metadata/md5-cache/acct-group/reg-0-r28
-rw-r--r--metadata/md5-cache/acct-group/reg-0-r38
-rw-r--r--metadata/md5-cache/acct-group/registry-0-r18
-rw-r--r--metadata/md5-cache/acct-group/registry-0-r28
-rw-r--r--metadata/md5-cache/acct-group/render-0-r28
-rw-r--r--metadata/md5-cache/acct-group/render-0-r38
-rw-r--r--metadata/md5-cache/acct-group/roccat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/roccat-0-r28
-rw-r--r--metadata/md5-cache/acct-group/root-0-r18
-rw-r--r--metadata/md5-cache/acct-group/root-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rslsync-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rslsync-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rspamd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rspamd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/rtkit-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rtkit-0-r38
-rw-r--r--metadata/md5-cache/acct-group/rwhoisd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rwhoisd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sabnzbd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sabnzbd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/sagan-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sagan-0-r28
-rw-r--r--metadata/md5-cache/acct-group/samplicator-0-r18
-rw-r--r--metadata/md5-cache/acct-group/samplicator-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sancp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sancp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sanlock-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sanlock-0-r38
-rw-r--r--metadata/md5-cache/acct-group/sauerbraten-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sauerbraten-0-r38
-rw-r--r--metadata/md5-cache/acct-group/scanlogd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/scanlogd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/scanner-0-r18
-rw-r--r--metadata/md5-cache/acct-group/scanner-0-r28
-rw-r--r--metadata/md5-cache/acct-group/scponly-0-r28
-rw-r--r--metadata/md5-cache/acct-group/scponly-0-r38
-rw-r--r--metadata/md5-cache/acct-group/scsi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/scsi-0-r28
-rw-r--r--metadata/md5-cache/acct-group/serf-0-r18
-rw-r--r--metadata/md5-cache/acct-group/serf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sgx-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sgx-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sispmctl-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sispmctl-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sks-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sks-0-r28
-rw-r--r--metadata/md5-cache/acct-group/slurm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/slurm-0-r38
-rw-r--r--metadata/md5-cache/acct-group/smmsp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/smmsp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/sms-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sms-0-r28
-rw-r--r--metadata/md5-cache/acct-group/smtpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/smtpd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/smtpq-0-r28
-rw-r--r--metadata/md5-cache/acct-group/smtpq-0-r38
-rw-r--r--metadata/md5-cache/acct-group/snapserver-0-r18
-rw-r--r--metadata/md5-cache/acct-group/snapserver-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sniproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sniproxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/snmp_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/snmp_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/snort-0-r18
-rw-r--r--metadata/md5-cache/acct-group/snort-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sobexsrv-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sobexsrv-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sockd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sockd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sogo-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sogo-0-r38
-rw-r--r--metadata/md5-cache/acct-group/spamd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/spamd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/spectrum-0-r28
-rw-r--r--metadata/md5-cache/acct-group/spectrum-0-r38
-rw-r--r--metadata/md5-cache/acct-group/spire-0-r28
-rw-r--r--metadata/md5-cache/acct-group/spire-0-r38
-rw-r--r--metadata/md5-cache/acct-group/sqlgrey-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sqlgrey-0-r38
-rw-r--r--metadata/md5-cache/acct-group/squid-0-r28
-rw-r--r--metadata/md5-cache/acct-group/squid-0-r38
-rw-r--r--metadata/md5-cache/acct-group/sshd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sshd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ssmtp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ssmtp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sstpc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sstpc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/stapdev-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stapdev-0-r28
-rw-r--r--metadata/md5-cache/acct-group/stapsys-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stapsys-0-r28
-rw-r--r--metadata/md5-cache/acct-group/stapusr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stapusr-0-r28
-rw-r--r--metadata/md5-cache/acct-group/steamcmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/steamcmd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/stubby-0-r28
-rw-r--r--metadata/md5-cache/acct-group/stubby-0-r38
-rw-r--r--metadata/md5-cache/acct-group/stunnel-0-r28
-rw-r--r--metadata/md5-cache/acct-group/stunnel-0-r38
-rw-r--r--metadata/md5-cache/acct-group/subsonic-0-r18
-rw-r--r--metadata/md5-cache/acct-group/subsonic-0-r28
-rw-r--r--metadata/md5-cache/acct-group/supervisor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/supervisor-0-r38
-rw-r--r--metadata/md5-cache/acct-group/suricata-0-r28
-rw-r--r--metadata/md5-cache/acct-group/suricata-0-r38
-rw-r--r--metadata/md5-cache/acct-group/svnusers-0-r28
-rw-r--r--metadata/md5-cache/acct-group/svnusers-0-r38
-rw-r--r--metadata/md5-cache/acct-group/svxlink-0-r18
-rw-r--r--metadata/md5-cache/acct-group/svxlink-0-r28
-rw-r--r--metadata/md5-cache/acct-group/syncthing-0-r28
-rw-r--r--metadata/md5-cache/acct-group/syncthing-0-r38
-rw-r--r--metadata/md5-cache/acct-group/systemd-coredump-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-coredump-0-r38
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-0-r38
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-remote-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-remote-0-r38
-rw-r--r--metadata/md5-cache/acct-group/systemd-network-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-network-0-r38
-rw-r--r--metadata/md5-cache/acct-group/systemd-oom-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-oom-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-resolve-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-resolve-0-r38
-rw-r--r--metadata/md5-cache/acct-group/systemd-timesync-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-timesync-0-r38
-rw-r--r--metadata/md5-cache/acct-group/tape-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tape-0-r38
-rw-r--r--metadata/md5-cache/acct-group/taskd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/taskd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/teamspeak-0-r28
-rw-r--r--metadata/md5-cache/acct-group/teamspeak-0-r38
-rw-r--r--metadata/md5-cache/acct-group/telegraf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/telegraf-0-r38
-rw-r--r--metadata/md5-cache/acct-group/tenshi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tenshi-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tinyproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tinyproxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tomcat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tomcat-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tor-0-r38
-rw-r--r--metadata/md5-cache/acct-group/tox-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tox-0-r38
-rw-r--r--metadata/md5-cache/acct-group/transmission-0-r28
-rw-r--r--metadata/md5-cache/acct-group/transmission-0-r38
-rw-r--r--metadata/md5-cache/acct-group/trickster-0-r18
-rw-r--r--metadata/md5-cache/acct-group/trickster-0-r28
-rw-r--r--metadata/md5-cache/acct-group/trojan-0-r18
-rw-r--r--metadata/md5-cache/acct-group/trojan-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tsm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tsm-0-r38
-rw-r--r--metadata/md5-cache/acct-group/tss-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tss-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ttrssd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ttrssd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tty-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tty-0-r38
-rw-r--r--metadata/md5-cache/acct-group/turnserver-0-r28
-rw-r--r--metadata/md5-cache/acct-group/turnserver-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ubridge-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ubridge-0-r38
-rw-r--r--metadata/md5-cache/acct-group/ulogd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ulogd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/unbound-0-r28
-rw-r--r--metadata/md5-cache/acct-group/unbound-0-r38
-rw-r--r--metadata/md5-cache/acct-group/unbound-telemetry-0-r18
-rw-r--r--metadata/md5-cache/acct-group/unbound-telemetry-0-r28
-rw-r--r--metadata/md5-cache/acct-group/unifi-0-r28
-rw-r--r--metadata/md5-cache/acct-group/unifi-0-r38
-rw-r--r--metadata/md5-cache/acct-group/unifi-video-0-r18
-rw-r--r--metadata/md5-cache/acct-group/unifi-video-0-r28
-rw-r--r--metadata/md5-cache/acct-group/upmpdcli-0-r18
-rw-r--r--metadata/md5-cache/acct-group/upmpdcli-0-r28
-rw-r--r--metadata/md5-cache/acct-group/usb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/usb-0-r38
-rw-r--r--metadata/md5-cache/acct-group/users-0-r18
-rw-r--r--metadata/md5-cache/acct-group/users-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ushare-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ushare-0-r28
-rw-r--r--metadata/md5-cache/acct-group/utmp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/utmp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/uucp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/uucp-0-r38
-rw-r--r--metadata/md5-cache/acct-group/uwsgi_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/uwsgi_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vacation-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vacation-0-r28
-rw-r--r--metadata/md5-cache/acct-group/varnish-0-r28
-rw-r--r--metadata/md5-cache/acct-group/varnish-0-r38
-rw-r--r--metadata/md5-cache/acct-group/vault-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vault-0-r38
-rw-r--r--metadata/md5-cache/acct-group/vault_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vault_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vboxguest-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vboxguest-0-r38
-rw-r--r--metadata/md5-cache/acct-group/vboxsf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vboxsf-0-r38
-rw-r--r--metadata/md5-cache/acct-group/vboxusers-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vboxusers-0-r38
-rw-r--r--metadata/md5-cache/acct-group/vdr-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vdr-0-r38
-rw-r--r--metadata/md5-cache/acct-group/vdradmin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vdradmin-0-r38
-rw-r--r--metadata/md5-cache/acct-group/video-0-r28
-rw-r--r--metadata/md5-cache/acct-group/video-0-r38
-rw-r--r--metadata/md5-cache/acct-group/vlock-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vlock-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vpopmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vpopmail-0-r38
-rw-r--r--metadata/md5-cache/acct-group/wesnoth-0-r28
-rw-r--r--metadata/md5-cache/acct-group/wesnoth-0-r38
-rw-r--r--metadata/md5-cache/acct-group/wheel-0-r28
-rw-r--r--metadata/md5-cache/acct-group/wheel-0-r38
-rw-r--r--metadata/md5-cache/acct-group/wwwoffle-0-r18
-rw-r--r--metadata/md5-cache/acct-group/wwwoffle-0-r28
-rw-r--r--metadata/md5-cache/acct-group/x2goprint-0-r28
-rw-r--r--metadata/md5-cache/acct-group/x2goprint-0-r38
-rw-r--r--metadata/md5-cache/acct-group/x2gouser-0-r28
-rw-r--r--metadata/md5-cache/acct-group/x2gouser-0-r38
-rw-r--r--metadata/md5-cache/acct-group/xpra-0-r18
-rw-r--r--metadata/md5-cache/acct-group/xpra-0-r28
-rw-r--r--metadata/md5-cache/acct-group/xrootd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/xrootd-0-r38
-rw-r--r--metadata/md5-cache/acct-group/xwax-0-r18
-rw-r--r--metadata/md5-cache/acct-group/xwax-0-r28
-rw-r--r--metadata/md5-cache/acct-group/zabbix-0-r18
-rw-r--r--metadata/md5-cache/acct-group/zabbix-0-r28
-rw-r--r--metadata/md5-cache/acct-group/zeppelin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/zeppelin-0-r38
-rw-r--r--metadata/md5-cache/acct-group/zetcd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/zetcd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ziproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ziproxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/znc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/znc-0-r38
-rw-r--r--metadata/md5-cache/acct-group/zookeeper-0-r18
-rw-r--r--metadata/md5-cache/acct-group/zookeeper-0-r28
-rw-r--r--metadata/md5-cache/acct-user/Manifest.gzbin67814 -> 67815 bytes
-rw-r--r--metadata/md5-cache/acct-user/aerospike-amc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/aerospike-amc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/airdcppd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/airdcppd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/alertmanager-0-r19
-rw-r--r--metadata/md5-cache/acct-user/alertmanager-0-r29
-rw-r--r--metadata/md5-cache/acct-user/alias-0-r210
-rw-r--r--metadata/md5-cache/acct-user/alias-0-r310
-rw-r--r--metadata/md5-cache/acct-user/amanda-0-r19
-rw-r--r--metadata/md5-cache/acct-user/amanda-0-r29
-rw-r--r--metadata/md5-cache/acct-user/amavis-0-r29
-rw-r--r--metadata/md5-cache/acct-user/amavis-0-r39
-rw-r--r--metadata/md5-cache/acct-user/apt-cacher-ng-0-r19
-rw-r--r--metadata/md5-cache/acct-user/apt-cacher-ng-0-r29
-rw-r--r--metadata/md5-cache/acct-user/argus-0-r19
-rw-r--r--metadata/md5-cache/acct-user/argus-0-r29
-rw-r--r--metadata/md5-cache/acct-user/arpwatch-0-r19
-rw-r--r--metadata/md5-cache/acct-user/arpwatch-0-r29
-rw-r--r--metadata/md5-cache/acct-user/aspnet-0-r19
-rw-r--r--metadata/md5-cache/acct-user/aspnet-0-r29
-rw-r--r--metadata/md5-cache/acct-user/asterisk-0-r29
-rw-r--r--metadata/md5-cache/acct-user/asterisk-0-r39
-rw-r--r--metadata/md5-cache/acct-user/at-0-r19
-rw-r--r--metadata/md5-cache/acct-user/at-0-r29
-rw-r--r--metadata/md5-cache/acct-user/atheme-services-0-r29
-rw-r--r--metadata/md5-cache/acct-user/atheme-services-0-r39
-rw-r--r--metadata/md5-cache/acct-user/automatic-0-r19
-rw-r--r--metadata/md5-cache/acct-user/automatic-0-r29
-rw-r--r--metadata/md5-cache/acct-user/automx2-0-r29
-rw-r--r--metadata/md5-cache/acct-user/automx2-0-r39
-rw-r--r--metadata/md5-cache/acct-user/avahi-0-r29
-rw-r--r--metadata/md5-cache/acct-user/avahi-0-r39
-rw-r--r--metadata/md5-cache/acct-user/avahi-autoipd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/avahi-autoipd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/axtls-0-r19
-rw-r--r--metadata/md5-cache/acct-user/axtls-0-r29
-rw-r--r--metadata/md5-cache/acct-user/backuppc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/backuppc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bacula-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bacula-0-r39
-rw-r--r--metadata/md5-cache/acct-user/bareos-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bareos-0-r39
-rw-r--r--metadata/md5-cache/acct-user/beanstalk-0-r19
-rw-r--r--metadata/md5-cache/acct-user/beanstalk-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bedrock-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bedrock-0-r39
-rw-r--r--metadata/md5-cache/acct-user/bind_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bind_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/bird-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bird-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bitcoin-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bitcoin-0-r39
-rw-r--r--metadata/md5-cache/acct-user/bitflu-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bitflu-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bitlbee-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bitlbee-0-r39
-rw-r--r--metadata/md5-cache/acct-user/blackbox_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/blackbox_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/boinc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/boinc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/brltty-0-r19
-rw-r--r--metadata/md5-cache/acct-user/brltty-0-r29
-rw-r--r--metadata/md5-cache/acct-user/buildbot-0-r29
-rw-r--r--metadata/md5-cache/acct-user/buildbot-0-r39
-rw-r--r--metadata/md5-cache/acct-user/burp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/burp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/burrow_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/burrow_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/cadvisor-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cadvisor-0-r39
-rw-r--r--metadata/md5-cache/acct-user/cancd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cancd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/carbon-0-r29
-rw-r--r--metadata/md5-cache/acct-user/carbon-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ceph-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ceph-0-r39
-rw-r--r--metadata/md5-cache/acct-user/cgit-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cgit-0-r29
-rw-r--r--metadata/md5-cache/acct-user/chronograf-0-r29
-rw-r--r--metadata/md5-cache/acct-user/chronograf-0-r39
-rw-r--r--metadata/md5-cache/acct-user/clair-0-r29
-rw-r--r--metadata/md5-cache/acct-user/clair-0-r39
-rw-r--r--metadata/md5-cache/acct-user/clamav-0-r29
-rw-r--r--metadata/md5-cache/acct-user/clamav-0-r39
-rw-r--r--metadata/md5-cache/acct-user/cntlm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cntlm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cockroach-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cockroach-0-r29
-rw-r--r--metadata/md5-cache/acct-user/collectd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/collectd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/colord-0-r19
-rw-r--r--metadata/md5-cache/acct-user/colord-0-r29
-rw-r--r--metadata/md5-cache/acct-user/consul-0-r29
-rw-r--r--metadata/md5-cache/acct-user/consul-0-r39
-rw-r--r--metadata/md5-cache/acct-user/consul-template-0-r29
-rw-r--r--metadata/md5-cache/acct-user/consul-template-0-r39
-rw-r--r--metadata/md5-cache/acct-user/consul_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/consul_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/coredns-0-r19
-rw-r--r--metadata/md5-cache/acct-user/coredns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cron-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cron-0-r39
-rw-r--r--metadata/md5-cache/acct-user/cvmfs-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cvmfs-0-r39
-rw-r--r--metadata/md5-cache/acct-user/cyrus-0-r39
-rw-r--r--metadata/md5-cache/acct-user/cyrus-0-r49
-rw-r--r--metadata/md5-cache/acct-user/darkstat-0-r19
-rw-r--r--metadata/md5-cache/acct-user/darkstat-0-r29
-rw-r--r--metadata/md5-cache/acct-user/davfs2-0-r29
-rw-r--r--metadata/md5-cache/acct-user/davfs2-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dbmail-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dbmail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dbskkd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dbskkd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ddclient-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ddclient-0-r39
-rw-r--r--metadata/md5-cache/acct-user/defang-0-r19
-rw-r--r--metadata/md5-cache/acct-user/defang-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dehydrated-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dehydrated-0-r29
-rw-r--r--metadata/md5-cache/acct-user/deluge-0-r29
-rw-r--r--metadata/md5-cache/acct-user/deluge-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dhcp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dhcp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dhcpcd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dhcpcd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dictd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dictd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dirsrv-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dirsrv-0-r29
-rw-r--r--metadata/md5-cache/acct-user/distcc-1-r19
-rw-r--r--metadata/md5-cache/acct-user/distcc-1-r29
-rw-r--r--metadata/md5-cache/acct-user/dnrd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnrd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnscache-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnscache-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnsdist-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnsdist-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dnslog-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnslog-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/docker_auth-0-r29
-rw-r--r--metadata/md5-cache/acct-user/docker_auth-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dovecot-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dovecot-0-r39
-rw-r--r--metadata/md5-cache/acct-user/dovenull-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dovenull-0-r39
-rw-r--r--metadata/md5-cache/acct-user/drone-0-r19
-rw-r--r--metadata/md5-cache/acct-user/drone-0-r29
-rw-r--r--metadata/md5-cache/acct-user/duende-0-r210
-rw-r--r--metadata/md5-cache/acct-user/duende-0-r310
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch-0-r29
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch-0-r39
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/energi3-0-r19
-rw-r--r--metadata/md5-cache/acct-user/energi3-0-r29
-rw-r--r--metadata/md5-cache/acct-user/epmd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/epmd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/err-0-r19
-rw-r--r--metadata/md5-cache/acct-user/err-0-r29
-rw-r--r--metadata/md5-cache/acct-user/etcd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/etcd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/exabgp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/exabgp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ez-ipupd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ez-ipupd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fax-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fax-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fcron-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fcron-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fdm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fdm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fetchmail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fetchmail-0-r39
-rw-r--r--metadata/md5-cache/acct-user/fhem-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fhem-0-r39
-rw-r--r--metadata/md5-cache/acct-user/flatpak-0-r19
-rw-r--r--metadata/md5-cache/acct-user/flatpak-0-r29
-rw-r--r--metadata/md5-cache/acct-user/flows-0-r19
-rw-r--r--metadata/md5-cache/acct-user/flows-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fluentd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fluentd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/fnord-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fnord-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fnordlog-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fnordlog-0-r29
-rw-r--r--metadata/md5-cache/acct-user/foldingathome-0-r19
-rw-r--r--metadata/md5-cache/acct-user/foldingathome-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fp-multiuser-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fp-multiuser-0-r29
-rw-r--r--metadata/md5-cache/acct-user/freenet-0-r19
-rw-r--r--metadata/md5-cache/acct-user/freenet-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/frr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/frr-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ftp-0-r49
-rw-r--r--metadata/md5-cache/acct-user/ftp-0-r59
-rw-r--r--metadata/md5-cache/acct-user/ftpproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ftpproxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gatling-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gatling-0-r39
-rw-r--r--metadata/md5-cache/acct-user/gauth-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gauth-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gdm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gdm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/geneweb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/geneweb-0-r39
-rw-r--r--metadata/md5-cache/acct-user/geoclue-0-r19
-rw-r--r--metadata/md5-cache/acct-user/geoclue-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gerbera-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gerbera-0-r39
-rw-r--r--metadata/md5-cache/acct-user/github-exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/github-exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gitlab-runner-1-r19
-rw-r--r--metadata/md5-cache/acct-user/gitlab-runner-1-r29
-rw-r--r--metadata/md5-cache/acct-user/gkrellmd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gkrellmd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/gluster-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gluster-0-r39
-rw-r--r--metadata/md5-cache/acct-user/gnump3d-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gnump3d-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gopher-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gopher-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gopherd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gopherd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gpsd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/gpsd-0-r49
-rw-r--r--metadata/md5-cache/acct-user/grafana-0-r29
-rw-r--r--metadata/md5-cache/acct-user/grafana-0-r39
-rw-r--r--metadata/md5-cache/acct-user/graylog-0-r29
-rw-r--r--metadata/md5-cache/acct-user/graylog-0-r39
-rw-r--r--metadata/md5-cache/acct-user/greetd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/greetd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/grok_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/grok_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/groonga-0-r19
-rw-r--r--metadata/md5-cache/acct-user/groonga-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gvm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gvm-0-r39
-rw-r--r--metadata/md5-cache/acct-user/h2o-0-r19
-rw-r--r--metadata/md5-cache/acct-user/h2o-0-r29
-rw-r--r--metadata/md5-cache/acct-user/hacluster-0-r19
-rw-r--r--metadata/md5-cache/acct-user/hacluster-0-r29
-rw-r--r--metadata/md5-cache/acct-user/haproxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/haproxy-0-r39
-rw-r--r--metadata/md5-cache/acct-user/hsqldb-0-r19
-rw-r--r--metadata/md5-cache/acct-user/hsqldb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/http-0-r19
-rw-r--r--metadata/md5-cache/acct-user/http-0-r29
-rw-r--r--metadata/md5-cache/acct-user/i2p-0-r29
-rw-r--r--metadata/md5-cache/acct-user/i2p-0-r39
-rw-r--r--metadata/md5-cache/acct-user/i2pd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/i2pd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/icecast-0-r19
-rw-r--r--metadata/md5-cache/acct-user/icecast-0-r29
-rw-r--r--metadata/md5-cache/acct-user/icecream-0-r19
-rw-r--r--metadata/md5-cache/acct-user/icecream-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ices-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ices-0-r29
-rw-r--r--metadata/md5-cache/acct-user/icinga-0-r29
-rw-r--r--metadata/md5-cache/acct-user/icinga-0-r39
-rw-r--r--metadata/md5-cache/acct-user/influxdb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/influxdb-0-r39
-rw-r--r--metadata/md5-cache/acct-user/inspircd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/inspircd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ipfs-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ipfs-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ippl-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ippl-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ipsec-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ipsec-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ipsentinel-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ipsentinel-0-r29
-rw-r--r--metadata/md5-cache/acct-user/iroffer-0-r19
-rw-r--r--metadata/md5-cache/acct-user/iroffer-0-r29
-rw-r--r--metadata/md5-cache/acct-user/jenkins-0-r19
-rw-r--r--metadata/md5-cache/acct-user/jenkins-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kafka-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kafka-0-r39
-rw-r--r--metadata/md5-cache/acct-user/kapacitor-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kapacitor-0-r39
-rw-r--r--metadata/md5-cache/acct-user/karma-0-r19
-rw-r--r--metadata/md5-cache/acct-user/karma-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kibana-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kibana-0-r39
-rw-r--r--metadata/md5-cache/acct-user/kismet-0-r210
-rw-r--r--metadata/md5-cache/acct-user/kismet-0-r310
-rw-r--r--metadata/md5-cache/acct-user/knot-0-r29
-rw-r--r--metadata/md5-cache/acct-user/knot-0-r39
-rw-r--r--metadata/md5-cache/acct-user/kube-apiserver-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kube-apiserver-0-r39
-rw-r--r--metadata/md5-cache/acct-user/kube-controller-manager-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kube-controller-manager-0-r39
-rw-r--r--metadata/md5-cache/acct-user/kube-scheduler-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kube-scheduler-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ldap-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ldap-0-r29
-rw-r--r--metadata/md5-cache/acct-user/lighttpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/lighttpd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/lldpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/lldpd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/logstash-0-r29
-rw-r--r--metadata/md5-cache/acct-user/logstash-0-r39
-rw-r--r--metadata/md5-cache/acct-user/logsurfer-0-r19
-rw-r--r--metadata/md5-cache/acct-user/logsurfer-0-r29
-rw-r--r--metadata/md5-cache/acct-user/lxc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/lxc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mail-0-r39
-rw-r--r--metadata/md5-cache/acct-user/man-1-r29
-rw-r--r--metadata/md5-cache/acct-user/man-1-r39
-rw-r--r--metadata/md5-cache/acct-user/maradns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/maradns-0-r39
-rw-r--r--metadata/md5-cache/acct-user/memcached-0-r29
-rw-r--r--metadata/md5-cache/acct-user/memcached-0-r39
-rw-r--r--metadata/md5-cache/acct-user/memcached_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/memcached_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/messagebus-0-r29
-rw-r--r--metadata/md5-cache/acct-user/messagebus-0-r39
-rw-r--r--metadata/md5-cache/acct-user/mgraph-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mgraph-0-r29
-rw-r--r--metadata/md5-cache/acct-user/milter-regex-0-r29
-rw-r--r--metadata/md5-cache/acct-user/milter-regex-0-r39
-rw-r--r--metadata/md5-cache/acct-user/minecraft-0-r29
-rw-r--r--metadata/md5-cache/acct-user/minecraft-0-r39
-rw-r--r--metadata/md5-cache/acct-user/minetest-1-r29
-rw-r--r--metadata/md5-cache/acct-user/minetest-1-r39
-rw-r--r--metadata/md5-cache/acct-user/minidlna-0-r19
-rw-r--r--metadata/md5-cache/acct-user/minidlna-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mogile-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mogile-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mongodb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mongodb-0-r39
-rw-r--r--metadata/md5-cache/acct-user/mongodb_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mongodb_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/monitorix-0-r29
-rw-r--r--metadata/md5-cache/acct-user/monitorix-0-r39
-rw-r--r--metadata/md5-cache/acct-user/monkeyd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/monkeyd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/monkeysphere-0-r29
-rw-r--r--metadata/md5-cache/acct-user/monkeysphere-0-r39
-rw-r--r--metadata/md5-cache/acct-user/mosquitto-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mosquitto-0-r39
-rw-r--r--metadata/md5-cache/acct-user/motion-0-r29
-rw-r--r--metadata/md5-cache/acct-user/motion-0-r39
-rw-r--r--metadata/md5-cache/acct-user/mpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mpd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/msmtpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/msmtpd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/munge-0-r19
-rw-r--r--metadata/md5-cache/acct-user/munge-0-r29
-rw-r--r--metadata/md5-cache/acct-user/munin-0-r29
-rw-r--r--metadata/md5-cache/acct-user/munin-0-r39
-rw-r--r--metadata/md5-cache/acct-user/munin-async-0-r29
-rw-r--r--metadata/md5-cache/acct-user/munin-async-0-r39
-rw-r--r--metadata/md5-cache/acct-user/murmur-0-r29
-rw-r--r--metadata/md5-cache/acct-user/murmur-0-r39
-rw-r--r--metadata/md5-cache/acct-user/mysql-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mysql-0-r39
-rw-r--r--metadata/md5-cache/acct-user/mysqld_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mysqld_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/mythtv-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mythtv-0-r39
-rw-r--r--metadata/md5-cache/acct-user/nagios-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nagios-0-r39
-rw-r--r--metadata/md5-cache/acct-user/named-0-r29
-rw-r--r--metadata/md5-cache/acct-user/named-0-r39
-rw-r--r--metadata/md5-cache/acct-user/netdata-1-r19
-rw-r--r--metadata/md5-cache/acct-user/netdata-1-r29
-rw-r--r--metadata/md5-cache/acct-user/netperf-0-r19
-rw-r--r--metadata/md5-cache/acct-user/netperf-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nginx-vts-exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nginx-vts-exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ngrep-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ngrep-0-r39
-rw-r--r--metadata/md5-cache/acct-user/nm-openconnect-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nm-openconnect-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nm-openvpn-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nm-openvpn-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nobody-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nobody-0-r29
-rw-r--r--metadata/md5-cache/acct-user/node_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/node_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/notary-0-r19
-rw-r--r--metadata/md5-cache/acct-user/notary-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nsd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nsd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/nslcd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nslcd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ntopng-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ntopng-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ntp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ntp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/nullmail-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nullmail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nut-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nut-0-r39
-rw-r--r--metadata/md5-cache/acct-user/nvpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nvpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nzbget-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nzbget-0-r29
-rw-r--r--metadata/md5-cache/acct-user/oidentd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/oidentd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/openctd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/openctd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/opendkim-0-r29
-rw-r--r--metadata/md5-cache/acct-user/opendkim-0-r39
-rw-r--r--metadata/md5-cache/acct-user/opendmarc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/opendmarc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/opendnssec-0-r19
-rw-r--r--metadata/md5-cache/acct-user/opendnssec-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openntpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openntpd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/openrct2-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openrct2-0-r39
-rw-r--r--metadata/md5-cache/acct-user/openvpn-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openvpn-0-r39
-rw-r--r--metadata/md5-cache/acct-user/openvpn_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openvpn_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/oprofile-0-r29
-rw-r--r--metadata/md5-cache/acct-user/oprofile-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ossec-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ossec-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ossecm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ossecm-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ossecr-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ossecr-0-r39
-rw-r--r--metadata/md5-cache/acct-user/p2p-0-r19
-rw-r--r--metadata/md5-cache/acct-user/p2p-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pcscd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pcscd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/pdns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pdns-0-r39
-rw-r--r--metadata/md5-cache/acct-user/pdnsd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pdnsd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/pgbouncer-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pgbouncer-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pipewire-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pipewire-1-r19
-rw-r--r--metadata/md5-cache/acct-user/pipewire-1-r29
-rw-r--r--metadata/md5-cache/acct-user/plex-0-r29
-rw-r--r--metadata/md5-cache/acct-user/plex-0-r39
-rw-r--r--metadata/md5-cache/acct-user/polkitd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/polkitd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/polw-0-r19
-rw-r--r--metadata/md5-cache/acct-user/polw-0-r29
-rw-r--r--metadata/md5-cache/acct-user/popa3d-0-r19
-rw-r--r--metadata/md5-cache/acct-user/popa3d-0-r29
-rw-r--r--metadata/md5-cache/acct-user/portage-0-r29
-rw-r--r--metadata/md5-cache/acct-user/portage-0-r39
-rw-r--r--metadata/md5-cache/acct-user/postfix-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postfix-0-r39
-rw-r--r--metadata/md5-cache/acct-user/postfix_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postfix_exporter-0-r39
-rw-r--r--metadata/md5-cache/acct-user/postfwd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postfwd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postgres-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postgres-0-r39
-rw-r--r--metadata/md5-cache/acct-user/postgres_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postgres_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postmaster-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postmaster-0-r39
-rw-r--r--metadata/md5-cache/acct-user/privoxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/privoxy-0-r39
-rw-r--r--metadata/md5-cache/acct-user/prometheus-0-r29
-rw-r--r--metadata/md5-cache/acct-user/prometheus-0-r39
-rw-r--r--metadata/md5-cache/acct-user/psybnc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/psybnc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pulse-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pulse-0-r29
-rw-r--r--metadata/md5-cache/acct-user/puppet-0-r29
-rw-r--r--metadata/md5-cache/acct-user/puppet-0-r39
-rw-r--r--metadata/md5-cache/acct-user/puppetdb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/puppetdb-0-r39
-rw-r--r--metadata/md5-cache/acct-user/pushgateway-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pushgateway-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pvpgn-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pvpgn-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qemu-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qemu-0-r39
-rw-r--r--metadata/md5-cache/acct-user/qmaild-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmaild-0-r39
-rw-r--r--metadata/md5-cache/acct-user/qmaill-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmaill-0-r39
-rw-r--r--metadata/md5-cache/acct-user/qmailp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmailp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/qmailq-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmailq-0-r39
-rw-r--r--metadata/md5-cache/acct-user/qmailr-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmailr-0-r39
-rw-r--r--metadata/md5-cache/acct-user/qmails-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmails-0-r39
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/radicale-0-r39
-rw-r--r--metadata/md5-cache/acct-user/radicale-0-r49
-rw-r--r--metadata/md5-cache/acct-user/radius-0-r29
-rw-r--r--metadata/md5-cache/acct-user/radius-0-r39
-rw-r--r--metadata/md5-cache/acct-user/radvd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/radvd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rbldns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rbldns-0-r39
-rw-r--r--metadata/md5-cache/acct-user/rbot-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rbot-0-r29
-rw-r--r--metadata/md5-cache/acct-user/redis_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/redis_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/redmine-0-r29
-rw-r--r--metadata/md5-cache/acct-user/redmine-0-r39
-rw-r--r--metadata/md5-cache/acct-user/redsocks-0-r29
-rw-r--r--metadata/md5-cache/acct-user/redsocks-0-r39
-rw-r--r--metadata/md5-cache/acct-user/reg-0-r29
-rw-r--r--metadata/md5-cache/acct-user/reg-0-r39
-rw-r--r--metadata/md5-cache/acct-user/registry-0-r19
-rw-r--r--metadata/md5-cache/acct-user/registry-0-r29
-rw-r--r--metadata/md5-cache/acct-user/root-0-r29
-rw-r--r--metadata/md5-cache/acct-user/root-0-r39
-rw-r--r--metadata/md5-cache/acct-user/rslsync-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rslsync-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rspamd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rspamd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/rtkit-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rtkit-0-r39
-rw-r--r--metadata/md5-cache/acct-user/rwhoisd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rwhoisd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sabnzbd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sabnzbd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/sagan-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sagan-0-r39
-rw-r--r--metadata/md5-cache/acct-user/samplicator-0-r19
-rw-r--r--metadata/md5-cache/acct-user/samplicator-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sancp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sancp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/saned-0-r19
-rw-r--r--metadata/md5-cache/acct-user/saned-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sanlock-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sanlock-0-r39
-rw-r--r--metadata/md5-cache/acct-user/sauerbraten-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sauerbraten-0-r39
-rw-r--r--metadata/md5-cache/acct-user/scanlogd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/scanlogd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/scponly-0-r29
-rw-r--r--metadata/md5-cache/acct-user/scponly-0-r39
-rw-r--r--metadata/md5-cache/acct-user/sendpage-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sendpage-0-r29
-rw-r--r--metadata/md5-cache/acct-user/serf-0-r19
-rw-r--r--metadata/md5-cache/acct-user/serf-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sks-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sks-0-r29
-rw-r--r--metadata/md5-cache/acct-user/slurm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/slurm-0-r39
-rw-r--r--metadata/md5-cache/acct-user/smmsp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/smmsp-0-r49
-rw-r--r--metadata/md5-cache/acct-user/smsd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/smsd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/smtpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/smtpd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/smtpq-0-r29
-rw-r--r--metadata/md5-cache/acct-user/smtpq-0-r39
-rw-r--r--metadata/md5-cache/acct-user/snapclient-0-r19
-rw-r--r--metadata/md5-cache/acct-user/snapclient-0-r29
-rw-r--r--metadata/md5-cache/acct-user/snapserver-0-r19
-rw-r--r--metadata/md5-cache/acct-user/snapserver-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sndiod-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sndiod-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sniproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sniproxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/snmp_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/snmp_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/snort-0-r19
-rw-r--r--metadata/md5-cache/acct-user/snort-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sobexsrv-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sobexsrv-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sockd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sockd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/sogo-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sogo-0-r39
-rw-r--r--metadata/md5-cache/acct-user/spamd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/spamd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/spectrum-0-r29
-rw-r--r--metadata/md5-cache/acct-user/spectrum-0-r39
-rw-r--r--metadata/md5-cache/acct-user/spire-0-r29
-rw-r--r--metadata/md5-cache/acct-user/spire-0-r39
-rw-r--r--metadata/md5-cache/acct-user/sqlgrey-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sqlgrey-0-r39
-rw-r--r--metadata/md5-cache/acct-user/squid-0-r29
-rw-r--r--metadata/md5-cache/acct-user/squid-0-r39
-rw-r--r--metadata/md5-cache/acct-user/sshd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sshd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/sstpc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sstpc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/steamcmd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/steamcmd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/stubby-0-r29
-rw-r--r--metadata/md5-cache/acct-user/stubby-0-r39
-rw-r--r--metadata/md5-cache/acct-user/stunnel-0-r29
-rw-r--r--metadata/md5-cache/acct-user/stunnel-0-r39
-rw-r--r--metadata/md5-cache/acct-user/subsonic-0-r29
-rw-r--r--metadata/md5-cache/acct-user/subsonic-0-r39
-rw-r--r--metadata/md5-cache/acct-user/suricata-0-r29
-rw-r--r--metadata/md5-cache/acct-user/suricata-0-r39
-rw-r--r--metadata/md5-cache/acct-user/svn-0-r29
-rw-r--r--metadata/md5-cache/acct-user/svn-0-r39
-rw-r--r--metadata/md5-cache/acct-user/svxlink-0-r19
-rw-r--r--metadata/md5-cache/acct-user/svxlink-0-r29
-rw-r--r--metadata/md5-cache/acct-user/syncthing-0-r29
-rw-r--r--metadata/md5-cache/acct-user/syncthing-0-r39
-rw-r--r--metadata/md5-cache/acct-user/systemd-coredump-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-coredump-0-r39
-rw-r--r--metadata/md5-cache/acct-user/systemd-journal-remote-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-journal-remote-0-r39
-rw-r--r--metadata/md5-cache/acct-user/systemd-network-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-network-0-r39
-rw-r--r--metadata/md5-cache/acct-user/systemd-oom-0-r19
-rw-r--r--metadata/md5-cache/acct-user/systemd-oom-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-resolve-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-resolve-0-r39
-rw-r--r--metadata/md5-cache/acct-user/systemd-timesync-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-timesync-0-r39
-rw-r--r--metadata/md5-cache/acct-user/taskd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/taskd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/teamspeak-0-r29
-rw-r--r--metadata/md5-cache/acct-user/teamspeak-0-r39
-rw-r--r--metadata/md5-cache/acct-user/telegraf-0-r29
-rw-r--r--metadata/md5-cache/acct-user/telegraf-0-r39
-rw-r--r--metadata/md5-cache/acct-user/tenshi-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tenshi-0-r29
-rw-r--r--metadata/md5-cache/acct-user/timidity-0-r19
-rw-r--r--metadata/md5-cache/acct-user/timidity-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tinydns-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tinydns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tinyproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tinyproxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tomcat-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tomcat-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tor-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tor-0-r39
-rw-r--r--metadata/md5-cache/acct-user/tox-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tox-0-r39
-rw-r--r--metadata/md5-cache/acct-user/transmission-1-r29
-rw-r--r--metadata/md5-cache/acct-user/transmission-1-r39
-rw-r--r--metadata/md5-cache/acct-user/trickster-0-r19
-rw-r--r--metadata/md5-cache/acct-user/trickster-0-r29
-rw-r--r--metadata/md5-cache/acct-user/trojan-0-r19
-rw-r--r--metadata/md5-cache/acct-user/trojan-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tss-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tss-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ttrssd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ttrssd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/turnserver-0-r29
-rw-r--r--metadata/md5-cache/acct-user/turnserver-0-r39
-rw-r--r--metadata/md5-cache/acct-user/tvheadend-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tvheadend-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ulogd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ulogd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/unbound-0-r29
-rw-r--r--metadata/md5-cache/acct-user/unbound-0-r39
-rw-r--r--metadata/md5-cache/acct-user/unbound-telemetry-1-r19
-rw-r--r--metadata/md5-cache/acct-user/unbound-telemetry-1-r29
-rw-r--r--metadata/md5-cache/acct-user/unifi-0-r29
-rw-r--r--metadata/md5-cache/acct-user/unifi-0-r39
-rw-r--r--metadata/md5-cache/acct-user/unifi-video-0-r19
-rw-r--r--metadata/md5-cache/acct-user/unifi-video-0-r29
-rw-r--r--metadata/md5-cache/acct-user/upmpdcli-0-r19
-rw-r--r--metadata/md5-cache/acct-user/upmpdcli-0-r29
-rw-r--r--metadata/md5-cache/acct-user/usbmux-0-r29
-rw-r--r--metadata/md5-cache/acct-user/usbmux-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ushare-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ushare-0-r29
-rw-r--r--metadata/md5-cache/acct-user/uwsgi_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/uwsgi_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vacation-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vacation-0-r29
-rw-r--r--metadata/md5-cache/acct-user/varnish-0-r29
-rw-r--r--metadata/md5-cache/acct-user/varnish-0-r39
-rw-r--r--metadata/md5-cache/acct-user/vault-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vault-0-r39
-rw-r--r--metadata/md5-cache/acct-user/vault_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vault_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vboxguest-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vboxguest-0-r39
-rw-r--r--metadata/md5-cache/acct-user/vdradmin-0-r210
-rw-r--r--metadata/md5-cache/acct-user/vdradmin-0-r310
-rw-r--r--metadata/md5-cache/acct-user/vpopmail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vpopmail-0-r39
-rw-r--r--metadata/md5-cache/acct-user/wesnoth-0-r29
-rw-r--r--metadata/md5-cache/acct-user/wesnoth-0-r39
-rw-r--r--metadata/md5-cache/acct-user/wwwoffle-0-r19
-rw-r--r--metadata/md5-cache/acct-user/wwwoffle-0-r29
-rw-r--r--metadata/md5-cache/acct-user/x2goprint-0-r29
-rw-r--r--metadata/md5-cache/acct-user/x2goprint-0-r39
-rw-r--r--metadata/md5-cache/acct-user/x2gouser-0-r29
-rw-r--r--metadata/md5-cache/acct-user/x2gouser-0-r39
-rw-r--r--metadata/md5-cache/acct-user/xrootd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/xrootd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/zabbix-0-r19
-rw-r--r--metadata/md5-cache/acct-user/zabbix-0-r29
-rw-r--r--metadata/md5-cache/acct-user/zeppelin-0-r29
-rw-r--r--metadata/md5-cache/acct-user/zeppelin-0-r39
-rw-r--r--metadata/md5-cache/acct-user/zetcd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/zetcd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ziproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ziproxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/znc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/znc-0-r39
-rw-r--r--metadata/md5-cache/acct-user/zookeeper-0-r19
-rw-r--r--metadata/md5-cache/acct-user/zookeeper-0-r29
-rw-r--r--metadata/md5-cache/app-admin/Manifest.gzbin56651 -> 56651 bytes
-rw-r--r--metadata/md5-cache/app-admin/salt-3007.016
-rw-r--r--metadata/md5-cache/app-admin/salt-3007.0-r116
-rw-r--r--metadata/md5-cache/app-containers/Manifest.gzbin23949 -> 24096 bytes
-rw-r--r--metadata/md5-cache/app-containers/earthly-0.8.32
-rw-r--r--metadata/md5-cache/app-containers/earthly-0.8.42
-rw-r--r--metadata/md5-cache/app-containers/earthly-0.8.52
-rw-r--r--metadata/md5-cache/app-containers/earthly-0.8.614
-rw-r--r--metadata/md5-cache/app-editors/Manifest.gzbin25879 -> 26041 bytes
-rw-r--r--metadata/md5-cache/app-editors/retext-8.0.1-r118
-rw-r--r--metadata/md5-cache/app-editors/retext-99992
-rw-r--r--metadata/md5-cache/app-shells/Manifest.gzbin17924 -> 18272 bytes
-rw-r--r--metadata/md5-cache/app-shells/irregular-0.7.810
-rw-r--r--metadata/md5-cache/app-shells/ugit-0.4.310
-rw-r--r--metadata/md5-cache/dev-ada/Manifest.gzbin8817 -> 8824 bytes
-rw-r--r--metadata/md5-cache/dev-ada/VSS-24.0.017
-rw-r--r--metadata/md5-cache/dev-ada/VSS-24.0.0-r117
-rw-r--r--metadata/md5-cache/dev-lang/Manifest.gzbin45221 -> 45217 bytes
-rw-r--r--metadata/md5-cache/dev-lang/dafny-4.5.02
-rw-r--r--metadata/md5-cache/net-dialup/Manifest.gzbin7260 -> 7420 bytes
-rw-r--r--metadata/md5-cache/net-dialup/wvdial-1.61-r114
-rw-r--r--metadata/md5-cache/net-news/Manifest.gzbin3373 -> 3376 bytes
-rw-r--r--metadata/md5-cache/net-news/liferea-1.14.5-r117
-rw-r--r--metadata/md5-cache/net-news/liferea-1.15.617
-rw-r--r--metadata/md5-cache/net-wireless/Manifest.gzbin26400 -> 26567 bytes
-rw-r--r--metadata/md5-cache/net-wireless/unifi-6.5.55-r22
-rw-r--r--metadata/md5-cache/net-wireless/unifi-7.5.1872
-rw-r--r--metadata/md5-cache/net-wireless/unifi-8.0.282
-rw-r--r--metadata/md5-cache/net-wireless/unifi-8.1.11316
-rw-r--r--metadata/md5-cache/sys-apps/Manifest.gzbin86692 -> 86695 bytes
-rw-r--r--metadata/md5-cache/sys-apps/smc-sum-2.13.0.2023082517
-rw-r--r--metadata/md5-cache/sys-apps/smc-sum-2.14.0.2024021517
-rw-r--r--metadata/md5-cache/sys-boot/Manifest.gzbin8743 -> 8897 bytes
-rw-r--r--metadata/md5-cache/sys-boot/cromwell-bin-2.40-r212
-rw-r--r--metadata/md5-cache/x11-terms/Manifest.gzbin8021 -> 7854 bytes
-rw-r--r--metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r213
-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-dialup/Manifest.gzbin5231 -> 5228 bytes
-rw-r--r--net-dialup/wvdial/Manifest1
-rw-r--r--net-dialup/wvdial/wvdial-1.61-r1.ebuild46
-rw-r--r--net-misc/Manifest.gzbin54964 -> 54965 bytes
-rw-r--r--net-misc/rsync/Manifest3
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-notpedantic.patch25
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-strlcpy.patch46
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch12
-rw-r--r--net-news/Manifest.gzbin2223 -> 2222 bytes
-rw-r--r--net-news/liferea/Manifest4
-rw-r--r--net-news/liferea/liferea-1.14.5-r1.ebuild69
-rw-r--r--net-news/liferea/liferea-1.15.6.ebuild69
-rw-r--r--net-wireless/Manifest.gzbin13913 -> 13916 bytes
-rw-r--r--net-wireless/unifi/Manifest8
-rw-r--r--net-wireless/unifi/unifi-6.5.55-r2.ebuild2
-rw-r--r--net-wireless/unifi/unifi-7.5.187.ebuild2
-rw-r--r--net-wireless/unifi/unifi-8.0.28.ebuild2
-rw-r--r--net-wireless/unifi/unifi-8.1.113.ebuild109
-rw-r--r--profiles/Manifest.gzbin202676 -> 202670 bytes
-rw-r--r--profiles/base/package.use.mask4
-rw-r--r--profiles/package.mask4
-rw-r--r--profiles/use.local.desc2
-rw-r--r--sys-apps/Manifest.gzbin50823 -> 50819 bytes
-rw-r--r--sys-apps/smc-sum/Manifest4
-rw-r--r--sys-apps/smc-sum/smc-sum-2.13.0.20230825.ebuild68
-rw-r--r--sys-apps/smc-sum/smc-sum-2.14.0.20240215.ebuild68
-rw-r--r--sys-boot/Manifest.gzbin5724 -> 5728 bytes
-rw-r--r--sys-boot/cromwell-bin/Manifest1
-rw-r--r--sys-boot/cromwell-bin/cromwell-bin-2.40-r2.ebuild21
-rw-r--r--x11-terms/Manifest.gzbin4557 -> 4555 bytes
-rw-r--r--x11-terms/cool-retro-term/Manifest4
-rw-r--r--x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild60
-rw-r--r--x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch46
3893 files changed, 16792 insertions, 17025 deletions
diff --git a/Manifest b/Manifest
index 0d7fe88223e7..279a0884fea6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29739 BLAKE2B 955b6dabd920fc5d3fa2351606bedd6a1a981d602859a338eb910f234a47199a90c87eb841f700e477512d55c4bca0d037b957aa1de364b6cae2740186debdda SHA512 73e696c45b9b2417f1be60864c043f187a2e095337f1b0ae4a1826178618614c2f274219b082681a762ece1911301e834fb7b229095cbcebe6c4684d03c25dad
-TIMESTAMP 2024-03-18T18:09:56Z
+MANIFEST Manifest.files.gz 29736 BLAKE2B fa8ad3752c75c5ace05e719bd3cb3d08e09ac24b4a0516728b7eb1a3797c493001b0cfc0c2b5359e48c58b592309d0c930710f07eade62fcf287339fe746b791 SHA512 8862d1dcb022624c28916bb22bab21ef4a0a4cf6f0cabf7bdd323173a86bfc4344b061f39d7d8f718dcb1d2840466721dff642a5192eefe476b9fd3410edfcc4
+TIMESTAMP 2024-03-19T00:09:58Z
-----BEGIN PGP SIGNATURE-----
-iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX4g3RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX419ZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB5vA/4rc7Yzk6VHErDBcugItHRUDqD4ZFF+9G8sOPqBKMlCTXcSMKbwiaklIDJ
-/F9qiRCGdFuWRCysVns00EkXSlvevL0++JVwEaZ/5ytYPDGqJ6Wl47OfkWY685Ot
-/ObIH8+ahxCqtB5vC0WC9agmJnzbGwA+9RU3YMGkJETP20A60rWaCW8+7eVBqAn2
-a7fnuL4ArG4Rzkq40ypXyMzR9XBJcX5l6a727+zmG52RL7mPVc3bD66EpbrklyEU
-4hGvVd7Jn2JUlxObRlkc2JdI9CW3WXrwf1f9NN/KK1fDvQLf9zpYmh4zIo35vpK8
-NlY4kp5sD6ZHQSExGfqt5nAqgWl5GSHJBwPJhJPfZQlcjSWK66nUTCMHeg+xLU5v
-V8Yj3xxJlrVkcsprSOV+cH2DlsMVgUqIz6bltTvH5icNZMXIo+tLsxM2Y/fMxLwE
-RJ6O0FgwjMNGY7cENk4IJk3cwbQ8hQf7wP8DnUDAcnVkfpi0HAjI9GCLn/1ATtD+
-EitXK8u0Bxx4v0FOUgGQbgRevI9Kb/jatQ7IxyplYNDSxnbdc9l7WMVcWDWBEDBP
-jeQLkeeRh2hpkZwaQTuVI3pW2D9625NwurbEG+J/n/cL5cudJVn0bghfiNN0zSOG
-f5V34Z9w5/HjMENfu/29i45Y1pgraUVHpgq1RDsHEqiLhpGR3w==
-=LEbw
+klBTAxAAp0gHBAx1q1TpJjn8nTeYvHwqT0Ow5Ep7yF1OwBtnBbw5Zj1Jv6i52CL+
+XAbY40FmBNUVwN3kgeoUfD1BcB/iIO3yffpBZkGMA3i+QaaIQ2fNrzb6a5wyFzao
+coFbLcz1sgtFNAtVaqGKi+fSD8wjh6U+jwmf5u/mKZUYAT/P9+NbW7AfAPWwVz7c
+tpFlDelsXmeS8U9En70GDMQUtx1Jmmyf4+DlsL+y6hVSh3aRujcHowZAIz+Gvb0l
+Fq9RYqKMZTWLEgnGFS61ecsOC0rMC4zGFgCCBfxOPqPqmt5z7LGKhBX+NyudmnLU
+Rscjy3TATL+ctvmORNvO/SSU5CQ6ebeoa2kAEcnBvde0BcLWk1kLdPEpvN8REDh6
+vTByBc3D666EiSuV9W8++KeuF+rAE/zVyaIbkAnL5klntOmSiUg5OUk8cjH5L49D
+zzcyKFkfwcK1XqkRpXmJYQVo393oSdY0Hajuwyj0m1sh6b9AbOSB2krKbpx7kEof
+w0GabfSRGaPkvrrAC+s3BeZARaZuBwiNVMgxmCqqSOr4HibCMK9nTgcutUPZKLA+
+pb3kkX69OHspYGPDQHAXzu7/R+/l2kw1Eehb4qPN2htuOfHLQ6wYDpkBGvG/smJZ
+N58XXwC07A8SjZvTnhI/pxipnCmX9Kx4X0dR7mtAQIszlSJ+szQ=
+=6mt6
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a5c291b71b01..8136b47ad89b 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 eae8c490e668..0d2eb0e5c4c4 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
Binary files differ
diff --git a/acct-group/adm/Manifest b/acct-group/adm/Manifest
index f4d17163300d..f3031d1637fa 100644
--- a/acct-group/adm/Manifest
+++ b/acct-group/adm/Manifest
@@ -1,2 +1,2 @@
-EBUILD adm-0-r2.ebuild 149 BLAKE2B 19d7c1b8d6957b4981c12264b8c44bfde053c1c5fa5f7b1bfac48332375b58f86b3f4173993326fe01fd4352be3406c8bdf58bc8b37011dc588a52a1dac182b6 SHA512 df0b166def375795229a0dbbb71936ee63615fd0993b617977f2d20d42d27b31edf64977600224caef38fce91a4dee07ef7535ad71ab286ed986dc2bb5287f07
+EBUILD adm-0-r3.ebuild 149 BLAKE2B a177462716430266c65599177603943d3f6ff8b56b56760d2c5de81b7c1e205093bcf26c0cee50a3d18ea46ee840bedf849a4d3d0f3f06cf86c064cda1f6d6f6 SHA512 8ad0a53dc826c8a9008a3b8824b4701536098d4ad01af4384e6de6523a31f81edd5048014fcbee96d4953c4f0e16c9c90f4c435918adf872878ad2556b791613
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/adm/adm-0-r2.ebuild b/acct-group/adm/adm-0-r2.ebuild
deleted file mode 100644
index 3e0853baca96..000000000000
--- a/acct-group/adm/adm-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/adm/adm-0-r3.ebuild b/acct-group/adm/adm-0-r3.ebuild
new file mode 100644
index 000000000000..d6d40f4001fc
--- /dev/null
+++ b/acct-group/adm/adm-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=4
diff --git a/acct-group/aerospike-amc/Manifest b/acct-group/aerospike-amc/Manifest
index 0d9b18e713a7..e0c9ebd0e2d9 100644
--- a/acct-group/aerospike-amc/Manifest
+++ b/acct-group/aerospike-amc/Manifest
@@ -1,2 +1,2 @@
-EBUILD aerospike-amc-0-r1.ebuild 214 BLAKE2B b7e324227796e67f846f3b3a2b21c93ab1051c26a1b12bf88ce41b4106ccf5a48d082a405f5388467638aa6a1081ffd7b5a5b8c6014f90da67c75e1b8284243e SHA512 b0f23eb44493ddd4a783ead334810583a71634ded4f0f6ab64d9b85d380972f4093a9e00c30117e721f5f3be0b208fe4d76da5f96eced4fa21614c0b722614db
+EBUILD aerospike-amc-0-r2.ebuild 214 BLAKE2B 5b74aa34abc445885f29ee838a450a773bb01fc256ecf607f69e2cbb3359611251b13b6e7578549b5d4aa4503d211a43709c5132e7bf731320278b41bd63661d SHA512 e6b2b168ac7de72b9c852a9f9ac257ccf7a72ac66b4615570d2fc2f3adcee4c44c117610e7e270587b03cc47a2c73e7b1e1a044a3c0849f67cc67841f41fc32a
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
deleted file mode 100644
index afe329ac705f..000000000000
--- a/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/aerospike-amc/aerospike-amc-0-r2.ebuild
new file mode 100644
index 000000000000..5c098ba0dfc9
--- /dev/null
+++ b/acct-group/aerospike-amc/aerospike-amc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d7b469ca99ee..1fc9587f25b2 100644
--- a/acct-group/airdcppd/Manifest
+++ b/acct-group/airdcppd/Manifest
@@ -1,2 +1,2 @@
-EBUILD airdcppd-0-r2.ebuild 201 BLAKE2B c59abec9bf92cd29f1558e6caaeab20b34501f53ce4989486afcbff69a9c86a82ed9ce24be69bdd57ed0c3c3c46fb79ac3331e958b53b34e0093cfe59d4d5c9c SHA512 2a2ad419f34394331456cdde5de72143caf4c5f94a5bb6c82b3faf3f661a906238f1c63f96b6c9b1ef3dd1a5eab08ae85b7d2ee29a3db47edeea0a523dc7fe08
+EBUILD airdcppd-0-r3.ebuild 201 BLAKE2B f5f4efcb2a3fa86ed74ce5735a016ede31f283f349e323ff32b4217424b6ed51dde976c08524f92c2efd36b759cc5afa07c94df14050b2d890f9dbeb93131b8a SHA512 228af7dceda110fb1f950b096e7cdf5790d43122c44fdc7466dab663290b7d9dad517f190bf8f1436288162a4c98091d8c46d618154f8ec531a028eaffb7eafb
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-group/airdcppd/airdcppd-0-r2.ebuild b/acct-group/airdcppd/airdcppd-0-r2.ebuild
deleted file mode 100644
index 6021954f07fc..000000000000
--- a/acct-group/airdcppd/airdcppd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/airdcppd/airdcppd-0-r3.ebuild b/acct-group/airdcppd/airdcppd-0-r3.ebuild
new file mode 100644
index 000000000000..ddec456e2efa
--- /dev/null
+++ b/acct-group/airdcppd/airdcppd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 dc39a75a9560..a36a81efb1c3 100644
--- a/acct-group/alertmanager/Manifest
+++ b/acct-group/alertmanager/Manifest
@@ -1,2 +1,2 @@
-EBUILD alertmanager-0-r1.ebuild 151 BLAKE2B 97ede82bb42a2ee6da0306d522c10dff091374eaf1875000d6d13a79dde35786f782b2bd21edff5187e0763e8fdef5d8179e2528dd2892db8580946c42d78dca SHA512 bce247a4f0ff1f24b74aca91fab57d2a86492263809380d80e04f10e54b3c3db85e4e110ac846ee3bdb65b3de6808fdfef5715586c8f621a1f77e7bf21dd6323
+EBUILD alertmanager-0-r2.ebuild 151 BLAKE2B c0743d537b2b25aaaaad5001b8dcf4711d222992dfd48d20cd0504d1cdabb558fb4bced0be4346d201fc026d51b575c23e3cc3b06ad4c50d574e6246a1a36a86 SHA512 dc6bac19c8cd0df1f663f6c8d1b53177b0c6d6d111b3c155005b0c503cec9aea35a8da07c62d91ef30eb7e4c01a8222dd2b42813c122aee2f5e5e4cf5a98d9ee
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
deleted file mode 100644
index da84d7d1fed2..000000000000
--- a/acct-group/alertmanager/alertmanager-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/alertmanager/alertmanager-0-r2.ebuild
new file mode 100644
index 000000000000..318651cadb9b
--- /dev/null
+++ b/acct-group/alertmanager/alertmanager-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=294
diff --git a/acct-group/amanda/Manifest b/acct-group/amanda/Manifest
index defa15f00258..c4529db3c480 100644
--- a/acct-group/amanda/Manifest
+++ b/acct-group/amanda/Manifest
@@ -1,2 +1,2 @@
-EBUILD amanda-0-r1.ebuild 151 BLAKE2B c7ec000e381b37ba5c31df729e13a9917060bb7ebbec6e1160d7839ecd99b7e88c2b4b78e1bd0760ff3680c32bcc49b2ae78a69504d492fd8ba4405eb67a289d SHA512 6cbdaffaf03d30c08e2b69a2ab64b516ef70a7e266840d8ccf9fddeb6f1f26fadb90525c549e0fdf553bee09a50f26b8cf831cc0d8b9f98f2bc70a739e8d8607
+EBUILD amanda-0-r2.ebuild 151 BLAKE2B 4bebc57f403e113ff616dbda773fb3df3825d134632f2cc777027de10b8900cc3f5a07d2444dab5c3cc77836e7bbeebc9b3e86f598ca3fb238d7d0b59f072b44 SHA512 dd3a196db610630a7115cd7e3f061420b1099be8bc1f0d703120e4dc0548fc12e8dc20ff8342813e59ee91cc4db8df8bfe6d17beff470fc4a2bfea2bce65fe80
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
deleted file mode 100644
index 3eb2c5b3a0da..000000000000
--- a/acct-group/amanda/amanda-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/amanda/amanda-0-r2.ebuild
new file mode 100644
index 000000000000..74902fa20e5a
--- /dev/null
+++ b/acct-group/amanda/amanda-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=362
diff --git a/acct-group/amavis/Manifest b/acct-group/amavis/Manifest
index 0de71543db73..6ef9e6dbd6b5 100644
--- a/acct-group/amavis/Manifest
+++ b/acct-group/amavis/Manifest
@@ -1,2 +1,2 @@
-EBUILD amavis-0-r2.ebuild 199 BLAKE2B 303dbe1c1b876db93c3f30248cad3ffaedd2feb4e7bcb43c59bc59365f0a2f16b24800fe15d531f71efa120150e5581c0ffe364a83758170bfbd21588b08471d SHA512 8acc6f8290daf74b92c5b555409af38c3b550bd25af5f224e95cffbe4f26442c65f9ee92727f3229b8e356ea9c6ead6d283e2f3acff17dd2c539a0548946154d
+EBUILD amavis-0-r3.ebuild 199 BLAKE2B e81857442a0fd38e95c80ffcb0c4e72a68614f10ba599c49f470f70a934418bca2e64019bbbd1f05dc7d605e0d2705ea9b0cfe5781457dc9a3191b5e802e5b5b SHA512 8bf12a38fa562c6584556c4a33cdafa7d279f0c11c9c3dd7e6e35edc0a897712e3abb52794293842735fb01bbcead4469d56c89277ceda29eb3d9c9c22ea5eba
MISC metadata.xml 262 BLAKE2B bdf88a65e34409c3f65204337925e14be06c13ab53571f864dc58309b72d50a9968dacf93110bd97acc5ae729f55207718d4ffd6ce321210e220bc6d57fc61a7 SHA512 9836f7da275ae8424e0494ee38313d62f90a180ed9fcbf7ff6391b3a5b4c3679f566668f0acd82ad0fe5f036e70a0e0a33b95df87475e4cbf8aafe1ae6974774
diff --git a/acct-group/amavis/amavis-0-r2.ebuild b/acct-group/amavis/amavis-0-r2.ebuild
deleted file mode 100644
index f34143344b41..000000000000
--- a/acct-group/amavis/amavis-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/amavis/amavis-0-r3.ebuild b/acct-group/amavis/amavis-0-r3.ebuild
new file mode 100644
index 000000000000..810670d42a33
--- /dev/null
+++ b/acct-group/amavis/amavis-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 45aeb89edb8b..24c87cb4863c 100644
--- a/acct-group/amule/Manifest
+++ b/acct-group/amule/Manifest
@@ -1,2 +1,2 @@
-EBUILD amule-0-r2.ebuild 189 BLAKE2B cce95d3d3f59d3704f8c25cdb670d905155f3719dbfce93ae7278d93fc9b0c25c9dcdbf0cf19c8b804511a40be5c37f969ad88436c05b4f1c48a0aa724cc7613 SHA512 b8b0dec39e249a1fb48488db961afbb3d5d33c17b87ffe3659fadbf9986ca3add3fac9b555caeaef85053955580623eefae00edf00113734e1b53b6eee58a749
+EBUILD amule-0-r3.ebuild 189 BLAKE2B 6e99910259284c94c9861f36496c8b06ef22a389fb8eb77cf581dcdb8bb7702d0e93d8e281cca1a65d282ac1733a9a42f8896975f958db691fe516cbb5d05321 SHA512 c0e3076f5cf73c4ab2fd1dab8968d02b381ddbd1d953d8b0882eb4eac77d7a3851d748ff0252dae63ef8c0a29f13373b7256233a31a79d9984f2306421c78b00
MISC metadata.xml 395 BLAKE2B 676ceaef4b63cc5fd7c0ad8b28065738adf013fa4f85cb2fa70bd1cafa8ea6b76fc6ca81e36e91c839bcc55c55a8bf24b4a325e44b0830f653adc89ee09dbfc4 SHA512 30eec216eef39513374c06cc1b0be994f53deb7054f7241a55b1ccc73d58ab0b578b92096eb56daef0e7f8d1377480a00a6bbb6e0bcbffb19d53a48f081170f3
diff --git a/acct-group/amule/amule-0-r2.ebuild b/acct-group/amule/amule-0-r2.ebuild
deleted file mode 100644
index dda4974ede76..000000000000
--- a/acct-group/amule/amule-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/amule/amule-0-r3.ebuild b/acct-group/amule/amule-0-r3.ebuild
new file mode 100644
index 000000000000..1901f86bd58a
--- /dev/null
+++ b/acct-group/amule/amule-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b364b3d238b1..3e8714690f9b 100644
--- a/acct-group/android/Manifest
+++ b/acct-group/android/Manifest
@@ -1,2 +1,2 @@
-EBUILD android-0-r1.ebuild 220 BLAKE2B bde8081a42646faa5461618c8f10f42bb5072def7ced8146a5ce45e5dcd33550f50f34eb038637d7c69ea76f47dbec3ef051f5cd087a9d7262672168c586a35c SHA512 e678681f83a39f8b254c14094985614f55a33f15e2a41398169f97ecd3f5c8cf6a01e04c83b35e6ddcd80e96e375c79bbc836c318937ceac30c2f1f38e8a7e76
+EBUILD android-0-r2.ebuild 220 BLAKE2B e6e732a66f37981447f7111ddd494acd76a60fdb235e964dc3571e70a713e85ed562a8fd80d89aeb22c44116f9414597c5de1cb5e443572bad05e6e67574cc80 SHA512 10fc84dbd90c025ad4ecf79cde240d55635f04b8b0062229e0329657c724ad72363abb622f819676d8ec75144bf259f091fb15e68b87b382f5034f2a4310f876
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
deleted file mode 100644
index 5698fc27e4ab..000000000000
--- a/acct-group/android/android-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/android/android-0-r2.ebuild
new file mode 100644
index 000000000000..f77482745537
--- /dev/null
+++ b/acct-group/android/android-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
+
+ACCT_GROUP_ID="174"
diff --git a/acct-group/apt-cacher-ng/Manifest b/acct-group/apt-cacher-ng/Manifest
index 8de4d8f58113..d9745cc22dc8 100644
--- a/acct-group/apt-cacher-ng/Manifest
+++ b/acct-group/apt-cacher-ng/Manifest
@@ -1,2 +1,2 @@
-EBUILD apt-cacher-ng-0-r1.ebuild 151 BLAKE2B 1fa6ca127c3d82422e002c7d08abc8a2a4215afb801ef569b3174120cb27c99e659abec67c5fd146d19a9fe3cf871685868e1898a76972989f3ccef1de690529 SHA512 0770ccda9996188466fbb687fe2d06abd1753f35cee0654e8e12203ba960fe00ae83a6aa0808cf3e948db25acdef0295fd70b9d090e5d4ab057e1873ee4a6693
+EBUILD apt-cacher-ng-0-r2.ebuild 151 BLAKE2B 43e4474e96f17297584af1e7efc43236d5dfd10dfa1fae69bc59506012b94f08656ce6dc806082e7724edeff96d6910bcc3f9ba597f7594a7968c23339a1992f SHA512 353880bac76f7b1c79ad19ccf5a5d60e31c203467bc2a9f7d2d544bf72387725bea81b6e213d09a8748781626302e818bf40c4e1f9b7861e6e1f422d7495ec82
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
deleted file mode 100644
index 74d54239c6fc..000000000000
--- a/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
new file mode 100644
index 000000000000..4943ebeadb7d
--- /dev/null
+++ b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=319
diff --git a/acct-group/argus/Manifest b/acct-group/argus/Manifest
index 84ff92e7d3b3..bebccdb25766 100644
--- a/acct-group/argus/Manifest
+++ b/acct-group/argus/Manifest
@@ -1,2 +1,2 @@
-EBUILD argus-0-r1.ebuild 193 BLAKE2B 0be02daaa9ff181a446e671bde3439e1fcf2e1b4ba9c6c38b8700acd67f2c002c3c97b119e0c2c8cd7ff7630e4ef0785c395db310e14a7543d0d9e3512e8acb7 SHA512 8c79d1677a1b7ccbfec999868b8416e0c8e2708e3f8ef82a803dbd3d5a819704814eccf87471cc6955aa9c210de6fc51453b779282bb3d29da982c98bfeb61d8
+EBUILD argus-0-r2.ebuild 193 BLAKE2B 24cf022cb5018fdfab1d1413a6a45f2d0b4db004e156853e7a3847df8b1b497eb6852c4a3e1946792a1cca0cab44ad97774ace961a8c146854478521f7ee69f6 SHA512 39698ca52aa346f986898d244ab9c79c9086d796a179270237a4db2cf2a68becac80431ac0359413f61b8957375680af61eb1db0f13b6dc8bec7b18d9b845355
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
deleted file mode 100644
index 2a586410a682..000000000000
--- a/acct-group/argus/argus-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/argus/argus-0-r2.ebuild
new file mode 100644
index 000000000000..00f85456f034
--- /dev/null
+++ b/acct-group/argus/argus-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f260d97b2e00..72c2baade627 100644
--- a/acct-group/arpwatch/Manifest
+++ b/acct-group/arpwatch/Manifest
@@ -1,2 +1,2 @@
-EBUILD arpwatch-0-r1.ebuild 202 BLAKE2B 4bc304704b1a4c38176212f6d692b7c5ac4145569d7de81ce973f736f0a5abe6c31ab24d38240447df7f372941181dd92d05a95a2fadd210549fb8e721134625 SHA512 40484cf09cf72d4353431c62ac4634fda9f0f67045a2f46c04920d87637c6d3a4a2cc815d5662370ebcf6b4ee347229b4d3e47f0a66370359bbab9a4d1c65899
+EBUILD arpwatch-0-r2.ebuild 202 BLAKE2B 215e0220f6289d5437cf665afba68dbc65d802c085daa10bbe8f1b9ad14f15fed79f508a56a48e54e4e1f8ce46e36eb43202c81df05ae18d563f983f1c6b8b33 SHA512 3650fafd283f46d708ccc7dca19bd76cdcea03105f5cc93ec0b760f992580c8cf1826f9a69cebf3cb7d389fd30cca42a174a584c7e12a53f52167354bbeefe86
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
deleted file mode 100644
index 3763a50ff43b..000000000000
--- a/acct-group/arpwatch/arpwatch-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/arpwatch/arpwatch-0-r2.ebuild
new file mode 100644
index 000000000000..1a21b1a09e1e
--- /dev/null
+++ b/acct-group/arpwatch/arpwatch-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/arpwatch"
+
+ACCT_GROUP_ID="170"
diff --git a/acct-group/aspnet/Manifest b/acct-group/aspnet/Manifest
index 3400c8cc87de..176c1892e296 100644
--- a/acct-group/aspnet/Manifest
+++ b/acct-group/aspnet/Manifest
@@ -1,2 +1,2 @@
-EBUILD aspnet-0-r1.ebuild 151 BLAKE2B 956ed665224c5a95ac8419b6dfd02f6d912689674a218c6849631f4380d77b51891e429d1479e70abc24b418f7aa215f401896f077205a4c6939ea6c3b7c63ec SHA512 096f13743d3729ed7fd7c04aa88dd77ddc56ed672f99d39a2269fa96cc10501b8d96ba825bcacc54c259d7431b3356b3bf912c31cfee2742989effeb2214cc05
+EBUILD aspnet-0-r2.ebuild 151 BLAKE2B 658a3e834b1a64343a8ee32612797aebb51e5f7af6f2e969d811d755faf35a1478323fd12e068f053be3bfc5815d03b7b82237234b17b2e6a923e0bb44e558aa SHA512 717f09b81577e5b2a126eb8491aae7b3e0d14e106476f079724e842a25ac188aa0c47aba9b76655bbdf374fb1659391895c30d3241d1a66049d8823289b2948d
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
deleted file mode 100644
index c879ec8f038b..000000000000
--- a/acct-group/aspnet/aspnet-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/aspnet/aspnet-0-r2.ebuild
new file mode 100644
index 000000000000..251b49c23f49
--- /dev/null
+++ b/acct-group/aspnet/aspnet-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=216
diff --git a/acct-group/asterisk/Manifest b/acct-group/asterisk/Manifest
index 9f697c06f0e1..009104bbfe0b 100644
--- a/acct-group/asterisk/Manifest
+++ b/acct-group/asterisk/Manifest
@@ -1,2 +1,2 @@
-EBUILD asterisk-0-r2.ebuild 184 BLAKE2B 6031a817c9a956a91f592538d90efebbd8482bf671b8e592637142a68b4c03083ad1a99b17b0cbad4e5c1b1001250d8037b5c645ef643cf2924a71b63bf875bb SHA512 2a3969f048954ea1edee8539ae51f43d0164f72bc992069f46da721d16904bd0c71ddc098d35e4db4e4b06901110729677fe041c2b1617ae3a7430f018dee6b7
+EBUILD asterisk-0-r3.ebuild 184 BLAKE2B 0ae2782b561884258d63bc7842f2f2946ed9a4315109613ab1ca4a4b769607bb32277ac647f9031aafc14357b319067dc07e3b4bf5633826eb344ae1d162c150 SHA512 47a842eca53e4de8eea07c30c6976c965a630fca1e11af8cc3cb10a1c5a84f7b6f65c47a5c46a25443797703b54bc202743a21b48640cf33380a5a041758070e
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/acct-group/asterisk/asterisk-0-r2.ebuild b/acct-group/asterisk/asterisk-0-r2.ebuild
deleted file mode 100644
index da68978223d3..000000000000
--- a/acct-group/asterisk/asterisk-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/asterisk/asterisk-0-r3.ebuild b/acct-group/asterisk/asterisk-0-r3.ebuild
new file mode 100644
index 000000000000..ec0dd73afdbe
--- /dev/null
+++ b/acct-group/asterisk/asterisk-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for asterisk"
+ACCT_GROUP_ID=242
diff --git a/acct-group/at/Manifest b/acct-group/at/Manifest
index 471ddc4af2d5..74900acdab6f 100644
--- a/acct-group/at/Manifest
+++ b/acct-group/at/Manifest
@@ -1,2 +1,2 @@
-EBUILD at-0-r1.ebuild 151 BLAKE2B cb344fb6001f03c5dceac0823697804b619bc12c2a938cd3d179bb88f34cbfcc6fd0e545a9bfb65bd9acc25272de512afb9b8bb6b7d6675a440025905eaf652a SHA512 e50477db660851850462f6020b0c7db55f8b1ce734332b17d8b8e1b9de1737b2a42ed47f589b399d6b257aeaf118541812cb427131837d67f54d611517e3dd9e
+EBUILD at-0-r2.ebuild 151 BLAKE2B 9f88866c03478b79ad53db7fcc6aa5e46dc9b04b02768c756fc1578b46819596ef9cb148b516dc4de8f205f56f9109180b5128ef7a2852ab88fbbaf54b9d2cff SHA512 debd6fe16f51eb463c318cbf7a55e72ac3ed14789c881bbd666d744558230ea23cbcd43d824ee3eab50ed69963c7eee5dc4b3c17a2f87d7f01c2959e89943363
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
deleted file mode 100644
index aec9d092feb7..000000000000
--- a/acct-group/at/at-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/at/at-0-r2.ebuild
new file mode 100644
index 000000000000..61d88222ad7b
--- /dev/null
+++ b/acct-group/at/at-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=246
diff --git a/acct-group/atheme-services/Manifest b/acct-group/atheme-services/Manifest
index 7aeafd225c2c..4dd528a32c77 100644
--- a/acct-group/atheme-services/Manifest
+++ b/acct-group/atheme-services/Manifest
@@ -1,2 +1,2 @@
-EBUILD atheme-services-0-r2.ebuild 195 BLAKE2B 1c42efb448a937e0df893cc5ba2b9f9647d38089e0f29e55f0b0d1d9530dc5bc4c006a250f86a65f3ce09f5ccad11fa11a946f007c7af829a7f994fb57eef66e SHA512 d5885fd937761f87cebb850faa6f006793d6fc591f1303659997fe6fed34017b4a62715a5ed7d31b4d2346a4a9245162f81dc79507d99551edbc8f0ec0cef87a
+EBUILD atheme-services-0-r3.ebuild 195 BLAKE2B ad019c1d2c36e47486565b1c21f90a229db465c7b1d0d59d1d2c43d6281984a50a0c4603064e9e0c42a6abeac5513ec89c35e56cc786745f21d7353da89eaf43 SHA512 3bc295b38ef91a92efb032b4ca2f5bda8307c7e176c952da2407cc4a234d1500a8ff4582e3e134407469a97901c9cd564ba5b46c1160f588adf2d7b7f97e9ede
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/acct-group/atheme-services/atheme-services-0-r2.ebuild b/acct-group/atheme-services/atheme-services-0-r2.ebuild
deleted file mode 100644
index ff1b39f3444c..000000000000
--- a/acct-group/atheme-services/atheme-services-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/atheme-services/atheme-services-0-r3.ebuild b/acct-group/atheme-services/atheme-services-0-r3.ebuild
new file mode 100644
index 000000000000..6fe83c79b938
--- /dev/null
+++ b/acct-group/atheme-services/atheme-services-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 30930840ca76..6768bd43415f 100644
--- a/acct-group/audio/Manifest
+++ b/acct-group/audio/Manifest
@@ -1,2 +1,2 @@
-EBUILD audio-0-r2.ebuild 150 BLAKE2B d328ae8d617465d40e8a4d9a4422f6a1af58dbcb88d6e291861f3f9aa53a6268e16f66e633c8163e09e085204d5658a1bed16981b835f10da7a2105cc76e553d SHA512 4104cd051a8f576e73e4646144930172fe8254ac1a1d97b1a43275e1fd95728e4ccaeacccf99e7556c88daa5bde76696053428813ca465ecff7d4615dc2c8740
+EBUILD audio-0-r3.ebuild 150 BLAKE2B a3e2f8a3f49cde2cf0663a35d53135a918c0bd86d60d3b6823b92d8ce6d21da5f89601de5b99371c3967c68169ccfc035da8c4bb4221b4d8c2ebf31c15a2e3c3 SHA512 5ce5b81e00c7476c6294a0a7f3ea74ba5568b039f4d13f3fe837a0fc3120435c754dba8d59a4efd7ceb40dbe90df7ce9dc4aa2845fe64334af1422ff32cf9fe4
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/audio/audio-0-r2.ebuild b/acct-group/audio/audio-0-r2.ebuild
deleted file mode 100644
index 112b264b30ad..000000000000
--- a/acct-group/audio/audio-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/audio/audio-0-r3.ebuild b/acct-group/audio/audio-0-r3.ebuild
new file mode 100644
index 000000000000..eb826ff375df
--- /dev/null
+++ b/acct-group/audio/audio-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=18
diff --git a/acct-group/automatic/Manifest b/acct-group/automatic/Manifest
index 082f05dc0c60..b6d65243e547 100644
--- a/acct-group/automatic/Manifest
+++ b/acct-group/automatic/Manifest
@@ -1,2 +1,2 @@
-EBUILD automatic-0-r1.ebuild 151 BLAKE2B ad7475ef510d15881bb6c3b6c02cda97e16a9219c27aec23783695430d847041c7fc1479e09de79f2e89abe946b8072252279ae298fc534b0fbc6f980534d340 SHA512 7672fabaa60df72e08f3a598b9c049a0c3a2481be26d5a9a9989ed275cde88fbb7abd0378dea9d12746c3197f8467df198ce9b881919f174481f149ca07f0df0
+EBUILD automatic-0-r2.ebuild 151 BLAKE2B fe6c79722bc6bb9b287de4d30bd912385d1d82f52a06c71c5d70e1956e07d39b5c69038712a7be91448ec4d121bbfce2c86814e84f0755c222461c4bb218885f SHA512 cecf7683afb9705cc0a8ac2755ee82848ae9100b1f1d1ec26014d70be82c4a277499b42eeeaad3fdd8a745ca08a2ec94c1d1ddc3425cb9a705b3144c94e3dcd0
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
deleted file mode 100644
index 60432b0cf093..000000000000
--- a/acct-group/automatic/automatic-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/automatic/automatic-0-r2.ebuild
new file mode 100644
index 000000000000..12b9af797e8f
--- /dev/null
+++ b/acct-group/automatic/automatic-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=338
diff --git a/acct-group/automx2/Manifest b/acct-group/automx2/Manifest
index da4a9eaac782..fcb91492d3da 100644
--- a/acct-group/automx2/Manifest
+++ b/acct-group/automx2/Manifest
@@ -1,2 +1,2 @@
-EBUILD automx2-0-r2.ebuild 192 BLAKE2B 413bb10a7d054d5c83406cdb8c5516bfb4ac8c5c0c337f8385895dd2234d83c387527e3a8a5f0326f300662cd30541d9066c44e6f3181ff5e631509cf57b06f9 SHA512 45eb764d89f690bedf6859d7f76dc3bcbbcdb962e4a8bf3988e030d8ccedc906a88c202fc616dfd87efb59b6947fca2139c5bfd02f0646dc75898ed8a9849dd0
+EBUILD automx2-0-r3.ebuild 192 BLAKE2B 85ddb9dceb93a09b51cc8e89e5e623cfe61bd4f13669183fed99e2faa7d63c4227c5930481d8b70bd8efbc9f4b8df3fbdd629add6fa35d00f0bffde7c8f053ff SHA512 f4885ce018046b206215c97a26998274664cad799a0d11e6c9951f9af457ecc8dc22f888d172e2d8db73bc313543d8957b4b7d8959dcc8ddc2968843097a1786
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/automx2/automx2-0-r2.ebuild b/acct-group/automx2/automx2-0-r2.ebuild
deleted file mode 100644
index 4a38f233a8b9..000000000000
--- a/acct-group/automx2/automx2-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/automx2/automx2-0-r3.ebuild b/acct-group/automx2/automx2-0-r3.ebuild
new file mode 100644
index 000000000000..c3f844dce715
--- /dev/null
+++ b/acct-group/automx2/automx2-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b7e0541e75f3..f21cbb88b02b 100644
--- a/acct-group/avahi-autoipd/Manifest
+++ b/acct-group/avahi-autoipd/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-autoipd-0-r2.ebuild 188 BLAKE2B befbf1838c860531800ef54004ce781e87c9f8e7fc2fe3895880733c10e73508f85e03a1269b5c4daf981b704639f02ebbd7053ccd5aab57107143aa0097526a SHA512 808483813e98f397478af82ac64fc89d26c21e5759107ca0aeef5e6cca35808eef09192a90c277a5321fbc847eb5474281504688d992e8eea4aa4f020b6e7cb4
+EBUILD avahi-autoipd-0-r3.ebuild 188 BLAKE2B c034678d154d3e7ac46a77d4449ea2448631f21c41a8e718f294e98772f391802cde7aa79acb616d7d738952a027eae0c1244478ea0d89e22f80e962b425b54a SHA512 7e10515ba9d2057a2d525d822714291ae9ea458b3c9e3a2d946e41be865c40963a9c28327c85ca8ea0cc461f4f21a82e97a234c80414b027665d1c51df306178
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
deleted file mode 100644
index 02b2443648a7..000000000000
--- a/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-autoipd/avahi-autoipd-0-r3.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r3.ebuild
new file mode 100644
index 000000000000..5284a434019e
--- /dev/null
+++ b/acct-group/avahi-autoipd/avahi-autoipd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5de3da005599..588cd67c92f9 100644
--- a/acct-group/avahi/Manifest
+++ b/acct-group/avahi/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-0-r2.ebuild 180 BLAKE2B 3cfe1ed6f96b71991945aa02c81c681ea3c21e48263400867d8785ac631c903f99d3e943f5b03d1ce79173e770e46067e650831cfa6537568d9fe0b049ebd891 SHA512 bb31dfe4bb8b8c23914bb6b5e44a6e71f7d0af16be6fd3545f4644b654fbd657f68ec98bbe055d9a2ced02eb5f7bdabe87713ef38606d22861a8774e5762c454
+EBUILD avahi-0-r3.ebuild 180 BLAKE2B 26223723ce6d9244994b368d09bdc5a8e1a271926a98ce015907fc0c57ea37f8e5eec4d174bcba02025ea970ca679fb4b9eec9842349fb5f4a550202485b6ce8 SHA512 bbd69d5da8bef36d77cac164403fa0f5c1a32b7fd61766b389cb02cb3f657a1f39a84330146489ee18aa0df1921382d0a59abc2f18ba33473d59d67046287263
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/avahi/avahi-0-r2.ebuild b/acct-group/avahi/avahi-0-r2.ebuild
deleted file mode 100644
index 0b24f601736e..000000000000
--- a/acct-group/avahi/avahi-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/avahi/avahi-0-r3.ebuild b/acct-group/avahi/avahi-0-r3.ebuild
new file mode 100644
index 000000000000..675f8ac2fc06
--- /dev/null
+++ b/acct-group/avahi/avahi-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for avahi"
+ACCT_GROUP_ID=61
diff --git a/acct-group/axtls/Manifest b/acct-group/axtls/Manifest
index e801b97c6939..11526a8e182f 100644
--- a/acct-group/axtls/Manifest
+++ b/acct-group/axtls/Manifest
@@ -1,2 +1,2 @@
-EBUILD axtls-0-r1.ebuild 195 BLAKE2B 6039e5bd75930ff6206595e90af27cc236d08a6240f97f29030dff6556ab2c4464a27314131ded039db6799889e9ddecd4096cc2e8011206bcb0afd6e8da6076 SHA512 be7c373ad745a0fb66f80fe7cc5254ad4739f6227e856777db7a536ae26a1b8465e73f48c068c133a5451637282461b026cdee8b5db0fdd4f63d906a929d908c
+EBUILD axtls-0-r2.ebuild 195 BLAKE2B 46e6895d18e3c2451aeb35e8c40689e0432a4a131f80016fa0289ace756bf0679d40d98a7b731d395edfc588033545127c67b0f300cd3a7097c507e3fa8912ae SHA512 61cadf817cabc733c0b10cb8e4bffb86342a6190768d0fef955188c8bd5891de9a3dd7ddc5906d4e32b8f5140a8679ab768b566679db1ff9ed3a54b60e0a5fe1
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
deleted file mode 100644
index bf1a8f22259f..000000000000
--- a/acct-group/axtls/axtls-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/axtls/axtls-0-r2.ebuild
new file mode 100644
index 000000000000..b5a6ac11331f
--- /dev/null
+++ b/acct-group/axtls/axtls-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bc949105020e..7ead33530d40 100644
--- a/acct-group/backuppc/Manifest
+++ b/acct-group/backuppc/Manifest
@@ -1,2 +1,2 @@
-EBUILD backuppc-0-r1.ebuild 198 BLAKE2B 40b35990a51b867ceccb93054bfe03d7b7a7487441857cbafbdbad07799bda6881b6758afe46acaba0ffd2b6e3e69ffdc7c74ee925d1d625e05b20afcbfaf55e SHA512 7b885587ffdfd2bff2f693cb549b88137d810a8a707fe1ff96ba2669dced9dd1b5746f817016f5ab1d010ee5bccd202cb34c398b4a33ac1469b2f3fa180fdfc1
+EBUILD backuppc-0-r2.ebuild 198 BLAKE2B 6e3467a37f8f36ce46ed2ce1809c45608de6f24c0a50151172a173c098fe090f1e903683d8f59ec0a74ef9d03a1a09a0084c1f8edcaacc369e5b7ee6b43dbc41 SHA512 9682e612fc3ebd95960ec298b0e4915733bbe00998054be6af537ca90a1f35ac95bdd4e259232d1c22a7c082dcd898ec2587a9f305b787be66211820a17a043c
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
deleted file mode 100644
index 3297ead3270f..000000000000
--- a/acct-group/backuppc/backuppc-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/backuppc/backuppc-0-r2.ebuild
new file mode 100644
index 000000000000..5a1109026408
--- /dev/null
+++ b/acct-group/backuppc/backuppc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1d8bb1341476..aeca7e1aaedc 100644
--- a/acct-group/bacula/Manifest
+++ b/acct-group/bacula/Manifest
@@ -1,2 +1,2 @@
-EBUILD bacula-0-r2.ebuild 202 BLAKE2B a47b25bea9be45566a529ef9aba525213dc48d8bb2b1eea1e48aa561489172ef0b12e8a014881becc893a85135d6bba875b5856ca5f6867d6aaeb801813e7649 SHA512 ca0cb37a18a4b0a48543b05314924fd5fe90295fdce78f39a82cae9854fd23d2982c7de0a8dee655c22fa37977814e4f786ccd640038ddc5d417a4e6aa00ebcd
+EBUILD bacula-0-r3.ebuild 202 BLAKE2B 96ff5633cfce254bf0f9a7600137c12899637622788e7f67ede772f628257a3371c396d84d5efa1eb52a0e79efc4dbcdf38eb7c6dd89159bd7b3fe63e73f7e92 SHA512 0f1ce7e135bda90204291f36a3e099118ae7ecba8641a74c2f57dcc388cc63b384e7daae7a46ab7d67085e04fd87464c4cd19d6e1c1f790adb9f76441f1ea98d
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/acct-group/bacula/bacula-0-r2.ebuild b/acct-group/bacula/bacula-0-r2.ebuild
deleted file mode 100644
index dc252476093c..000000000000
--- a/acct-group/bacula/bacula-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/bacula/bacula-0-r3.ebuild b/acct-group/bacula/bacula-0-r3.ebuild
new file mode 100644
index 000000000000..d7714e98fe19
--- /dev/null
+++ b/acct-group/bacula/bacula-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9b3012135911..dc17fc87b094 100644
--- a/acct-group/bareos/Manifest
+++ b/acct-group/bareos/Manifest
@@ -1,2 +1,2 @@
-EBUILD bareos-0-r2.ebuild 207 BLAKE2B e635d16d53abc82b006d6b656f121f4f444d8fb87d0e3496a17b40dfefd1147fa330b9c351eb7c0da0e2d21fb3ea10c67f343c151a438b633d7b17223d1b5b5c SHA512 ffb10b12e0efa797a8f54717720972499c3cdc7d05154aa6acc4d8b811a94999963766ed2c06b68f72b1a3afd769ce0b0085f2fbadd5c381ccc06db6d97436b8
+EBUILD bareos-0-r3.ebuild 207 BLAKE2B 18f3b63dac09acfdfc1b81725f67543ff1cf4ffae311090d06496214205f441733ecf945c90530f5832a5e85cbd2269bdebffc6f7c01b9d4dcca6ef519a8f06d SHA512 e146a632735a6334995e93edfc5aadea3314f7726d31b5bdc66d0be643566f32f597e1f0636debe48bc9ca19c8393f6ecd088d9e6fd1218cc0ad050c53b7f3b5
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/bareos/bareos-0-r2.ebuild b/acct-group/bareos/bareos-0-r2.ebuild
deleted file mode 100644
index 82834b64fcac..000000000000
--- a/acct-group/bareos/bareos-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/bareos/bareos-0-r3.ebuild b/acct-group/bareos/bareos-0-r3.ebuild
new file mode 100644
index 000000000000..cc82ce372c4b
--- /dev/null
+++ b/acct-group/bareos/bareos-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7a3b219ff2ee..c59f86b6281b 100644
--- a/acct-group/beanstalk/Manifest
+++ b/acct-group/beanstalk/Manifest
@@ -1,2 +1,2 @@
-EBUILD beanstalk-0-r1.ebuild 200 BLAKE2B c4aae3b84896712eaf769586e0ea169686a6c00b84d8583c5916d73cd14d5f5e083577b97ad92ec0e97c4dd2deeecaea17fbeacdac1729c373e54930231323a0 SHA512 f4f1ba8ffd2632560c0cbdb2a2a974baabc88eb4c6b9fe2aec8988c6b49d4feca1e5ef2ef429750651896b2692bf4ff0b5eeb54973df6f319c2404be4ffedbdd
+EBUILD beanstalk-0-r2.ebuild 200 BLAKE2B ccb265eb92cb0674ed5d4342a72bbf0ff3630dcfc614e8bc937769f6bfb3e6ba0ea1d651927639b2b7c79ce5c9b1342830b4bc58b39a6871700650a523c7e0be SHA512 4b399b8b829cbdb42e9ce0816b906af29686690b9cd3265602dbbb8fc219537ec04963b5bcfa8711820fa0499995e3404a70ccc8973f30f81f5ff3b8cdd2e53f
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
deleted file mode 100644
index 8587963e6d4a..000000000000
--- a/acct-group/beanstalk/beanstalk-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/beanstalk/beanstalk-0-r2.ebuild
new file mode 100644
index 000000000000..c95260922366
--- /dev/null
+++ b/acct-group/beanstalk/beanstalk-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0aef6757381f..d163a0f08738 100644
--- a/acct-group/bedrock/Manifest
+++ b/acct-group/bedrock/Manifest
@@ -1,2 +1,2 @@
-EBUILD bedrock-0-r2.ebuild 209 BLAKE2B f8b5c55a70ea671fd00bd611c46999cc8c6d56c5fe4c8ea00efebb0faa6d4e3326da01304cc7bbf36436db467b7bda95ff486af6327fac16b5578974669f6dc8 SHA512 38712bff42ef9d48c877087130c179c82fa6a77c7fa4d07c65aa42d13f7c306eee4ae2c093fd087cc5c14cbc423f33334515ef76949b96c59f5698fd11816a5f
+EBUILD bedrock-0-r3.ebuild 209 BLAKE2B eadb0d199e95b9c1bd1a61c509f137da12ee085a4302a89ab9dd0c00a1fb503157a527e70e691b13afbd4489404b8253e774e0b82bc16060ddf19f83fcc66eb5 SHA512 4b073963976988cdd1afcba4c583bbba52ac577b81cf02b2972cb2a06924792e94bcf6c56afae4c7413b1b85b5f01f181a27c144437f3fc24d504f0a08152136
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/bedrock/bedrock-0-r2.ebuild b/acct-group/bedrock/bedrock-0-r2.ebuild
deleted file mode 100644
index 65b2c6db2dbb..000000000000
--- a/acct-group/bedrock/bedrock-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/bedrock/bedrock-0-r3.ebuild b/acct-group/bedrock/bedrock-0-r3.ebuild
new file mode 100644
index 000000000000..60af38f945a8
--- /dev/null
+++ b/acct-group/bedrock/bedrock-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft Bedrock server"
+
+ACCT_GROUP_ID="485"
diff --git a/acct-group/bind_exporter/Manifest b/acct-group/bind_exporter/Manifest
index 9c9f1e8af275..86344d0a4742 100644
--- a/acct-group/bind_exporter/Manifest
+++ b/acct-group/bind_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD bind_exporter-0-r2.ebuild 151 BLAKE2B f5050a82ec7c0e1a5e524019835126d268e45fb4d9e335311f60acc491a1c0a22f6c976568cc319690d4a04a3e8b05684faf5ba314f22a8adc5aa2a35b899e2a SHA512 d7a76601ba149d8482a669d084981b0a9dad2e45d14a09fc2d5c1341d9ae8065b908267cb0ad0adfbbeb962ad044c47951635a1d69c98fd83999c74ab1fa11b5
+EBUILD bind_exporter-0-r3.ebuild 151 BLAKE2B c22545eccf39d56fbeaaef8131712b1f66198fec5c803e6b059dd37397c8479ce8fd56055bcb7c4a3ad38618507f0e5ccdc9702877fcac6338e9b9be3a73558b SHA512 a7fa3cd48a0303c934a2a60428a15dd76fe3b64a5d8f6d2965e014735f921ee28cc2b0eb4a73cd1ecf9614c9e5b23fe93fc2612a73172138e5cc3af494ea6aec
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/bind_exporter/bind_exporter-0-r2.ebuild b/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
deleted file mode 100644
index 37141abf1c02..000000000000
--- a/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/bind_exporter/bind_exporter-0-r3.ebuild b/acct-group/bind_exporter/bind_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..ff68ea954d3f
--- /dev/null
+++ b/acct-group/bind_exporter/bind_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=276
diff --git a/acct-group/bird/Manifest b/acct-group/bird/Manifest
index 97f7626f9dff..95a206570599 100644
--- a/acct-group/bird/Manifest
+++ b/acct-group/bird/Manifest
@@ -1,2 +1,2 @@
-EBUILD bird-0-r1.ebuild 211 BLAKE2B 15674bf2611a6074cc57c6c73011a4822ba8bf68693a78f387fe80ba741392a1a1d3c457677d416e412652a3e5b6cbd0b42fec5c09d4fb56b12069fb2cb1311c SHA512 1d583cfeabe0a36eaf9b1d902145ad778fe362d0e38788ff42f15ea860543f4c603bf3874860850b9eb8943530cfca0663123f2046e5a01c046244c73ffeaa0b
+EBUILD bird-0-r2.ebuild 211 BLAKE2B 3e066ce800b1627ab79e0f49903fd6f70781dd385ec35c0de8bccd7c5f1eca5352333758942aa21f0542ec8b7d5ea07e773016df40b1e1bb336a6b648d8ea005 SHA512 609fb55cb203628523b59b08e80e13fde0dc7e0813a2a204f2a20b05c898b22a4f97eebc20b8cdf101e37fa8d102c98e194a09b1c99a776e175b7b02a254525b
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
deleted file mode 100644
index d409ead353b0..000000000000
--- a/acct-group/bird/bird-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/bird/bird-0-r2.ebuild
new file mode 100644
index 000000000000..a01a80d52368
--- /dev/null
+++ b/acct-group/bird/bird-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a737508c5351..d2d3f3f43841 100644
--- a/acct-group/bitcoin/Manifest
+++ b/acct-group/bitcoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-0-r2.ebuild 227 BLAKE2B 97988e5b1c96cb91873e160da4b0ddfee68b3d90cc2431fc967169b6ed85201d1b166fd62bb72395f2d8a203321a5313175cb4ca99965af6e19d82f4f6ac52ad SHA512 a7f7ea535865c00b01b49b502e70fd52b9e677fa8d47e9268e4e3c5433e2c67cf4ea8dc3105bda75f078ecf2f162a3ba4055a9a3d2780eef96e5c8b22ab45f8a
+EBUILD bitcoin-0-r3.ebuild 227 BLAKE2B 72fb9b4ddc854bf77977ff15415346cb74f5bc6b14e16903e47b06432938896a90eab32b111a6017384e851ace2e8bf06c74c6d8c5cbde2422755b8580e48d04 SHA512 4dff65e754798997d2d43d7c4827271d6bfb2b580300060048ec29d3e9544a315f958f75b9c5596cc8153e6f91c057c22ff0405ccd9992074cf1ff41cc5fcdf4
MISC metadata.xml 405 BLAKE2B 3eb2845f129f9c7ece1f374a0bef8eeba29614c94e714afa75d9193c5238539d48de1c761de7568eb7a1e3497fc8afc0e876be8339292e7e020d14531b963a59 SHA512 2ef8d9eb38092901821728d198e438c169f57cb38772267e62dc352ec7e35586a578802492682705fcd1d387ef9987344ef7d501d254d2743a35c9f0692d3f75
diff --git a/acct-group/bitcoin/bitcoin-0-r2.ebuild b/acct-group/bitcoin/bitcoin-0-r2.ebuild
deleted file mode 100644
index a29293fcef17..000000000000
--- a/acct-group/bitcoin/bitcoin-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/bitcoin/bitcoin-0-r3.ebuild b/acct-group/bitcoin/bitcoin-0-r3.ebuild
new file mode 100644
index 000000000000..5b6a1717ba9b
--- /dev/null
+++ b/acct-group/bitcoin/bitcoin-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 35e4c83764ff..b65b02ece4df 100644
--- a/acct-group/bitflu/Manifest
+++ b/acct-group/bitflu/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitflu-0-r1.ebuild 195 BLAKE2B 5ad5dbdc05539091a237190455aa3347a0ab3aa04243a1a453317073f502eee1bb04db5c1a1b8e82156e38279ba62c3354127c8012569fd53587ebcdd2c95681 SHA512 77a2439b436531dec91e99bffe1ef2819b63469943fa271588f93f0fc4a87b5e96e2d7a26fef6814fafe8b32106c3077e21dc3c983f8d38fa03aec7e9e8052e8
+EBUILD bitflu-0-r2.ebuild 195 BLAKE2B d3ac03e85884f04d5351f28e9b3edefa6aff1e7d05aaecf56dbed322b13c735632fed9668d917dcd8b23e6552244e7f08e3d4ba452500cda24196f48715f75c9 SHA512 d3fcfa2c2869866c4d8007e886994beb73b7d285685ca588e5db5ac2ff31575e6aea0ed5b7b51ff98c48b554462f78f94d97ee5235fd9849951ffbbfdd73f9fe
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
deleted file mode 100644
index 8009fbfbedcc..000000000000
--- a/acct-group/bitflu/bitflu-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/bitflu/bitflu-0-r2.ebuild
new file mode 100644
index 000000000000..932da2ca6ce7
--- /dev/null
+++ b/acct-group/bitflu/bitflu-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 623dfacec2cd..d5eab24ba7cc 100644
--- a/acct-group/bitlbee/Manifest
+++ b/acct-group/bitlbee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitlbee-0-r2.ebuild 151 BLAKE2B 8df8c1742d104abe8e7157517fbbcbb4662b8744b4826664d5d0d815a11ee28f89a237b8491ec8bd1093408344565d68bfb2e02eb8775cf679969b27db7ddcf9 SHA512 7f6595a5b74d8576a4cd85c4973c8eb0d6076fd5eea860f3a5824f653e970cb51e00e0676761ab51ec252f30b22c9982380b48cc9b2f00e44cc1b922ce673d0c
+EBUILD bitlbee-0-r3.ebuild 151 BLAKE2B 058a998469ccd2e1bfec33b56c52acae50a5654579addfc56946c84f49bce1d692b9677d916fa5e56bb5606105052cb7d00739d7eb7f4ed55e8b1263a0755e43 SHA512 450e2105c3094a86658b4f6a718d1437bd9e5e229d859ef94bd704014cac4fb0b306dbd2e6eec9704fe63cf18f1796e606a0facee8d231c3c394b5dbec3a8e3c
MISC metadata.xml 246 BLAKE2B 10aefa483b0d2464cc54717a1e00c5474059fb01c51ef76d09d2618a3f22d0bcf12d67d0bc625757697d7cc07ac6516718fa254e67163410241794b2417d7417 SHA512 e05bd4e45e37c5246d1a8d144d348aae094aa7ffb63651222eb91c47f6e08bc84d6cff93d3622a218cb9184fa64dee598a1a9041853321e417afc293b6135f04
diff --git a/acct-group/bitlbee/bitlbee-0-r2.ebuild b/acct-group/bitlbee/bitlbee-0-r2.ebuild
deleted file mode 100644
index 93485a39696f..000000000000
--- a/acct-group/bitlbee/bitlbee-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/bitlbee/bitlbee-0-r3.ebuild b/acct-group/bitlbee/bitlbee-0-r3.ebuild
new file mode 100644
index 000000000000..4ec68115e3c0
--- /dev/null
+++ b/acct-group/bitlbee/bitlbee-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=407
diff --git a/acct-group/blackbox_exporter/Manifest b/acct-group/blackbox_exporter/Manifest
index c7c657720c51..f5266cfbf07b 100644
--- a/acct-group/blackbox_exporter/Manifest
+++ b/acct-group/blackbox_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD blackbox_exporter-0-r1.ebuild 151 BLAKE2B b1de27dfbb6020abea966efd607161d057015f55e059a781e957d04586777ad7fe6e675cce61ab3e2db04c9ea02eb640172560355ba58b4a41f3710cd739f13f SHA512 a4f82682d1f66b8d7a4e553887905bba9fa22368ec9d5b2fdce3eb949b434ee7012a0d3ed14edee8ee627aca62fefaefeb8a72e34614e9107c59c41f08fe29ba
+EBUILD blackbox_exporter-0-r2.ebuild 151 BLAKE2B 2edcf0d5d5117f95c814acd77932204714f1b9df0ec10c0481d1259f0c6968256da72fb134c75646b5d9262e55296e8005c17872db6b12ee4fe90eabd38bc1b1 SHA512 f8e2af74773ebe6182d82482941189d4cf7da6b92a21e1afa0822060408b045210e03e168807d7e1e5f49bfa4fc3036619807a5dee5a4a02bc98a7b771ec018a
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
deleted file mode 100644
index 8e1e5e73db5f..000000000000
--- a/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..e1543bff5700
--- /dev/null
+++ b/acct-group/blackbox_exporter/blackbox_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=293
diff --git a/acct-group/boinc/Manifest b/acct-group/boinc/Manifest
index d82dc73f50f8..8c6555ba4baf 100644
--- a/acct-group/boinc/Manifest
+++ b/acct-group/boinc/Manifest
@@ -1,2 +1,2 @@
-EBUILD boinc-0-r1.ebuild 190 BLAKE2B 87ee45fa74444cd0440b56ea89b5d6d282d9f78d1eac87e936518b414f3d5db302b21eedd910f9e82f5fcdffe3ce5053392806c2e211e97bbb4e572d1d3a6340 SHA512 a310661ddad06ddacbcaa93522701e9e91c882bdc7c57c1f92c55586be91038fde4949856ae32e0f4a05cb924cd8153a5811def8444262f1085d87ff5a7b865c
+EBUILD boinc-0-r2.ebuild 190 BLAKE2B 7735437152ff2db1c5530c07f8e434b4c266e6f4811181d6e455b33b0a91f95ab7bdc123a1ccd5d1fcb87161dae756e01fd0904161d6b5d63f2f2762126e6470 SHA512 0b2dc32e025fa04b5cde52fdddb4bd41c8e2d85244519f42110e61d86f934d0f148e4093c26782e4f72106933d67ef5ccd4b59b575f3c1f34b944b25efd620cb
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
deleted file mode 100644
index cad1c8d097f6..000000000000
--- a/acct-group/boinc/boinc-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/boinc/boinc-0-r2.ebuild
new file mode 100644
index 000000000000..7c7facdbdd76
--- /dev/null
+++ b/acct-group/boinc/boinc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bcd39facba89..d5577f3076cc 100644
--- a/acct-group/brlapi/Manifest
+++ b/acct-group/brlapi/Manifest
@@ -1,2 +1,2 @@
-EBUILD brlapi-0-r1.ebuild 151 BLAKE2B 5235da32932170c316e874cce192b1401997aac316b06a25c26efeb2800ffb51287d4d0393f1a1f13c7523af9f8e9a702f3be201459fc65c08ffa47c6c5e54a5 SHA512 a76d52701c08c5edb7d042d1ea8999be5e69c954bb532196246bec1a9422b24d53a91bf5ae80a1657ab1d8a14be56f473d52eae033782345961116f4247a5032
+EBUILD brlapi-0-r2.ebuild 151 BLAKE2B 8c1756b3f2141e64bd611ef1754793cfac6aa6e8b567482e38d24e53b63eb6613f6e6e346c06b4d65a5b4268bb56c2417148f51af87af7777aa5a88219033347 SHA512 b3de65c56fbd4c233eb9dfd7bdf5aff185c4abaa866c8d9392bf12cde21b9604507f613c911dcf99a549c8198ec604d998d682aadeb635d270c9f714ea47ed0b
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
deleted file mode 100644
index 752469ce1198..000000000000
--- a/acct-group/brlapi/brlapi-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/brlapi/brlapi-0-r2.ebuild
new file mode 100644
index 000000000000..c1221abbe8cd
--- /dev/null
+++ b/acct-group/brlapi/brlapi-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=507
diff --git a/acct-group/brltty/Manifest b/acct-group/brltty/Manifest
index 79b54f5a39b7..73066b8a0df1 100644
--- a/acct-group/brltty/Manifest
+++ b/acct-group/brltty/Manifest
@@ -1,2 +1,2 @@
-EBUILD brltty-0-r1.ebuild 151 BLAKE2B e7a433fca43ddd6a1e04a01d8bf9f495fba60cd5f2cd25afe88f0d58d3399f67ab72472e3de6105c62c5b1b3f467a109a3a26f5173bf4713ff32dd0a6aa05c27 SHA512 834a87e4cddd12d7f51c77471b0d27c702cb9e692df3b87e67d831d1b45823d588cb5162e2ff0e31808e777b79fb86c0cd3dd01d0e5a77b362ebb2c1e4c0bbca
+EBUILD brltty-0-r2.ebuild 151 BLAKE2B 922db60caba88c8710952566a944b36c616fed58e3df4e7e8f278a4a7a8f43dd3b5ea1d84851fe34fb4d47187f6060d5ae6f5747227b4822b049db24534080e1 SHA512 57bb77afd5692341f8dcc9569aac24e58449d94869e630efecfed2b9d489cee0da271a2c251d72fafae740e7b930126be7a5c8ed740c3ecc8db069efe37c0c69
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
deleted file mode 100644
index 73c11e0c07cf..000000000000
--- a/acct-group/brltty/brltty-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/brltty/brltty-0-r2.ebuild
new file mode 100644
index 000000000000..306e103359df
--- /dev/null
+++ b/acct-group/brltty/brltty-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=506
diff --git a/acct-group/buildbot/Manifest b/acct-group/buildbot/Manifest
index bbe26648d0d3..5db986b935af 100644
--- a/acct-group/buildbot/Manifest
+++ b/acct-group/buildbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD buildbot-0-r2.ebuild 197 BLAKE2B ae617e87921fbfebd3d8218d987d8d15dfba56e524f60c6dd9bc37aaae492cc7f28350e1b0055ff30aa2e9c6de6a595f9cd1541ba8f6567354a7c7d12947f15a SHA512 209f0c19d77ac05ec239c7314711d244b56a7ed9111030e9cbaf26a371043f64502171d120898486b6b0df950789bccc02ede79cc950a469b71d106aacbe8996
+EBUILD buildbot-0-r3.ebuild 197 BLAKE2B c92f8ced5629387f5ccd62b82e21dd92eb67f3ebbb5decb068d051f2faa24732dfc6fef2391fdb43d8b0ffb79d0f7b9ad259613c9d727657f34130a0daf14b9c SHA512 00c42d4bad67857a53750810ec0d3adc02fd3f6b384f1732ea2ddd7eecd79cb44307c952d1a396e82857cadfd85d9ac0686e2bbe9c6751c7ea8ce4b9145767cf
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/acct-group/buildbot/buildbot-0-r2.ebuild b/acct-group/buildbot/buildbot-0-r2.ebuild
deleted file mode 100644
index b58d336eef9c..000000000000
--- a/acct-group/buildbot/buildbot-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/buildbot/buildbot-0-r3.ebuild b/acct-group/buildbot/buildbot-0-r3.ebuild
new file mode 100644
index 000000000000..bff1474aef01
--- /dev/null
+++ b/acct-group/buildbot/buildbot-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d56f7de52a04..98aabb8cf310 100644
--- a/acct-group/bumblebee/Manifest
+++ b/acct-group/bumblebee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bumblebee-0-r1.ebuild 151 BLAKE2B d5c37fffd8c26c6cd1103a063912728dd51e5fc4e071d91dba799adb0c7180c529c5ba966682b2dd42de55afa48cb885395abb19fa4ed1ba790825067c81a2ac SHA512 f63354ec194fd1e5a5a2aad4b368003c1b44923af4b4e44c6f561efd64d876c8d5929357a4094ca3a32d1b5d765fd8661000764e39ef2b549ed47c2013c757a6
+EBUILD bumblebee-0-r2.ebuild 151 BLAKE2B 6e68442422337419bc26c76558210bacffba40305f70e649b50c18a7f37a236c0832c88f7ee5ae4959d39f517c4b995234b4c395e995e8d9c4a6dffa5fe264f2 SHA512 8c40414b93ce5cc3e382701d6965a09482a1f1ea119ef2764b37bc6a7aa4c32f85938d86906a16b74d358c491dd3c90f42ded65f794f77ef464296c43ce27b95
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
deleted file mode 100644
index 316fc9ef3427..000000000000
--- a/acct-group/bumblebee/bumblebee-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/bumblebee/bumblebee-0-r2.ebuild
new file mode 100644
index 000000000000..2bde643a8b45
--- /dev/null
+++ b/acct-group/bumblebee/bumblebee-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=380
diff --git a/acct-group/burp/Manifest b/acct-group/burp/Manifest
index 0a3bf9ef3d51..7494fb58ca63 100644
--- a/acct-group/burp/Manifest
+++ b/acct-group/burp/Manifest
@@ -1,2 +1,2 @@
-EBUILD burp-0-r2.ebuild 202 BLAKE2B 4b04dd679b0a0c5eb84c10074345e980ea92c7fb6b28e7dfa91451dfe1c5604e322048ec7034617d608384a11c0f4bad3e506fae16a482cb9de4cff117c97e60 SHA512 7ce4081085bf78bb0ac167955b2de7fad649f369d23a5f8f5984e1d86e1a188c16e8f3d561ebeb7c4b5954cff43604951f378979cad47e4dab43d5effa50b90e
+EBUILD burp-0-r3.ebuild 202 BLAKE2B 6dc5c51e8c78e93c76021dfb9e635e2e0446baeef2939e2ccaec528ef5781a61670f143cd978e8d37712081dd68242f6d8530bebf1e743c54238bf931fe351df SHA512 2c4877a64f96734164d16f8ba136cf25d0ac7c434cd6db4bbf358b0fb416b5e2b29df15a305664f9707f339622ff797fca7b608cdd0fb2c3ae1fbaad0f6320ab
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/burp/burp-0-r2.ebuild b/acct-group/burp/burp-0-r2.ebuild
deleted file mode 100644
index 474fe04b5889..000000000000
--- a/acct-group/burp/burp-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/burp/burp-0-r3.ebuild b/acct-group/burp/burp-0-r3.ebuild
new file mode 100644
index 000000000000..4285dba481b2
--- /dev/null
+++ b/acct-group/burp/burp-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1644902b77d2..7726cb692133 100644
--- a/acct-group/burrow_exporter/Manifest
+++ b/acct-group/burrow_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD burrow_exporter-0-r2.ebuild 208 BLAKE2B f4d9771935ab83f8045944127d0fd02574b684ddb4b7738e3097c4476a3274bc0abaa8e37a8120cd2443a7ba2b1f65c5028c1bb0c5356a86f5afc9220cecdf59 SHA512 cfde4b94351d5484887377a2422b1fa3bcfa31d457440d76c4003f5bff92bd4e59a827bec08d881653e2d4ad237aa6cc0d9193eec86c2fcddf6892f74faf770f
+EBUILD burrow_exporter-0-r3.ebuild 208 BLAKE2B e9f771500fc63879be56c70aaa363ad0fdc0052c214da0a98df62bb5feee5be0e18b2bfcb58111bc99878a4837d8a1480819c039c8e5e24bb9973ce271ff5d60 SHA512 81bc7af7edccb79c71f47f5d5bae7cc026fae028b2fc00834644fcd3e3fe6d8d72b38e266c9c901d62e839c687d554c3d3690a4b66672b3e7077dafd2ce6e870
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
deleted file mode 100644
index 49197343c68a..000000000000
--- a/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/burrow_exporter/burrow_exporter-0-r3.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..112dfb718da2
--- /dev/null
+++ b/acct-group/burrow_exporter/burrow_exporter-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a5e48fc60304..b975c94ef354 100644
--- a/acct-group/cadvisor/Manifest
+++ b/acct-group/cadvisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD cadvisor-0-r2.ebuild 151 BLAKE2B d717a8ee90d77d4c564ea2930748042dc662bc671519a41dee9cdd5a1006d95b9571c9ca225e6fe85ff1f517419337029762af396305305cee2aca90d24f6efe SHA512 eeae26ffc075d8115a90c4c68d2cd606c586a4b134cf1785f2554ee1f37c2d49e43ab01367c94de2922e1634911a542fd39c19a92e0635f342d59a1c54d39992
+EBUILD cadvisor-0-r3.ebuild 151 BLAKE2B 1b2b3f87a84c8a7a69f7176b4a062510848c6a179f84b6d924b0e4ea7b08278cbf791fc17ab8f3e4a9f7b6b0c7dcb1f3764cd8789eedfe7b612831c33b6f3434 SHA512 03bbbbb5336f2b6eae8a0205cbb301d80ee2385c50530971fc6d59a31788559cf34cf21296cfc26919e8244ba502923d7d2313573d281e4b372a7fb4bae18d02
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/cadvisor/cadvisor-0-r2.ebuild b/acct-group/cadvisor/cadvisor-0-r2.ebuild
deleted file mode 100644
index 12ee15aed64f..000000000000
--- a/acct-group/cadvisor/cadvisor-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/cadvisor/cadvisor-0-r3.ebuild b/acct-group/cadvisor/cadvisor-0-r3.ebuild
new file mode 100644
index 000000000000..71e3a5e0420c
--- /dev/null
+++ b/acct-group/cadvisor/cadvisor-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=427
diff --git a/acct-group/cancd/Manifest b/acct-group/cancd/Manifest
index 4d9f3ba86a86..2e79f4003ab3 100644
--- a/acct-group/cancd/Manifest
+++ b/acct-group/cancd/Manifest
@@ -1,2 +1,2 @@
-EBUILD cancd-0-r1.ebuild 205 BLAKE2B 9a2d8ad8e4ad85919b99dff346f6ae1d633a50320d457a5424e94d38fd0428a01fa70362cf736a1d1d862ec9e9cc877eb0c6fa9e45cae7636fbddaa5241695c4 SHA512 973a171797f7f93e98698e202a942b361b9297455738433d6e9ace1c90d4d593a83306e211dfe183720c3292c7efd728425cfffa50167f06f73568137d791499
+EBUILD cancd-0-r2.ebuild 205 BLAKE2B 68a0feba9bcafaaab024f7a39bc9867ce6b1337fd97a9da01f5d80eb2ef63496b1555b9ac591f38f9442088c540c1cf37cc8e0b44a1e90f6b86d3745bfe6d059 SHA512 0ae6e788223265210b7bc014bc8e24ac981109878324d4ca3e0bd46054f24e01d733049369e16adee4393ee251f3ed262d9f8866dc124965e40e3ec11004febc
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
deleted file mode 100644
index 46428de1cae0..000000000000
--- a/acct-group/cancd/cancd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/cancd/cancd-0-r2.ebuild
new file mode 100644
index 000000000000..8d9b8230ff93
--- /dev/null
+++ b/acct-group/cancd/cancd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6de860eafb97..019e3321dcd4 100644
--- a/acct-group/carbon/Manifest
+++ b/acct-group/carbon/Manifest
@@ -1,2 +1,2 @@
-EBUILD carbon-0-r2.ebuild 151 BLAKE2B dd8b6d1a44ee51d0986aaaf3eb564d354423f8b08229d3f7f44d27aca82b1129908e300977f22fc09c0d0b74d762ecffea9411b445574f9567d61f12bd690d0d SHA512 5d95fd7bd439209e503e68ddbd194d80c92f560bbd314fd6a70f945c2bb8d6dab3b170e446bd4bc0b9959f01b4f56af8a9162cc77b858ea53f74bd70273d8517
+EBUILD carbon-0-r3.ebuild 151 BLAKE2B acfb41c819c8231f44acbec40a4dabac2d816e38735012ce8cc3f4502d1a6c0a094b1d510e2c09beb946ef69b69ce869e7a3f31727c98b73955556660474ff08 SHA512 e55803c35ec5343553a0bc13d3053001d094c7817ef96368b74011ab89e2ca1c72f5ac3d75f4c054e02d063f42cadf48f9c781251edac7d369608e2b32efa7d9
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/acct-group/carbon/carbon-0-r2.ebuild b/acct-group/carbon/carbon-0-r2.ebuild
deleted file mode 100644
index e84b103f0d05..000000000000
--- a/acct-group/carbon/carbon-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/carbon/carbon-0-r3.ebuild b/acct-group/carbon/carbon-0-r3.ebuild
new file mode 100644
index 000000000000..894ba9738107
--- /dev/null
+++ b/acct-group/carbon/carbon-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=230
diff --git a/acct-group/cdrom/Manifest b/acct-group/cdrom/Manifest
index 1c3e3aae758c..e0d45254c8d4 100644
--- a/acct-group/cdrom/Manifest
+++ b/acct-group/cdrom/Manifest
@@ -1,2 +1,2 @@
-EBUILD cdrom-0-r2.ebuild 150 BLAKE2B 83bf383304bc9b55d04e20e98f1f3c2c8f3c51731f83123151a2db20d2206dbe7762280fd0b8b321adc50cb0243e920ffa20d801fc7d25db144065f78f265334 SHA512 052f12098feb680aeb884b50dbb133e921322d22b9409efe5d1776d0e731c8d80bc448d148f1922022e3b29f31d8888e87e7e5439a5555347a4ed17490655eae
+EBUILD cdrom-0-r3.ebuild 150 BLAKE2B c972b6a8f754a16848a2dcfe5b55fbbfa940463b90150a41b4a30fb9579abac26fdae64990edb4ad486f3cab67f2f2c3f0178fe0cfc946949d3c0c62f9e23098 SHA512 e3f0cf5fa4b3345c40d5442f2cb5329b0fa2dc675319dbded422c9bbc00f00906f48f4dd81334dce9e8a0e6abe9cf370b531374856026db87f4e2ed8c531466e
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/cdrom/cdrom-0-r2.ebuild b/acct-group/cdrom/cdrom-0-r2.ebuild
deleted file mode 100644
index 74979bf5d8cb..000000000000
--- a/acct-group/cdrom/cdrom-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/cdrom/cdrom-0-r3.ebuild b/acct-group/cdrom/cdrom-0-r3.ebuild
new file mode 100644
index 000000000000..5c3b0daadb5d
--- /dev/null
+++ b/acct-group/cdrom/cdrom-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=19
diff --git a/acct-group/ceph/Manifest b/acct-group/ceph/Manifest
index c02506682e5b..e66f9126a6b6 100644
--- a/acct-group/ceph/Manifest
+++ b/acct-group/ceph/Manifest
@@ -1,2 +1,2 @@
-EBUILD ceph-0-r2.ebuild 151 BLAKE2B 495f0122b3e3f48b8085722a265170f61b56f889ee1dd4be040b147816aeeb7d12ffacdcb53b98a0d6c169b79a4a6ed54fad642a7563d0ea28bbbb76448ad96a SHA512 518b15570e98eccfe1360d15c4ab57f80a0399cd94595b21b903f4d1dd515313c23214afe3662f581481bd48245ddadc0031368f2ad47641aff012ed97f28d62
+EBUILD ceph-0-r3.ebuild 151 BLAKE2B d8c0cab4821a4b9759a1572a5eb7266a32d4d5aee8f8c7a5a7a4b5bb3c6cc34344cd3dadf98ec1c282502e6848b2baa9620a942060e8ae181a667415bcf1acbc SHA512 94fd1551d5e10908681341cffafef79dc582747c8ea1c8ff0d960861ae3095b5ce8147cfd892478eb0b33a045487881381b5e17b587e09e75b7a12658abb9c89
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/ceph/ceph-0-r2.ebuild b/acct-group/ceph/ceph-0-r2.ebuild
deleted file mode 100644
index 5ad28791f8d9..000000000000
--- a/acct-group/ceph/ceph-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/ceph/ceph-0-r3.ebuild b/acct-group/ceph/ceph-0-r3.ebuild
new file mode 100644
index 000000000000..2513b2d369ed
--- /dev/null
+++ b/acct-group/ceph/ceph-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=267
diff --git a/acct-group/cgit/Manifest b/acct-group/cgit/Manifest
index 78ce8d5c3af1..e839185e4731 100644
--- a/acct-group/cgit/Manifest
+++ b/acct-group/cgit/Manifest
@@ -1,2 +1,2 @@
-EBUILD cgit-0-r1.ebuild 151 BLAKE2B 41937637ea053ea4ef00fa7e06a5ca874a7e43df16adcf6299bb02a69db410645c3db842b8db4e88ef4ed544e526007b78604c206f9537f29809fd5f42299dc0 SHA512 ed2cd14188f20411394b217be1f7ea358704cfbc3c80c9d29ca03ed38749f7d19632e5cfdc380b3ab6dc4f215e999c34f47282247e5118a98c1b448464c7be13
+EBUILD cgit-0-r2.ebuild 151 BLAKE2B c05d84a0915075205f9bbe124ffb8c8c359aff7301c927cc7eb3a42baa28b6c5aeb4350f88a8a1447e786274c4a78bd12b7b47579c99a95e24d65c7f447f3b02 SHA512 24e621c0c965b2672710d4ad2e8d3e6e46fc42aa1951c774e748c1fab9c9c052374b66e8ec45a37b054c047655f8bb5d24c18d5d1510045ba7a33dbad0947e29
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
deleted file mode 100644
index 73dd86cc52dc..000000000000
--- a/acct-group/cgit/cgit-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/cgit/cgit-0-r2.ebuild
new file mode 100644
index 000000000000..7394e9b61367
--- /dev/null
+++ b/acct-group/cgit/cgit-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=197
diff --git a/acct-group/chronograf/Manifest b/acct-group/chronograf/Manifest
index 2f8701e6d53f..759d55b6f854 100644
--- a/acct-group/chronograf/Manifest
+++ b/acct-group/chronograf/Manifest
@@ -1,2 +1,2 @@
-EBUILD chronograf-0-r2.ebuild 151 BLAKE2B a909c4324cb0d50b6c1b7a9691096e468dc83cae6bb000049462f092dbf42f987619f0cf6476fa7c7efbc17d1ac2ea3767b8465e6f95aec2f0703f60ba17afb8 SHA512 8547ec6aa451ab732df92782e7ee78df8ea273cbb996fbbc989ea55d65f56b42de699454dc87c5cdc403006599db7beee27626b8f1fb6d457710e2678c3cdaf6
+EBUILD chronograf-0-r3.ebuild 151 BLAKE2B 4ff1b07387b9e7811b591549bbb6a975df742fe0bd4f2ed7be76fc6a122ae369d26cbfbd6b48838e195205e6b3595b87b7befdc80a88771a6961ef60fcbff866 SHA512 4e0fa118c5a1c4f880689280119085a23f7cd5fc8f9171d5662ccdec5406add3aba8ca67c8e92cba7da5233d9a137c97213983db56415de3c6a273d9086a9b86
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/chronograf/chronograf-0-r2.ebuild b/acct-group/chronograf/chronograf-0-r2.ebuild
deleted file mode 100644
index b653b69c5f32..000000000000
--- a/acct-group/chronograf/chronograf-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/chronograf/chronograf-0-r3.ebuild b/acct-group/chronograf/chronograf-0-r3.ebuild
new file mode 100644
index 000000000000..0da1e77a1201
--- /dev/null
+++ b/acct-group/chronograf/chronograf-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=344
diff --git a/acct-group/clair/Manifest b/acct-group/clair/Manifest
index 1c04bbea1dc0..d1cf637fba5e 100644
--- a/acct-group/clair/Manifest
+++ b/acct-group/clair/Manifest
@@ -1,2 +1,2 @@
-EBUILD clair-0-r2.ebuild 151 BLAKE2B 559a5f8658c85e00834a7bc60a13885bb10a72ed8a2568fad25535522da466b8b21ea367ca1258798084053ece2b3f04dd749cb73e5c5667c33d27b332f18304 SHA512 4b343a44d2c11fb85f61c9e6423b34e19fb5cae4f27d09d9cd921f5003add8cb8e1f053f0d81f67ebc08d1cd90646ab7c57e519ff46393876da2114c689b0c76
+EBUILD clair-0-r3.ebuild 151 BLAKE2B 53268b2b9bfb088c81c61491701d87df15621c347062316857f9a8bb8ee7b79dd027163504683182d859ca038d1d26cfd89565ed2e173d49077420a114ac5cf0 SHA512 49aa85ce225abc99dc024f4a064bff2bc059570f3f55e5f3fd0869d57ea0ca5d9f474aa1afbaf85139c3efbae51392f615ea7a219ab7001c0d619b0c0cf0d298
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/clair/clair-0-r2.ebuild b/acct-group/clair/clair-0-r2.ebuild
deleted file mode 100644
index e9ba2bbad69a..000000000000
--- a/acct-group/clair/clair-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/clair/clair-0-r3.ebuild b/acct-group/clair/clair-0-r3.ebuild
new file mode 100644
index 000000000000..9e167da9815c
--- /dev/null
+++ b/acct-group/clair/clair-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=307
diff --git a/acct-group/clamav/Manifest b/acct-group/clamav/Manifest
index a7d899b97d9c..0fcb81f840b9 100644
--- a/acct-group/clamav/Manifest
+++ b/acct-group/clamav/Manifest
@@ -1,2 +1,2 @@
-EBUILD clamav-0-r2.ebuild 151 BLAKE2B 09baad0b80d0c0f6729ee877d7aa9b947667847966806b9c64573178a372b89627a543b13a02b38bfc9a9d9accd30752d57722836634350f6e6ac04a291b457c SHA512 70bfdd90aee6843de9fed4afa41d7db60adc143ac58f908a2c221e128e32dd8b61a03e5595238e5d5a7d0ed6d237296c4c930c07c5db77d89a67f7623679b5ef
+EBUILD clamav-0-r3.ebuild 151 BLAKE2B edcff5444885febdbe8c00a7447892ded5eafe4ee023e39c13646bab6a6d32eddfc76316c9bb6c04c5443cba58561a432c42b30d2cdd4d662706d823750a4e98 SHA512 3d7f7ef23b8b6d4b2c7ad725748cbad7935f0ed1fe4072619e63b1bf5ba2c9d2ee1e45a32021c6b221d6978f6560dc6e2466bbf3a75e6b6f1632cdef280961bd
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-group/clamav/clamav-0-r2.ebuild b/acct-group/clamav/clamav-0-r2.ebuild
deleted file mode 100644
index b41166d96ada..000000000000
--- a/acct-group/clamav/clamav-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/clamav/clamav-0-r3.ebuild b/acct-group/clamav/clamav-0-r3.ebuild
new file mode 100644
index 000000000000..faa7535de917
--- /dev/null
+++ b/acct-group/clamav/clamav-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=435
diff --git a/acct-group/cntlm/Manifest b/acct-group/cntlm/Manifest
index 4259aa0ef6c8..3c6225046e72 100644
--- a/acct-group/cntlm/Manifest
+++ b/acct-group/cntlm/Manifest
@@ -1,2 +1,2 @@
-EBUILD cntlm-0-r1.ebuild 194 BLAKE2B 5934ef171699f275acb5c20d290ca52c9c9f8fdfc9b11430bebd504d4a680d1defb1e9ba887aa55ad221798304ef3e3e6b0c289a534dd20abcb053fd60c0c7e3 SHA512 77b64b394c5171dab0c4e4f37e1245c3eee832e8716fbfdea9f658ea8ef11e939761e0c2406856844b25f2b59bdbe98523f322aa8b2242e1cbfafa799ed252a1
+EBUILD cntlm-0-r2.ebuild 194 BLAKE2B 98967920a5d1eca5926d825a58e365362f1ecd78b24f506d102ce4d534c09b43f414431163f68fc0d8bc277a4dcf2306936d3f90e436d8cfba1f1a018709f875 SHA512 575ec2c8ab9aee8657213948e63262ba24883c62ac1799f0c703ee97d395740f5628d55112d9130eb296aa6a487c00ed67d6612bfb54cd15989f8e598f2af939
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
deleted file mode 100644
index 745f398c94b5..000000000000
--- a/acct-group/cntlm/cntlm-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/cntlm/cntlm-0-r2.ebuild
new file mode 100644
index 000000000000..d39b348c23a9
--- /dev/null
+++ b/acct-group/cntlm/cntlm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 eb6f52789581..1fb5863b86b6 100644
--- a/acct-group/cockroach/Manifest
+++ b/acct-group/cockroach/Manifest
@@ -1,2 +1,2 @@
-EBUILD cockroach-0-r1.ebuild 197 BLAKE2B 826b74008c46e030a0145a75d538d42144ad4a960827587dac2d8ba0be5efb41b7611b2ac4b9b9724a4f98400075ebf474b6ac1880ab2b459adf82a64c98b981 SHA512 d0e65acc3cf53d57d1a3be0609fa157ecd1b6396d4316ff1f6089a68e821a9b960b4f104762968e27e466d1e563b0ee418437574b5993282d810f6d6c559765c
+EBUILD cockroach-0-r2.ebuild 197 BLAKE2B 9784c5cdedf83988a3217e967427be70aa1d1ef542ddcd0b9b25d0454c1fd48a6b1bcea3d9a0ff1fe473f6a4ee0ceeeb1cebf46d045c4a5dbef01f04e72b3715 SHA512 90eec0ab8ecb4773fc5de2c97444f49a19a4005221947501f9915e4289ac9699fc8c2b4b2f80dd247dc1ec5e69f6f53bcfe22d25346e1f7fc192e51995916f75
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
deleted file mode 100644
index c0d4c9ca4dbb..000000000000
--- a/acct-group/cockroach/cockroach-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/cockroach/cockroach-0-r2.ebuild
new file mode 100644
index 000000000000..392b734250d7
--- /dev/null
+++ b/acct-group/cockroach/cockroach-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 fe57b202b937..e13afd4af42b 100644
--- a/acct-group/collectd/Manifest
+++ b/acct-group/collectd/Manifest
@@ -1,2 +1,2 @@
-EBUILD collectd-0-r1.ebuild 189 BLAKE2B 0050301aa22e59b49ab881a81f237fa4b21cb8040936e6403fe27c33ce5ab3edafb078058c3f3658c605bbc2779079a9db3b063766447058d1ecbd04dd3d5a5b SHA512 b37947900e4cda4fc97db3cbc22855d7b974d5cc4a70d40e090e319fca104b12fd1b07b0fd69adbea62a7d96c73c3a5c06287ee9bd66d83414bb006cc6d7c4d0
+EBUILD collectd-0-r2.ebuild 189 BLAKE2B ae39bed1b4b9e69025aab4c5dd93aceab841840639d2920821f93181cccd3d5315196a4d77868e415c45e32f0a4cd943b20424f3e790f98cb613525be3cef0ac SHA512 f73889c378978070f822ccffcdb1feb89455b20a1ad4ad3e0714f0cb38246c0e3973db7282e3fb3963ae8a3b81901c9f7667159694f469fb321184dd307be8e3
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
deleted file mode 100644
index 8ff3458b3df8..000000000000
--- a/acct-group/collectd/collectd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/collectd/collectd-0-r2.ebuild
new file mode 100644
index 000000000000..bebcb0b996b0
--- /dev/null
+++ b/acct-group/collectd/collectd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="collectd program group"
+
+ACCT_GROUP_ID=440
diff --git a/acct-group/colord/Manifest b/acct-group/colord/Manifest
index 73a8b85e2d72..f6f6139ae492 100644
--- a/acct-group/colord/Manifest
+++ b/acct-group/colord/Manifest
@@ -1,2 +1,2 @@
-EBUILD colord-0-r1.ebuild 151 BLAKE2B 817c038c5d34173b9f39e1e07bd5901e736652247d4049de983586ad6c27edef1d54074fb1b7bc6cc31c0222d47243d67328f8236618dbe9c81e4d6f8cd69bf5 SHA512 7a11570b0e484588cf14f957d88f067c7c1ef0cf6d25368180e41e1c63f2119cc9392d1dc32274fda6b54b1666462c285e0cff46f7b3748f5e7be22ecfc076ef
+EBUILD colord-0-r2.ebuild 151 BLAKE2B df9ab62251829dcb6cd3f0fac8331da1da860fa293954cdd050919b60329f2b263b86978551b9b1d65b6b59097c3f9ba6f47962aa7d51b52b39f3f40f99a05da SHA512 933dd8f8df51c13510d60fef9e36bfecd731c8a2e3a55d06879fd61c4da986977208a7105430b9ac1eab78a371fdfa1c7a07684ed03354919da0fb3cb8bbe055
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
deleted file mode 100644
index 1758aa8ec47b..000000000000
--- a/acct-group/colord/colord-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/colord/colord-0-r2.ebuild
new file mode 100644
index 000000000000..5b86269b7934
--- /dev/null
+++ b/acct-group/colord/colord-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=350
diff --git a/acct-group/consul-template/Manifest b/acct-group/consul-template/Manifest
index 239ce2c4b59b..57a490fb1897 100644
--- a/acct-group/consul-template/Manifest
+++ b/acct-group/consul-template/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-template-0-r2.ebuild 151 BLAKE2B 30b45f090d85188c518a5ef274e9389d8ffe4d845023408beaf16fda4afca8b58c8261330304fc1f0b56b98dd1a2ad19a0e24a68d7ed0fcbe7d62cdf6604fcce SHA512 bb0fb4fb2ca5655d2f1026f55d76cedffcbe8a12fa9077b7c5947af20efdfe2b07fe424d7fba03f4c012f1614ad2fae1e1697cde2247ffe200da943c07660746
+EBUILD consul-template-0-r3.ebuild 151 BLAKE2B 090ed666046dee2261993c95e9b99ce52c4f53828ba916283ea6cd2cc8dee227662354d4c5a7c5bbfda9d7230760fc6550c1e02ce4ca4bf9a7b7ddac6fa4dca5 SHA512 49de4769ff510a496ba33d90beb4ce38d95f75a49f294475979801fa52d536812e44f12845f751ab937de62eb3961475e226318a505d21ed3fec16542e8b247f
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/consul-template/consul-template-0-r2.ebuild b/acct-group/consul-template/consul-template-0-r2.ebuild
deleted file mode 100644
index e8c79f811996..000000000000
--- a/acct-group/consul-template/consul-template-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-template/consul-template-0-r3.ebuild b/acct-group/consul-template/consul-template-0-r3.ebuild
new file mode 100644
index 000000000000..ecde26a12c8e
--- /dev/null
+++ b/acct-group/consul-template/consul-template-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=408
diff --git a/acct-group/consul/Manifest b/acct-group/consul/Manifest
index d392c47a6dfe..3860bfe4f48b 100644
--- a/acct-group/consul/Manifest
+++ b/acct-group/consul/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-0-r2.ebuild 151 BLAKE2B 92275d23403ef6d3374a4b8b4e05c8c72ff5b464f448ad324cd83a96aa96ba193f2eaea30e6e37f0dd5d1a8a43e1a1c92a4bda663ff2fd34e23c7015ee222040 SHA512 fbc847499aa617dd9aa8a12a89a868ec6a2c5b590f601d5d817e24fa016ab2961a5ee9f9577df85767236aaddd86f8ad17b25a11e21029f94496bce36ed3c44b
+EBUILD consul-0-r3.ebuild 151 BLAKE2B 692f512bc765e248220477f93e04b890339b5b52c0357de870a9bf72fa456c0dbb26ff39e0e902b57c47f55384e71f6da1a283de68357fc7a870ad1242007d26 SHA512 0c04c47f3d603ca825575857eccf71fa57742bc47d1242248bf55719b6d09a70f62cff4eee8e34a3729772f9b7a9350d09eee2329eb03537d34beff267c546ca
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/consul/consul-0-r2.ebuild b/acct-group/consul/consul-0-r2.ebuild
deleted file mode 100644
index b7dac9bca6c3..000000000000
--- a/acct-group/consul/consul-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/consul-0-r3.ebuild b/acct-group/consul/consul-0-r3.ebuild
new file mode 100644
index 000000000000..ea8438e2c740
--- /dev/null
+++ b/acct-group/consul/consul-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=411
diff --git a/acct-group/consul_exporter/Manifest b/acct-group/consul_exporter/Manifest
index 90323638f42a..d15ea4b22254 100644
--- a/acct-group/consul_exporter/Manifest
+++ b/acct-group/consul_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul_exporter-0-r1.ebuild 151 BLAKE2B 1746e139e362b4805480b58bec27948b803db76a8a99eaeba22029c87667b199fc005a13780ce8065f44fc2e4aa3ee2a1b866edcceeacf8b1c9417bfb2420588 SHA512 54d226b1a9f7f7cab21aa68b88dda139d3f91b3296d50a846c2ccf2ec16c4d3bb26cdaa32376858762289608ad769a56a5b5ea74540b7d62bee5e937168e1b4d
+EBUILD consul_exporter-0-r2.ebuild 151 BLAKE2B 23442586b35e11712a11a465efd02a00b48cc6a20cd05f885a7a894efe002682b13eef7fa50554360f41f7a34eb72bdd60eb4f9f978c753880785f3403f29071 SHA512 b2e8a216517ba8cad7a621bc6116cfd3a619f832ee4aab772de7c07d6c30c1e26082805e728534850df45dbdf6356a251944ccca64756fe8a25f2db45a4e52d3
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
deleted file mode 100644
index c77db8b3a594..000000000000
--- a/acct-group/consul_exporter/consul_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/consul_exporter/consul_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..6c606828890f
--- /dev/null
+++ b/acct-group/consul_exporter/consul_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=278
diff --git a/acct-group/coredns/Manifest b/acct-group/coredns/Manifest
index 80edfe930f00..28d6359e5649 100644
--- a/acct-group/coredns/Manifest
+++ b/acct-group/coredns/Manifest
@@ -1,2 +1,2 @@
-EBUILD coredns-0-r1.ebuild 196 BLAKE2B 1352a9791a56e5b68a1d04a57d18eb5d5d894e598d7970ce3a78fd5af8c47ebfe8df3fc6be9a346fee5c37f03bfaea0e2662350a20c432f12a2a63ca1939788e SHA512 07409c6514515269269efa06f3656226ae0d05403e670fee22af5133fc70afcbd74c29d99c9eb776319a3fd5ad840f64b751a187444c840aa6985e4ef5d217c2
+EBUILD coredns-0-r2.ebuild 196 BLAKE2B df6fa2e76c4e4bb68e72b697f4163fdf5114087c778542ceea10065f9c24d912f2c7ef34c46acd97b02cc16b8a98a514bd9c90cf16244a6839cbe31a8dec8834 SHA512 848a9a9e6fb0ce13acfe4b8f919574373df17b5e7a1d087e02e208cc71c10dee6d7a2bec4b0877c30e47d3d13375f304082fe5697eead0bf9d9214556777334d
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
deleted file mode 100644
index a182b8feb18d..000000000000
--- a/acct-group/coredns/coredns-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/coredns/coredns-0-r2.ebuild
new file mode 100644
index 000000000000..88552487a150
--- /dev/null
+++ b/acct-group/coredns/coredns-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/coredns"
+
+ACCT_GROUP_ID="312"
diff --git a/acct-group/cron/Manifest b/acct-group/cron/Manifest
index d7084613a634..6c78d7c88b1d 100644
--- a/acct-group/cron/Manifest
+++ b/acct-group/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0-r1.ebuild 200 BLAKE2B 9aa0f8eb28cb391ab6bdd6979f72e33cf39dd48e934fe74e99d356e746453c7958bd52ce058aa3c8efc79d497833eff77ddec7088e3715bb25fc5d1446079f74 SHA512 1e30c768f793babc8a79b00bf7d9c1b9f34bbac1ba37424b10c6218249a2ebab7f135d813e8ed5b54f48683122bdab283dbeae2fe41b36c9cebd353dd32de8e4
+EBUILD cron-0-r2.ebuild 200 BLAKE2B 5f3f9869794f2b7bc9770c681562d99e9b257a61bc9d38977570e50bfd8c0a1e72eb6b330110ba8a9bcf74344ddf0d6ecd4d501e1139757f93a607b9d05a44e3 SHA512 a9ad0127ce3ac406142019f1d8d9d568749dcb79ad041a308451bddc12a5aa852e04938326dd26273138e3d1e03c71cc1e3cb2248b6a540093101648f1703590
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/cron/cron-0-r1.ebuild b/acct-group/cron/cron-0-r1.ebuild
deleted file mode 100644
index 84142b621a23..000000000000
--- a/acct-group/cron/cron-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/cron/cron-0-r2.ebuild
new file mode 100644
index 000000000000..c373c2b6f2ae
--- /dev/null
+++ b/acct-group/cron/cron-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 dccf2a648246..012b55f378de 100644
--- a/acct-group/crontab/Manifest
+++ b/acct-group/crontab/Manifest
@@ -1,2 +1,2 @@
-EBUILD crontab-0-r1.ebuild 151 BLAKE2B 0a94d546ffa0e5db213491d0e935ed6150a5d74f541aa966fa85e614782a1d691b1bdd02980907dd15d9da093925e84491f9bd1cf4a214dcb5b0ec024930189a SHA512 8d2a18ea92c8e9e9083ce335e24ae627217f63654aedcf26310d2ed81804135b2bd0cd98b60a9d673795359b61698b20079016dd2dcd919e56d37a09ff001703
+EBUILD crontab-0-r2.ebuild 151 BLAKE2B 53fe29133fe8d2efc719d3bcd7ce77f2b4386d73addec264edea56aac30a72885a13792bfb6b3c9911d41bea571392e56a52033872b18db06707ce887a9415bf SHA512 5fd15b0251b1e354bcad6ee48924f514fc7e35d53094a45503b5c30cc7021d391daabe0df11d0739b5f58940de9f1cea6b56f1e1586f4800a66dc94058793f6a
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
deleted file mode 100644
index d50789d7615d..000000000000
--- a/acct-group/crontab/crontab-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/crontab/crontab-0-r2.ebuild
new file mode 100644
index 000000000000..ba0d0f2c8958
--- /dev/null
+++ b/acct-group/crontab/crontab-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=460
diff --git a/acct-group/cvmfs/Manifest b/acct-group/cvmfs/Manifest
index 714d56a337da..fa74188dedf2 100644
--- a/acct-group/cvmfs/Manifest
+++ b/acct-group/cvmfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD cvmfs-0-r2.ebuild 209 BLAKE2B 11008cd6d660d6962cdef3e71c2eb8a30824071142b139062b6cb62493275f7acf982cec93b0473ec64be08298a03fc06746a787dcab675efc10f339df9cdae3 SHA512 3cae32f151909ab7c0c4181382328deefdf17fb448f03e50c1a1a831e53779733d866fe3b83635770280168b998307fb85bfafa4707f8f31672841a3b531fd91
+EBUILD cvmfs-0-r3.ebuild 209 BLAKE2B 92b6921d22c3c440f3fbaa542c6ca4dc1e2d9121e351266039dcfb3639e6ff54fc924820a17a26b9d9a1e5b62fc3baf863058c269569e3889a4cd1cdbbc9808b SHA512 bbaad892a85767e89f85284d530b676117ae6621b35a778fd8c92c116850fe698a91316a2a29ab53fdfcfcc39cf20b1daea1e743a863f88c5245d6443a08b482
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
diff --git a/acct-group/cvmfs/cvmfs-0-r2.ebuild b/acct-group/cvmfs/cvmfs-0-r2.ebuild
deleted file mode 100644
index 201f3329a7b2..000000000000
--- a/acct-group/cvmfs/cvmfs-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/cvmfs/cvmfs-0-r3.ebuild b/acct-group/cvmfs/cvmfs-0-r3.ebuild
new file mode 100644
index 000000000000..d8300bcc342f
--- /dev/null
+++ b/acct-group/cvmfs/cvmfs-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c47bf97962da..6eab3484dfbd 100644
--- a/acct-group/davfs2/Manifest
+++ b/acct-group/davfs2/Manifest
@@ -1,2 +1,2 @@
-EBUILD davfs2-0-r2.ebuild 151 BLAKE2B 90c70265fd59f0d5767d545002f20b58d2ecd14381f34e2497674551ade6e558a993a2fa33634c7b70d8f7251fafea8cd751b1645f294c1674818fec61f85ba2 SHA512 ddbd0c954bab419ef08121727ea98e538a6917650e1f56057be80e406973b70449123e797a319188650c228ddc16a4885bf626e92d96b050ea917c149aa132e2
+EBUILD davfs2-0-r3.ebuild 151 BLAKE2B c1c63f9abe0bc6bb1e5ba9d7e39e93a427474fb0de42393c4bf3e22d6a51e29c5a29e46e2137857a0b3625ed551fcdbed59ba2229ee29e63c8fc211dc43c0b4f SHA512 ec69abae49ed65a0da1a3a9c2c0ce370dfa4ac2344de07d1551e22009d27aefc2625cb38e97aa905024697eaa6d9352cab9baf5f7b8d72a256ba687f78107ecd
MISC metadata.xml 219 BLAKE2B c0192fc2c685f564929ff304a18b20facdcc8638726bfb8711803a633a109780747e98c42b14cd3e8dd674a92a7ed783a40d56e617e414b6cbc3d4fb18a63caa SHA512 f702a981fd2afe5f23c2814fdf91a540e6335e50e3cd85003e28ec2130739001ecfcfd824cfa91780c6b1d5999cdcfbb06857dada1c53b4f9580675a5491eb46
diff --git a/acct-group/davfs2/davfs2-0-r2.ebuild b/acct-group/davfs2/davfs2-0-r2.ebuild
deleted file mode 100644
index 8e919d778a20..000000000000
--- a/acct-group/davfs2/davfs2-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/davfs2/davfs2-0-r3.ebuild b/acct-group/davfs2/davfs2-0-r3.ebuild
new file mode 100644
index 000000000000..5125906dd427
--- /dev/null
+++ b/acct-group/davfs2/davfs2-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=420
diff --git a/acct-group/dbmail/Manifest b/acct-group/dbmail/Manifest
index f892c54c44da..c9171eb61ad5 100644
--- a/acct-group/dbmail/Manifest
+++ b/acct-group/dbmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbmail-0-r1.ebuild 151 BLAKE2B d53218559931b16df962818b9c19486f817d334944e977502e4c937b4ef1ff3970d70f74f228ab7c13cc5d97ce6e6d32c4549783f0bfa569c8b6cc6dd5052cc0 SHA512 23625fb7f665a6e8ad4970aaf05c5cd867e9614e8b3526ab2c42dc892fccc7c1f88da9fe1119de2668cecdd5b6477f99f98432917b74598374a665bdac589a40
+EBUILD dbmail-0-r2.ebuild 151 BLAKE2B 4aeec37ae281ae99b51e6899bde228ad775ed2e2934282c3e53999ab79ad6fc90715b968127946d9734ed5985d66553a74950a47da8475c364d62ecc6f9a80fe SHA512 8028ccdf0fa4dc339aae9fe06590f7f461f3e50a0672346fdf4c9b13e74c536ebd6fff464537853d1be8c35a061e6684a55fcff57269d6724d72ab612898085e
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
deleted file mode 100644
index 98ef2242b546..000000000000
--- a/acct-group/dbmail/dbmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/dbmail/dbmail-0-r2.ebuild
new file mode 100644
index 000000000000..61d37c5cfa52
--- /dev/null
+++ b/acct-group/dbmail/dbmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=365
diff --git a/acct-group/dbskkd/Manifest b/acct-group/dbskkd/Manifest
index 6f1ff5ca0a38..44dd92c62e50 100644
--- a/acct-group/dbskkd/Manifest
+++ b/acct-group/dbskkd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbskkd-0-r1.ebuild 200 BLAKE2B 9b7b5203d53d16ac2b7b65729ca4f9111ecda3dadf1e384de819e75989ce09cca83b9ee204416695a498d1d11afc7738f56984680db4549da149e4ed8268bf48 SHA512 abce279f501d14da1c0133b85f5615edee3c0f9aa798ef23bbae8e6ec81e9b4f2fce8f52c417c07b1316e85ac557b67d287be51c8072a6e664297ea914448fab
+EBUILD dbskkd-0-r2.ebuild 200 BLAKE2B 5a8d141e470e328745d3f3df1ba00991a70d4a02391d5aea0b66a793a31ef8ba74634920e8c93e7f38f409caee16bcb405520077fd235df7890c9bb26871fb94 SHA512 a1be510f20f4ab09310d4a1c4e631b94133fdeb2e33ff66502386273809a51d075f47a6dc84ad35762103595f8a426a65b142c1b6a56521ccf156deaa0647538
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
deleted file mode 100644
index b657171d9527..000000000000
--- a/acct-group/dbskkd/dbskkd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/dbskkd/dbskkd-0-r2.ebuild
new file mode 100644
index 000000000000..2aad41c0179e
--- /dev/null
+++ b/acct-group/dbskkd/dbskkd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5913e3f97fb6..85a06dccb98c 100644
--- a/acct-group/ddclient/Manifest
+++ b/acct-group/ddclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD ddclient-0-r2.ebuild 203 BLAKE2B 3ef1f11a5e512419a4aad77b84f5543c5913053078879ae7a9778a6a86c099ff0dad8f231387ab75284199a15d375780e7e4b3ed1cdfa1c3a7b517d3f249b753 SHA512 e117e94f86ca12a460f25161ae8f1911d731f800aed139105f37dbaab2c3d6df747b352a03fb1a7cb1ac8b3076145bbe1818cbe81787e9f262b9e96c1d67d127
+EBUILD ddclient-0-r3.ebuild 203 BLAKE2B e9b4f599e96bdf9980fed9f79ab2549fe882cf19ec79f4a8f1856f87ac021a731b98d42e1563f4459b46d76cfc40585c4908a579d5d41fcc36101539ed44b3da SHA512 69cc7388d7a4a4b8ffb7c04245148d7e92c3b630f20651cb2354cf113df0aa14444ad1a3a3727152331997a117c45b5bb5cf06bc92f614d2befa1a5acd3cc156
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/ddclient/ddclient-0-r2.ebuild b/acct-group/ddclient/ddclient-0-r2.ebuild
deleted file mode 100644
index 635e8d6f55ff..000000000000
--- a/acct-group/ddclient/ddclient-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/ddclient/ddclient-0-r3.ebuild b/acct-group/ddclient/ddclient-0-r3.ebuild
new file mode 100644
index 000000000000..42f28bf80adb
--- /dev/null
+++ b/acct-group/ddclient/ddclient-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f443f35365be..7b304b0ae09b 100644
--- a/acct-group/defang/Manifest
+++ b/acct-group/defang/Manifest
@@ -1,2 +1,2 @@
-EBUILD defang-0-r1.ebuild 203 BLAKE2B 68aa63ee0cd6c6cb8f4fc5ef7eacc4222830769817b587f92e94881c122e2466d74f532e1dbcec0c5949601c34dbbc7df205eca74f1df81c99923c77dacd8a28 SHA512 07f53d72ab9dff823fc8664c8070110d74278c8e2c6c9c5506b4a76d7b1978a49f821a5d72d512783447ec1889f7b7a93631c406d99faa0a80715585f716b45a
+EBUILD defang-0-r2.ebuild 203 BLAKE2B 495eb2c85d005631fa6f597073c3f1573f3ba640687b0bffa4ddb6cd39a54f3afab15a218560ee5f6c3f973e9228f199cd1dafa014c86ded1e0dd02638c89d24 SHA512 18760c5756467ffcdb3f99a9fc674625cc84908e6b1760fb1cb258fb28df5ca81c2b6c5d4039ae4f893856f28164d3390f53ea42f69cb03347f8efd2d3ff7a41
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
deleted file mode 100644
index 07fb25a22c25..000000000000
--- a/acct-group/defang/defang-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/defang/defang-0-r2.ebuild
new file mode 100644
index 000000000000..384624e62bbf
--- /dev/null
+++ b/acct-group/defang/defang-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1b815e72ff1c..4bf5fce879b8 100644
--- a/acct-group/dehydrated/Manifest
+++ b/acct-group/dehydrated/Manifest
@@ -1,2 +1,2 @@
-EBUILD dehydrated-0-r1.ebuild 191 BLAKE2B a313bce15933ac965e1cd3dbbb4c0089affbf39c38502241a3b5e4f20855ec7c9d602556c38001b3fe3b008c01a188ab51ccc1a14efa5920b887411e7e659637 SHA512 98229252e9343ee8cbeed09e515f1ff87300ad5de22273552c7585f086b8a6180932cc6820ce8bfb7dd2e97b2a5517a96c89f2e54f4c860474e4441b73d0efb3
+EBUILD dehydrated-0-r2.ebuild 191 BLAKE2B f02637722eb062115429ba881c3c0204c195cdec9e15c4373898e340233d866a5ae74d1bf5fd82f988e7788aeb01c0878fb97fe0d7266574db35e1a06a0819e7 SHA512 2dcaf16022cab46a1fc95143cfab8ee42c93cfa33ee47937ef9a35897b75f1307077be2261be1d95650c013e17a2b0356d63c7e5c5fe8f685d8e7a1ece2eb210
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
deleted file mode 100644
index bd6fc5074d0f..000000000000
--- a/acct-group/dehydrated/dehydrated-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/dehydrated/dehydrated-0-r2.ebuild
new file mode 100644
index 000000000000..0f77876a8ed5
--- /dev/null
+++ b/acct-group/dehydrated/dehydrated-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="dehydrated program group"
+
+ACCT_GROUP_ID=361
diff --git a/acct-group/deluge/Manifest b/acct-group/deluge/Manifest
index 2464855aee49..30d7adad65fd 100644
--- a/acct-group/deluge/Manifest
+++ b/acct-group/deluge/Manifest
@@ -1,2 +1,2 @@
-EBUILD deluge-0-r2.ebuild 151 BLAKE2B d65aa03726916e276da49c0a01383101cbb36d9ff9da16568f92b77c431a96f096a0bb00c0a0f267da7d0da70dede5d62deeddd34eaff664d86b90fc61e30047 SHA512 65265fd6ceda4e339a8f12f6cb2744b6649e19ffc94aa1d8fd2bd447015fd3fc4c7054c01d8b5caba9f78a5ad40c1b8519af3cdfcefdd69b0b63258e1fe9ced0
+EBUILD deluge-0-r3.ebuild 151 BLAKE2B a0339677716185137b7429560f161514e716a140d20fb006c1084d141b4227262ec09c87922988531e79f56f055492ef22da381b1926892e17ae566ba6af56d1 SHA512 834d2fafbd2f3237882017cac2db9bd94d3d3b356477b3df01e4e0443140b53c84d63355ecacc74e1cfad23e8908d4a6fbba803e7833eb5a300ad1a9aa889c92
MISC metadata.xml 521 BLAKE2B e4adb92b824153ea2e9d79164c2111a1e49049286cbe9e1662ff0ee8300031092d65b3ca97c3cf449ca7a57bcdb78f86c9988154244686879194686f0bf3048c SHA512 d37d8f08b7b7d5a5a00d1c0ecbcf27d42610df9c4a1e68dbb2f17272cbc73fe000bba406f0f9ca40aba22f081ef2de097029886af6938d1b64e63a6d25fc8bba
diff --git a/acct-group/deluge/deluge-0-r2.ebuild b/acct-group/deluge/deluge-0-r2.ebuild
deleted file mode 100644
index b6fabbb0d9ee..000000000000
--- a/acct-group/deluge/deluge-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/deluge/deluge-0-r3.ebuild b/acct-group/deluge/deluge-0-r3.ebuild
new file mode 100644
index 000000000000..1ec0f73ef909
--- /dev/null
+++ b/acct-group/deluge/deluge-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=454
diff --git a/acct-group/dhcp/Manifest b/acct-group/dhcp/Manifest
index a856c3d3fb1c..b613969e3d40 100644
--- a/acct-group/dhcp/Manifest
+++ b/acct-group/dhcp/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcp-0-r2.ebuild 151 BLAKE2B bd2658011fdc9e8a1797f57b2447c8797d1f9f58f73a4380408ffc5f1b83eba415d45f481538a4979f50d2103bd54c76d4b34398cadd64f15622ceb7eb932ca9 SHA512 35e1527785f1d8389e4b8d66d1e21ce85f6858e4e4f295d888424dbaf0cdf4138db15c49eeb0bd2063457bdfb68d2882e5309f646469caee923e3c7a45d66904
+EBUILD dhcp-0-r3.ebuild 151 BLAKE2B cc8df5651eed258daefb8522b92da3967b7756b0fcf82ec73776558c1b7c977b8a8796d9bad6017bfa06c26515a3e899085972fffcd98fefae5d9adb5e89718d SHA512 72043746ac29f7d2510755e99267efabad0f090bb3551e5d01904f8853b902149c458824ed2299a7020a22544ae196f51a2a0741cde02c4f630839323e6b6040
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/dhcp/dhcp-0-r2.ebuild b/acct-group/dhcp/dhcp-0-r2.ebuild
deleted file mode 100644
index ae3d106df1b4..000000000000
--- a/acct-group/dhcp/dhcp-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/dhcp/dhcp-0-r3.ebuild b/acct-group/dhcp/dhcp-0-r3.ebuild
new file mode 100644
index 000000000000..c04eb2d3609a
--- /dev/null
+++ b/acct-group/dhcp/dhcp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=300
diff --git a/acct-group/dhcpcd/Manifest b/acct-group/dhcpcd/Manifest
index 27c5c84f55d8..1c2476087a8b 100644
--- a/acct-group/dhcpcd/Manifest
+++ b/acct-group/dhcpcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcpcd-0-r2.ebuild 151 BLAKE2B 0adfc2ba925b1a1dcfca499857406406a9010f0eeb939816f1dc9f6ec2cec0ebe003529b983c9778cf650858c30217ccbe7efbeb9c86e0593036c22208374f72 SHA512 e124bd09301cd1e2665e3cbad37ec776e8731cde06022dc6eaaec3a0e33357d23620397f02313c92d750791ffc51894713f80d37b02e7264ee0c7538919bd302
+EBUILD dhcpcd-0-r3.ebuild 151 BLAKE2B ed8cf82a7c68415838b90ab93cbd7c9d54858b50cbe0a96e5fbe7b11732fa2dea5e1c87642eb7b6c4acadc84ad86ef769b38bacb07eb2a8f84bb59bdcf0555a2 SHA512 ccf22865d5b2ae4591f212182733c4e2e81be06bc4af8bbba1ffbf0c48e53754f2a557052521147e0b263a741b1f42fa3ab1e1e836b9fb8cf6db34520ae85bbf
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/dhcpcd/dhcpcd-0-r2.ebuild b/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
deleted file mode 100644
index 358823c53a84..000000000000
--- a/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/dhcpcd/dhcpcd-0-r3.ebuild b/acct-group/dhcpcd/dhcpcd-0-r3.ebuild
new file mode 100644
index 000000000000..acbc42d14dc1
--- /dev/null
+++ b/acct-group/dhcpcd/dhcpcd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=303
diff --git a/acct-group/dialout/Manifest b/acct-group/dialout/Manifest
index 75ca511ff0c4..8c9e9ad82d2d 100644
--- a/acct-group/dialout/Manifest
+++ b/acct-group/dialout/Manifest
@@ -1,2 +1,2 @@
-EBUILD dialout-0-r2.ebuild 150 BLAKE2B 6c2496da9ee4966c751839793a0a68679d500a05c17d334a846716481562a1464077ce85e8870a377ec15cd64ad6494a4b51f2e11e3e39c28af425ca56291e34 SHA512 95bfa65320b2e04d878484eb8c5335e4a8ccd64539b3adbf21f6ce76dff9925810f1bd3881c9116ccb83b30fd3c24134b9a87f0d131ea4bee591482319136ab0
+EBUILD dialout-0-r3.ebuild 150 BLAKE2B 2a5bce3582271960d013b8b005e6da2613d8513c6f2754e80d42bcd7cdce47dcdedef45780b5a92999deb9b0fc9378a655ea82a292c9a96d9b40b7d8300576a2 SHA512 c9d228fd7fb350f9594f2ca466048719c5d01321f324c8f368e0e665713d186dc8a92a102728e11f997f4ffe804ccd32aa5914cfe1ebc086e60722c5f5152c88
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/dialout/dialout-0-r2.ebuild b/acct-group/dialout/dialout-0-r2.ebuild
deleted file mode 100644
index b83a88cc096f..000000000000
--- a/acct-group/dialout/dialout-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/dialout/dialout-0-r3.ebuild b/acct-group/dialout/dialout-0-r3.ebuild
new file mode 100644
index 000000000000..114baf79a77e
--- /dev/null
+++ b/acct-group/dialout/dialout-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=20
diff --git a/acct-group/dictd/Manifest b/acct-group/dictd/Manifest
index 38912307ee15..56e33ed687c2 100644
--- a/acct-group/dictd/Manifest
+++ b/acct-group/dictd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dictd-0-r1.ebuild 189 BLAKE2B a677d245b8711fb45357a627c7b902f465fe13e476cfeac2e68a2c374420400219e8595b4fdef7cb8249f1b6afddcbbc6c827d651ff9825a2e47e91e14d7e624 SHA512 6a82bbe7dc5cdb1a331514365cd81d45cd0bf85ebf95bbe8dbec402a7c70f9a25ce415099c8147053160b42b416b40a8bdc52f077e4e72242c932717d0cb8f33
+EBUILD dictd-0-r2.ebuild 189 BLAKE2B e41f46c980a511473acbb986ea60d849531c3b258fa0818c0047a321a01771d5c15adf27515836e8bb3f21562b12ac99c53d3058f63636aace41b452daa0de10 SHA512 1be33c608a339c4cc1061b232ab5c0b4c00b845e5b54e596268a83659fa864f916cd1fc9b5167202467c4176a5519079ad6aeb6ec03b92dc26dfd4538439d834
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
deleted file mode 100644
index 30250bf20c3c..000000000000
--- a/acct-group/dictd/dictd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/dictd/dictd-0-r2.ebuild
new file mode 100644
index 000000000000..645bf40bdaff
--- /dev/null
+++ b/acct-group/dictd/dictd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 731e9b120a9a..9f0fb19c8ddc 100644
--- a/acct-group/dirsrv/Manifest
+++ b/acct-group/dirsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD dirsrv-0-r1.ebuild 195 BLAKE2B 9950599616e84d0ed717b4c831abe3fa026f0ea6f054a6aab08ffd62d5a52f21a902ca466073fa8a285ace87516d4e860c1b111f80cda8d5adb5b31dd3610ad9 SHA512 4f2b090a2164354d8673080c74a71ff8e564638dacf1efa00308044ab5f650c1c4cfb0a033e4be691339cc8a8e36457e7c5d77258c299abf4f466668431fa45f
+EBUILD dirsrv-0-r2.ebuild 195 BLAKE2B cc20d867c570545fe3892c48b91f36161af8a583fd52a225ff8ef53e493ef039f5a74928a7ad28e5245d9a042b5545e00a1c34a6e3f88a3f536e1168716bbe0b SHA512 6df9df3ba5c4591f87e356751b2b6acf568af9117791d42066d851a55492059ab901dac4087beb7fb65e3698e03029378550285154ea1640aa28f07acf93f137
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
deleted file mode 100644
index 44e24def6561..000000000000
--- a/acct-group/dirsrv/dirsrv-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/dirsrv/dirsrv-0-r2.ebuild
new file mode 100644
index 000000000000..b304b16343e8
--- /dev/null
+++ b/acct-group/dirsrv/dirsrv-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0fbe0c69b1c7..8ff3e4b3fdda 100644
--- a/acct-group/disk/Manifest
+++ b/acct-group/disk/Manifest
@@ -1,2 +1,2 @@
-EBUILD disk-0-r2.ebuild 149 BLAKE2B c810342ab964f1de2c1db14abd1a1af4484efa0461da05f83e3d3ec58684bded78d457c2feb6ab9ae20a836006d94d80c75b316f860017b43816a65910acd261 SHA512 2845f3f33bed8129a046408764b0a36bc1e5c77c703bbccdf88929cf19e18c09301ac98660cdf06ff49f09f5e0e0e1dd46853c161f534dd3aa0a5664676baa9c
+EBUILD disk-0-r3.ebuild 149 BLAKE2B 6a8652ece602b769c7d53ee47ec32f9e1f11f08c63604d472e748ed4ea626fed6eb85078df7d2277d6d589aebf89a312508572ae75ce3229cae667d8cff45e55 SHA512 ab18b86a8bec0ddeb0b278d8d80c2856386cd6fb70bd502a3f528f518aa3f399dad8a8a90cdf7500fdfdf1d1bc7e00f86fabf032a1c8a0d3bc2420ab3c17a6b2
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/disk/disk-0-r2.ebuild b/acct-group/disk/disk-0-r2.ebuild
deleted file mode 100644
index 1eb22b9bbbb5..000000000000
--- a/acct-group/disk/disk-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/disk/disk-0-r3.ebuild b/acct-group/disk/disk-0-r3.ebuild
new file mode 100644
index 000000000000..1ac5e355e384
--- /dev/null
+++ b/acct-group/disk/disk-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=6
diff --git a/acct-group/distcc/Manifest b/acct-group/distcc/Manifest
index ea2b923dad2f..5c0695a37259 100644
--- a/acct-group/distcc/Manifest
+++ b/acct-group/distcc/Manifest
@@ -1,2 +1,2 @@
-EBUILD distcc-1-r1.ebuild 151 BLAKE2B 1f95dad39f33a3fdf5aad5bae968e2c4ab69f0b42c0254573dce2aebd4acb92cb06edfbd7079abf616b440badb44bebad9961d637abe1702f96606b8f94b572f SHA512 80545347d33b9bb82f6589f45b4b33a8cdadb478dab468f012676f7560ff6b71799e798367b1135803c8f586804ae1edcf6aaba9ea3166dec646106df8c83a8b
+EBUILD distcc-1-r2.ebuild 151 BLAKE2B cc5c95219d96cb2224f6c0c929099d5d2ab3cbd06aed4dc4698e898d0270cc022c73b6fd4342b0c8a5437e4163d730a933123d6301f31be1c0c44735caf13cb8 SHA512 0130df14b88b19c623faa5307c969fc7ecf14dd9f95256481b2ab1eb41d2e69120ae08e53611defcc925f771417181614f100558280a4370d8bcd6dfadd10f14
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
deleted file mode 100644
index 7c650651a234..000000000000
--- a/acct-group/distcc/distcc-1-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/distcc/distcc-1-r2.ebuild
new file mode 100644
index 000000000000..90989412e3fa
--- /dev/null
+++ b/acct-group/distcc/distcc-1-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=240
diff --git a/acct-group/dnrd/Manifest b/acct-group/dnrd/Manifest
index 175931f55f57..1e71d43e8bd5 100644
--- a/acct-group/dnrd/Manifest
+++ b/acct-group/dnrd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnrd-0-r1.ebuild 191 BLAKE2B 7ea12f13fb51787dc36d36cb81c53276c5a022a22ead8f72c4d07910bbe1a8ec16b1a7374a2238376d12a0d962157f70d1e02243b5ee8ace56a27597eb54714d SHA512 44ea40507f90db997ed30d02fabc8574fdbf3355a46b7234d4dc354aa9ebeb69e835e13cbea3640121ad60655481feeceb730760cb50a9c45b214a02720791aa
+EBUILD dnrd-0-r2.ebuild 191 BLAKE2B e53b670d424c32edf0b7003bcbd43548afcb3111cc44228c89ec672d6ee33545aabcdaacd633ad8124bcacb7c659e72a65ae848a9cb97af7069bb6377a4f9467 SHA512 999486ce1453ff929fb92f3a6b406d622c5aeec7662d1de597be57ec76966bca972919756cddd52f51ef79580aad7bbc7f78fc11375e657ffe206d35241d1877
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
deleted file mode 100644
index 235dbfcf78c0..000000000000
--- a/acct-group/dnrd/dnrd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/dnrd/dnrd-0-r2.ebuild
new file mode 100644
index 000000000000..2092c1f01f5e
--- /dev/null
+++ b/acct-group/dnrd/dnrd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnrd"
+
+ACCT_GROUP_ID="262"
diff --git a/acct-group/dnsdist/Manifest b/acct-group/dnsdist/Manifest
index d2c07d454a28..e82fc545de01 100644
--- a/acct-group/dnsdist/Manifest
+++ b/acct-group/dnsdist/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsdist-0-r2.ebuild 196 BLAKE2B c332c82779ca0c2b16b380eef6e54515348b2c4cc1acc64b1f670e09d4edc7b272ba8551a0ca080636109535cb4f1f337784be38e7d270159bc8e614cec059dc SHA512 9bd7cfb6a3d4c91dd5c9c0bf179451b4b6611c13481871d9dcad7d75d7efefd79338a2d64b6b0e10655c0c75c595f195877fe6dcc2fba5d0edc32a320cb43900
+EBUILD dnsdist-0-r3.ebuild 196 BLAKE2B afdb90821b9f24d418c8f652f1add1cff067d8acf55eed3e6c2c7f9de3070f2edba33e33c1940f540e11cc3ffabc899c24ab6e622a85de1566d69847633da5ec SHA512 b928aa358306cb10f83ecae2e472d2dd154f1c7651d699f716d66afcda03438e3d4f8f71ec5c656cd8b5a8a07dd293ee39bb22c192ece2eb8ccf12ff4b3fa3a3
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/dnsdist/dnsdist-0-r2.ebuild b/acct-group/dnsdist/dnsdist-0-r2.ebuild
deleted file mode 100644
index 573f371e6d0c..000000000000
--- a/acct-group/dnsdist/dnsdist-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/dnsdist/dnsdist-0-r3.ebuild b/acct-group/dnsdist/dnsdist-0-r3.ebuild
new file mode 100644
index 000000000000..dcce820fb2ef
--- /dev/null
+++ b/acct-group/dnsdist/dnsdist-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 165021075924..569fb1b4ce62 100644
--- a/acct-group/dnsmasq/Manifest
+++ b/acct-group/dnsmasq/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq-0-r2.ebuild 151 BLAKE2B ab1a50c19482ee843f70c019f38742772f04802962600918c4f2f9586a5b09d730294dc8dfbfaea4c0eb0e74230c30738bed18a0a20c215fc9def27e388ec6c9 SHA512 33dc53a1383508b38f50d216966b5628506c8d32fae19c365abf0877c8adc92bcdbfdf517bd89b570bb757f63400897f41f72e05ebb29530b3922e97a216e697
+EBUILD dnsmasq-0-r3.ebuild 151 BLAKE2B 737a8411ce41f6ed87b488de80a08b84c4cba224ad9f964bd3a489ac0b0dc9ccf7ac5f3a687230dcaa49585568c5e154bddff80299256a8b4018417d217dad0d SHA512 9c568b6c05f38ac3338dfa0e783a93fd48e25442523c5f604b62ab109f945f7d4d5b56a862b49e99a23f5c6e8acbaf9a0d3b68880929a35168daf5783f4678ca
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/dnsmasq/dnsmasq-0-r2.ebuild b/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
deleted file mode 100644
index e41841312803..000000000000
--- a/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/dnsmasq-0-r3.ebuild b/acct-group/dnsmasq/dnsmasq-0-r3.ebuild
new file mode 100644
index 000000000000..ac5a4eeaf6dd
--- /dev/null
+++ b/acct-group/dnsmasq/dnsmasq-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq_exporter/Manifest b/acct-group/dnsmasq_exporter/Manifest
index d42fdf8f37d0..eabdba48c56f 100644
--- a/acct-group/dnsmasq_exporter/Manifest
+++ b/acct-group/dnsmasq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq_exporter-0-r2.ebuild 151 BLAKE2B c5824f9bf752ae7c01fcd228ddd8465f98d77e3ff0ca9446da1d7bdd0e99be375ba26d3a66e8ddb4ec80ea0ce3b516038a7397be68b4fb41641e38bf323c0849 SHA512 24f035576ff8e4e5f6165bcb05574ed7dde1a82bc9d00748dd42d803ecc9d7a7e24afa86b28e31d996520d4d441aac470d6c62398d260f30f6484a1bdf445a78
+EBUILD dnsmasq_exporter-0-r3.ebuild 151 BLAKE2B 8e014a21a02171fd98b9956b4fcb600a4c01305eda728bf18cc4f4de0aabe9753177bf558406c8d822379157e9d416165ed26da4d40576bdda3d87321b80e62c SHA512 11c97f1e7242c045ef80fac1b5d10a63b851ab636c7df38b4b072c16ee08c4be4ca58bb6694db680459c33491ddd58938ce2070914b4d13e6cb3df6d242c5725
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
deleted file mode 100644
index 2568d8d50be2..000000000000
--- a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..be7e96162722
--- /dev/null
+++ b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=274
diff --git a/acct-group/docker/Manifest b/acct-group/docker/Manifest
index d5f13b1f66d3..25b107ed874f 100644
--- a/acct-group/docker/Manifest
+++ b/acct-group/docker/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker-0-r2.ebuild 150 BLAKE2B ba4f757068cc16b68bb52e0173c9d7385a530ac241c3c97aa7d4b9c089f24267486fc3d6b61422e290a7f66a55d9285166263fbf8be09aff327510c88c97332a SHA512 2423b2073fd29d31f7039119511411d788b23ce87f7c58a38b052404dec99cf24b9cb7a076457a8db116080619d653128407a3d2b8c67b1905651bc6ee028161
+EBUILD docker-0-r3.ebuild 150 BLAKE2B 419019accc75f5f6563afd020c7f661fae9aae70b818fe972be2eb927d08972701477bae69451d34b548300c023267ff2b9321b23c12c548f2c9befef83121ee SHA512 1c9a7ad6fc3962adec46c0d1af5f5e7f5b1241a83b834fe3d1d0512f841ec17688843b266f45665fa8550b7efac4b00aaf98951c8c62e343cbbc17651c37edd4
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/docker/docker-0-r2.ebuild b/acct-group/docker/docker-0-r2.ebuild
deleted file mode 100644
index e59205efc4c2..000000000000
--- a/acct-group/docker/docker-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/docker-0-r3.ebuild b/acct-group/docker/docker-0-r3.ebuild
new file mode 100644
index 000000000000..38dc0db2635b
--- /dev/null
+++ b/acct-group/docker/docker-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=48
diff --git a/acct-group/docker_auth/Manifest b/acct-group/docker_auth/Manifest
index f87149a9d056..7240acbed512 100644
--- a/acct-group/docker_auth/Manifest
+++ b/acct-group/docker_auth/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker_auth-0-r2.ebuild 151 BLAKE2B aac7e84f3af549f5cd37c7827f2932d7efc2d61c4a8d138702f9e338c5b7b2578639895a96d063a62738c4cd0ce33c0d698c43a6236a132303c4f6a4c28d03a9 SHA512 6a9d6f4b5d314d27bc0019203cafd9151bdeafc806d86ae707be6ffc9a9fd731625226ea209be78c25eaa2fd806591adf0ea13df00b5b52fe9076d1e3b4ae40c
+EBUILD docker_auth-0-r3.ebuild 151 BLAKE2B 9edb8077ab16584c1ab4843c8985d9d074248c3e10efede11f38e04cc6538f26cb968dbbc12cda19bd8de35cecd269f3aa91b7042525c47673965c8b7c6535b5 SHA512 2405cc55688fd814859e5856f5d83ee12f5b2987a4b7a423fe8b6f896cb3b0cbfe07f534c9d4ed310bbefd33dcc9dbedbfd3c143e1bad6f0687c2f614397e0e1
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/docker_auth/docker_auth-0-r2.ebuild b/acct-group/docker_auth/docker_auth-0-r2.ebuild
deleted file mode 100644
index d3f082ccbf0d..000000000000
--- a/acct-group/docker_auth/docker_auth-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/docker_auth/docker_auth-0-r3.ebuild b/acct-group/docker_auth/docker_auth-0-r3.ebuild
new file mode 100644
index 000000000000..68fe0c04145b
--- /dev/null
+++ b/acct-group/docker_auth/docker_auth-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=345
diff --git a/acct-group/dovecot/Manifest b/acct-group/dovecot/Manifest
index 8d158b43830c..967124a772b9 100644
--- a/acct-group/dovecot/Manifest
+++ b/acct-group/dovecot/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovecot-0-r2.ebuild 150 BLAKE2B 196d19787b3ffc014b4cf34877a484969c2e1625fcb732aab934716fefbe12b5959b5d269b8799baa51a98808cf9583de8cbceb6114e259677e6e0e9c0fb438b SHA512 47fcf07792c893f5c65039f284306b63fbf578aa6502b69b9e3fbcd9b31b061238ec515d5013c8f18a98266710db1e3e2bfe4619dba427077e965fe5b184e641
+EBUILD dovecot-0-r3.ebuild 150 BLAKE2B 7f9e41a2a9bcc2c8a02f51e27f3a8e836d33614d331f3f2baeb71785d341f653b1ffe3569c01cb449a9575d55f58c63b0263756168e5d5fc5d6adba1b9034fea SHA512 75cc2711d626457eed9300be9d882187b36b0ca00c8a5781e68352c2f315e00ed93d451a498eaea6361d3c23b0242cd05c317c528adc6f17f115a63aaf524a12
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/dovecot/dovecot-0-r2.ebuild b/acct-group/dovecot/dovecot-0-r2.ebuild
deleted file mode 100644
index b79d8d933cfe..000000000000
--- a/acct-group/dovecot/dovecot-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/dovecot/dovecot-0-r3.ebuild b/acct-group/dovecot/dovecot-0-r3.ebuild
new file mode 100644
index 000000000000..27dd6b6faa1b
--- /dev/null
+++ b/acct-group/dovecot/dovecot-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=76
diff --git a/acct-group/dovenull/Manifest b/acct-group/dovenull/Manifest
index baa2a12a03ee..92b6f7c881e4 100644
--- a/acct-group/dovenull/Manifest
+++ b/acct-group/dovenull/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovenull-0-r2.ebuild 150 BLAKE2B 488d61dd9d9fe16763760d7cd38002ef1f9757d7689d792adefa50e96c19637955e5ebfe551d2a6be0ce2f1ec064d5d8275acde20ab4fda7a36e241319c7c992 SHA512 e8c23a4a16de2059c7744b23e2a5fe9882f558b2b74eb3b56bb48659a95211884d821d17db48866cc03cf221cf78dad8dd7fee834ba9ab87bee23b709905f9d4
+EBUILD dovenull-0-r3.ebuild 150 BLAKE2B c296d55f5ee84cf7920904784d8d969295ba2ded996f5e2af7dc8fa86c2ea184479dab36ddf23c11438e17c467dbff907863efde77f42e5f42ada87771da3fe1 SHA512 fa889147a7ffabfc7a01e6e174386d6dc369366467ff3bf27de670481f7d684d0cb6e52ba92fff12e607f5ba5a7700203732296de1f896fdbb72dd802dd35d12
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/dovenull/dovenull-0-r2.ebuild b/acct-group/dovenull/dovenull-0-r2.ebuild
deleted file mode 100644
index dfd9f8ee494c..000000000000
--- a/acct-group/dovenull/dovenull-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/dovenull/dovenull-0-r3.ebuild b/acct-group/dovenull/dovenull-0-r3.ebuild
new file mode 100644
index 000000000000..b5f5c6d41082
--- /dev/null
+++ b/acct-group/dovenull/dovenull-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=74
diff --git a/acct-group/drone/Manifest b/acct-group/drone/Manifest
index 8bd546a5a5b8..b908d9fe9584 100644
--- a/acct-group/drone/Manifest
+++ b/acct-group/drone/Manifest
@@ -1,2 +1,2 @@
-EBUILD drone-0-r1.ebuild 195 BLAKE2B 2f061770dc8358d45accb5fa09d12f4f719ac637ecbdd883042cadeae63a1642940f4526cd5ccb3d612288ab0a2662325078fc12db81a44c7960afd04a48e32f SHA512 19a95654d9bb1fd5713c8d53399e5b9f36e40cdb67c359cca58379600d2180ad0f8d7151432a321986c757116e82155e5845412bcac4e40e17298dc44b5deab3
+EBUILD drone-0-r2.ebuild 195 BLAKE2B 31191c0bde3f3575cd8d3de91c4b2f324005384916297a834aa9917ad0082f569e8354c3465502f909cdcb073f63c52c4ed0900d1234ff0a9c3c8b6f2db3d16e SHA512 a633c8a37a98261393b73db41d6d80edf7cc47d815d41848446f940b5ebdef3052042a949dc8801fe5a319f907e4a94b29aedb271aa467c9b309def3d3ac9aab
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
deleted file mode 100644
index c02ad8cb13d8..000000000000
--- a/acct-group/drone/drone-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/drone/drone-0-r2.ebuild
new file mode 100644
index 000000000000..4cac9359c209
--- /dev/null
+++ b/acct-group/drone/drone-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0d9479561959..4950b244f01c 100644
--- a/acct-group/ejabberd/Manifest
+++ b/acct-group/ejabberd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ejabberd-0-r1.ebuild 192 BLAKE2B 7766549dfbee1874ea04fdf3641bc783df6119910db1e4fcdbec75105311a559ed23abdb42af7c1f5ed61aca833fffb36a9384cdd959e508cfc22ce143075026 SHA512 2ab54546629107cd00cafdec010eafaabc858f00de01e0ab15a14854e6a61f5d6abbb533b6996c497101fbb8d9aa8f0ebc44a79c29fdfbfb909d1ad21c8383f2
+EBUILD ejabberd-0-r2.ebuild 192 BLAKE2B 023c57b0dc9d22cfef5f8c4e0f9f4596387d974e8a52650da51fb3dfda76294c5c5aa9126601da91e10cdc3d328b71746715055cd7b94c513098c003ac53917f SHA512 af7524f7463eae1fb509f4885dd192b611316139e18f2afa82f600a8ca7dae516f3fad0eaf8c9a4accf957e8d2dd38f536fb28ad5f1621cac4e2b0cae8094e34
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
deleted file mode 100644
index ec6a736d7bb1..000000000000
--- a/acct-group/ejabberd/ejabberd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/ejabberd/ejabberd-0-r2.ebuild
new file mode 100644
index 000000000000..a8267075d134
--- /dev/null
+++ b/acct-group/ejabberd/ejabberd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1a61102bc78a..3967f2b824be 100644
--- a/acct-group/elasticsearch/Manifest
+++ b/acct-group/elasticsearch/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch-0-r2.ebuild 193 BLAKE2B 2fbce27364c96c520cb186f3ead2c715b1ce00e1d23ec15ec22b15b218f02d302aeea4de52f83b0c17a9a6628488587c84a0505efec12c3d9d6aea31724b5a58 SHA512 31ff13fde899c28045728ad5fa10c2e392f2f29878b967cc4df879ec929748a379261e87db5c9d191e7a057d73ba6cb254a33442c8e80e8843003ec68ec00003
+EBUILD elasticsearch-0-r3.ebuild 193 BLAKE2B 0d9d4f08d7e43508f3c4a7a97067c5b936bcf2dfe9a241d0747914e6ad94a0742bf28b7e4fa0285b9b9d031cc0bf85310a38804f1f89f14815dcd522e2f0ab35 SHA512 bd16a890e545a27a5bc55257309981f74d5260b1ff041b216d664dc050cae46fb841efb027c8daa3abca01771f87f95b4af9596ca6e88397c458be66cb7f96c3
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-group/elasticsearch/elasticsearch-0-r2.ebuild b/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
deleted file mode 100644
index f9c57569df5f..000000000000
--- a/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/elasticsearch-0-r3.ebuild b/acct-group/elasticsearch/elasticsearch-0-r3.ebuild
new file mode 100644
index 000000000000..4d94cf7d0ade
--- /dev/null
+++ b/acct-group/elasticsearch/elasticsearch-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0b6c14d4227e..eeb1ce81958a 100644
--- a/acct-group/elasticsearch_exporter/Manifest
+++ b/acct-group/elasticsearch_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch_exporter-0-r2.ebuild 215 BLAKE2B 756bba51cc537d5f40aac9072f2f39fad80f03a0bf75760cf0612d564c124078653c92d0007813687dffdbe38a5152ade5b59e34ba7aded59e1d0a511efd6c7c SHA512 29c48030e85b4a070f4394d30004a709f0e445cf54ede2bef07b33096078a14f0758003e67167255cce37858b8ac86864f89d83bd31ddad29e9053e6d80c0830
+EBUILD elasticsearch_exporter-0-r3.ebuild 215 BLAKE2B b0875b21d4e95c1d0ed18e790963002dfd31af93cf1746c8a98b82bcb4b52850ef2f36b88c9b65bdadf53c50adcb758ff2d18ee62810060e456c21b69222d22b SHA512 0ab1205cc56e60ffaef221f7a28ef7891150ec28d4fbc9ba5499860f9f39e50b6daf38d6728884c20deb214b9e0f9053b3329b42f5464be618f0adbbaac9166b
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
deleted file mode 100644
index eb80176af463..000000000000
--- a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..830715dadfee
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5bea4cae8f06..cc0dcc4e81d1 100644
--- a/acct-group/energi3/Manifest
+++ b/acct-group/energi3/Manifest
@@ -1,2 +1,2 @@
-EBUILD energi3-0-r1.ebuild 203 BLAKE2B 60e793d8633c8a8e19eca964bb0ddbdd39fee2670ec1bd36d546abd6178437f7eb41b28ed2cb370645564f231d894cd0018e9cba42bf6e2b1f5d62ebef16b26e SHA512 dcca88177eed85416c7de3f3d9eb1bfd14662e5049ca2354813f9af98d663e5909b40f515c5e587144f4c69acd74e3c284e9773cbcb10288ef33152b00fe9b79
+EBUILD energi3-0-r2.ebuild 203 BLAKE2B 64c032ae94bdd52aae8c0afe2fd15932d1941672e63fd1bafa95537cb9bad219e8e436a225615a5ce95faeba78b874f2b37429d62143dfd2cfd3e8ed6a1b010c SHA512 f4d151d3c06ef7bbdfabac4891eeed4ab9992d65d358577e9d3cbc073879e7c973d51772abf46b0961e006d3048f5556c5e9873e0455591736e1d5395410ca80
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
deleted file mode 100644
index 0d5f2564832b..000000000000
--- a/acct-group/energi3/energi3-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/energi3/energi3-0-r2.ebuild
new file mode 100644
index 000000000000..85b0d4f52e36
--- /dev/null
+++ b/acct-group/energi3/energi3-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 694b277dc884..5179e38fc259 100644
--- a/acct-group/epam/Manifest
+++ b/acct-group/epam/Manifest
@@ -1,2 +1,2 @@
-EBUILD epam-0-r1.ebuild 205 BLAKE2B f4feffae5f02c062475dbe42c6f3daa58fa97fa9155ca99c96b1a3d8ab16f1531edd197d607b5925af507e3cabf712a9db46c9f01ca7a0288ffc5f215642f416 SHA512 c0073d5d44a4db4967c8537f79b5047d92e33d376daf085f0064df70677cde82a9bcf86a3f1606b211a7c5729af473dee93f75ad28b0ff1a4d36ec94ae5cd8a3
+EBUILD epam-0-r2.ebuild 205 BLAKE2B dfde6634d2cbadde12d2aa68910823c05845fdb3793a7cbf2b13b637f3086f9226a76f3a82a4dc32dd807eebb0f96c0bfcb699adb256ad4d53863ebea6e73c69 SHA512 2eaf066a1987e196adcfad5b96b2c492b58bb61997c27e55f23de94d5baf6f7bb7de0c821a2ca17be2a6379534d37b7df881ea04fc62d5338129fd8e2b95fb40
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
deleted file mode 100644
index 6df502deb6a8..000000000000
--- a/acct-group/epam/epam-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/epam/epam-0-r2.ebuild
new file mode 100644
index 000000000000..4056104b79fc
--- /dev/null
+++ b/acct-group/epam/epam-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8e70d5a23f76..2de3be6e3489 100644
--- a/acct-group/epmd/Manifest
+++ b/acct-group/epmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD epmd-0-r2.ebuild 200 BLAKE2B 7b77ad6f7535f17e13e910a2779bdad1889c5e715cc895fb3eb8b581d712f1f022153bb61de31678483b603d2573d812173febecdf1aaad66342ebbb48298d4a SHA512 0891531aed776fecbf0d4582b93699cc3ef42e891848eacc6ae000b6446f08ed31e9a72e6ba505d9e4b9870e42ba3c11ce129ddc568d390d0ea67150727f02ec
+EBUILD epmd-0-r3.ebuild 200 BLAKE2B 16a085d7a18c87c8b15519de92c185aac9db24fbd189f4a1c15706c043baaf2a6af3d12e933ad98dd7107cc8a5693d3e567c4c99085f9bbce600a826423c8162 SHA512 65f80208b48912b18cf665acaa37be9a1e688019b4c070d25b3d65a3ff3218d06f72418319469441658f6b90b3ffe43c5de9c86c3165df2840f05a9ef9bd69ec
MISC metadata.xml 246 BLAKE2B 10aefa483b0d2464cc54717a1e00c5474059fb01c51ef76d09d2618a3f22d0bcf12d67d0bc625757697d7cc07ac6516718fa254e67163410241794b2417d7417 SHA512 e05bd4e45e37c5246d1a8d144d348aae094aa7ffb63651222eb91c47f6e08bc84d6cff93d3622a218cb9184fa64dee598a1a9041853321e417afc293b6135f04
diff --git a/acct-group/epmd/epmd-0-r2.ebuild b/acct-group/epmd/epmd-0-r2.ebuild
deleted file mode 100644
index f954ffee5a68..000000000000
--- a/acct-group/epmd/epmd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/epmd/epmd-0-r3.ebuild b/acct-group/epmd/epmd-0-r3.ebuild
new file mode 100644
index 000000000000..9297c42d88c4
--- /dev/null
+++ b/acct-group/epmd/epmd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 14ea9a229773..01e0cbf04009 100644
--- a/acct-group/err/Manifest
+++ b/acct-group/err/Manifest
@@ -1,2 +1,2 @@
-EBUILD err-0-r1.ebuild 151 BLAKE2B 070df455fbe19bf62654b173fc6774ce94c917f53474c23033b83e8603419e28ba6cb57b1ed28e21f62cfe4b6574c4328e9c5f61cfb227d3f623e21615cc226b SHA512 5abd13966a2cac90201f9e76a40b8e107c6e44ceaec8dee38e6597a5bc0781a8cc05671effb3f974ffbb5fb4acba792d01c847e942e98b44c9aab5c9600ac246
+EBUILD err-0-r2.ebuild 151 BLAKE2B 2c5530310b086a49e865cf3509a9c97d893c8808281eed208b0383b51c1b6b8b88725d03569b5b21a5974a0fbf06759fd2baab8418d05fc858a377905b282acf SHA512 5d71936e4a513960579444e1623b2b9722fccb5d96f3ebcc530e7a96a440d6fa9da4f6ac38e04e0b4a1a0b3bd6d22dbdf7e2e520ccd2b5278f04639e27e69e84
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
deleted file mode 100644
index 961861c84779..000000000000
--- a/acct-group/err/err-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/err/err-0-r2.ebuild
new file mode 100644
index 000000000000..b3e590d72db8
--- /dev/null
+++ b/acct-group/err/err-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=325
diff --git a/acct-group/etcd/Manifest b/acct-group/etcd/Manifest
index ffcb0e504ccd..006f9543396b 100644
--- a/acct-group/etcd/Manifest
+++ b/acct-group/etcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD etcd-0-r2.ebuild 151 BLAKE2B eff3e5204d072841e4b185f1b855b6fa1c758af9be639bd62e701c7167240c4d0939e85707c8daeb0f217e9c7fd54e3813d414e8816ca6a7852d529bfb121fb9 SHA512 96e0080c21d45c9514d30f7154ae6ecc4fb788f374b3ff2b3d9d6e57688506357de1cf8aa0d21b522206acffb21bd6a1b64c34ad71c73da1bbca128edb5bc10e
+EBUILD etcd-0-r3.ebuild 151 BLAKE2B 195b0be8532a2daece53501eed8d784a1f9cc6417f10dc2c5b44367be2eef2fd56f9e5b33c375fd4a0159462a9c82664055f94ed92104b34cee825470714a82c SHA512 00096245d744b21cea2a82bab90a9007d67e483e3af1d25b287418fcf4479d2cae3c922c34fef3c5c2997c0751f24a63e6783f552ecc42fb3e633f0d777b1975
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/etcd/etcd-0-r2.ebuild b/acct-group/etcd/etcd-0-r2.ebuild
deleted file mode 100644
index 0cfe9ef27461..000000000000
--- a/acct-group/etcd/etcd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/etcd/etcd-0-r3.ebuild b/acct-group/etcd/etcd-0-r3.ebuild
new file mode 100644
index 000000000000..d6d653e3ad9a
--- /dev/null
+++ b/acct-group/etcd/etcd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=426
diff --git a/acct-group/exabgp/Manifest b/acct-group/exabgp/Manifest
index 7a4457f0834a..07cb31a07668 100644
--- a/acct-group/exabgp/Manifest
+++ b/acct-group/exabgp/Manifest
@@ -1,2 +1,2 @@
-EBUILD exabgp-0-r2.ebuild 151 BLAKE2B de225420e70ce3a9a18bf0091034f08ff733bf646aad264a04524686bb38efac63a054941fe02d7532316fcd03a42d1272503a24ef48b02db56871fcfe0ad62f SHA512 516c87c50c64728c486b297db2dad0f4e3ffcda3b3af5446c97eee4842bb60a8e238b8dfa1f8eaf72e5c77e9102622ce78bbe0292cc20a5c1d1f8abb23bda5c6
+EBUILD exabgp-0-r3.ebuild 151 BLAKE2B a087fa43a4e79542f1da2306812c2b079d54bd62392181d87f6819ac3c9870fd50acb6707b847b863176f4ad4bc0253f027220346d1ebe1bb302762c861213f4 SHA512 6011995499e5e8084add85ab42be15db7525fc9ad03f5b2becfc8f2f4ff8d3db346b94a2df0d64dbedc19cbbfe91e7dfc05a4ba5c2c9e4b4409b243a2da620c6
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/exabgp/exabgp-0-r2.ebuild b/acct-group/exabgp/exabgp-0-r2.ebuild
deleted file mode 100644
index 273ddc242928..000000000000
--- a/acct-group/exabgp/exabgp-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/exabgp/exabgp-0-r3.ebuild b/acct-group/exabgp/exabgp-0-r3.ebuild
new file mode 100644
index 000000000000..cf25acee38ee
--- /dev/null
+++ b/acct-group/exabgp/exabgp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=316
diff --git a/acct-group/ez-ipupd/Manifest b/acct-group/ez-ipupd/Manifest
index 6f4f1a5036c2..0476766669f5 100644
--- a/acct-group/ez-ipupd/Manifest
+++ b/acct-group/ez-ipupd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ez-ipupd-0-r1.ebuild 198 BLAKE2B 6415f81a08c6f1220d878b4329f61ae72efcb029eca1294190e6e821ba982bb6ee7d38e3cb08f163d1079091b5592334c8413bd5e6313635a1a3ce84dad11521 SHA512 e3ade307e18ac7de842014b7b243f2ff053094dcb8a7e67a563d2941737150c367a11081eaeb83a7ffb9aa8726a97489f9ffcd7910b0960cf92bd278b33bcf74
+EBUILD ez-ipupd-0-r2.ebuild 198 BLAKE2B 74ec5841da639c4bf962022ebc182f609dc883f843bb12d143e802101342447f14c74d0149a4428c3c64ffb581b77d0ff67fa6b96d13935f92325e1b4754950a SHA512 489bd5d956acf6d5e39dba7a5bc9a9f8133deb5e5cb99bffd7afe6f824cb02c13f8c29ee99e8635f1f53e951c6b43848f17ce05f600151e2b086419da0aff280
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
deleted file mode 100644
index d23e375c5f63..000000000000
--- a/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/ez-ipupd/ez-ipupd-0-r2.ebuild
new file mode 100644
index 000000000000..5838a20180da
--- /dev/null
+++ b/acct-group/ez-ipupd/ez-ipupd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f0f927b42d96..7480ebf24add 100644
--- a/acct-group/fax/Manifest
+++ b/acct-group/fax/Manifest
@@ -1,2 +1,2 @@
-EBUILD fax-0-r1.ebuild 198 BLAKE2B 801b12f3621b73f50bebb4d0ebc1f9347d17f1158e8ceca01bba71c01d17ad25ea72b1fa6813ce8763b79062764acaac38a1802e3d8f7056275deb3edb892675 SHA512 24d60f67b7b05344c12cdb666ad4519f73ef52c1e2dcc08ef486a29e02803740096ed029d9df3c72800cbb777fa7a553d03107976ab9c07d7a4756383bce0b9a
+EBUILD fax-0-r2.ebuild 198 BLAKE2B 384ff92b3784551c91125239b28670bb1c5d04055a149ae70c9d0bbd1bdb8c36f12deb7b0c9cc622831c6cde52b791ca73721839a22f7a37961ec993f8b6dc75 SHA512 f6c4e8cf81d6c780b674c18b0b792beb861463f3f5198b0cc074f3d4ba69a6628d0a22856615a5db670f400bf87122a4f44410eb19f0122ba92b202f8393e8a8
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
deleted file mode 100644
index 67affdc2830a..000000000000
--- a/acct-group/fax/fax-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/fax/fax-0-r2.ebuild
new file mode 100644
index 000000000000..5beff6f5e3cd
--- /dev/null
+++ b/acct-group/fax/fax-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e0d6f239b63f..6513f1e51fe3 100644
--- a/acct-group/fcron/Manifest
+++ b/acct-group/fcron/Manifest
@@ -1,2 +1,2 @@
-EBUILD fcron-0-r1.ebuild 198 BLAKE2B fe5205e29279f86a95d32b1c0de92f0be39f27477869a34f60ffa8dc188ef059d0b130aa3eae029ce9d4302856e07a46607d8f4df361acf5f634a1a0e2b72879 SHA512 86329d6df25b298efd9b21dcc6bce1900c4646954128a727d463231ea6714ee1d3d587e85bb7b39042212870d3834f8f89e9278f42af315be3802e25269247a7
+EBUILD fcron-0-r2.ebuild 198 BLAKE2B c77310663129963f782bcaeffaa82d210ffbeec31c760f8dfb080e16eb8615709deb4c6e131b9285d1ae2bd6c327c5371766de21b3318116f7df1de62d0fafed SHA512 f113337bd58bb69f8e8a1ba15b290ad87fa24ecca9955c37f69d04768a8c335d038db956a8054e06b2534bfd0380208db1023a27b95e4874818c83f8923a31ba
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
deleted file mode 100644
index 56134814b301..000000000000
--- a/acct-group/fcron/fcron-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/fcron/fcron-0-r2.ebuild
new file mode 100644
index 000000000000..6668f8aca0f4
--- /dev/null
+++ b/acct-group/fcron/fcron-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 dd8a12da0d25..88ff3f2bcff9 100644
--- a/acct-group/fdm/Manifest
+++ b/acct-group/fdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD fdm-0-r1.ebuild 191 BLAKE2B e9cb8ea931210af3f2bf78e324e42adc5f71fae9e0d69b5c4da1e8eaececb6b8c487cbe1d409929459994415af9c054a75ea66a38810de49807e04be59330a6f SHA512 18fa9c978b72c69aae0411d8b37e60c0469b2468fae6ab94d84eeacac48d854bb2b203c56f6eeb6b79f72a25eb6689e5ff469e8a1cb363c234205d418aeee84f
+EBUILD fdm-0-r2.ebuild 191 BLAKE2B 848f1ce46fa10ed9fb59ac358a6c3dc4837cd2a822113c2c95649c2c312f2c0ee1fcdad6c46af2790eb0408cdfb68d4bb13e1365d37e8e94dc320e2d7dc21a82 SHA512 ab712e8d3251056159add4e3d68926c2c1808f56e45ca08737b10e7a4c72260bef78a7bc14bf32f31b7f04354841dc812c71aad845926c5242a74d206b0c9a58
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
deleted file mode 100644
index f1e02f57ad2d..000000000000
--- a/acct-group/fdm/fdm-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/fdm/fdm-0-r2.ebuild
new file mode 100644
index 000000000000..b954a73a67d8
--- /dev/null
+++ b/acct-group/fdm/fdm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 32d3f422016b..79e67ce3a2e8 100644
--- a/acct-group/fetchmail/Manifest
+++ b/acct-group/fetchmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetchmail-0-r2.ebuild 194 BLAKE2B 87ef84ed78e68acca1da00fc96095f496755d01ea0976aa68e7a801f45832808637fe17bdc2b9cd755be566d438630a99f47cdefe87e2aa7cd8e3f637bd4c6fa SHA512 56bf2656cfa9f334c61b2638fe105d9f0cb7b486fd3d7bf0d1cc2c59097fc6a549384a7a4731f474e4cc2da505adb760bd68242a9952e9c825a56106145b3ece
+EBUILD fetchmail-0-r3.ebuild 194 BLAKE2B fd291f4494a3d26c09efb195f10312910e407cca46710fd4684fb5134c1bec5c2ef3f97233fec68280c06ee2c6cd67b3772a95c893669c97fdf18d191db5f02c SHA512 c8457b3632447784f42737d9615e8019e8051b7e458f749b406d0cba1cb38c4d80f3c4f4c4fed78eed6ebaf83e6d255aa987e401e8d25be8b3615c50b6ec0f5a
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-group/fetchmail/fetchmail-0-r2.ebuild b/acct-group/fetchmail/fetchmail-0-r2.ebuild
deleted file mode 100644
index f08ca98e37a3..000000000000
--- a/acct-group/fetchmail/fetchmail-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/fetchmail/fetchmail-0-r3.ebuild b/acct-group/fetchmail/fetchmail-0-r3.ebuild
new file mode 100644
index 000000000000..931f71ce145e
--- /dev/null
+++ b/acct-group/fetchmail/fetchmail-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 86d389552d59..db838d4ca3db 100644
--- a/acct-group/fhem/Manifest
+++ b/acct-group/fhem/Manifest
@@ -1,2 +1,2 @@
-EBUILD fhem-0-r2.ebuild 222 BLAKE2B 722899fff7e98449193cc43690fb2bb35dfd45765c148a935e783ae4a9a224b4dc420aa8af433b69430fd1a8d79c7cc29d4928c908f7c2ecca4f4941c9f37477 SHA512 9ca90b2de3e85ef55a5900167e81086e01125a9ce1504f125d1f18f099dab5308cf577c83c7e28d2b62f7492addabbe1bd09c1e4b57638e6e063c7e2056b7a52
+EBUILD fhem-0-r3.ebuild 222 BLAKE2B 481691abd554e54b9e538f59e2126e6a51f0597a220144b80eaa29f86a36aad3f18a3c6f2596e8a44d1f7cc971a2983958fc6029642f4b4389dac8c919229a1c SHA512 ff19f4331a82b9ae85c6ba2c804a48dc05e572b0508a24b7ae8cae8e16beba8f23cc8b1b58cd684fe980b961287a1e79e00ae4d0dd4c0b9ec31298fcc3915407
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/fhem/fhem-0-r2.ebuild b/acct-group/fhem/fhem-0-r2.ebuild
deleted file mode 100644
index 7bc0d371f660..000000000000
--- a/acct-group/fhem/fhem-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/fhem/fhem-0-r3.ebuild b/acct-group/fhem/fhem-0-r3.ebuild
new file mode 100644
index 000000000000..d6e1d819748a
--- /dev/null
+++ b/acct-group/fhem/fhem-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 863dff83fb92..1d764bff23b7 100644
--- a/acct-group/fingerprint/Manifest
+++ b/acct-group/fingerprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD fingerprint-0-r2.ebuild 151 BLAKE2B 39e009a4475094bbb43d65ae94dc86083137e539935f8cccd5a37dfba11371cba959f364ce388e4a9a9347cc958d29945b3ad09538f2d4f639c076f6bcdcfa9e SHA512 f089689fe4e1a330af1c2a59aaa9994855ee6934cb49a8b7b00d946a1c3c20e30cf00e87d8220ffb23c6d61075aba3cc8d779a51f718c5dfceafac991b766192
+EBUILD fingerprint-0-r3.ebuild 151 BLAKE2B b1d8be72222def017ea63ec0f37df2cfd1ce3d864de8d55babe22397b41a8bde93048d8886c7bc694a2e19759ddc1ea697672626d13880190c5a2cd0d6510964 SHA512 f9db2bf00691abb2a375e21106f4206f2e086cf55ed77c89258a7842927a96e400aba603ee84e42a996b25e67f568ade1c9aa70b8a6eafd8a291d4b8fb69f66e
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/acct-group/fingerprint/fingerprint-0-r2.ebuild b/acct-group/fingerprint/fingerprint-0-r2.ebuild
deleted file mode 100644
index 9d6861472560..000000000000
--- a/acct-group/fingerprint/fingerprint-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/fingerprint/fingerprint-0-r3.ebuild b/acct-group/fingerprint/fingerprint-0-r3.ebuild
new file mode 100644
index 000000000000..7068e6296612
--- /dev/null
+++ b/acct-group/fingerprint/fingerprint-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=243
diff --git a/acct-group/flatpak/Manifest b/acct-group/flatpak/Manifest
index 16af4321b923..d19438cb8bef 100644
--- a/acct-group/flatpak/Manifest
+++ b/acct-group/flatpak/Manifest
@@ -1,2 +1,2 @@
-EBUILD flatpak-0-r1.ebuild 151 BLAKE2B 058c6b84474ffa96b6f1d67ee66918186700217f785100889a1727a8e3015ba2f92cdb619d3bdc8dd5049cf2ef5b6ede9e09f139aeac1ce8b201de2ad8337325 SHA512 0e3b4a3168a25ed023dc51b6407e24afa9a1399b0740eecadfc51d325cca9528f66081940e8c9b307c38248063cbd4c6aca768c6f3e2c9aa789f62a8aa1cbb28
+EBUILD flatpak-0-r2.ebuild 151 BLAKE2B b8726ae0ef23841ed6b122628b20f8eb4f1ec323202cc29377c2e677f1377f895f50fe612184697dd0c9a4ca7d8b25345225afd188cafdc3f58b47d6ef60557c SHA512 6466545db6224222befe2f9cb98655190fbadbe8fc76935bb0f1e57b7d24561941f60a0f1c811cc9109056271ffe34305d355324a702be5da9467f01449a8e3b
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
deleted file mode 100644
index e90888ab5ece..000000000000
--- a/acct-group/flatpak/flatpak-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/flatpak/flatpak-0-r2.ebuild
new file mode 100644
index 000000000000..4493add5c925
--- /dev/null
+++ b/acct-group/flatpak/flatpak-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=313
diff --git a/acct-group/flows/Manifest b/acct-group/flows/Manifest
index 4284b0fd4f7e..022399caf73c 100644
--- a/acct-group/flows/Manifest
+++ b/acct-group/flows/Manifest
@@ -1,2 +1,2 @@
-EBUILD flows-0-r1.ebuild 198 BLAKE2B f9f7d772a2fee4c388012425a5512b36561392da75e8ce0691e6a436f2fc2767824d7751cefa0e2d814ecd69c918ccb38a8d5c323b15dba5fa1552a6d4d7f481 SHA512 6a911f2d15130c8dae3030ad2aeb4ccf128a9a54740239b2e7dd897ae9be3c59d2926c6d20ad6d21264e27c576f3b7457a8f69f9547d6a9000141bc186a10a15
+EBUILD flows-0-r2.ebuild 198 BLAKE2B 706e19c8f8476867a53644929473475341c85adbeec2607abe2481a171df68ba514a9d9621cf2ffd3b20560d76618c75850e290c56bdf74c12fddda5eef607e1 SHA512 06a294ac4a3a89ed72e05945b39a82e3f8e4eb1fd8f9ea50c23e85496cc4a9715c3e388c7fe4a6e835ba76f6827aba924ee80818216da8e2aff78e12ee35cee3
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
deleted file mode 100644
index b6a26f2afa24..000000000000
--- a/acct-group/flows/flows-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/flows/flows-0-r2.ebuild
new file mode 100644
index 000000000000..d6c35f06b881
--- /dev/null
+++ b/acct-group/flows/flows-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 79a947f70137..2871e30e6f3c 100644
--- a/acct-group/fluentd/Manifest
+++ b/acct-group/fluentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD fluentd-0-r2.ebuild 198 BLAKE2B 5ca399a329d2ddfe42da89168f4636650c4640853c39a1948b85a3388006c88ecb3842f4bd0c8b8040bb65175056189fd66d6189cc9e508e05a6c80f6a4cfd1c SHA512 e9c670927c90555f16f366c11dc6e5d03046fca8f05437dce468df3c18ecf944481c891430195c7f0b8bdd2919078bf42788de187339de88cdbcadf275969d2b
+EBUILD fluentd-0-r3.ebuild 198 BLAKE2B c0ce2dc38099cc233fb0a4afab759e0bd368835a385733053224228ae862ff0f8083f30e7782d0e9bc5f5ca68fe4a565614e85b461920b2af8734636f8810e8f SHA512 3b81fdc23a3195b94fb2a26ed0b39b786b39adf2b72db3e72f5d67da203da2f9b6472c78468a31686d572da4927866e3d4084381c0c56cc3c8cc93a846e81823
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/acct-group/fluentd/fluentd-0-r2.ebuild b/acct-group/fluentd/fluentd-0-r2.ebuild
deleted file mode 100644
index bad64bdcd72a..000000000000
--- a/acct-group/fluentd/fluentd-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/fluentd/fluentd-0-r3.ebuild b/acct-group/fluentd/fluentd-0-r3.ebuild
new file mode 100644
index 000000000000..529d7e4befea
--- /dev/null
+++ b/acct-group/fluentd/fluentd-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9e518fdeb595..2bb33fc6fe46 100644
--- a/acct-group/foldingathome/Manifest
+++ b/acct-group/foldingathome/Manifest
@@ -1,2 +1,2 @@
-EBUILD foldingathome-0-r1.ebuild 206 BLAKE2B 77cc1a2d6479c7ac45a728b9fdf2a4ea48128111b5f8cfb52fb17effde7395939e4f23fc4b1b8a50b13a57b461ddac8bba3d4744fe7fa6a490888fe425c93d6e SHA512 7fd59bc4dc993ce23c9b67c456b39e29522aaa0135d6a1a8ce856f5d8b802f32da77136807518d140958c05d464f9de85f655afa6a0ca9a4a29b802471a095c7
+EBUILD foldingathome-0-r2.ebuild 206 BLAKE2B b581b324f7cb61c4cb1fcbcbd85f98574b854641f7b49f98db7b505a6823288330088a013636ebf3185170bdbe74b7a3631d4555f4e446976b0fe0138ff8102b SHA512 d440d5c7000201614f7112d78dcec6b3a948e7b31dda7c9f61f0aff12dd5a540e1bede13b5ae1dc13876d8423c498700885894ace372d34170fb575ed3c28674
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
deleted file mode 100644
index d2ce82965e69..000000000000
--- a/acct-group/foldingathome/foldingathome-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/foldingathome/foldingathome-0-r2.ebuild
new file mode 100644
index 000000000000..b983ae8f33d0
--- /dev/null
+++ b/acct-group/foldingathome/foldingathome-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 07ee0166090f..2edc9264366f 100644
--- a/acct-group/fp-multiuser/Manifest
+++ b/acct-group/fp-multiuser/Manifest
@@ -1,2 +1,2 @@
-EBUILD fp-multiuser-0-r1.ebuild 201 BLAKE2B 11474175be1fdb058c19bc258adf40ee5235562430edfd1b3672a7ca6b6ccb2e24c9442879e8e1500b0806293ab67c38719a751ef1f31ef14c89049c7a0d72b2 SHA512 b34f9ef2258786ad2d5e1ed73337e1e27a33856446550cc6baf314ea51b36f12112276d34ff1cabafee2413d9ee4f7feea43627808b375c98b13032d5ef03230
+EBUILD fp-multiuser-0-r2.ebuild 201 BLAKE2B 5f8aef40fdfc677655a5a1a7b00a5986a2e0121ef121bff9d7594c51f2054b23a4d634b63234f6ef20606a0eb7518a6e2a2bde4672b57bed5af63cc7464d32b8 SHA512 69440148928654345497b5f19ae6e5f2574d77f440b9973fafa02e7b5af425652a7b71ab8c194fb012816bb32d74f16ae81c448790ceb825f6f91d963e092f31
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
deleted file mode 100644
index 6379f4551c43..000000000000
--- a/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/fp-multiuser/fp-multiuser-0-r2.ebuild
new file mode 100644
index 000000000000..cf8d0e690827
--- /dev/null
+++ b/acct-group/fp-multiuser/fp-multiuser-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6f4ef238efaa..e0f86fbaed6d 100644
--- a/acct-group/freenet/Manifest
+++ b/acct-group/freenet/Manifest
@@ -1,2 +1,2 @@
-EBUILD freenet-0-r1.ebuild 191 BLAKE2B 3928ed097095d330ac908a9296116fba140b4b5744436dec5f29e32313ff8d2d36da1f685c9c59e31ebb2db36ab6ddbdb5acb64cbe876f17ffc9a09d6d1e355d SHA512 87a7cb6491400783d3cb53d9e128515c725f7d23046880a60e4cb4a31e2e087b87bee69f3e1006037de63489fee77c07c57e36b6a08279f04fa3a15fbe7265c0
+EBUILD freenet-0-r2.ebuild 191 BLAKE2B 5f804b64f22fd919369f9c0c69a3bb8a5ad46f67e8ed5f662141894917986e63e9af2cd75c4559755773aa8e2377206cd6de982a740060381656b56224364c7f SHA512 f7a1d7e7781972125e829675290bb09119374ed77c0544ebc37934bc52adb343c5992fe1eb6865d8e5df4edcab8128bd05c18ff63cebd3151212e53ed9c2f5c7
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
deleted file mode 100644
index 8fb8e574f0d2..000000000000
--- a/acct-group/freenet/freenet-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/freenet/freenet-0-r2.ebuild
new file mode 100644
index 000000000000..fee69741aa6b
--- /dev/null
+++ b/acct-group/freenet/freenet-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ac14da0a00f8..ebc2b04b3fb9 100644
--- a/acct-group/fritzbox_smarthome_exporter/Manifest
+++ b/acct-group/fritzbox_smarthome_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD fritzbox_smarthome_exporter-0-r1.ebuild 151 BLAKE2B 48bda5e43e6e081811284b2cfae38c3bf529499b796305363899d470f4bf324511eaa6b210eb265c923381fb34b4c2c3f678cbd912db35b5984de48c1d94fbd5 SHA512 8c2c175f6f0425169c935a858b2428e7470bfe90751f2c54181471049a4168b7a75e1fe9a6101a997db45f8b24d0039883465f18aa0de3a05f658c96ec895c92
+EBUILD fritzbox_smarthome_exporter-0-r2.ebuild 151 BLAKE2B 69f045e712ca2c0991985b37622677dbfe9c8d580a5159cea1bbef340844ed26f9b3bb993ad9c59a054eac6cdb396e99d7e59256ac12a7cdb4e0cd304fb99f9f SHA512 ed43c2dc5575517e5eb32b5f6b76241bcc451c4580dea61fc35b163520a3e6ef01bdcc1ce120391d867126003a21dbb326f88fa470a5706d4b6f32c5c8c0d11a
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
deleted file mode 100644
index 17fa5738728a..000000000000
--- a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4d3ef69f819d
--- /dev/null
+++ b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=228
diff --git a/acct-group/frr/Manifest b/acct-group/frr/Manifest
index 408d466a39da..919d998cf0fb 100644
--- a/acct-group/frr/Manifest
+++ b/acct-group/frr/Manifest
@@ -1,2 +1,2 @@
-EBUILD frr-0-r1.ebuild 151 BLAKE2B 80f9f675b0b3011af2c35e1e6e5b6696f5ccabcbccacdd5d910194939ac32702b36aa2a88e10db4f59dd0c4b4967ed0775d6c07c83ca71b98452152e8d382815 SHA512 31cea66b630900047870df4ac5f77c7b6b08d2330a9a4ac0f839a4637088b1a9eb177de4a744ecb5c9b42ecdf9d2d69876f7bad239b59851a7cae806867cfd25
+EBUILD frr-0-r2.ebuild 151 BLAKE2B 4a1d8862e20d05ed03b4c7013bad28e63e8caa087eb453a68728555ea96925ae7af2248c6474ebe026e964c1f271508d167dd85d2ff756c36c597a32543bcecd SHA512 80f94bca9e9909f6478719ee208030ab47724554b2497ecc1fe783bbc93d94896cf5d9ef1e1327855b84a81eac0ba77dcd1313597a3dd3eddbf7b7265b9c0b7e
MISC metadata.xml 512 BLAKE2B 82b76e030726d436238e9b6253108b3690d767d249b107a6598e485309d8260c647bf9d956eba2a240cec7a515c73945d731fb8d92fce8a160b5092d8fce457f SHA512 b982967d0899b446f183ca3ed5769b04364ad50cd7e39b3a804eb0569b4affd14fbbbb8521b0e87dd6f293351513518b722a65558510686aad04fdb8e29918cf
diff --git a/acct-group/frr/frr-0-r1.ebuild b/acct-group/frr/frr-0-r1.ebuild
deleted file mode 100644
index ca45782773ab..000000000000
--- a/acct-group/frr/frr-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/frr/frr-0-r2.ebuild
new file mode 100644
index 000000000000..aa95a9dce08c
--- /dev/null
+++ b/acct-group/frr/frr-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=371
diff --git a/acct-group/ftp/Manifest b/acct-group/ftp/Manifest
index b46b4598d8e9..847d63d23877 100644
--- a/acct-group/ftp/Manifest
+++ b/acct-group/ftp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftp-0-r2.ebuild 199 BLAKE2B 6472b2f089a22b138652e6e2b7e2bd6a85fdb79a9788d404191cd104d48efa6889fa3c1b29731ff7c536f95bfb00743817ab3c023242a524c75f42d644cac49b SHA512 caa2a9d413c64baff15a38f6927bccaca10767f007560b28e11ed592e13d09cfa4cb075002d702d5ca0c95dede25c26d5b948c6d505f28a1da4bacb3eab48a73
+EBUILD ftp-0-r3.ebuild 199 BLAKE2B 03c0806fe24857ae880af4fcde6e7c9b2be2869ef1d6c79773ae6b746f064583af096a901659703ee5f49e6437cd2b7941df572928a8dc00b2382f342419b3af SHA512 34e4fbfb3add08f92a2b7928889e6c1ac8724010adcda49b0bf9c3fdb808c10077cb12c5bab251147996a98cf0e370f51ff94541458ec456ef148ecc9d8f972e
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/acct-group/ftp/ftp-0-r2.ebuild b/acct-group/ftp/ftp-0-r2.ebuild
deleted file mode 100644
index cba479f59ede..000000000000
--- a/acct-group/ftp/ftp-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/ftp/ftp-0-r3.ebuild b/acct-group/ftp/ftp-0-r3.ebuild
new file mode 100644
index 000000000000..068503a744e0
--- /dev/null
+++ b/acct-group/ftp/ftp-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6de23f7ff6f7..2a0e16cf7ad6 100644
--- a/acct-group/ftpproxy/Manifest
+++ b/acct-group/ftpproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftpproxy-0-r1.ebuild 193 BLAKE2B 70c0f2ce9ed78c9347bca75f79127cba9c03cf53385649e0c3334c14cf9d0eab2c1db66ce6c84cbda2064767639841534bca1f3c2737a7747785c4713ec5c33f SHA512 281af53ad9376f5ea4cde1cb085b2205004c3ce786d0a76dc0338f678b8bcc3ab9cae7f8bfe646d4a6933f910bbb7eb678ebcb8cd351af29cdd93cfb88238bba
+EBUILD ftpproxy-0-r2.ebuild 193 BLAKE2B 29252a9d9da0b9db71b8c4ea9250bfdcb29d397dc596830d0dd29f6d0b9fdcbaa81d59a701b9db3477a63aeda767e52824dc4bf7ab7362d323e6f94480ed2bd2 SHA512 6853889227a1c03f4ebb9354c187554f1885465dbdd01f6a05aaea27924e11aebc5b391081781583d7049eb5e8e0eab02d4279ea4b18f0ce537c7460fc1324da
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
deleted file mode 100644
index b0c7b700f6d3..000000000000
--- a/acct-group/ftpproxy/ftpproxy-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/ftpproxy/ftpproxy-0-r2.ebuild
new file mode 100644
index 000000000000..69c326fe4bdb
--- /dev/null
+++ b/acct-group/ftpproxy/ftpproxy-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 72c0d466b2a2..913a351b2649 100644
--- a/acct-group/fvwm-crystal/Manifest
+++ b/acct-group/fvwm-crystal/Manifest
@@ -1,2 +1,2 @@
-EBUILD fvwm-crystal-0-r2.ebuild 151 BLAKE2B 01837f83289b35f8e90a892e13feececa26c57a40e69c0108a3da3fa6ad046f4e2331fee01d445169e388ff5c7db1705926dba836f7637ae0cba8660806842f8 SHA512 c8fca2ed5df1cdc94cdfab55153c7bee1d75ece801b4171635ad244a6826740c5f1fc3771fcdfa7bc5fc3a9191af9aa589e5e1d34731b47b02c4c5d8bdccda73
+EBUILD fvwm-crystal-0-r3.ebuild 151 BLAKE2B 70acafbacf5b00d79fbe5dde05d563fa80b6b31163f6fa1765f53abd3ff4e903ea3e4935ec2ae32178306cd5c28195fdabaafe47c67d0724df528f9ca791c969 SHA512 d6761418bd37949e71ab92356a39458802c15442d06a70ff040ac30821a30b713e21be3182d91416a0d43b47cef5a60a632b643388e899df64de9803e98c2a21
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
deleted file mode 100644
index 1061d5c2843d..000000000000
--- a/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/fvwm-crystal/fvwm-crystal-0-r3.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r3.ebuild
new file mode 100644
index 000000000000..4aa7209a1576
--- /dev/null
+++ b/acct-group/fvwm-crystal/fvwm-crystal-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=232
diff --git a/acct-group/gamemode/Manifest b/acct-group/gamemode/Manifest
index f034a41a7877..48524e954ac2 100644
--- a/acct-group/gamemode/Manifest
+++ b/acct-group/gamemode/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamemode-0-r1.ebuild 226 BLAKE2B 540a62d73a0b6dc5327140fdef4ac13951436c7def9a9411212c9bb63ce0fb63746bbf501ebd0afcd007ba809c4cd1e7a97abda5dff288484f51c3a3134df6b7 SHA512 7e174fb3eb2e67795cee1abf46ecd7474d51ecafee86cc281f681788287dfba54f9d91e0333e9106364c6876885da4481f15157096264a9fe80faf5382312986
+EBUILD gamemode-0-r2.ebuild 226 BLAKE2B 76128a67d0c389e22961d2b189decdc96a3f2c708925f4ec7ec56c57ba7e0dab5179b0a583a23f62d649e71030b809faf4c0d0d278c50b0cbe4feb4b6060e77b SHA512 aa0fd0c22b96a88b37aa9ed80693ece7fceb0c2bdcb8384bcef1c9060435fefebb619c2598094c313223f0daa71cd5c0697bfc9d920c3c2b3d909d44cf5febf8
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
deleted file mode 100644
index 6de84c33acde..000000000000
--- a/acct-group/gamemode/gamemode-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/gamemode/gamemode-0-r2.ebuild
new file mode 100644
index 000000000000..98bf84515bd5
--- /dev/null
+++ b/acct-group/gamemode/gamemode-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5ecec7fa0e9a..c426e55497f3 100644
--- a/acct-group/gamestat/Manifest
+++ b/acct-group/gamestat/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamestat-0-r2.ebuild 213 BLAKE2B af70310d0e63e84f583df236c7a0fc8653cb1ee274c84e58e176181e7e0bf9a993565a9b7dae9a9d68c1b9d05cdc79564bb29b60870b18a74e3d72ed87999092 SHA512 5d8a64268e6b6d75b34b6b8fd97e36a9b1dc0e2f099c188e14bbdcb1310bdfbca8c4e50b6ef4af1284438e35b9256e674c630581f6d60cb8afd99a152f2ef85c
+EBUILD gamestat-0-r3.ebuild 213 BLAKE2B db7e869359b1a0cc1b414e4886869592db55d13d9112285e9807cda3a798fc9976ab5afa945286ae56319932a77e5f7e7cd94a893825e9c98040c342d393d43c SHA512 ef11f425043da7d5b95b1b1b2b157a049ffc9324b2259dd31a6c97b153027213581c1f249ccc89a0c3568348993fa8d4c928a908c8389cd3f00dd4ad7d4dbb6e
MISC metadata.xml 252 BLAKE2B 5cc2c22d613a5c76d3178ea36be48102519ca7619673667d6361743ba59e8f03663362d921f050300cae9a24e8d81c0fe3370db27e8e59092b15e2bb7f3614f6 SHA512 67ed405e37e55df875cf6e28fce9f0e6bd1b98c726458c5b7c5769593f6b2defe317a033f5a46bf79e177a10db2585b4c6ceb7b99571ca054074455b3773d452
diff --git a/acct-group/gamestat/gamestat-0-r2.ebuild b/acct-group/gamestat/gamestat-0-r2.ebuild
deleted file mode 100644
index bd9da8d91185..000000000000
--- a/acct-group/gamestat/gamestat-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/gamestat/gamestat-0-r3.ebuild b/acct-group/gamestat/gamestat-0-r3.ebuild
new file mode 100644
index 000000000000..f4200208e26c
--- /dev/null
+++ b/acct-group/gamestat/gamestat-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 716cc98714dd..35d38347a0ec 100644
--- a/acct-group/gatling/Manifest
+++ b/acct-group/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0-r2.ebuild 180 BLAKE2B 2d8f3d7633c968969d199850c07f8f0252df883d954e35579f5cea95d6232a03d96a8fd3aa6544b5cb1bb4d10274ec2cb7b46d0f4bcbd2796e71c396a76dcdd7 SHA512 fca0dc08d4185956981f4c1604ba7d035b928e7337fd6875550bdab9b065b37cf817f5a81159aa038378aad5ce85905675f3cdf5bdebb1b0c5b038199883be88
+EBUILD gatling-0-r3.ebuild 180 BLAKE2B c22c538a8f36c714a75d81dc33d44e6d59ed53da7d3aec9a927f2bceb9fd8997b4d39563663594c7e9195688786e44c0e14a0ef252085838bbf497f6b0f4d572 SHA512 1920b2379589ab0cbde5d29269cd1298fcbbb78a7162782cbbe260530bb77154c4dd0de4c02541b1de229a5b39c2f997facc7a94959d6315bd8fd08c91147c85
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/acct-group/gatling/gatling-0-r2.ebuild b/acct-group/gatling/gatling-0-r2.ebuild
deleted file mode 100644
index d7970f0e4edd..000000000000
--- a/acct-group/gatling/gatling-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/gatling/gatling-0-r3.ebuild b/acct-group/gatling/gatling-0-r3.ebuild
new file mode 100644
index 000000000000..3320bd8c385a
--- /dev/null
+++ b/acct-group/gatling/gatling-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=364 # matches acct-user/gatling
diff --git a/acct-group/gauth/Manifest b/acct-group/gauth/Manifest
index 247af4c97e8e..ac1e557782ca 100644
--- a/acct-group/gauth/Manifest
+++ b/acct-group/gauth/Manifest
@@ -1,2 +1,2 @@
-EBUILD gauth-0-r1.ebuild 219 BLAKE2B 922d1c8740db2f9722c21f68b12a0578554d96f5e2673703aa927a0e7af24109f0f1ee7a5fe874e9fa6de3a0bc0dd207d0c7929610f6597994a38ce72cd1aac4 SHA512 2ae36d2a2ee7768d5eed62b3042174ddc0485fecc0dcb41a7a658bda181c45802b13ab6bea93e20aff07a13d974aeead38c6fd0a09343a5e0afc4aa97d5d80d8
+EBUILD gauth-0-r2.ebuild 219 BLAKE2B 40ccadfca9c69e840f732d8b3477cbe8a2c2fb349a5a40ef82bb26e291edecfd2bbba888f77ca5c27d14ec57ba8adb956a167814680cd4990fa7decf723262c7 SHA512 0d8c27428968a64d0de8588033b90ef6cf43d94b137fb16dd359d74b4b8d747bca2c1af63ef714550ecf6a3e9ceab092e752fefe50874d54a9517ba73a9cacbc
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
deleted file mode 100644
index 7ffd2ea24153..000000000000
--- a/acct-group/gauth/gauth-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/gauth/gauth-0-r2.ebuild
new file mode 100644
index 000000000000..47ec0528f881
--- /dev/null
+++ b/acct-group/gauth/gauth-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5aec17dfdd6f..45876e615751 100644
--- a/acct-group/gdm/Manifest
+++ b/acct-group/gdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gdm-0-r1.ebuild 150 BLAKE2B f75d741a01282ca156d979da9fc8206c7aa07dd32e1c5031fd0b0d74863e8dd8284500e3c10c3d0fbc5245f662536b7521ddb9c09fc63e35fc3519dab3694cb0 SHA512 d74e3dea5e17c3a7800591b0ce5ea7c195efcd2823a6c133506c45e0a8eb0de886b2560b8a816ab83525499c1aed132223641c76ada961d894afea32447782f8
+EBUILD gdm-0-r2.ebuild 150 BLAKE2B 98dad3d600b67f75ba580eaf651357c3f7150c12dc0c9ed859a74de2f755d2a17a6bc46808832c14c9a264c12952ace8c24385be527521b7fff44a8eabb9d9e6 SHA512 c21aa36b10a5b3fa1a909e2af90f92c8305af729ed2160d414a25c44cc69f504e4f14da21bf859dfd29cef554fa71aa4c62c56d8015585a1b233835fb55e2e1e
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
deleted file mode 100644
index 5a31412ae683..000000000000
--- a/acct-group/gdm/gdm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/gdm/gdm-0-r2.ebuild
new file mode 100644
index 000000000000..fd2a703fe1c0
--- /dev/null
+++ b/acct-group/gdm/gdm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=32
diff --git a/acct-group/geneweb/Manifest b/acct-group/geneweb/Manifest
index f926f99b6405..cc349d4739e9 100644
--- a/acct-group/geneweb/Manifest
+++ b/acct-group/geneweb/Manifest
@@ -1,2 +1,2 @@
-EBUILD geneweb-0-r2.ebuild 191 BLAKE2B fc04921553c735cada2e230399f3a77e33bbe74058005bbd2616a25bd3500249ee2ab40a5b73c018aab38263865f3ee1fbcc95801893f392d812e999d49c4938 SHA512 e57f9dc3dbda270a43cccc3dcf736594b9aff865735942f3d7be586010bda0e576e81f0d3a94636585a30a746fce1a7e9d37cafc2f13a62c91a950320077d021
+EBUILD geneweb-0-r3.ebuild 191 BLAKE2B 6c5211b7812df70b50ce328a0ecb808aea1a33444cdba0a98879d2cffb02e2e32a819a5210a2641ee6181b0b3ff15ffa6f2345d8c9108f2fc2a181148310aae1 SHA512 c0eaa4c9d415e80e85a97cface51f740839be3f6fd32a13ae471cf0b3022aea4e8f7b8e247912d53c6cdf43db18de7cc7f0b01e209968ef554f147685477cbf7
MISC metadata.xml 248 BLAKE2B 6cf7555626f83d30e661b4284812eeb1b1f2fe0c0a2c78e68382cf21165eee45a4027020d509af5b87814913ea7f16a555b7f0b7da174f49dbb0200bcb2511e2 SHA512 4680f3a309b5836b23c44b1578f14ad49f6ebc52413f42e1d1d4b91d7000081df3be0ca1054ed47cd9df06a1a6bb7cf54d184619efff7dedb82ec7b528ea2dd2
diff --git a/acct-group/geneweb/geneweb-0-r2.ebuild b/acct-group/geneweb/geneweb-0-r2.ebuild
deleted file mode 100644
index fc4063c85e29..000000000000
--- a/acct-group/geneweb/geneweb-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/geneweb/geneweb-0-r3.ebuild b/acct-group/geneweb/geneweb-0-r3.ebuild
new file mode 100644
index 000000000000..e1b05ab6792e
--- /dev/null
+++ b/acct-group/geneweb/geneweb-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d0b29ef11956..16d1a4273dee 100644
--- a/acct-group/geoclue/Manifest
+++ b/acct-group/geoclue/Manifest
@@ -1,2 +1,2 @@
-EBUILD geoclue-0-r1.ebuild 151 BLAKE2B 9c6b6c293215f5ab2a7c07ebf251df7647259e31fa1dce2e6ed977f7f735ca63a1555e5156842bf227d8f98e630eb922744269e3495c7fae0ccf0fd38bbc8953 SHA512 a7cdd838d31e9084845b47c25b1baa8e6039300be86d9a28728da20dd52bbb1f546f7f02f8f25ee7ee031acef59401885f3c91777e4bc5f8f152cc9c8e844dca
+EBUILD geoclue-0-r2.ebuild 151 BLAKE2B 03b320a48c3c7acdb715c1e22a9642da37b81a5285ad60ac9dead9c10ba929448691f0d0c8856095b82a8d2c1958b3eb663d23c131652589b5baffd6550d9a6c SHA512 e3be5bc36315cc49c4cf7581b72d24c3bacf214d5596e5fad15006670ef90f3d80d5fa9732aad84b014018d2c43a8257c83286e8d7b69ab78de7bc210f6c254d
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
deleted file mode 100644
index a1d04d1f7011..000000000000
--- a/acct-group/geoclue/geoclue-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/geoclue/geoclue-0-r2.ebuild
new file mode 100644
index 000000000000..f7bfa17b2759
--- /dev/null
+++ b/acct-group/geoclue/geoclue-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=351
diff --git a/acct-group/gerbera/Manifest b/acct-group/gerbera/Manifest
index 21d69af47a67..7052aa05fe23 100644
--- a/acct-group/gerbera/Manifest
+++ b/acct-group/gerbera/Manifest
@@ -1,2 +1,2 @@
-EBUILD gerbera-0-r2.ebuild 197 BLAKE2B b76e3da3f13c586aa30adb5b40f3b9c18516c5ef4bbfbe7e5f53c419b6e30b0524d8ca3aaf152cb81edd7210dc364dfba57ea24f75b7d47ab336adb3bcda1ed3 SHA512 982c1e9059df072796efced867cb784ac86a5b95f16a853968b9cd8b5997beb891780b32a5e21ad6b597747be6399cff0d251147bc9f114ad8ec4b347960b02d
+EBUILD gerbera-0-r3.ebuild 197 BLAKE2B 83daac8a1e936bbbd637b8e96d2289fba1ada4a30fcca568fe885be2a6a3d22211f0385d5ca455f0feb51d4a3000ab285eba77daa2e24624f9b8bff81b1f89c7 SHA512 cceba5c1eb140d6f98ff50b90f7fc4fa4f03f597d9510f2561d990ab1503fd955ef26b969422d14099802083947eacf2f013de145a2f85ea36ed7f3ca18dbf08
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/gerbera/gerbera-0-r2.ebuild b/acct-group/gerbera/gerbera-0-r2.ebuild
deleted file mode 100644
index f275c9a42550..000000000000
--- a/acct-group/gerbera/gerbera-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/gerbera/gerbera-0-r3.ebuild b/acct-group/gerbera/gerbera-0-r3.ebuild
new file mode 100644
index 000000000000..8d4b01ced571
--- /dev/null
+++ b/acct-group/gerbera/gerbera-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7a16c2ee7eb3..b6cbc81e2837 100644
--- a/acct-group/git/Manifest
+++ b/acct-group/git/Manifest
@@ -1,2 +1,2 @@
-EBUILD git-0-r2.ebuild 151 BLAKE2B fd570a4130786122ad39c1a8d8692a32d0b60320cece4403d633ed5ced98e69426afabb32c15778c8e2994859b332eb9f23b95aff17ebe09830db5b3f16b4b7f SHA512 f91dbe8c57d4782e357934903786c72de04e3ac2d4b87de2f0958a69bc031c2801b6c6c06c84db971f76aef9ae08279584c2369ca85a58a6c65675138488beac
+EBUILD git-0-r3.ebuild 151 BLAKE2B 5d9ac9fa7cd7f5c8a07af4a8384f3904493cea883a86a643e47bfd751b6b318e07554fb4ec7f46c92bba0e3cb043287a4f7d00e5645e4d172baf157a0f14ebe4 SHA512 e8251f2b6abbeb01d4bce6e9bfe0cbe1ade25f6ff952187042cfdd77fb17dbb4d8d360b9024ad5ab66027afa3d2aeab5dfab9e85d36febd20ed6928a2735c53f
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-group/git/git-0-r2.ebuild b/acct-group/git/git-0-r2.ebuild
deleted file mode 100644
index 6e7351ce4f3c..000000000000
--- a/acct-group/git/git-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/git/git-0-r3.ebuild b/acct-group/git/git-0-r3.ebuild
new file mode 100644
index 000000000000..46f0009200a3
--- /dev/null
+++ b/acct-group/git/git-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=196
diff --git a/acct-group/github-exporter/Manifest b/acct-group/github-exporter/Manifest
index 3a7be60489b6..93d3b3b2c6ab 100644
--- a/acct-group/github-exporter/Manifest
+++ b/acct-group/github-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD github-exporter-0-r1.ebuild 151 BLAKE2B 4b45a4dacdd691fe1f7af79df567e12de48cd368c320c1efc7c081290876e4e1470ddc45bd339bef0fac885fd4b43cc76703a3deb18d77a30c1865ac00e160e0 SHA512 29a90d8d01bd96c106ed150cb3f16ff2d1517a0e889753031a92e73dd4ea8f3616a177b1e5885bfc731db856cfcc7df05f6cf562a99789cae79a3b991349ae7c
+EBUILD github-exporter-0-r2.ebuild 151 BLAKE2B 312458a959370ec34579a8a07f0849f1919d2f92867ed45a8042527bd743531a4109a4e4a72688a3a9baec40a76ffaf32b20c4d3224aae843c026fad43180e22 SHA512 3e75da8432fbe9e12fec078e77fbf890552d6049c42d3ed42bf8d5dfbdc1470324eba22dec5936de2971dd47176f1ef9a6b6e9b7cfbfb5c2a48572be8c108fe3
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
deleted file mode 100644
index 96f651982fa4..000000000000
--- a/acct-group/github-exporter/github-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/github-exporter/github-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ebf580991792
--- /dev/null
+++ b/acct-group/github-exporter/github-exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=238
diff --git a/acct-group/gitlab-runner/Manifest b/acct-group/gitlab-runner/Manifest
index da2f5bbf1c13..9732af659adf 100644
--- a/acct-group/gitlab-runner/Manifest
+++ b/acct-group/gitlab-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD gitlab-runner-1-r1.ebuild 151 BLAKE2B e85815d2950f2ab8502ce1177b7c754993e84ee5e6426448e7f88e0cb2c7d6b8bf4bd3d250391dfff925994d95557803f5ff30694a158cf1ab4ae3996bee366d SHA512 2eeadd86eba7e6f38fa1733234244c05edfe5d94307dd371fa7a81236befc17664e1e80cd6b9364c30fed36e4ea8eafdd3a7b565e4e4a2b29a63c5463887f31d
+EBUILD gitlab-runner-1-r2.ebuild 151 BLAKE2B 20b6a439ba41abaf7865ab45766a3413e80465d3abcb8e73fc231599a6801f985fa24a75fde2b4822dedd1929564bdae5a948cab346db98dc9a062ae6571b609 SHA512 6d4c9cf9fdc749eb4a1ab60df7e67e865ef54f22d1cee1aa0249b7318669ff14b0b4e4e49a6f59813ec34dfe3d4dfec86103ae7f2e9d72a1285a79957f83746e
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
deleted file mode 100644
index 9d26a29b7c61..000000000000
--- a/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/gitlab-runner/gitlab-runner-1-r2.ebuild
new file mode 100644
index 000000000000..2a48aaa0a275
--- /dev/null
+++ b/acct-group/gitlab-runner/gitlab-runner-1-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=510
diff --git a/acct-group/gkrellmd/Manifest b/acct-group/gkrellmd/Manifest
index 3570510dcac5..cf37d4b99201 100644
--- a/acct-group/gkrellmd/Manifest
+++ b/acct-group/gkrellmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellmd-0-r2.ebuild 151 BLAKE2B 18990fb44711cc22f807d9fd249099fd55834fd3263f9d3b00917df3ec2269247c90649dc7a5a5853039fd72b4176b5a84ad0786125264f90c9c2a4c79570951 SHA512 1a9bd83109610e4718989d246da7029413e1e775f2e3d5629244f8496e8b3dab27c3be7d90c41ed905d190d18eaf1621e422a21fef425c1ac65735b4f1407cb1
+EBUILD gkrellmd-0-r3.ebuild 151 BLAKE2B d7d7f5007dec089ce3ae56d75eb8ea203a4085d0a428409479819b588054dac13e89f7a917dfaf537f6194af4e7df828867355cab3ee848286563283ac3f22cd SHA512 6ca43ee7b6fd983d83be92644727c14b8e9984231eba67fe7b8c273b1ec77ec76f87ab9ce712367e29767de9654a412129993d49c287e2a2e9e7dba2f2ee4bec
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/gkrellmd/gkrellmd-0-r2.ebuild b/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
deleted file mode 100644
index 41c6b529035b..000000000000
--- a/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/gkrellmd/gkrellmd-0-r3.ebuild b/acct-group/gkrellmd/gkrellmd-0-r3.ebuild
new file mode 100644
index 000000000000..65ad5716b852
--- /dev/null
+++ b/acct-group/gkrellmd/gkrellmd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=221
diff --git a/acct-group/gluster/Manifest b/acct-group/gluster/Manifest
index 745ae9fe3997..7635cf17a15e 100644
--- a/acct-group/gluster/Manifest
+++ b/acct-group/gluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD gluster-0-r2.ebuild 151 BLAKE2B a4c1d6437ec09f791249ed6e3c18ca74271e9ecef537fe60555cdff0be8821934fc77d30a2d39dfe5bccf0ec40eb699b51f813d6fef4c63f6653b52416978f98 SHA512 7201da50da0f59185ecb098d73a044082cbf64a677c055718b2bd548a5f52fdbf7faa2c6a178870c6f30b82d19f1ee2d36f98327227f905f92ec3180722d1a76
+EBUILD gluster-0-r3.ebuild 151 BLAKE2B 77848693824e871f7bac9edeae39ff2fd572136393cd10739babc34d1b976b85686980919069d64dbe9ce5436b8aa8c5b6f769a85300ebd012c8e7dc0d2d015b SHA512 938c0d616793775404ad5cf463bfb33e846f1db40a4bf89ddf38e907b765409b620f0c2bb5b8980fc58b4eda7813a73afb1c5bbbea47336853f4381f7df57ba1
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-group/gluster/gluster-0-r2.ebuild b/acct-group/gluster/gluster-0-r2.ebuild
deleted file mode 100644
index d385d3e780c2..000000000000
--- a/acct-group/gluster/gluster-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/gluster/gluster-0-r3.ebuild b/acct-group/gluster/gluster-0-r3.ebuild
new file mode 100644
index 000000000000..a3c90c1c1f3d
--- /dev/null
+++ b/acct-group/gluster/gluster-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=416
diff --git a/acct-group/gnump3d/Manifest b/acct-group/gnump3d/Manifest
index 1a9a63948bd0..3303cf6fe651 100644
--- a/acct-group/gnump3d/Manifest
+++ b/acct-group/gnump3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnump3d-0-r1.ebuild 200 BLAKE2B 2cb64b2d508a75e7ccd1ececa284c1cbc57bf84dd4aaa4d3b005f6c315c16aeb88d621920e159918822dd09ee787ef1af0e88cab7c8777aed089359ba8712c96 SHA512 5ea8aba067e02481c713654655363e53705c6074450dedc153a9f7b6ebb1307215ac76b3241c6ae795bfde5fa2abde296c24ef1130859de8378b12d4e6509eec
+EBUILD gnump3d-0-r2.ebuild 200 BLAKE2B f5d2d7c10f57a69ff0278352b8e84197f23c22f8a9efeee99d58a0c68ea38b8dcec10ef79a520370b89fc588c19067bc258a5dccadcbef3bb778574216f4ceac SHA512 90945b37d8096d69245bfec2fb1ce9a8bbbf94a2ab91cac09047e6cd7435947eb5f7d0e96b91c2b9dc187e11aef34c915e3f6cd552e9e8acf485db04fc246ce7
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
deleted file mode 100644
index c8f2f001be9d..000000000000
--- a/acct-group/gnump3d/gnump3d-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/gnump3d/gnump3d-0-r2.ebuild
new file mode 100644
index 000000000000..adce1112e84a
--- /dev/null
+++ b/acct-group/gnump3d/gnump3d-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ea3e9168b54a..5ffad045e1f6 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-r1.ebuild 205 BLAKE2B 7bd4a91317af5d14f71d8fed844a4bf083aeb4b2c01fe27704a2bf669ca454a44da0004f6ba72ab8d2ded66dde833e32569d500b397f2d66a3cb7825d630a87d SHA512 479b3940b94196e2823906ebf081560db14210e4935b5c5336b532f1bcdfce80654fd4f366cb7f89fef56cc64db55c7ffb73e12b4552e00d26a0c2ea4b4ba0eb
+EBUILD gnupg-pkcs11-scd-proxy-0-r2.ebuild 205 BLAKE2B e2e3aec64c3124d4b575a649d6c637f9b7cc49cbc8cb39a0c4f0cb33bf235d0c838924a8413c2c592ec489571bc390d1f4b7ead3532091325cb0dc49dd1e59dd SHA512 ea3192b8cf63d00059545b7b3acb823c9dc67b59198e7fdfddaf51504dd36ee4e39bc53cfb14182bf2e64080aa0296e7a1648fdb021fae3b3d289dd22e1ca56c
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
deleted file mode 100644
index a1b538246fef..000000000000
--- a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..e78454b53417
--- /dev/null
+++ b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4969436f4d36..471f009cbfcb 100644
--- a/acct-group/gnupg-pkcs11/Manifest
+++ b/acct-group/gnupg-pkcs11/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnupg-pkcs11-0-r1.ebuild 205 BLAKE2B 5249b662819dfd56dfdfb3a659ec15f9d877c3639d6af5657d8f8f9bf8b983356565f291f27124ce2904958ae3f31b0cb7551dc830299b49f2cb554d783b34a4 SHA512 e0832778732e13685169ab487185c62315dd5c9dd1a278c900e743827202c48dcc3ec3ac92c0ace67a9e278826e78d0858f0c08fee45e9e927ad287e403653e6
+EBUILD gnupg-pkcs11-0-r2.ebuild 205 BLAKE2B 436668698c92608804b2d1e9d5d1cb70ce19ceb0335a45a874e99528101bce1584363bda0d8fbe72a3688fc8fcf4a2e17772b0f47747fb0c1080a68cacc03cbd SHA512 79082aad165f8dad87c8cb7213e159c19132a75212dbe214e9edcc60be9357bcfc3bbf95103d562ca0cedd7d54c46d155250159cd1f0c50f1d5bc83758db321b
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
deleted file mode 100644
index 11ab8a2ea439..000000000000
--- a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r2.ebuild
new file mode 100644
index 000000000000..86b84e02069c
--- /dev/null
+++ b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="373"
diff --git a/acct-group/gopher/Manifest b/acct-group/gopher/Manifest
index 35284f21b310..6a2c5da4c927 100644
--- a/acct-group/gopher/Manifest
+++ b/acct-group/gopher/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopher-0-r1.ebuild 151 BLAKE2B 24d7af5468dc36b12e477c2f6cebd4e9a71f34631f1fa43d0754e49aae612666c93fd9a78619b98f5ed455804ebf37489929051763f7530089f67ba0dfc597b4 SHA512 e4cb48f1db4eee21640162df11ae1449e9dc688e96ca6d1677aebc379cdc727f235502386538c0347ac52980d510f5ac84b5cf1f08d2eeeabbe0ca5805f20b37
+EBUILD gopher-0-r2.ebuild 151 BLAKE2B f23ad516ea818359bec2b13e9b9708bfee68c710d9b691a3e01bf06910650edf1be384f7aee0c004efce29364a136fd55a351d38d15baa14f9cc35cc08d018af SHA512 5e01edad34c85ad7d5f0438e8ee15f71afcb90a89c02d626106bc9f3003ee72be2cdaef0b31e096475ec76914f69dd4c24c450fd982ef619ba241bac23ac53fe
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
deleted file mode 100644
index 7e9fe881ffdf..000000000000
--- a/acct-group/gopher/gopher-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/gopher/gopher-0-r2.ebuild
new file mode 100644
index 000000000000..9215ed0277fa
--- /dev/null
+++ b/acct-group/gopher/gopher-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=287
diff --git a/acct-group/gopherd/Manifest b/acct-group/gopherd/Manifest
index 084aed1de640..93f97752ac84 100644
--- a/acct-group/gopherd/Manifest
+++ b/acct-group/gopherd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopherd-0-r1.ebuild 199 BLAKE2B 746b835bf8ff7e42edd24556ea24a584e11968ac967392b06755605688681ea7ca78b9e07cc450f1a25efd2b71ffe9a0eab1710039516ee6c743c772f3aaf63f SHA512 5cbda0b467c1d868ab14bb7f7eadbd0cbb860d491e955006ff229185ad07ef7b8c5750b720b920b63b62736943850dbba3092b74fd1d014a0e8c139aea4c6c59
+EBUILD gopherd-0-r2.ebuild 199 BLAKE2B 39f3cf1e563fb9a06d42f0216e140230184b16cdc32cf4b2d97f7ae74b2ea040a3d06c05f0c8ff16062babbca3dd7d0fe8938cc4dca4f3c7b2c02053d130b67e SHA512 57dc83ba1ca133390c5b200bf905d1abd7033617f1520bd6c0134ee61f2cc4ede6b945ea2f808ae1a15aafa44d98e4d6c82e3ecf10583f2aff537af8c35f0f52
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
deleted file mode 100644
index 6f3afeff7650..000000000000
--- a/acct-group/gopherd/gopherd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/gopherd/gopherd-0-r2.ebuild
new file mode 100644
index 000000000000..5b840efe95ab
--- /dev/null
+++ b/acct-group/gopherd/gopherd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9742ed0a6173..a7c6c71b51f9 100644
--- a/acct-group/gpib/Manifest
+++ b/acct-group/gpib/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpib-0-r2.ebuild 151 BLAKE2B 64ae6d4d9c709654491a0d2f7957b9a99f59d54d093f446f8dadd41ccd3cc49ed9c1ca5aa977dc05b38708606bd7aefa0d408a7d77ef15b96530441c2c2cfb91 SHA512 c75a37016c6377e73644c1f2695d6b613529a36478cd6c90752934d10a0c79bf0d4cb18d890bc1fe3b34f1b796c69d9f1b7e7a3f6c978ad20af859b32c35e93c
+EBUILD gpib-0-r3.ebuild 151 BLAKE2B fceb339e0bb044b61fa7ba6c3e510b8bb806729d27c913f8ab7d73e1d45270ae27a7503979e8a9d81c6bfec9ed55c0a5696e8566f5a437500857b7dd1e6dc0ce SHA512 cbc264d52f6d9803cd6cd8f66f5eb3fb398984a8bbf4f394873da8f44e1b62c558e3663e8bea25fde9a227d674c8568822e2d133ed465e122604f01b0b918dfd
MISC metadata.xml 397 BLAKE2B cbd397a1319623dce61bd4db5cea611afd9f6b6f7420fe0cbbbd08f7074cf625dafb3532fc78d969c6a3d283f2c7e4a4f45df4a06440b7946b94917b137643c2 SHA512 2fa1711d8da604e0ab4b6d4f3d46411893abbdcf92889df0f1205dfadf85b3e92253d928b207df9d0918949d4bb4d85a73d4ef3026a48e8001e070a3ca1c96ba
diff --git a/acct-group/gpib/gpib-0-r2.ebuild b/acct-group/gpib/gpib-0-r2.ebuild
deleted file mode 100644
index e278818e44db..000000000000
--- a/acct-group/gpib/gpib-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/gpib/gpib-0-r3.ebuild b/acct-group/gpib/gpib-0-r3.ebuild
new file mode 100644
index 000000000000..66238a6f692b
--- /dev/null
+++ b/acct-group/gpib/gpib-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=409
diff --git a/acct-group/grafana/Manifest b/acct-group/grafana/Manifest
index 2839aa37c9de..1d2663e8ad25 100644
--- a/acct-group/grafana/Manifest
+++ b/acct-group/grafana/Manifest
@@ -1,2 +1,2 @@
-EBUILD grafana-0-r2.ebuild 188 BLAKE2B 6986b43d59ea27db79df18c81c683e3c245c923a882bf65307a11d003576d504c883c15a02545943a6a0649204e79b875aa1cc91fc9a97b1f3564d5ae055a2cd SHA512 f19fb6bde5685cc85ea5153a79f55e067ec05747b07878ad6c73d98ed4c5179bc0a8d3a3afe30bdf926fab8c9365dec00ced1150f5fb1deddf8d6a768ecd46e5
+EBUILD grafana-0-r3.ebuild 188 BLAKE2B 975486ec223ff0f90bac5706de6e2ef78a5241d820f8940e1ced2804d87e40851c3b8f5e5a6440039e882f12b593961d89c53cf6ff6c1d6a26e0d6250ec6b236 SHA512 f5443801a5b57ca6331d9e4b45d5a14583c265100e45b8617477db29c64d46b4ab71dee3a22b8a4df7927efa8705b282a33299aa3167ad0005b0fc7a11507d3d
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/acct-group/grafana/grafana-0-r2.ebuild b/acct-group/grafana/grafana-0-r2.ebuild
deleted file mode 100644
index e217b4d7a405..000000000000
--- a/acct-group/grafana/grafana-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/grafana/grafana-0-r3.ebuild b/acct-group/grafana/grafana-0-r3.ebuild
new file mode 100644
index 000000000000..415401dfa0ab
--- /dev/null
+++ b/acct-group/grafana/grafana-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="grafana program group"
+
+ACCT_GROUP_ID=389
diff --git a/acct-group/graylog/Manifest b/acct-group/graylog/Manifest
index d2dfe8c2a1ea..2b6907c78f8a 100644
--- a/acct-group/graylog/Manifest
+++ b/acct-group/graylog/Manifest
@@ -1,2 +1,2 @@
-EBUILD graylog-0-r2.ebuild 187 BLAKE2B ce3c6429fed60d33629168719e739bea4aac0b00775fe62f50decbe6ccd3e416e245daed3c53163c2dd161f44b05d4922d7f9b3689cb113e6bb3d489c259a843 SHA512 3f57eb61dbc341b6e943868a4cad9a887954a1a2b5d293b6ddf8885d8b19d5bdfb88c15ed5c65cd5a8db88ddfb65e721bda0de27927998c59f2d573d4cc24854
+EBUILD graylog-0-r3.ebuild 187 BLAKE2B e27ac5bcecc9e11cdd6d45dd697e54ed7fbc20c012418b0591359ef28f72a3f9c72eecd8c8c40904f07c56191d7008c5b3f3320bfab6431544a77152582aa589 SHA512 2941bdc9668d08b5521980d3578d2ea4aa8cf582cf9b279f4491e48c03bfd51000ca6c8ff727a148f780ed69e888dca2d0e45415223ddcb689d5a8d45856e512
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/acct-group/graylog/graylog-0-r2.ebuild b/acct-group/graylog/graylog-0-r2.ebuild
deleted file mode 100644
index b59addc0d545..000000000000
--- a/acct-group/graylog/graylog-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/graylog/graylog-0-r3.ebuild b/acct-group/graylog/graylog-0-r3.ebuild
new file mode 100644
index 000000000000..198779b0eb79
--- /dev/null
+++ b/acct-group/graylog/graylog-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Graylog program group"
+ACCT_GROUP_ID=478
diff --git a/acct-group/greetd/Manifest b/acct-group/greetd/Manifest
index fff3b0acd1e2..96decc249a30 100644
--- a/acct-group/greetd/Manifest
+++ b/acct-group/greetd/Manifest
@@ -1,2 +1,2 @@
-EBUILD greetd-0-r2.ebuild 191 BLAKE2B f16b429983466b341f0d37597fda47ff293340013ae6a8659ca58f6eb815b34bcdd1a6c511c875f02afc076c3740fef951befb9849ea2953da6f9803081648ea SHA512 1f9b9e0b18b78493c0dfe6b9d0384f55d5e3a24c37b6e0723a0d00617d8dc0ce7937cae3acc2a21cdda3ce2778fc1d06373c5a70c6b058ae5f185093aea2d1df
+EBUILD greetd-0-r3.ebuild 191 BLAKE2B a439fb5e6a9ef75f40e1cb78aeddd42904e3f09a463ee506ebdc8ea0a74b0dd6c80aa12bc9c4f6f3b3988970f5293c32e449299403a2ebb6e88b273a5fb8f6c2 SHA512 d50c41573442f0ad970bee00334cd27d356dd70364f59cc866fe001fbc6fc51874877f972f0d9c0d3167e387b0f736d04b7349f04fce8ce9b7f6a237c424fb8a
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
diff --git a/acct-group/greetd/greetd-0-r2.ebuild b/acct-group/greetd/greetd-0-r2.ebuild
deleted file mode 100644
index ae697d32110a..000000000000
--- a/acct-group/greetd/greetd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/greetd/greetd-0-r3.ebuild b/acct-group/greetd/greetd-0-r3.ebuild
new file mode 100644
index 000000000000..26f599495a9c
--- /dev/null
+++ b/acct-group/greetd/greetd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 367937354be6..3d95203a0909 100644
--- a/acct-group/grok_exporter/Manifest
+++ b/acct-group/grok_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD grok_exporter-0-r1.ebuild 206 BLAKE2B d29ec5e255bed5b0340d6b04b958babb00af7c9c7a6f38d8dfd78b03ad64b255db90831d77fd3403da872fbd7e561811a6822a7206fd8439b52c5122e0558ba0 SHA512 0b88810cf38a67eed2c25204b98ad1aa44908f24fbba19c825aa0fb9db5c72f05ff4a34a15d60b1fc53a87780ecec67bf6d2f235effe70b084df7685d28f3d33
+EBUILD grok_exporter-0-r2.ebuild 206 BLAKE2B 02b64860f5ac142f4ac81f0d8db215f0a660cfda3b3a2958b09e1db6adcd70599e32ac7e079370077f4ff088bbdee67b36d874fe1ef7deee32cd4af85a05faf3 SHA512 4370170c93bc02cfacddaf78c0ec3cb36d6f6db3c02099b5b880f8e4f185701f577b1ceaae3e96b1e62d7c57f262ae80964e73c67b23c88bff4c8985de298e88
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
deleted file mode 100644
index 7667a6a11b48..000000000000
--- a/acct-group/grok_exporter/grok_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/grok_exporter/grok_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ba07953faacc
--- /dev/null
+++ b/acct-group/grok_exporter/grok_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b91a61ad31ca..71ed728e48dc 100644
--- a/acct-group/groonga/Manifest
+++ b/acct-group/groonga/Manifest
@@ -1,2 +1,2 @@
-EBUILD groonga-0-r1.ebuild 195 BLAKE2B 5575fe50b9746b5b253e2cf306cf0678250f44be03f790537f476b5cc53a37ec25c2876602cd7668bc8298992c2f7e76240254b0ccf28340bc3766486f2fa0ac SHA512 55e783b075285724e84bc003a9e74951e14573b8fc3785450458745718d92ed40a390dbdac46fe6b1341d93e66f9fd8bb22e23a9001815bec26da270e20c0c9a
+EBUILD groonga-0-r2.ebuild 195 BLAKE2B dfcc5d147a7f8ce78c9220a6b3e0959e39fc8cd6e131513b1d2d4fc950ccc72b62d14290dc246ea98364889246253137c77dea27094fa6eecc99bc7a09ae19d9 SHA512 c3df9d47232d6ee8372ba422e2b958c931c4c4e2fc6231e36d3745bf41c3a71ee6203bc2f07dd93e8979d897d8a74d279b57db74a51d98e820999f575ce902c9
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
deleted file mode 100644
index f99308dcac3b..000000000000
--- a/acct-group/groonga/groonga-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/groonga/groonga-0-r2.ebuild
new file mode 100644
index 000000000000..c90446fd8c73
--- /dev/null
+++ b/acct-group/groonga/groonga-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 70031d8a2329..bb493d21c05d 100644
--- a/acct-group/gvm/Manifest
+++ b/acct-group/gvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gvm-0-r2.ebuild 214 BLAKE2B e46dfa576dd99d3913fea79fb146aef4cb25a6714558b1d407e570603607b6f1257d2e436eea71f4a1c2b8396a472dce79af50630ac6f81a8720f75190061d14 SHA512 7a96a8a89de8213640897736c0edbf0e253c7d29cb9b8469275d00887d77639718957d9f49bbcfe3439abe29787fdadefe3359490b3063698d2dc982589e37d6
+EBUILD gvm-0-r3.ebuild 214 BLAKE2B 383c4aaa610ea7082ace31412a555549566c3dfb2b86774cd78921b098e863a157446ed626454891112efd9cf9356cdd9e7e0fb6147e256f2a54ea971b3dff4a SHA512 9f4e1baea128948295cb70e63f094962e9f1466c9f760eb538da8e2000ee95cf89ca2e55bfef7a53c2366185461ac97289d735285f442f3f5f5e983dfcf9dd7c
MISC metadata.xml 397 BLAKE2B b1e9b9b22e006817e3d1f223d7ed1196b620d29900dbf44478cb9f4f58f06c1b044ff8dde10e29b4e432b151955135a3e7c95914f477ff97f232939d1fa321e8 SHA512 88f46c3ecc6094a5283d4ed6e820372649bc5a8b37f2913d617e369d613719efb74eecdd2322cf386260b5b98004a28f2cc02c0ea63fc045fdafbf4671232b75
diff --git a/acct-group/gvm/gvm-0-r2.ebuild b/acct-group/gvm/gvm-0-r2.ebuild
deleted file mode 100644
index 281c7f93aae0..000000000000
--- a/acct-group/gvm/gvm-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/gvm/gvm-0-r3.ebuild b/acct-group/gvm/gvm-0-r3.ebuild
new file mode 100644
index 000000000000..ad6c8849d980
--- /dev/null
+++ b/acct-group/gvm/gvm-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8a6a8766f504..5d22fc267c8a 100644
--- a/acct-group/h2o/Manifest
+++ b/acct-group/h2o/Manifest
@@ -1,2 +1,2 @@
-EBUILD h2o-0-r1.ebuild 196 BLAKE2B 52d9e36e7f753b2b85d051878524c7f5c020e039715236621d744ae38dd4c72a83af6be43a92f4e4cd88f7c5c62ce8cef92440bf50418c46c886d2e1e6023ee3 SHA512 d2bbf1cc6fe9fdacbb0904bad12ae6a01cc1ccd910fdf8e2096e92936d8fecbd0bfdae27591389bc02b7cccb3ce1eabd8227df9e5a2dab01302c57d594129d8d
+EBUILD h2o-0-r2.ebuild 196 BLAKE2B d71accbc8c84b203e2b87b99bc77602eac091c6a2dd365ffc8147baf41527b33079e88c0f56421bb1c9b30474c6967fd1d87c87adf5ec8644376ff419d6de7c6 SHA512 5f7869e5869dc3d3d4c6227e3eece1080eb1736e4f70a0f6320bd93344b02813bd159eddf9f1105a0115ab6d93fe589a9ba3c98e5c542d701e0634255561c913
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
deleted file mode 100644
index 49b355695982..000000000000
--- a/acct-group/h2o/h2o-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/h2o/h2o-0-r2.ebuild
new file mode 100644
index 000000000000..c5f171ca640b
--- /dev/null
+++ b/acct-group/h2o/h2o-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 429e380d0bce..bd728f715c16 100644
--- a/acct-group/haclient/Manifest
+++ b/acct-group/haclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD haclient-0-r1.ebuild 205 BLAKE2B 4dbebdd120e1c6f09f46293e95b28c644718778be07d7c269546e59e4c137ba454de91ec5fe25c1b923d6ea09327bd281776d41c49d8f1805e049613a68863de SHA512 90acaf01a823d6d543d7efc9bf43420d09150707b0c81623166aa454b6d1358ff39e694dc6c671ebe95a89e103a0da896b8a3bc370d4cb379323636a8e06da7e
+EBUILD haclient-0-r2.ebuild 205 BLAKE2B 01fe84271fcf43459ed5444e7d43d399fedba77b5735f70b35c369f32a7c2c28e93b93351b08f2939193c4979a4a01381d2ca028ea66f4f9dff450978760c1ba SHA512 cb4968cd9ac8fe87a1160da51759c5c958fd1dc55e8eb025c0987a43876321f50d8fba2e8f6105ea471534e7a8d85d8a0958f01fac0e7b4e72c3d4a8fbf25f0e
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
deleted file mode 100644
index b9d4dd667d26..000000000000
--- a/acct-group/haclient/haclient-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/haclient/haclient-0-r2.ebuild
new file mode 100644
index 000000000000..a195b45010d8
--- /dev/null
+++ b/acct-group/haclient/haclient-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a4b179a2f768..3c10fcdf0a57 100644
--- a/acct-group/haproxy/Manifest
+++ b/acct-group/haproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD haproxy-0-r2.ebuild 151 BLAKE2B 9794a66422ce14e7c18d5a29f91285e3e7e0afa306a6c4b59d1dc5855cf6d5ac4b24dc8b6a6b50eb3523c16149da331bedb1b8a01e7b488c6c262b8e8918b73b SHA512 e5e457bd1862e647461f1d416dbb655d3bb18c0e45d066052b82ce9688e79acb2d46f84819a3fdaae0ab66a51b09b3b85a48ba2725952cd49b4504167e3f7663
+EBUILD haproxy-0-r3.ebuild 151 BLAKE2B a247430861c97d5483e0aff119943b5222bfb66d98e395cd5389ad48f33009891af04589deca61646c5f8ccc5fe19e28b8005c984ebedefd68aa23fed240b829 SHA512 c7c5df48c177ba03d38389d47321cca24823655ace9e972adc239ddf4bc66d65b2a759f15e1beae2b8e2f55e3c26155cee700d2863735575a618f1c9ff34c6cd
MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5
diff --git a/acct-group/haproxy/haproxy-0-r2.ebuild b/acct-group/haproxy/haproxy-0-r2.ebuild
deleted file mode 100644
index 857a2e2f134f..000000000000
--- a/acct-group/haproxy/haproxy-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/haproxy/haproxy-0-r3.ebuild b/acct-group/haproxy/haproxy-0-r3.ebuild
new file mode 100644
index 000000000000..4670a8f5e3b7
--- /dev/null
+++ b/acct-group/haproxy/haproxy-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=188
diff --git a/acct-group/hsqldb/Manifest b/acct-group/hsqldb/Manifest
index 63848e211d70..d8569ca1652f 100644
--- a/acct-group/hsqldb/Manifest
+++ b/acct-group/hsqldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD hsqldb-0-r1.ebuild 182 BLAKE2B 58a6da712b1f9d3c47a6892bd88ccd6c95d922abc1d12b959bf7b223e0a353d97e258167bb27339ec4ebacb241500a547d5088eb326181411a47a9a7b6d76a30 SHA512 68eb1aa8c04abb51544e6f11e70ba24ca32120a674f07dc7572c7317cd4f947e25074e81565f9336025675f16f82b9e82f6895de3eba881aaebc2635b5071ecc
+EBUILD hsqldb-0-r2.ebuild 182 BLAKE2B dda536a6f4ff076130c20c81a71ccc1634c22ee8ca1fe7b30f23f19f1d33abac6ca9f5ccc2995a4ecd6c383f4d96aa6e2078e60f9450b88448cdaf947bfbd743 SHA512 03cb87afa2c8195eeaedfb32bf1b80c43ffc4b4ded02c00e0bccdbe01e45e51f9f8bc85dc79e11de414ec0b47dc54e90680f60e9370e09ca46b8123c96ee88e5
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
deleted file mode 100644
index 4fd2909bb0a0..000000000000
--- a/acct-group/hsqldb/hsqldb-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/hsqldb/hsqldb-0-r2.ebuild
new file mode 100644
index 000000000000..6a36c91930a2
--- /dev/null
+++ b/acct-group/hsqldb/hsqldb-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for hsqldb"
+ACCT_GROUP_ID=217
diff --git a/acct-group/http/Manifest b/acct-group/http/Manifest
index 4b76d2b5e327..8dca4603d7b1 100644
--- a/acct-group/http/Manifest
+++ b/acct-group/http/Manifest
@@ -1,2 +1,2 @@
-EBUILD http-0-r1.ebuild 151 BLAKE2B 85af1588eda33c31dac522cf124591f64cb4d93e899d647fd9016696fc58cbd8a904d1a6dbfcb019252450065b861780ed289d47034e627d79212940d49aef5a SHA512 1420fe82d6b674f164f28913361648a91af0295806d2011cb85e4b9f9e5b91f6bd14b5d80d59ad1189c21825150588e5ad179754c88a03bfb47d614fbf25252b
+EBUILD http-0-r2.ebuild 151 BLAKE2B 8507886919c0785714c363157a7d51dcae958733eeaddd11fb847a51af3a3e82d9ed0ca4b02df289cb886f1a77a0df615c912b342a743a3b5c637cd553b33697 SHA512 5a1d20855ce325f9154d3c157e2153d71e8aae52cb8df434f53fe7a93dbc4d03073d0d8bb6ca8e8ca0d15f9fe2cb44819d6bb3a8879f01bbd3dddf0bfb194a90
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
deleted file mode 100644
index a91ed39f6dc9..000000000000
--- a/acct-group/http/http-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/http/http-0-r2.ebuild
new file mode 100644
index 000000000000..3442955b21b3
--- /dev/null
+++ b/acct-group/http/http-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=297
diff --git a/acct-group/i2c/Manifest b/acct-group/i2c/Manifest
index 6cbc0d228401..bb780ed2190d 100644
--- a/acct-group/i2c/Manifest
+++ b/acct-group/i2c/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2c-0-r1.ebuild 153 BLAKE2B b3fcf77585f369e26364a35e08344eee94bfb64fed2cf8df6e0471329e96bc145605c480968ff6a321c750741ecbe90175d24db2558b8356547b21d3e478af0c SHA512 e7280efe1fd378254181c3aba28337e7eec5fa26bf0f92fe8d3fda2cbee18bc45b727fa566f51b3df582aa0dd88da3d4022979ed5abdd5d268b9e83f79ab3c13
+EBUILD i2c-0-r2.ebuild 153 BLAKE2B d59eda218f72395efa11a27220cd4bdacf6e6cd30da33d506c3068d160012c46dc549b69c20b375edccbd83fd4c1de14ef3b651eab90523290661f42f972777c SHA512 65f90f5acd1029eae856eb20f479fb6987636d6c37c9aa6d4de2356b37280d9a05d34a85cd388825821b0186fc6f690c99014616780aaeb57b252222268fde99
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
deleted file mode 100644
index 2ada0a64d487..000000000000
--- a/acct-group/i2c/i2c-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/i2c/i2c-0-r2.ebuild
new file mode 100644
index 000000000000..d013f8147798
--- /dev/null
+++ b/acct-group/i2c/i2c-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="226"
diff --git a/acct-group/i2p/Manifest b/acct-group/i2p/Manifest
index 1bbc7f34e7bc..01dab2d4e43d 100644
--- a/acct-group/i2p/Manifest
+++ b/acct-group/i2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2p-0-r2.ebuild 199 BLAKE2B ffa2b31b5eb0e4acffdbc9a5fb5a4d4694b61cbddadc482c22079286d3263f9d5512a853d2f6f7d7eeb557c322aeda3a21a625a20459d0c8c6f1fd6c5f9483ad SHA512 f457a29825fbf665de9823adfe772d1df71a5d11118ba2be7add78f6406a13b8522d1de1b25abba58b22d5fa7f14ac794c668181daff6f966ca477f94c7ecea3
+EBUILD i2p-0-r3.ebuild 199 BLAKE2B 05919e164d1559ff9f8bdbfbeb04eda24d5ee21b0d8c05e91dcf5dafce35a166a1de663f6023049294c2ffa80a844f2d61d33688a0152a3fe730a33701f66799 SHA512 6468eac38a774390674547fed315387c40d941fcf89bc6f9f4c1d5d8435dd937ab0460850e31d32cf716250c2b61b3f9bcca455303ce490c5d7e7c9ca284d181
MISC metadata.xml 483 BLAKE2B 6e2651a8813c1dd7ac7feef36431a6e08809d57b66381ded08d142088ee4f71d3fd2fed3e441cca0d87b1c22075acac5576528b84997743ad2b2b05144d66b98 SHA512 354e27f466ce32837109c395204282426ff5ca47f7f5e6c50679add744daf3b6507ed9f6e1e954db4ddebb98b9c9e556d8a0de0f58b9a0882905f83b46f69aef
diff --git a/acct-group/i2p/i2p-0-r2.ebuild b/acct-group/i2p/i2p-0-r2.ebuild
deleted file mode 100644
index 47ed7781c511..000000000000
--- a/acct-group/i2p/i2p-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/i2p/i2p-0-r3.ebuild b/acct-group/i2p/i2p-0-r3.ebuild
new file mode 100644
index 000000000000..b2649e8b803f
--- /dev/null
+++ b/acct-group/i2p/i2p-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c96da7cef9a7..a711398add2a 100644
--- a/acct-group/i2pd/Manifest
+++ b/acct-group/i2pd/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2pd-0-r2.ebuild 211 BLAKE2B 90fc1859b684c66c390689d0c20d5f3cedce243c5c08d6bea0f66afa2796388f0d47dfc25ade30644e44dfb89ea5bbb816534ae22d333d49d1e4b5a5adaeec5e SHA512 78daf64db88c26d3e49d48a638f59085b62a7e984354994396970b5aec45499dca94eb29cf17275769dad7cc9f37c72b74ab8ada37b63caab7fa6b4e5544d93e
+EBUILD i2pd-0-r3.ebuild 211 BLAKE2B 532fb5d012f0dfa1959783a74db92778e04f7f2a0645c7d7c8dd5edb41a9f5f0b1aa82eea72b1dd117fe7c31b06a03d46769c6e3e95df49c9d1e9cf98e141ef1 SHA512 3df8950374b9065ac26432a6160a44bf936ebc9539eb8de349e1493661e97d182dbaf8e7ca2f1bb013f91121d6335b70336da9a8e38f04aafc4c946aa6d13ac6
MISC metadata.xml 399 BLAKE2B 85166ccc3c029d08bd993b4040ba89b287a14fe22bac1a96834686f074766a5545c64e6062766d0fe4162cf21e41772b8fedfac25c0d3f6f23bc38fc6feb1b6b SHA512 5add7dc4ce04ba1d51cc81d277ed0b7d50e16b678847aa00061fb7df1588f7080a911f54904ef36a3577dc199051189400cbcbb76b2c632cbbad72c2b8876da7
diff --git a/acct-group/i2pd/i2pd-0-r2.ebuild b/acct-group/i2pd/i2pd-0-r2.ebuild
deleted file mode 100644
index e823550e39c3..000000000000
--- a/acct-group/i2pd/i2pd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/i2pd/i2pd-0-r3.ebuild b/acct-group/i2pd/i2pd-0-r3.ebuild
new file mode 100644
index 000000000000..059bc29c5ee0
--- /dev/null
+++ b/acct-group/i2pd/i2pd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a393a819edf6..c6b2840ddb39 100644
--- a/acct-group/icecast/Manifest
+++ b/acct-group/icecast/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecast-0-r1.ebuild 197 BLAKE2B bdd254a0b3abc1cdeb059c4258f39936c1fcdf603a6db25e5ebe722ef5578d18a0b2373ab8f2220e7085e5aad7319df643af388a9a6cb69df8ea1fc370585bcd SHA512 cca7413f44b4edb3c21e35802b70764ce9f041a8b9da0c1f41f55c20ae5d0304cdc637d6f69fbae12cf0db23774421d41236d2336e1e715d729c7fef34f0db8f
+EBUILD icecast-0-r2.ebuild 197 BLAKE2B 495b896b255a8e2144838f6becd094fe63405888a1359a5cdc5bed2b21d2b2be565b381fbdb6b90e53acbd98181c74da1c6c8c1063b5c05e7ca789a9213a68f5 SHA512 526c160f42aea33bb6daef4c2d906d39a38b09f2b2dba098223fc90eae3cf53588b8a3adfb0948fda7b291ce8bc8a84628fbdbb4fa683e63c82a5bb125d8bb63
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
deleted file mode 100644
index eb7e463046f7..000000000000
--- a/acct-group/icecast/icecast-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/icecast/icecast-0-r2.ebuild
new file mode 100644
index 000000000000..6e20c4d00aaf
--- /dev/null
+++ b/acct-group/icecast/icecast-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 874e6f3c7872..a7e07ebc6f8f 100644
--- a/acct-group/icecream/Manifest
+++ b/acct-group/icecream/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecream-0-r1.ebuild 199 BLAKE2B f51851dfad002928e2ca4f47b24faac8ebf637644ae5039695ad2cc37a0b2cf0e90879ecb4d01b1472d752ebd611a167ea5cd1c0d5046e6cae6fccb4c34c8a1d SHA512 f2b5afe7b070f8308578d66dcbaf40b2625c7fa784d3b5caf129e447e926bc64780c38db2fa8070a42608e930798acfdc0384e49d725867b4ba7a3c539db1b3e
+EBUILD icecream-0-r2.ebuild 199 BLAKE2B 83a7a6280ed5a12296e1815888301c2d9a89842c4021cd89eced81b5a816175343d2e079d59ce8d082b41df21eda2f9d7c49824a4a5732eec4ffe30d01f9a087 SHA512 c0d5511aa893c2bb747d1e340ede29685b72cc700f77cd1f9c7bc9aee82972dec109e9e6954f1d6f337ac3798db905437bd538ca641393c801e0e260efeea5d1
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
deleted file mode 100644
index 898cf5518a04..000000000000
--- a/acct-group/icecream/icecream-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/icecream/icecream-0-r2.ebuild
new file mode 100644
index 000000000000..4373bfec7e39
--- /dev/null
+++ b/acct-group/icecream/icecream-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d4897443558b..ad87b887724f 100644
--- a/acct-group/ices/Manifest
+++ b/acct-group/ices/Manifest
@@ -1,2 +1,2 @@
-EBUILD ices-0-r1.ebuild 194 BLAKE2B 583048b2cde31b10e63986f787155611e2bfa27b51fd592841b50abe6d71e629a1368d583bfa8f09f83069fa65ca6bd9edaed3739cf996deb68426c1ab769cd9 SHA512 f4ffb69935046d2718c39e2baa3eb9610d02106d7bc21b376c92fe7da8f7be19e5e7ab3f39faa8c157b2df417fae9972b4f1af2ea0bac4e62ee4be5d5a5744de
+EBUILD ices-0-r2.ebuild 194 BLAKE2B 05739da7ca00dadeffcd9f538123676d6844244f3385dbd4c6e85d05d3992659a175e158ff6310dfd6ec553c36272362440fcda0ecdac24a499f5e53e204a187 SHA512 74cdef4f68e7073bf03d675c9ef5e17672473e87de4c687c1107613023b5b01bb2fa9fee5827e7a9c5a55c6f2ca84dd35d358f0e39b65cb40720ac7ade32bc5b
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
deleted file mode 100644
index 59690dd46fd6..000000000000
--- a/acct-group/ices/ices-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/ices/ices-0-r2.ebuild
new file mode 100644
index 000000000000..eff4a325c60c
--- /dev/null
+++ b/acct-group/ices/ices-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7ffbf886e700..ebfbdaaa4d1d 100644
--- a/acct-group/icinga/Manifest
+++ b/acct-group/icinga/Manifest
@@ -1,2 +1,2 @@
-EBUILD icinga-0-r2.ebuild 151 BLAKE2B 69b64c1cea9e3debf5702c90b45135e323d332a4fb68b8070681f75d2cb93932b63d37716b144e4bc46ae2d95b22ca1e97abdf640adaf94c7b2c6d52e0bbfa31 SHA512 60518ea2d7478a3443216bb98549b76d4aad7fd0bad393c02fdbd1d7f9f490fd57e7daf4d177f7e826b0a42dda698b0403450851be7ce0791181629f959ff8ea
+EBUILD icinga-0-r3.ebuild 151 BLAKE2B 8ca0e1dfb40c22e8a7ffc178956cb7f0642c9c453b46a9e8488220317a33e9842c0a643f1d11a25b7fdfb730f989cd79776edfc1722c2d8dabef568aca19acdf SHA512 ae926da11b2ba8771165288895afa0cac8b9684da88567089c01081b0063b12d765b458e7a4f251585ab2e964d83bf9f15f6ac03191d36cbe645231e9f5a1b02
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/icinga/icinga-0-r2.ebuild b/acct-group/icinga/icinga-0-r2.ebuild
deleted file mode 100644
index 9d84d81f4cc4..000000000000
--- a/acct-group/icinga/icinga-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/icinga/icinga-0-r3.ebuild b/acct-group/icinga/icinga-0-r3.ebuild
new file mode 100644
index 000000000000..a9fd8edd36c8
--- /dev/null
+++ b/acct-group/icinga/icinga-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=457
diff --git a/acct-group/icingacmd/Manifest b/acct-group/icingacmd/Manifest
index f799f8e59d92..cde15f289637 100644
--- a/acct-group/icingacmd/Manifest
+++ b/acct-group/icingacmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingacmd-0-r2.ebuild 151 BLAKE2B 334dec4119c14bcdd8511b4b9102ac16074434fa67dc49806ea6970f95b13bac7a863901cca42037931c0c4eba431ae558f9a2465da3877bc27686f9e14e5128 SHA512 0f687530126db975a700e27ee1fe9dd32b2946ac15305b577a9ba4d6ea3b0ef2e8799e93076fda4d30a2d6ef73d8e7cfb65bdcc551006f4606f34e7ae8dddc02
+EBUILD icingacmd-0-r3.ebuild 151 BLAKE2B 44ed33288258ae3d71af35bfdffef8f5c016ddb3de2ee0ad5bfc24a5a40daab791a49138bfe886d512eb2e47838c36ffeac135e08d0d9e5084918b5db648ca84 SHA512 d2d8e58684a46afa5b55c2b95df60998ba41a3f28d6a191e4f96241dbc5ef27fe105c779f7951f83a38e3633c951eac407ab661bd55088c268fbc78bac227bf7
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/icingacmd/icingacmd-0-r2.ebuild b/acct-group/icingacmd/icingacmd-0-r2.ebuild
deleted file mode 100644
index 9ed75a172c3b..000000000000
--- a/acct-group/icingacmd/icingacmd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/icingacmd/icingacmd-0-r3.ebuild b/acct-group/icingacmd/icingacmd-0-r3.ebuild
new file mode 100644
index 000000000000..1ada740de349
--- /dev/null
+++ b/acct-group/icingacmd/icingacmd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=458
diff --git a/acct-group/icingaweb2/Manifest b/acct-group/icingaweb2/Manifest
index 14b09fb1f4e9..4de05108f3f3 100644
--- a/acct-group/icingaweb2/Manifest
+++ b/acct-group/icingaweb2/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingaweb2-0-r2.ebuild 151 BLAKE2B 5781ffd9db20753025129dfb979bfbea5b310dbd255792353d4e38554d67879a21edb1aff7806b5b249a8cea816a4f1c349d423ed83e7965a23958c2d5b9abda SHA512 791b1d20fb313d7013d1ea920663d957a776886f6e401fd50b44b1143c64cb38caadada17ea16992c8463441d384ca7139f696751b71b5c8e9d6e5debb5901e1
+EBUILD icingaweb2-0-r3.ebuild 151 BLAKE2B bf068cf6f94fb76eb172d633b1f49874890e920ffab45f58eb32a6843d890581a301a5017e572ada88fcd811180245a3993a9367301eeef9ef2e1a8d8cc67449 SHA512 99dbb612f21780f0f24b56d2900f534b42593ba45fefb8d74d05faf7395ee03bacc0f17f19762cf4df5b43982a6bb195abdee21f4e74f435f28141e7ef03cb39
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/icingaweb2/icingaweb2-0-r2.ebuild b/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
deleted file mode 100644
index 0f7977916325..000000000000
--- a/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/icingaweb2/icingaweb2-0-r3.ebuild b/acct-group/icingaweb2/icingaweb2-0-r3.ebuild
new file mode 100644
index 000000000000..cfbb93e9cb84
--- /dev/null
+++ b/acct-group/icingaweb2/icingaweb2-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=241
diff --git a/acct-group/influxdb/Manifest b/acct-group/influxdb/Manifest
index f04d71a143ec..d14bf683047c 100644
--- a/acct-group/influxdb/Manifest
+++ b/acct-group/influxdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD influxdb-0-r2.ebuild 151 BLAKE2B 06ae5cff4ed259666f9632c70490a381e2c7388aff99e89d6361db818997225be8ace3cf1388b953d75722ae8653cdb924cf26f8778abd9b438ac2e1bba8b65b SHA512 4b9ae23881c97b040fe26c26dc69c7c8718acab62d2c2484b214563d69858af54d306d47cf14da56f3c2ae67852c1dc999aa0042c715fe24646c21a26ba9b0e8
+EBUILD influxdb-0-r3.ebuild 151 BLAKE2B 07034b468f4a1c14830dcf3bf41b9f6890246f2f5cb209efe59726269345219f455b3c51bf45327003291103fe5cb535cbba24d49969a659dceda463a5216ce5 SHA512 2afef9632b85b62eed5543ea573ef20b8792c538d8a1177d1ec17da341174b8383567f6242a0a7d6689fa9ea8364d37fa559c460c1e06e1833113c03436c6477
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/influxdb/influxdb-0-r2.ebuild b/acct-group/influxdb/influxdb-0-r2.ebuild
deleted file mode 100644
index 035b6cd5fcc9..000000000000
--- a/acct-group/influxdb/influxdb-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/influxdb/influxdb-0-r3.ebuild b/acct-group/influxdb/influxdb-0-r3.ebuild
new file mode 100644
index 000000000000..90c3e31dab3a
--- /dev/null
+++ b/acct-group/influxdb/influxdb-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=342
diff --git a/acct-group/input/Manifest b/acct-group/input/Manifest
index b7ae5b8d09f6..5ee44cebc8ca 100644
--- a/acct-group/input/Manifest
+++ b/acct-group/input/Manifest
@@ -1,2 +1,2 @@
-EBUILD input-0-r2.ebuild 150 BLAKE2B 4e9ec6948ef3a52f850bd7906dcd3d859cc5aeea5422902d19abeedf738faf7ed30079df3b2502a4f73c97950b0968d0bf32e8348eed5b1db91aeac8bb3af037 SHA512 7f76231675f4c3148d2b9b07d80018c9183ad89c74b700452ded0a6e340792637e8b9a1a223b8be48feb593e9fffdc6e4b62eb7048d047de404cdf7b3504964c
+EBUILD input-0-r3.ebuild 150 BLAKE2B f086611a398a01784c404da6d44171a94343574e73d7a1bb50c2422be706db1b4fa5e9d1a658d64d050428af4fd06f2363c25ea24ea932f165a4ee64409aba4a SHA512 a5d0b4354e3b05524f0db748c1f8c3b7f59ce8eee8bff7fa29862c8e0e1a3e2c0620a40755c3b95d36ba3a9f0a01db0fbfd8df6d1aedca380905277d5abaa7b9
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/input/input-0-r2.ebuild b/acct-group/input/input-0-r2.ebuild
deleted file mode 100644
index 966d8ca0658c..000000000000
--- a/acct-group/input/input-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/input/input-0-r3.ebuild b/acct-group/input/input-0-r3.ebuild
new file mode 100644
index 000000000000..c36cb568afc9
--- /dev/null
+++ b/acct-group/input/input-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=97
diff --git a/acct-group/inspircd/Manifest b/acct-group/inspircd/Manifest
index 6922f88d1204..87a23cc87af6 100644
--- a/acct-group/inspircd/Manifest
+++ b/acct-group/inspircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD inspircd-0-r2.ebuild 169 BLAKE2B 2ca06e9f7fc4f023b38596de2095ddda45457664a3da620a3bfc4934f3fc1bc37f3e42cf43614ae3e66b3a80aca681050c788e431b161049e211d31f35f1417b SHA512 89148001a10496e93438eaff2b97730dc8add73b948c53e00a838446a46fb126fb5a82315f6e8df653479a8cb9998a4c568f8d600c4a16ff45275543d69724e6
+EBUILD inspircd-0-r3.ebuild 169 BLAKE2B d686edf5cfd15093504cf278b55c107de526b92e27ca1ca66aa679e86692860afd072e8b060f56605d1e7f7f5322ed358328efcc0ef737cbceb20ffa77824685 SHA512 aff277945b37bbc4eca3ad67729516cc20c438b44a6c892d113e30050f75ad4a59c583fe1525d472de3e073552e54a25ca2df0cd3942f0f57d48045e192fe98c
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/acct-group/inspircd/inspircd-0-r2.ebuild b/acct-group/inspircd/inspircd-0-r2.ebuild
deleted file mode 100644
index 4c056457ee4e..000000000000
--- a/acct-group/inspircd/inspircd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/inspircd/inspircd-0-r3.ebuild b/acct-group/inspircd/inspircd-0-r3.ebuild
new file mode 100644
index 000000000000..726d6425d855
--- /dev/null
+++ b/acct-group/inspircd/inspircd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+# Port 6667 % 500
+ACCT_GROUP_ID=167
diff --git a/acct-group/ipfs/Manifest b/acct-group/ipfs/Manifest
index 3dad770c5c31..5795c8c29aba 100644
--- a/acct-group/ipfs/Manifest
+++ b/acct-group/ipfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipfs-0-r2.ebuild 218 BLAKE2B c0365355132bb0691e2ca2898803e4e0db43a16f04ee569a90c461a1d9ab67212b21b47fece0a757e61cfaea91968f625d87191b23de9ba2fe641150edc354af SHA512 ddb5ff7a7184a53b6535589d0879f832cf28657f7a213da05373f09ce32ddc298b42bfca9990aa85842db9d004d5ea61d0f185f4dacba58d986f63c9e82823c2
+EBUILD ipfs-0-r3.ebuild 218 BLAKE2B d565871a08bf35414022b0d854fd5f02f4c18731d692b0598b380d57ac993b81c2ffdb2ced5f1179ff589bb36e937a91736b86c3418d8ac140ee63ba4ff3fb48 SHA512 236a7c5a9a9a46ace2aa868c7c12ec278d5882cb4d0fdeb4a5e0f568b0e1f16cf91da00739e7705768d99e70ac99f38a5518e0e9c4c70197edc020eee43562f6
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
diff --git a/acct-group/ipfs/ipfs-0-r2.ebuild b/acct-group/ipfs/ipfs-0-r2.ebuild
deleted file mode 100644
index 6328588e24e3..000000000000
--- a/acct-group/ipfs/ipfs-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/ipfs/ipfs-0-r3.ebuild b/acct-group/ipfs/ipfs-0-r3.ebuild
new file mode 100644
index 000000000000..40b308e4e7a7
--- /dev/null
+++ b/acct-group/ipfs/ipfs-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 65147b758827..1eba85f7cb5c 100644
--- a/acct-group/ipsec/Manifest
+++ b/acct-group/ipsec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsec-0-r1.ebuild 199 BLAKE2B 8997c3f4ca2e9fbaf67a66ecff5fa66082c78b55d5f29e864b4264c86c28b77017725d19b2bb54001ff7b5efbcb0efbb63fb4d0f3be5be35a74bda53bfbad903 SHA512 9df048a9d596166acb273a456583ba11db3a68c12e4ef259c345a9da13f32fb917ba1846edf9314be8d895c3e27aba7bbb8661c08f544dca6fcb9de0d0ee8c53
+EBUILD ipsec-0-r2.ebuild 199 BLAKE2B 709e5a1d2b458e3048b44dd9c5746dd292ea03e3d07e0feadb87545bc516cb2c90a9dc3620346da6fe1cfa5fee968be09e3d5f972793d3131f3fe47cc4707c4a SHA512 29336db9412e04179a8a98eb29f2125471533c9a8b11e96df5a2d4d7a3e92a548e4b738bd0b03048e9482a2b14f95089e528dad2f1ab69750b97d25aba82afd0
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
deleted file mode 100644
index 8a31b9f0e9c9..000000000000
--- a/acct-group/ipsec/ipsec-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/ipsec/ipsec-0-r2.ebuild
new file mode 100644
index 000000000000..edf068da7665
--- /dev/null
+++ b/acct-group/ipsec/ipsec-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0d36f0a10714..897f7d1dbb8c 100644
--- a/acct-group/ipsentinel/Manifest
+++ b/acct-group/ipsentinel/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsentinel-0-r1.ebuild 201 BLAKE2B 9dc43f39d9aedadbb07c8adf6227c383966719749e097672477f1ed0c8eb1ea3f542284965a86c98a4ee99deecde1cc71f8e696338d0b2d3881aee8946dcaa34 SHA512 5af293dc4101bfbc3750826af5474b19fb219373e4e773fb63a4b1d58df824a5b36497063dd17e264becfded72e95dbd205cf203c4797a1db477e1cef2e90d98
+EBUILD ipsentinel-0-r2.ebuild 201 BLAKE2B 74fe57460722c4d694b24919debdc409911b99bfe7e924361d51607a0616064df1af209570160dd3c9f0b15eb3efeaebf269329cd4e82c58454555c3dc2b9774 SHA512 2c94f85023697b098e410682589a6b14bdd235a40653a552c4519237855ff7486c7deaf80b712e8ef842cc3395fd4df10e8506bd899eb01f02998d4a10037a1d
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
deleted file mode 100644
index eb3389f4a1e8..000000000000
--- a/acct-group/ipsentinel/ipsentinel-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/ipsentinel/ipsentinel-0-r2.ebuild
new file mode 100644
index 000000000000..14611f8dbd1e
--- /dev/null
+++ b/acct-group/ipsentinel/ipsentinel-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f204a1bcee87..f4fca791265f 100644
--- a/acct-group/iroffer/Manifest
+++ b/acct-group/iroffer/Manifest
@@ -1,2 +1,2 @@
-EBUILD iroffer-0-r1.ebuild 151 BLAKE2B b69bd43b9dee3ccd6a9d2072890778874ed1f7de6e530607cc4e9f22bf29cad8a9e20dbb97e5bb7126ad4d009f5e994b980a7b9fdc019d39cf20991463b4fc96 SHA512 2bdf346c0aa0e90df92eb9d7b3f70e5f2fd2d42c1873b2137a050d8a143de09b6ab2ef83b40092dc384627ed64f2c72c31d13494f1a09e9b6f0f0aa231289e37
+EBUILD iroffer-0-r2.ebuild 151 BLAKE2B 3c15d9d9a112925751000a76d77d8464451820feaebf895164c9e1f9520700cc0b9a9ceb4888dfee553a1a1eefff738aa6276df61cf371fbf5023f098c74dffa SHA512 8c028881bd2d61c9ea5e57da5c26344ae871c42adb57493ed0b82489dcb3252dd37f4d57e39d715857d60f5ac85043a32431e5048bdbe76bceb3f2e99e972eb4
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
deleted file mode 100644
index f25bc31a520d..000000000000
--- a/acct-group/iroffer/iroffer-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/iroffer/iroffer-0-r2.ebuild
new file mode 100644
index 000000000000..07e349e494ec
--- /dev/null
+++ b/acct-group/iroffer/iroffer-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=187
diff --git a/acct-group/jenkins/Manifest b/acct-group/jenkins/Manifest
index 3c31bd7f9f6b..6cedbd137893 100644
--- a/acct-group/jenkins/Manifest
+++ b/acct-group/jenkins/Manifest
@@ -1,2 +1,2 @@
-EBUILD jenkins-0-r1.ebuild 188 BLAKE2B 0ad93ffa4901e5d818c2db0aaea0d2fc68d5ce904b32ae3e6d4fd3e51d428fc8a9a2ec4c11ed52f0d8024195f3c2eecb20a76e97115fa180a44afbde3c23b0a6 SHA512 30c54ef2f55d29590bcfa71de80e0078c8a35e7aab7f9c492e20bfe981e1c724a3650d5ddbe8a1cdbf59338d1a72b8a9f8f33838ce9f141a8a5d24378cd7899a
+EBUILD jenkins-0-r2.ebuild 188 BLAKE2B 622587b7854a5788fd6b5110f74498b2672d0d0d41f3c51645cca86292fefddd7d42c08505abd5b9f9500fe896423975aabf6d5530e1e8943ce9dca637c8ec13 SHA512 f2c0fec4de119ab438c10f016f80624b5c973349fd5b3c3fa06bce62dc838eb3254485b99e8a18d878bd73f24aae5b18f8dede085d063d4445f0cac9a250d2d0
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
deleted file mode 100644
index 887aa8613518..000000000000
--- a/acct-group/jenkins/jenkins-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/jenkins/jenkins-0-r2.ebuild
new file mode 100644
index 000000000000..2bc90921c127
--- /dev/null
+++ b/acct-group/jenkins/jenkins-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Jenkins program group"
+
+ACCT_GROUP_ID=473
diff --git a/acct-group/kafka/Manifest b/acct-group/kafka/Manifest
index fab6938da32a..88b81217d4e7 100644
--- a/acct-group/kafka/Manifest
+++ b/acct-group/kafka/Manifest
@@ -1,2 +1,2 @@
-EBUILD kafka-0-r2.ebuild 151 BLAKE2B c7b78c0eb2d6467bf77fbfb99e35fb3d298d45f9201b356cb1b26cea2849c88a9b6e2938b1cc096bf203330e63888db4d0e4f3d5c1818bbab0e1088dc21dd76f SHA512 ad62320884d89a4a1559ab979fd93750bc840037a223fdc88a413817a52712b9a0e9fd1a1bb625ebffa5d424fca7bc0358418d40a809b00613685f35bad37605
+EBUILD kafka-0-r3.ebuild 151 BLAKE2B cc583c5cae4b75f57037af6fbad167a1313da1f3dd7ba3a4946e6298eb9d991c358bed7ac924bab25779db1c9198c293160cb8753381c88cae7d5aa3a251cd46 SHA512 a4ca6bfe0bac2db1a82c0443d99c2918d831f2afd6665c86b54850acc6613d5afdd190ac0049e09c7c2c66486f9c8162ed8ec0f8ebaebb68f9bd58deaf7e9a27
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kafka/kafka-0-r2.ebuild b/acct-group/kafka/kafka-0-r2.ebuild
deleted file mode 100644
index 738fbb5b48da..000000000000
--- a/acct-group/kafka/kafka-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/kafka/kafka-0-r3.ebuild b/acct-group/kafka/kafka-0-r3.ebuild
new file mode 100644
index 000000000000..9e45cc67dbf5
--- /dev/null
+++ b/acct-group/kafka/kafka-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=425
diff --git a/acct-group/kapacitor/Manifest b/acct-group/kapacitor/Manifest
index fbaf1497f0cb..5c34036f4ae2 100644
--- a/acct-group/kapacitor/Manifest
+++ b/acct-group/kapacitor/Manifest
@@ -1,2 +1,2 @@
-EBUILD kapacitor-0-r2.ebuild 151 BLAKE2B 6703c17509ceaa4297915bbaad96e92ee3da45cf6411d6ec3d78618533dda54274c0a80a882f498e3afe339cb60ba7f1d997bbea0342a7bcc1c1c5e19d67fdf0 SHA512 6217a66d57289992f4f93ae26319f299da48db080858a0986db57279dd98fb26b8bc072b50965ccdc50ad5ffc320bc8a0f3f7516d65028e956bb29e88c27ac85
+EBUILD kapacitor-0-r3.ebuild 151 BLAKE2B 3452dfe4aca3f1f4a5f4f710441539bfddccebe364fa3ce27edc0b36e89e8cd9691c0d0b8f0c8b856718664c6af1fc32f13f644eb9fc3a3801846bb90777c1c6 SHA512 7ba9eb752911942c37c12fdee43991c5c786d70eb8a617eac9dc57c9400a54aa593ab05fbbbc8489a8600cde37b55b11732ecb3c971ced8dfdc4098c176e21cc
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kapacitor/kapacitor-0-r2.ebuild b/acct-group/kapacitor/kapacitor-0-r2.ebuild
deleted file mode 100644
index 3a84f7bcd450..000000000000
--- a/acct-group/kapacitor/kapacitor-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/kapacitor/kapacitor-0-r3.ebuild b/acct-group/kapacitor/kapacitor-0-r3.ebuild
new file mode 100644
index 000000000000..d0003ed7f992
--- /dev/null
+++ b/acct-group/kapacitor/kapacitor-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=343
diff --git a/acct-group/karma/Manifest b/acct-group/karma/Manifest
index 90b722587551..06ef85d507db 100644
--- a/acct-group/karma/Manifest
+++ b/acct-group/karma/Manifest
@@ -1,2 +1,2 @@
-EBUILD karma-0-r1.ebuild 199 BLAKE2B 0630c52a00e93d818ac7433f1e049304cf71dd7c281cd9b24ca4096ab36a0ad7ca4f108ed86df89aa2edd6fb06b97f3aca486c5cb9db4f2638aa86ffc09cf8d6 SHA512 0e564440229d8dcaf556b449fdf61768f200c75b1587e8de30b2904ec0c129a648d945ec723e166b6c4c900bc5c91a1627d4a3941304b727a34e3994f7dde76b
+EBUILD karma-0-r2.ebuild 199 BLAKE2B 82a39759bdea15ecb3d5c5ec073843144332a06053cc878ca1a49e4d834db6e114d9203d904cea7f0a25842cb942f5105b64c9741c3276efdbc1c1ebd5d139a9 SHA512 bf755ad7ccd604ef7fdaef9c47bd51a89da31c15ed2ff282b98cec41c90d05e879fd274772bf3f5480d6881eee3a9f18d0461fcd3337b6b59a178b19cf4077a5
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
deleted file mode 100644
index 68555d5c9381..000000000000
--- a/acct-group/karma/karma-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/karma/karma-0-r2.ebuild
new file mode 100644
index 000000000000..7e4df0eb0bdf
--- /dev/null
+++ b/acct-group/karma/karma-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/karma-bin"
+
+ACCT_GROUP_ID="118"
diff --git a/acct-group/kibana/Manifest b/acct-group/kibana/Manifest
index aa01d7ed62f2..f801b06f5404 100644
--- a/acct-group/kibana/Manifest
+++ b/acct-group/kibana/Manifest
@@ -1,2 +1,2 @@
-EBUILD kibana-0-r2.ebuild 186 BLAKE2B 6d40d1bdfe6b952f13aa713c426b6ebd8951971e20cd14506651155383e6807f50762ed3877d82e096bed96e87d8f9993de5deefe5cdea4c8351a3c79da7cb37 SHA512 1ac7ca9c04070a38bdfaed531c29d610ff53b54b755ec792f2746ee71580f4ecc203925ca6b0ad19221acaeb33a7a8a22db1c320d09e25102c79545516678026
+EBUILD kibana-0-r3.ebuild 186 BLAKE2B 11ad5e601fcfdb56d622ad6e6f7aa0db1cf0d77fc1f3f469edccc20cbeec56bfbd21e888158132061ae52fc09545a4bb007cfe2d9e7cfaeaae9e1c64da0dbb30 SHA512 9b40e14eb377aea30efadaac9e4b8216ce5469dfea253b8f467521ec6845f55625eb9d94322fc5a8f4f23a789ff1b7e8ca2a94cb27e71520fa1c97d7db2f01dc
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-group/kibana/kibana-0-r2.ebuild b/acct-group/kibana/kibana-0-r2.ebuild
deleted file mode 100644
index 61a710122e7e..000000000000
--- a/acct-group/kibana/kibana-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/kibana/kibana-0-r3.ebuild b/acct-group/kibana/kibana-0-r3.ebuild
new file mode 100644
index 000000000000..75f399d6edca
--- /dev/null
+++ b/acct-group/kibana/kibana-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Kibana program group"
+ACCT_GROUP_ID=269
diff --git a/acct-group/kismet/Manifest b/acct-group/kismet/Manifest
index 66746eda475d..39780ef91aff 100644
--- a/acct-group/kismet/Manifest
+++ b/acct-group/kismet/Manifest
@@ -1,2 +1,2 @@
-EBUILD kismet-0-r2.ebuild 187 BLAKE2B cdb5fc2eea34ba7653e4ae7e92f85626286a21d38e6bebe68a6aa99d8119d961bf480e0a10209b25248e51b349658109c90f53c5a9ecec6ad591e3218c8e4748 SHA512 d42fd7ce8d1c72cbca9640b33f31f9856058979d0becfbde4580c2df3ee50b70325c134af237dea022a1e9be3ce978d32c33ca9f9c610e3c3b20d5297708ad4f
+EBUILD kismet-0-r3.ebuild 187 BLAKE2B d38342c1ae8ee4a6633ab0f79d0ed3fd1a84d999da46a49fa3a3f2774ff65922334b380ea357e6285f64b73247022df408ff19f2d147bb0817aef5208afb44f2 SHA512 bf4d508eb339a1b0fd6ee9da8d0bc48699e20d13528b8022b8d5638c0b78459aaacb25eee380311e398bdde4733e8e3e6c2126365503834bd50c1166419efc72
MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
diff --git a/acct-group/kismet/kismet-0-r2.ebuild b/acct-group/kismet/kismet-0-r2.ebuild
deleted file mode 100644
index f06dfe9ab2bc..000000000000
--- a/acct-group/kismet/kismet-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/kismet/kismet-0-r3.ebuild b/acct-group/kismet/kismet-0-r3.ebuild
new file mode 100644
index 000000000000..17bd7e8a9cf3
--- /dev/null
+++ b/acct-group/kismet/kismet-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_GROUP_ID="388"
diff --git a/acct-group/kmem/Manifest b/acct-group/kmem/Manifest
index 834016da1205..2aaa5abf1e1b 100644
--- a/acct-group/kmem/Manifest
+++ b/acct-group/kmem/Manifest
@@ -1,2 +1,2 @@
-EBUILD kmem-0-r2.ebuild 149 BLAKE2B b6936e330f69ce8f03524b53078ca3ddcff200a3d7015e06656b05536655b8ee2235b2280f1670ab5f2228eaebd4382d2698d11326c97bb2f7593a548a8ce416 SHA512 0a248bb3833de7330a8027a84dd949c998b4db0208c82b480b04e31efc4fd87c1ba6eb88035f37a43c3ff40a547b0d0a43363af6b1d0ddcdbfea4083ef675295
+EBUILD kmem-0-r3.ebuild 149 BLAKE2B 3801a2e5c3adf85be49627a869696fec8d8e689eeeed6cc5ea1909a05bd3e209d6c99ad8677edee03342e0abd399bbf5dca0e24cdcd1cf90709bb24d4b002a45 SHA512 9f56586436332a1e1b6d45ba755e0b17a3dcab1db95ad3fe3c552c0118b786cc89548caaa93b448eca60e6febc14abd52fe5bc757b52ef2549b1b70935907a2c
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/kmem/kmem-0-r2.ebuild b/acct-group/kmem/kmem-0-r2.ebuild
deleted file mode 100644
index 68e5fd412c4a..000000000000
--- a/acct-group/kmem/kmem-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/kmem/kmem-0-r3.ebuild b/acct-group/kmem/kmem-0-r3.ebuild
new file mode 100644
index 000000000000..5f002bfa09de
--- /dev/null
+++ b/acct-group/kmem/kmem-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=9
diff --git a/acct-group/knot/Manifest b/acct-group/knot/Manifest
index 45e4c6b72a2a..33484ad2339f 100644
--- a/acct-group/knot/Manifest
+++ b/acct-group/knot/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-0-r2.ebuild 150 BLAKE2B aca2edcac668ff0276a07c04bbb14297aee6ba67eded7592b587b832121bcd88857391b4b48ec988ecd05e8595ff300ab73b234e693a73f85715ec280a2a3115 SHA512 dcc9f9b14aa9ee3dbb05f52b8bb36e021c8d69b476a4ac4fed0a7944ae9bb54d9be4bab81400b8641c869f853c901684eb213a13b008a18c32d6c2bc73a6d1fd
+EBUILD knot-0-r3.ebuild 150 BLAKE2B ea1e2b109ee783e41ef706a4bfe2c09249b2aaefda531f30d926c61df52ccdbc71ea04e03f2ab26bc87ee3a71d74fe79ae03d89b3948ee3b7810f546e27d5186 SHA512 be2f249261b7a2d33cea911b143fc48fdf7439c8758527f14c7078f5f8d4b4143aa19f7c853e74993223b32fcf41e96d8e6816c2e8a34744c7398559de47f020
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
diff --git a/acct-group/knot/knot-0-r2.ebuild b/acct-group/knot/knot-0-r2.ebuild
deleted file mode 100644
index 227d7be2e8aa..000000000000
--- a/acct-group/knot/knot-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/knot/knot-0-r3.ebuild b/acct-group/knot/knot-0-r3.ebuild
new file mode 100644
index 000000000000..4d993124c032
--- /dev/null
+++ b/acct-group/knot/knot-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=53
diff --git a/acct-group/kube-apiserver/Manifest b/acct-group/kube-apiserver/Manifest
index 1bd3399dc006..0bc8015754ad 100644
--- a/acct-group/kube-apiserver/Manifest
+++ b/acct-group/kube-apiserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-apiserver-0-r2.ebuild 151 BLAKE2B c645303908b7ce624702d6d951e3f5f7ec04eda18b00ccab8da270d1b4a57d178f802b2bedfda11d6f0dd03ae47c79fcec2237aa5ffb7132402f0e393710e6d7 SHA512 e4cbf09f45848fe9c27ab4e13d9df89f6303d60def2233863d1a69a58a4ee0bece0b3a07c1b8d25fd28ad63cc60e6fb43af12ba4adcac280638c1a9700e8badf
+EBUILD kube-apiserver-0-r3.ebuild 151 BLAKE2B ae9cd4b636a2dcc6d6fb08c253bcc161348db3310e62f6711ec24699d79b45ec70601ac1819fa43daa8d8c1f97fe7dac82e2859676e33678815f0bb3da1d729d SHA512 0b20f5fd87eac5a824934b1d010c3b8abf42908a3252bcc9c5e37e18e8847451e9681a156227226a240dcc98d5bb2ed2d476e066f680236299b02beb629a1a4b
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
deleted file mode 100644
index e314e709eba1..000000000000
--- a/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-apiserver/kube-apiserver-0-r3.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r3.ebuild
new file mode 100644
index 000000000000..a463c0e4ca1d
--- /dev/null
+++ b/acct-group/kube-apiserver/kube-apiserver-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=432
diff --git a/acct-group/kube-controller-manager/Manifest b/acct-group/kube-controller-manager/Manifest
index 5d5e0a158003..feb0f5661f34 100644
--- a/acct-group/kube-controller-manager/Manifest
+++ b/acct-group/kube-controller-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-controller-manager-0-r2.ebuild 151 BLAKE2B 07cf3c0bb529655b751a69f70b6ad149384cae557c2ebd8f6078500c60228d8f454fa6e239b17a1ee0c5abf27e3014135f337df9500208735f6fa04c8a94f69e SHA512 d219fb3ecb34c0deba2d5b6bd9a6e6528ab45efd9a84e18bd7fb2232c44cf1d39c1b24a99cf754f024653bf4a4e6ad0cf42e8849c11e3bc175db875c799fa805
+EBUILD kube-controller-manager-0-r3.ebuild 151 BLAKE2B ad5587dac564072f4de54a94eccc18bfec029e60c26b577cb1e8e113adda145bee4754c1c45263c6c5fb52e3c27d4dead4d7d8cad1298332f502003f13791933 SHA512 6d5d2e82ac1b5c3c94d872a40ec9555f5c9c4b11b19310061eb341256b6bc63ae40fd7008b70145ee7dd5d67ea3c51eda366a92b14541d2d1fed94c3d337cefc
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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
deleted file mode 100644
index 763c1ac5a255..000000000000
--- a/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-controller-manager/kube-controller-manager-0-r3.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r3.ebuild
new file mode 100644
index 000000000000..c77d290da863
--- /dev/null
+++ b/acct-group/kube-controller-manager/kube-controller-manager-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=433
diff --git a/acct-group/kube-scheduler/Manifest b/acct-group/kube-scheduler/Manifest
index 9b10fc81db7d..83b9a95fe30a 100644
--- a/acct-group/kube-scheduler/Manifest
+++ b/acct-group/kube-scheduler/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-scheduler-0-r2.ebuild 151 BLAKE2B 6921f8b1a381cdf52728a204654498d5943a6d332c029813734826607f4aaabdb127dccb519e263ac6decb8efde23ade08a9c618b1d8a10825d0b3a714898bcc SHA512 59668584db75f4d45ae08f47280bdc87ee923d5e07d79c5a674e6982e4a1ae8fcbe71ecff5df30d62faff7fbddffa3fd0819388f16d1d9b8b9db63b74660c1bc
+EBUILD kube-scheduler-0-r3.ebuild 151 BLAKE2B 4966261b6323452a5f060766eb50a38037965b1da6f61994cdb080f7385955937eec4b90894e83b370e3571332ba7db8bc423422b010743847352f732d106421 SHA512 a32272c86717239ec8363a6e75c574d1b91f9114620705bf5c4dccbd82856d8c3d473b1d16c075fd1071574280dd6946066a39d4bf7b4681debfdd2806ffd2b8
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
deleted file mode 100644
index 9b3c883ca810..000000000000
--- a/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/kube-scheduler/kube-scheduler-0-r3.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r3.ebuild
new file mode 100644
index 000000000000..ea4f92b812ac
--- /dev/null
+++ b/acct-group/kube-scheduler/kube-scheduler-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=434
diff --git a/acct-group/kvm/Manifest b/acct-group/kvm/Manifest
index 69f2d0ff8dfd..3d7b88298dad 100644
--- a/acct-group/kvm/Manifest
+++ b/acct-group/kvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD kvm-0-r2.ebuild 150 BLAKE2B d48ebefb710fe5399f19a92eb43b7e6d4b04cfd5596d7f73a47c48b3586c9f69b3caead82e1a1cb8275fbcbd39a8e4ee3c5b425af2e94ea2d503ff4c53978086 SHA512 13313a08d175747ef836f23447be46923cab07aa463d0dced4905df5ad6481fb456605bca8539a55bd98cbf6376284a9ae4b5e7f3ea0e28952382b6ab850a68d
+EBUILD kvm-0-r3.ebuild 150 BLAKE2B 24ea6e3ee254f897692065f1a8d1ce8c4687cbed00b391c762158bf1ff60655e6ee58e695fa145ba61dbbac546c402082eac34900ef4753853e75175c51fccef SHA512 39155686a19df695d6a5417a627507bca70416585bd398ef76d03ece9e67d6e3d44185c23e2153a8e5cb533b25812627a0930e6a831a20a476bf03a5560b680a
MISC metadata.xml 307 BLAKE2B f3bc564fda062e522caef7e6ffbb50e253b7a17f2ab2f24e7df84cb805bee9d454e3b4bc946c5764464219161ad057177ac7c8911cf3056291b06770d2b1b1df SHA512 fb2e553cd8a6663edc6cfb17d2a41193f970b89efaf93e2f2516b9ca778e8a9426126c4f22cef7535ebc2d99912507e3906fce0170859005ab2e1590632534bc
diff --git a/acct-group/kvm/kvm-0-r2.ebuild b/acct-group/kvm/kvm-0-r2.ebuild
deleted file mode 100644
index 125d57ad0b93..000000000000
--- a/acct-group/kvm/kvm-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/kvm/kvm-0-r3.ebuild b/acct-group/kvm/kvm-0-r3.ebuild
new file mode 100644
index 000000000000..d73a52a713ec
--- /dev/null
+++ b/acct-group/kvm/kvm-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=78
diff --git a/acct-group/ldap/Manifest b/acct-group/ldap/Manifest
index 592f3b55b2a7..d2ae0a18b645 100644
--- a/acct-group/ldap/Manifest
+++ b/acct-group/ldap/Manifest
@@ -1,2 +1,2 @@
-EBUILD ldap-0-r1.ebuild 151 BLAKE2B aea14a17cefa4e53d6e4cb8bafcba364276d16b5e1af9c646ad160b97192b5cd9c0c1134ab73d32458e5ad2197f837b5149bdf4f3ad2d87a46fff5d8aa6a7b64 SHA512 ed611b86cd45dc9fff99470d76c094ddee8f58bbac831334f0be60cc41b376942d1e533ac223a81c14bdb67ebc50eeed756be246270045a0e040f9b826974f40
+EBUILD ldap-0-r2.ebuild 151 BLAKE2B ad35cff5c9c1ca8e5a019436d7ad308f54f9b2718a4d7a64320e234fc37ccdeb076f02423db0d439d719e62d18068f505c9a1bc54179d697b6b2cb56d0559ea3 SHA512 a17a898f1f71f54bde6652a39a9c113f2262b838bae8aa55bdeff7e4ddfa166c0f14b64d8b97abe3f5d24f2ab243b1946a16d97b79cd6ef5314a117c8ae3d9b6
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
deleted file mode 100644
index f90c3a827f8c..000000000000
--- a/acct-group/ldap/ldap-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/ldap/ldap-0-r2.ebuild
new file mode 100644
index 000000000000..d5677d8b4469
--- /dev/null
+++ b/acct-group/ldap/ldap-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=439
diff --git a/acct-group/libvirt/Manifest b/acct-group/libvirt/Manifest
index 5ad0c88a9b00..5113275a712c 100644
--- a/acct-group/libvirt/Manifest
+++ b/acct-group/libvirt/Manifest
@@ -1,2 +1,2 @@
-EBUILD libvirt-0-r2.ebuild 150 BLAKE2B 1a7eb33c8ce00043293606375b151ac4532ed77c4b3f65861988aab3428215534d9b29b0dca7a7a66befb49a0cf54b7270c0b9be00a3f17e906012ea0cfe0f14 SHA512 f04cb2ad8ccd72f12701e21a2ef13d8929454748004d78c4e629e136e2bb19a12617d077052e10b804abae29a03e09232f827e690983f15d221614c62a28f198
+EBUILD libvirt-0-r3.ebuild 150 BLAKE2B 9b65095df3e4ffa89b1b12afc77a9fef6d9326c88831019157054dc7bd2d56392946fbd2723848f6e0f89d3d1f63536f74edc1ac5068c67a645b580d1c03f485 SHA512 4ba033c48a961202c00d85adb8ba7d70db18d099fbf6e3d354cbd074849e3e494bdcc8b4eb901691009c6420e0b36435fba0ceb2e8110824c82cc9ee6e8a9067
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
diff --git a/acct-group/libvirt/libvirt-0-r2.ebuild b/acct-group/libvirt/libvirt-0-r2.ebuild
deleted file mode 100644
index b3143725a005..000000000000
--- a/acct-group/libvirt/libvirt-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/libvirt/libvirt-0-r3.ebuild b/acct-group/libvirt/libvirt-0-r3.ebuild
new file mode 100644
index 000000000000..444fa1ba0155
--- /dev/null
+++ b/acct-group/libvirt/libvirt-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=79
diff --git a/acct-group/lighttpd/Manifest b/acct-group/lighttpd/Manifest
index 991f8fd1c067..33003ff9d51a 100644
--- a/acct-group/lighttpd/Manifest
+++ b/acct-group/lighttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lighttpd-0-r2.ebuild 151 BLAKE2B 21d96c00156009f30a422ea3789c547269dd62e7b16f2254416861e7dd4a2ad7e027c174c7e70562ba166c24c9d919f2b276d4f1c2a6ad8c4a511e41ca24cac2 SHA512 8ee6a94ec9452d7cdd217d2840df15305001e2493a2fe0254c31192bd9de02e57b0c54734d1007edb9583e9126c668340f29bf9b5c0845e2899153aafa9b0ec1
+EBUILD lighttpd-0-r3.ebuild 151 BLAKE2B 4652095a98948d1c6e177bc9cff8fe646d58d62da01cdd2e17a1b50d9a53c8cb9b10a0e870ae2e094cec0dfbd7c920e49b03b650905436382e93e20f9b43240a SHA512 4f304fec16b4a3b778e9a8ea39cc244823b3e396b34429780c95094a95714022d746e1605b05f69c3fc3f7c37ad2fae484dd88c78ff71823aba61e4c3ebedd64
MISC metadata.xml 369 BLAKE2B 6cc19ae6c320ce326a51aa83486490be1cfd4219c79b926da9afa9cddc28d1cd793abd7ad6a334b482a1cffde812ebc44ea869c7ae024c2365a5bb55448fd890 SHA512 db84772cf1584b166aa81c3238a8bb312ab781f9c8285df37d5a7fb9e84af602b9ea9075d582bd1b350610f8502d6d03e4c91f5378d61924c2350591f632e65b
diff --git a/acct-group/lighttpd/lighttpd-0-r2.ebuild b/acct-group/lighttpd/lighttpd-0-r2.ebuild
deleted file mode 100644
index 044328ed7179..000000000000
--- a/acct-group/lighttpd/lighttpd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/lighttpd/lighttpd-0-r3.ebuild b/acct-group/lighttpd/lighttpd-0-r3.ebuild
new file mode 100644
index 000000000000..2e713731cdbf
--- /dev/null
+++ b/acct-group/lighttpd/lighttpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=302
diff --git a/acct-group/lldpd/Manifest b/acct-group/lldpd/Manifest
index 6cd39b9e4376..cf18ffd9e49a 100644
--- a/acct-group/lldpd/Manifest
+++ b/acct-group/lldpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lldpd-0-r2.ebuild 151 BLAKE2B 8f3e7b54d70a088fd59162f2ff8809ca9112a94739f63bb2dd8e103142362b5d30bdb99df6390252df64f036acf8d30e37418801d1770b6e78678b7504dd6337 SHA512 95ca51deb35a85b25e19eefd43788ff5d63da60d8894278ebac20f184a09a3140d1b85b5f31c8e1e2345ecda2b9516a724c6110bf80b4ec87df75987e65b5bd8
+EBUILD lldpd-0-r3.ebuild 151 BLAKE2B 3db37cba6a92bc340fad3fc097f0b280e2ae01c8d571d311edb89014d9ba6c2148f3a85949fb64cade8f3fa7cf581cc78b4ec6aa728ef6a0086dc0e1a655566c SHA512 1b018c830176ea5cffc69a38426e1139c32c004f9cf8e74e7e8d0bb793d8adfd16966c9fa8b9c3ac7f95d1d55ed227c2ef437e19e930cd097e071ce1ec9c38fc
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/lldpd/lldpd-0-r2.ebuild b/acct-group/lldpd/lldpd-0-r2.ebuild
deleted file mode 100644
index de42bfe44bdf..000000000000
--- a/acct-group/lldpd/lldpd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/lldpd/lldpd-0-r3.ebuild b/acct-group/lldpd/lldpd-0-r3.ebuild
new file mode 100644
index 000000000000..4431d6585f39
--- /dev/null
+++ b/acct-group/lldpd/lldpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=315
diff --git a/acct-group/locate/Manifest b/acct-group/locate/Manifest
index de60d7510fad..edd8590c5642 100644
--- a/acct-group/locate/Manifest
+++ b/acct-group/locate/Manifest
@@ -1,2 +1,2 @@
-EBUILD locate-0-r2.ebuild 151 BLAKE2B fb31ec9d6d3ca45b60d78f62fc082a3ac21fdffd9bd86e5091997b27b5b0fe34eb8c7def342a26fb616bc935770a6ca9c4d0d1aca3ac6182111258c1c48fa510 SHA512 86e34031fe500aa5a14070353db4067fc104ee55e75dd1d09311657c66b640b82739919e9bc7939aca55d71bd06e3543e7cba2f65c6d6fc88d0f2b478a48e859
+EBUILD locate-0-r3.ebuild 151 BLAKE2B c5cb45d7563c8d1201bccf1022caa11682f76dbac5a23dce6d113c157fe18205db72ba7f1a5fd7e601ec3b39fc3bb3c637e38839e30828f4311ac857fe32a6f9 SHA512 f2184077cdbba3fae6cd306164f82e231f30859c0b62b57ca1b018432fd5ee1a42e5985ea53a05887d07d957a9da4a1409f8102babd2141217611a8a09181ec5
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/locate/locate-0-r2.ebuild b/acct-group/locate/locate-0-r2.ebuild
deleted file mode 100644
index 6cd73ba39ad5..000000000000
--- a/acct-group/locate/locate-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/locate/locate-0-r3.ebuild b/acct-group/locate/locate-0-r3.ebuild
new file mode 100644
index 000000000000..791bc456ed84
--- /dev/null
+++ b/acct-group/locate/locate-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=245
diff --git a/acct-group/logcheck/Manifest b/acct-group/logcheck/Manifest
index b80f901e1928..76dbf48ec94e 100644
--- a/acct-group/logcheck/Manifest
+++ b/acct-group/logcheck/Manifest
@@ -1,2 +1,2 @@
-EBUILD logcheck-0-r1.ebuild 197 BLAKE2B 8a1eb76ad9c5af3d6812c28af6fb532bd2d1f7f010dce2eeabda940168231a9407360c29da9568cc8715393b014d0f1a7e5ab67c57d960b28713770c310720ee SHA512 d991e52132560f6f0a91b6ec08026b803df0ef66568af9e4fe94fbe248c048607859bb3bebc3a62a6be618cd031c85d70194d284dcd3e8a4f64fbc0977fcd564
+EBUILD logcheck-0-r2.ebuild 197 BLAKE2B 39d526c2ed4956649bc965c5f99bce67c6e91365a29283240a94fd73ef07eb9c3cf3a97cf87094d5b969dd5642e6703109732831836f8437e0b50dc0884f30c7 SHA512 2a47c343508f2c55c0ce84662396627745c362ba5c94b4430f64b2e2557cd877a20aafd1e3809fbc1c3b29d75989e8dda3dce7db7764ec9e35f69a38158ad23f
MISC metadata.xml 400 BLAKE2B 79ef577f4ab4c217efa68d9a554dfde7546a8eb61fbf7a6e5b02ade8d7d1e1d120b005dc5b706bf3e8f4bc7b11d0a47d5ef8b3e598e552c02e227018f9bdff63 SHA512 b38c776402dd6e969a1340a883dd7f776e2c27262421e8186714d7fb05ba059d04d73b08e44bf8517299c65770196585cc74c9eceeda9c27ff5ab9c60d15e44b
diff --git a/acct-group/logcheck/logcheck-0-r1.ebuild b/acct-group/logcheck/logcheck-0-r1.ebuild
deleted file mode 100644
index 8bba51bbeaf3..000000000000
--- a/acct-group/logcheck/logcheck-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/logcheck/logcheck-0-r2.ebuild
new file mode 100644
index 000000000000..93c098e69c52
--- /dev/null
+++ b/acct-group/logcheck/logcheck-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d6b02bfdacc7..dded59f5f1e1 100644
--- a/acct-group/logstash/Manifest
+++ b/acct-group/logstash/Manifest
@@ -1,2 +1,2 @@
-EBUILD logstash-0-r2.ebuild 188 BLAKE2B ba3b2e68d00348f9fa7d7bc7115b49a0a9f4e8ec137cd2b1120d75e434823926ec2ec517630e13752efa844543d40591ee2c3760e36a83102d6ddf3ce2ac8a52 SHA512 d16199ca20a79f9387ac6b1f19703f515e523bb1e92be7727820d11bbafee52855591aecb5f2d107358c158d1d8827b635d7312455888765251bcf26a9882d4a
+EBUILD logstash-0-r3.ebuild 188 BLAKE2B 3697fc657ce3dd4fb3bf74437e73265bf6a45d7af7bafcd8f5dbd369b2b25875e8a19e8e43775eafe41314b56e54fdb49925449455ce8faee845847331ae0ad3 SHA512 a09c699dca6a5e1ae37fed87310d2155e17fac2d80a0329a55c8cc90ce101d835a6f61cc2238a96e83a99460d5e5d81e4133ac0b99dbb9024a253344549d6e78
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-group/logstash/logstash-0-r2.ebuild b/acct-group/logstash/logstash-0-r2.ebuild
deleted file mode 100644
index 42641f69f967..000000000000
--- a/acct-group/logstash/logstash-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/logstash/logstash-0-r3.ebuild b/acct-group/logstash/logstash-0-r3.ebuild
new file mode 100644
index 000000000000..a2cdfb0a44db
--- /dev/null
+++ b/acct-group/logstash/logstash-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Logstash program group"
+ACCT_GROUP_ID=270
diff --git a/acct-group/logsurfer/Manifest b/acct-group/logsurfer/Manifest
index 30787c484df0..789bfd8cf0fd 100644
--- a/acct-group/logsurfer/Manifest
+++ b/acct-group/logsurfer/Manifest
@@ -1,2 +1,2 @@
-EBUILD logsurfer-0-r1.ebuild 198 BLAKE2B b1d5f3073b7657e25a1eb51c220e2557287863bfea35633d67806202293d6976023953ed4b9b52153c5e237a0f70e092fcb4ea3cde69e20017ecd7320b193494 SHA512 a1756d206d0a2ce227a2de856a52a2d64c7e6241ee320ddde28cebb57dc097c44574451ee7ba8a0c4c90483503e76e0e24aa010d3ed96e40fae7b711a07b97ed
+EBUILD logsurfer-0-r2.ebuild 198 BLAKE2B 4ae63f4b786746fbe0d57041066b465f77f86be1a02949b9c5b7ac63b27a365c88ae0b8dd6358902a9b88518a2df599bdebf03e0091809e346753caaabd9df88 SHA512 dc95899371f2e821e7a12ef03eb5a809722ee6f6341dcd11f64b0dd3211f821600efded7bbae62323afb63c9be22b3ef252324c62de3576e9b188371906b857b
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
deleted file mode 100644
index 3d292f5966bc..000000000000
--- a/acct-group/logsurfer/logsurfer-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/logsurfer/logsurfer-0-r2.ebuild
new file mode 100644
index 000000000000..5b5d9d3d6494
--- /dev/null
+++ b/acct-group/logsurfer/logsurfer-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0d44343eb412..9ac4c7281086 100644
--- a/acct-group/lp/Manifest
+++ b/acct-group/lp/Manifest
@@ -1,2 +1,2 @@
-EBUILD lp-0-r2.ebuild 149 BLAKE2B df4f8d76b5227d5c88d4eaef450b47768e68165c685706eb790ae5055b714594e0ba0532785f162a594f81d119385eaee989ddcdb443f462070bbc271066330a SHA512 7afd7905ae4e94b262188a6609a7cfa7cc925f4035342b27be32aad874e2fbe63684948540c0accca5edeb7a9b0936ac4d764378009f2e2f3735f5c437b5e179
+EBUILD lp-0-r3.ebuild 149 BLAKE2B dbcda9cb34f0ca6571f66f760202cb3987534f2942eaffb159e6eec23267627ae038ecf58f9c13007441048d3fbcc3dc913472b2d37e7f6e4e8349c0d8123747 SHA512 178e5b1f85dcad9c6344954910f70f386cc3315162318567b90552d527932e67d0cc562480f25e127ba0f7a8c7c6e01d08d161ced7cd0f77413509eb9c2549e3
MISC metadata.xml 301 BLAKE2B 86ad0bddef68521045ebb915b0ba368f84a75abbb241412b62599c2ee8c31697e6a7a01dd432c1b8e233aaeabd3db7593e861c5616256a3f9961b986b8e1da3b SHA512 c021de9a8b6fb3d4e8a5e3d1c17ec4af1864f421df07cfc431e147ed1fb4bc00f2428e988220c162a6732747086ab884b43a9e390bb8e6314563a48e1e2095a4
diff --git a/acct-group/lp/lp-0-r2.ebuild b/acct-group/lp/lp-0-r2.ebuild
deleted file mode 100644
index 618f81be25b3..000000000000
--- a/acct-group/lp/lp-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/lp/lp-0-r3.ebuild b/acct-group/lp/lp-0-r3.ebuild
new file mode 100644
index 000000000000..1c71c87752be
--- /dev/null
+++ b/acct-group/lp/lp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=7
diff --git a/acct-group/lpadmin/Manifest b/acct-group/lpadmin/Manifest
index 2b6b91429b43..bf7869099c9e 100644
--- a/acct-group/lpadmin/Manifest
+++ b/acct-group/lpadmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD lpadmin-0-r2.ebuild 151 BLAKE2B 6d604eaaa87590f194aa99c4d9623aca1a871f1f7248dd6a1e4430d3fe819099fe2f748b8ca1dd2f89b7f4f2a8aa89b8673eeecf8bbaffbb9bb8d99fd84d326d SHA512 57aba1a7ff4a32e174e5f9984c47f0af8dc14ac533ae085ef2f2af046065e53b7acf1db93cc00eada438ea238921dd8c3c69c9cddfa8c9ef9f993acd80db1fdf
+EBUILD lpadmin-0-r3.ebuild 151 BLAKE2B 2663b1a417ca2102809b6ebc77ff4c7d093ac655623e8906f67a4138207db38127565b5a432c385fa66f9bf6284c84a55e7cd482b0817b4dff39f99aa7969a43 SHA512 0f9c0254b4386df9e9c7e631be8e1d230302138331b8426ac31b02dde67c9e02cbbe2691e8041b38ed69552f22ca196095d71bc8e298e8d0f0fec7d0a0d14c31
MISC metadata.xml 221 BLAKE2B ce23f4ebf10e1e55aa36ba3cb894fd1b38220b6e75aca1d9261563a503cd86ab04c537d6c0740b62865566c76a1cb201e07e9f717a6e53ec899b0bd6827c8624 SHA512 6b27a3121ee6f6cd4e7dc0e1880b6b9b51171196d9739663ecc56d1d8e73ef3d81cda09cab6bcccc2ff3ea98e260a3f9e9c5091b3df20fd08e2b443ec435777b
diff --git a/acct-group/lpadmin/lpadmin-0-r2.ebuild b/acct-group/lpadmin/lpadmin-0-r2.ebuild
deleted file mode 100644
index 4ef70c955560..000000000000
--- a/acct-group/lpadmin/lpadmin-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/lpadmin/lpadmin-0-r3.ebuild b/acct-group/lpadmin/lpadmin-0-r3.ebuild
new file mode 100644
index 000000000000..25e40d2f0da3
--- /dev/null
+++ b/acct-group/lpadmin/lpadmin-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=106
diff --git a/acct-group/lxc/Manifest b/acct-group/lxc/Manifest
index a49d8d3215b5..23d3022f401f 100644
--- a/acct-group/lxc/Manifest
+++ b/acct-group/lxc/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxc-0-r1.ebuild 194 BLAKE2B 53801e58b9978c28f7a6a77f216a69ee213e868654817af9417818f58d25d7e25039f033ac25da38f2c8f20fae2d03c4fc8b8558bb987592a7107850ca99e22c SHA512 0cf6c779f84ca3c75eb58ca0796780d382c6529b1efda4764b6ac300938cc70a35dd26e5b39dd274f043d7015ca20a2085944e81ae9416497e12ef30427fc440
+EBUILD lxc-0-r2.ebuild 194 BLAKE2B 0455670c8d637db44e91fecae01ae1d3997887ac644ced658117cc669ee872949886bd1934d5e47b862efdc1b5589ede957632a7b09152faf9fd2abe71af1743 SHA512 8f90f06e072fbf48852a894f5e7d44867ac23b44067a82b620bd5b1346705d3c228922072cbecca97e3428690569a14ab22af884a4862331c6415fb27adf912e
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
deleted file mode 100644
index 32280b0d00db..000000000000
--- a/acct-group/lxc/lxc-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/lxc/lxc-0-r2.ebuild
new file mode 100644
index 000000000000..c2f7cd728e64
--- /dev/null
+++ b/acct-group/lxc/lxc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ae7fd2772524..0bfddbae671e 100644
--- a/acct-group/lxd/Manifest
+++ b/acct-group/lxd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxd-0-r2.ebuild 194 BLAKE2B db30fe63418abe7de473b04c27eb3565d41bb90ca1a3855cae27599f38eac6cf92bcea9f41eaaf7e97c03336fc788ee41fd4fc9eb06e096ce73aaeb06c6e9a8f SHA512 bbd72ab733c06d46428bd416ef6b264f5cc29594783322a202b2f8ae86c2a1f8ee6c22c7e42e3317844f0f184b0d1ee0af8b8e68256bf2679fdf8e6a6428c361
+EBUILD lxd-0-r3.ebuild 194 BLAKE2B 93776a9ed8d7be83d20c3adfd78cda0c5f20aa007fb523bdbbc7f5b26b3dd3c7055f367cfea6735a168d0072eabd6a49b889361e48e0bc719b8c073563ffe265 SHA512 39712fee5f508ef66b86e9a7cff3ec5cd1f8893a58774724f460471794dc5aabf5b81a9e3a5276647f9484e745b65aea5f4a7b9396d4e32524c4ba0d1848ccf3
MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
diff --git a/acct-group/lxd/lxd-0-r2.ebuild b/acct-group/lxd/lxd-0-r2.ebuild
deleted file mode 100644
index 3d00c2969023..000000000000
--- a/acct-group/lxd/lxd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/lxd/lxd-0-r3.ebuild b/acct-group/lxd/lxd-0-r3.ebuild
new file mode 100644
index 000000000000..0a7b074ee124
--- /dev/null
+++ b/acct-group/lxd/lxd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1d936bec8eaf..c97e0454d11e 100644
--- a/acct-group/mail/Manifest
+++ b/acct-group/mail/Manifest
@@ -1,2 +1,2 @@
-EBUILD mail-0-r2.ebuild 183 BLAKE2B e51079d08de4ac6adaf06be287a0953b2274a3fc8c1f27fd08704ce19837460b654cba28f8b31718e53cc8614ea174a5fa0692572beb9ac058dc15abd1a5e458 SHA512 6122e77360ba2acd55305584cd8c18aadac02fac40304773f07eb60cad166c2cb2945562f6ce9da41b1141340c838838637ba75b133cfb69b2a36d7fdb0b8f70
+EBUILD mail-0-r3.ebuild 183 BLAKE2B 10d2130761e947d6f534421694f0d472c2172d6ec521494c989210f6ea6a653e9208885c262a8bd2d83a7a820b664490979d2f27b39364c5fb7c8d3a3ba6d838 SHA512 5c52b580f347dbc45898a998d10ada1b09a83c66582d246d62effe774a7b411200152f03678db03e58130fc4dff4206fd7fa8c572acf687baed11be4b480a0b9
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/mail/mail-0-r2.ebuild b/acct-group/mail/mail-0-r2.ebuild
deleted file mode 100644
index 4d07cc2e2645..000000000000
--- a/acct-group/mail/mail-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/mail/mail-0-r3.ebuild b/acct-group/mail/mail-0-r3.ebuild
new file mode 100644
index 000000000000..10aa566c31d3
--- /dev/null
+++ b/acct-group/mail/mail-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Mail program group"
+ACCT_GROUP_ID=12
diff --git a/acct-group/man/Manifest b/acct-group/man/Manifest
index b55ec6c42dfd..ed75ffe0d252 100644
--- a/acct-group/man/Manifest
+++ b/acct-group/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-0-r2.ebuild 150 BLAKE2B 59695b071eae00e45b00f760262a4ca77d39f4fafd30b256ac42bd5ac1343994197f79165f4666d63673c5c8011257af600882461a541c371871102442ab6393 SHA512 b82a485a15f31c3c153965353be3ba96fc8cbd0271f35e03f3c983abfb22ea14735d05383b687087ac10dbe9ef7327e9dc1d962b254ad8938d575445b9a07d00
+EBUILD man-0-r3.ebuild 150 BLAKE2B 562e842e7942e9926f4c92692cac84316e03cf47b4996ea23bc9a9b7292503f64442e9d4a6cfb3790869315f03c5c42618822ae8efa8fa464d2f211053043a6a SHA512 0edd4a6fc0111a79f2a7a93b4b1e6c64bd74c26252f59bb0fa82a8b1a0aa9a3dfe2955cb193c36642d0d37d192ec313f3f3cb33ad4a354ebfc1b7f86d1c971e8
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/man/man-0-r2.ebuild b/acct-group/man/man-0-r2.ebuild
deleted file mode 100644
index c14861bca27c..000000000000
--- a/acct-group/man/man-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/man/man-0-r3.ebuild b/acct-group/man/man-0-r3.ebuild
new file mode 100644
index 000000000000..a30608f304f4
--- /dev/null
+++ b/acct-group/man/man-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=15
diff --git a/acct-group/maradns/Manifest b/acct-group/maradns/Manifest
index e5d30ecd9eb7..d8d076ec5355 100644
--- a/acct-group/maradns/Manifest
+++ b/acct-group/maradns/Manifest
@@ -1,2 +1,2 @@
-EBUILD maradns-0-r2.ebuild 150 BLAKE2B 4336395513c43f8b64e6204c4a14dbef97b61014afe427e53a44a910865ab32ae046779dc8a4f08bb41776d0949a3d89c8bc3e1b56317af29dc7f6d60122f414 SHA512 9f51565fbcf1a36fe9ea3bd0cc13101a8b737c4031ed03d04f1f19ba48d6085c18468284a552b176b1ad23ebd583f4ad996dd28598839b3aa33ba8c0f98b1139
+EBUILD maradns-0-r3.ebuild 150 BLAKE2B aa18bdab4ee19f5d741912619978db9feb74a4dbed39c48660895a81cd26135c36a457f7b2380c408b144f119fcd0db0b42afc7ed0597cc61fa393a81a448e91 SHA512 b7669c2fa8c00e312914cf3227a3c9c0143d01826d14d08e89df63b682a4714d9d0d96258f26bc243705b185b0b5c6a8fda3127abafb055688508306bddf6e14
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/maradns/maradns-0-r2.ebuild b/acct-group/maradns/maradns-0-r2.ebuild
deleted file mode 100644
index 9886574c2705..000000000000
--- a/acct-group/maradns/maradns-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/maradns/maradns-0-r3.ebuild b/acct-group/maradns/maradns-0-r3.ebuild
new file mode 100644
index 000000000000..15e43c2d718f
--- /dev/null
+++ b/acct-group/maradns/maradns-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=99
diff --git a/acct-group/memcached/Manifest b/acct-group/memcached/Manifest
index da4085b43eac..d151a8c0ea4c 100644
--- a/acct-group/memcached/Manifest
+++ b/acct-group/memcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached-0-r2.ebuild 151 BLAKE2B 7f1675b66cfc1b04981689f93ac677c5a3ac0c8bbf95cc4aa64aeee81ded7440e842d4d36677a8eab28362a5a9f0d7f59fd328588ee0da1dffc04904ec021a91 SHA512 d400a3485b858e082fafa7396696064b80da4c9bd27e8cf81061451d9edd39a829a5787ccf818e44eca0b11501a1db0794a23409e5c60bd17ed8f1c0d9acecbe
+EBUILD memcached-0-r3.ebuild 151 BLAKE2B ea457b19b3fd5aa03b0106d94340b3e076a6296c68da44d42f4edfdf01b2a9b41fddbcdb0c542f3b8d5df364d139a5d0f1d1bf9f8d2e2b11d4ea25667cb7b34d SHA512 ff1ba1f4c543c89c453071885e4d2bfa7efa3a43f49bc2f115be69ce57deeddf6425f439159eb6311d8eae039c552b2e9b10801d2bf5c51ce41f93b6302fcf35
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/memcached/memcached-0-r2.ebuild b/acct-group/memcached/memcached-0-r2.ebuild
deleted file mode 100644
index efcdd1096125..000000000000
--- a/acct-group/memcached/memcached-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/memcached-0-r3.ebuild b/acct-group/memcached/memcached-0-r3.ebuild
new file mode 100644
index 000000000000..59df670d17c7
--- /dev/null
+++ b/acct-group/memcached/memcached-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=441
diff --git a/acct-group/memcached_exporter/Manifest b/acct-group/memcached_exporter/Manifest
index 68841917a5f4..0da954adaadf 100644
--- a/acct-group/memcached_exporter/Manifest
+++ b/acct-group/memcached_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached_exporter-0-r1.ebuild 151 BLAKE2B 2cae867ec21155e7de106eebdd98468b41d54d0b0277c6803ec352e7d757b4e757a8c1575bc508d8972c049120429d55ad7acbaf49d11eb3738a33d2be25454a SHA512 6b911f75661d757f2780b3e3f6f6a3b711a7f85eea1a2a777d7f79e535c1bd79b27e476f323bfdc30a4fbcc0b1b49a4dcf6112f8eb6e2573253fceb2439e40fc
+EBUILD memcached_exporter-0-r2.ebuild 151 BLAKE2B eb8f2616c702bf708127d109d7467de9010677bcc136a08219824b69c0b0bf30d8991b0d1338250cb12adf08d0b1f168a395d6cc34f026fafe3af837cb81a075 SHA512 dd81b1af04d2a04bf1d1e13d15c727717366e60a185b359ab4afe2974d55fb5ea9890bbf922557b51ada3d419514a0bfb5f396b5edbbb85c78f9701442eede9b
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
deleted file mode 100644
index 5e8edc6f6f93..000000000000
--- a/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/memcached_exporter/memcached_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4307fbd4e949
--- /dev/null
+++ b/acct-group/memcached_exporter/memcached_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=234
diff --git a/acct-group/messagebus/Manifest b/acct-group/messagebus/Manifest
index b16002a23dee..0c369ee6afa4 100644
--- a/acct-group/messagebus/Manifest
+++ b/acct-group/messagebus/Manifest
@@ -1,2 +1,2 @@
-EBUILD messagebus-0-r2.ebuild 151 BLAKE2B 9a9cb326ee0d5c3e094d90a7b1a2e90d07dca4bd141d5e7e3ff0ba8b8c87f25e703967a6d3bcca38182446ef18e396ac51b86a375da9903f661d8ddf57933959 SHA512 2f35620327b0577a6b35f6d468d2c6adff973b6161a4c8a384193a653b40ac34f52acd8abeb6b841115d62289eb94c2fc22cb7e785b2476de0cf31e8e9029028
+EBUILD messagebus-0-r3.ebuild 151 BLAKE2B 29c7095febc3e2f83a17568da3502d4f1aa006fe18338c99dec6dc874bd4463aaec769f165f2e43cba05eafe2b76c45ce8ffda376325c560b9eee127d8131880 SHA512 ec57e2cd1e76e199d6efc7f9f4eb879b188fc5a7b0d9cf3349ce2a98d717eb7db5226f183bea46b9c67b71d31f3d349d956932ebda001794c524e89e028fc0fe
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/acct-group/messagebus/messagebus-0-r2.ebuild b/acct-group/messagebus/messagebus-0-r2.ebuild
deleted file mode 100644
index c4ee2ee50216..000000000000
--- a/acct-group/messagebus/messagebus-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/messagebus/messagebus-0-r3.ebuild b/acct-group/messagebus/messagebus-0-r3.ebuild
new file mode 100644
index 000000000000..082e60cc4a96
--- /dev/null
+++ b/acct-group/messagebus/messagebus-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=101
diff --git a/acct-group/mgraph/Manifest b/acct-group/mgraph/Manifest
index bfde5f8e4b9d..1df9bdc53b7f 100644
--- a/acct-group/mgraph/Manifest
+++ b/acct-group/mgraph/Manifest
@@ -1,2 +1,2 @@
-EBUILD mgraph-0-r1.ebuild 194 BLAKE2B 5e3a7495186c000aefc7966b42f3d4fec0cc2257ab4cc6692c9fd49b4c19c1585fb1e894c03bb89b3250b9ae3159764a1aa79a43f9af0042ef70ce5e696257c3 SHA512 3d352867cce0de41083529148565f65f20872b4db0548bb048f1aeedd752d5f15851cee71469d9765d24ef7afedec525cda1029b508e495d3d11ee04c6449d3e
+EBUILD mgraph-0-r2.ebuild 194 BLAKE2B 280fa54bb46c254c8f58a5cb8ae85bbb01abcf078dfbd7dea319c3bbbdaea7c5c848a1cdb8b1f7d632775957b4f342f969a63c1d02489333273ff19284b9704c SHA512 d1caaca5d4ebbcee3f485bc8f06715b38cddeb32bcc47b8a0dfc09ab6f677a5c55b5d465e08869dc379ab9354510f0fd3dabdd087ed6450eee841a99cac477db
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
deleted file mode 100644
index 77e91ef55a0e..000000000000
--- a/acct-group/mgraph/mgraph-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/mgraph/mgraph-0-r2.ebuild
new file mode 100644
index 000000000000..94a9ca8ec946
--- /dev/null
+++ b/acct-group/mgraph/mgraph-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 21cc077694f8..ad7ab34467be 100644
--- a/acct-group/milter-regex/Manifest
+++ b/acct-group/milter-regex/Manifest
@@ -1,2 +1,2 @@
-EBUILD milter-regex-0-r2.ebuild 200 BLAKE2B 41ef87e307c71c04d377c81c7608b5589e120ea7d82afbd47d9cd63b375d015ef3eaa06293b9203ae831ed6cbd6ff3dba82bea1086633c748b2c6274c22f51af SHA512 a0423b8776f10488f36e9838da4cfbf3bef33a884e14109c5bc562cb81ff573a3db6e63d3bcc4209e380384d3983da375ff761ffb579f4bbe3b47f815c307a74
+EBUILD milter-regex-0-r3.ebuild 200 BLAKE2B 529299e6c6b2668c156fce5c3ca2240d72c81df5aa403e4bbfc731a9117d572559ce728b7080fc7e2be2fb0ae2679aa7aa68c4c11083e1ef5bc59414ec9d3bdb SHA512 1d02b8c7270ce76df859281241db643aa29a529d2896f8965949c60149c7e12f7f0959e950f40e12c99334cbe03ef886313a4a6cf837c21aa505afea2ddd8eba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/milter-regex/milter-regex-0-r2.ebuild b/acct-group/milter-regex/milter-regex-0-r2.ebuild
deleted file mode 100644
index 5a6247c9190c..000000000000
--- a/acct-group/milter-regex/milter-regex-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/milter-regex/milter-regex-0-r3.ebuild b/acct-group/milter-regex/milter-regex-0-r3.ebuild
new file mode 100644
index 000000000000..286213fbc310
--- /dev/null
+++ b/acct-group/milter-regex/milter-regex-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/milter-regex"
+ACCT_GROUP_ID=438
diff --git a/acct-group/minecraft/Manifest b/acct-group/minecraft/Manifest
index e50e148b1f72..ac760adebe68 100644
--- a/acct-group/minecraft/Manifest
+++ b/acct-group/minecraft/Manifest
@@ -1,2 +1,2 @@
-EBUILD minecraft-0-r2.ebuild 201 BLAKE2B 8a571dc255d15b3c4e5b587012e28fa9bfdb205cbdacae76b2f132d81f0470df258840168a493953152478b61e06a2c8d5cd9498df4376ba470e2d4a53571e8d SHA512 057affbd46f27ad7ae9f1784c4dcab390d11cb8390206bd57ba6431cdbf18c52b2cec76d21a04c13cc3f1c02e67fe637a9eea223ba3c551982def285e0f84424
+EBUILD minecraft-0-r3.ebuild 201 BLAKE2B 660ec5866983d8a5c50b94db0791f29cff41d4b3d86cc3331e57dc88ed4389dcc246de37ce09b8c399b92bb411551094c275f4f31485ba02b77d1345cb2e22bf SHA512 8d9bf167c395d436a92765b605aa7062ee319606c01c9200665d823a0b82865e0f88164964710af057cd2f7c17ddc0785b5e342bf07abcdfcab0da220672539e
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/minecraft/minecraft-0-r2.ebuild b/acct-group/minecraft/minecraft-0-r2.ebuild
deleted file mode 100644
index 2d3d01a8778e..000000000000
--- a/acct-group/minecraft/minecraft-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/minecraft/minecraft-0-r3.ebuild b/acct-group/minecraft/minecraft-0-r3.ebuild
new file mode 100644
index 000000000000..0c2bfddc89de
--- /dev/null
+++ b/acct-group/minecraft/minecraft-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6b2f38efec91..8505b347cd0c 100644
--- a/acct-group/minetest/Manifest
+++ b/acct-group/minetest/Manifest
@@ -1,2 +1,2 @@
-EBUILD minetest-0-r2.ebuild 200 BLAKE2B 35ffd374b50bf1cbb77e73098c5bddac16efde760edd34998b25c627b18a7a530e06c35525bbe8f845e194306eebaee93e68a54e9819eaec7f7703b7365e9e9e SHA512 cfce77d027e548c42efff4340a039a301643e42a8b26fc11b5309317ce6b994458f78754dde2bbd46ca6160994fc09ee093072266b50107a4ca4d4e9a6c4ac93
+EBUILD minetest-0-r3.ebuild 200 BLAKE2B 6634664a1dba3d4c11789aadffe4442a2b12a753936d48260bf05ef9acabce8cf3c4e8ceeb8aee9741bdecd7cd33bed6f38a2f26afd85703ae3efe605d4edd7b SHA512 aeec055440bdfa2f15adb374a9f9aa08a7cd4834805dc37c46fcc45642a9cdbbd088969752d567ed993d61d0c375314852b91425287b707c98d8715290927b72
MISC metadata.xml 360 BLAKE2B 4867d8ae1f68605b01a06a446474bf19088f0cc57c5b381dd3af707e32bb7727c348b2c59b4ff654551be2ab78ac7ded05a0e258d0601740d27c058bbc08e863 SHA512 db7554cc1f206ef22ee9748d3102d40cb5b1085f5acf3f2cbd732ea11e122da26d20d2065d7184ea4a6b94105b4e53794af339c869f5432cc005e46b4b506545
diff --git a/acct-group/minetest/minetest-0-r2.ebuild b/acct-group/minetest/minetest-0-r2.ebuild
deleted file mode 100644
index 0ab3add9768c..000000000000
--- a/acct-group/minetest/minetest-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/minetest/minetest-0-r3.ebuild b/acct-group/minetest/minetest-0-r3.ebuild
new file mode 100644
index 000000000000..4ae667496298
--- /dev/null
+++ b/acct-group/minetest/minetest-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 50db0c921061..6d904fbcc4c2 100644
--- a/acct-group/minidlna/Manifest
+++ b/acct-group/minidlna/Manifest
@@ -1,2 +1,2 @@
-EBUILD minidlna-0-r1.ebuild 151 BLAKE2B c1d1f2f79fc20a53a1d88badbdb75c30ef6b60124078f3c37d2020f0a6025d6611ec0fd8ced025a7d5395adcc27356d3bdc5c91c6d4ac60b16837e5a93038050 SHA512 dab8c732fb97177bcac9fe97d3ed0c619d83f1bdecf0ba9103f1f97a87ac8ebdb410bde1bda9c4af2fbbf278abc2de6359ae7f6d7c738de8a65da9b1d0900071
+EBUILD minidlna-0-r2.ebuild 151 BLAKE2B 7dc6647bf710b2c3028298a63acec53d24869371be00f41597c5d1ddff6e2ca88bdee9cb348218ae25c6e50a00de6a2aeb43f53f627ebf7ef2e2b236f3ac8bee SHA512 fd6c01e70330a9b6ede8faab09b5f92190e01b2bb020322fc74a8416be0821da8417db82c14d848d7d9ed2df7d40fc6e0f4b636e57a852b8dae2a914082d251f
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
deleted file mode 100644
index 0bd234023279..000000000000
--- a/acct-group/minidlna/minidlna-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/minidlna/minidlna-0-r2.ebuild
new file mode 100644
index 000000000000..e8a9ebe67679
--- /dev/null
+++ b/acct-group/minidlna/minidlna-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=339
diff --git a/acct-group/mogile/Manifest b/acct-group/mogile/Manifest
index 290da4bb4364..7f6932c745bf 100644
--- a/acct-group/mogile/Manifest
+++ b/acct-group/mogile/Manifest
@@ -1,2 +1,2 @@
-EBUILD mogile-0-r1.ebuild 180 BLAKE2B c527b575ce262e8ca3c8bd43ccb7a816af12f1d55d5752008c6e2c62b3fff597da90bded8e1bca3c15f8ef9b5b8a62620e4fb8e964c790a852062ff649ddecd8 SHA512 32d3eaa1186e80756b5fc736823feffb396c8f5fe2db7c0e8ce007b48b313ae472515c32c6477b325ba6b3851d2d22430de851c49792a7734382d0cdeb4cc1bd
+EBUILD mogile-0-r2.ebuild 180 BLAKE2B 6a2418dcc5d79988154ca4d10d050742da476f93bcf6001dd9313a45a3208ee9ccd0b8e53c0eef3333065775e92ec7874ae645d60287bd62b83d24dbe2c2f78f SHA512 9e37d256742e8a5b12f5933b70c9762ca04e7168dd54d41323bb7d7c17d215918ecfd6b6022f848edc96311b062abf83962b4415042a12ca7096e331f3ff4099
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
deleted file mode 100644
index fae6fd78811d..000000000000
--- a/acct-group/mogile/mogile-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/mogile/mogile-0-r2.ebuild
new file mode 100644
index 000000000000..b08046581733
--- /dev/null
+++ b/acct-group/mogile/mogile-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="MogileFS group"
+ACCT_GROUP_ID=231
diff --git a/acct-group/mongodb/Manifest b/acct-group/mongodb/Manifest
index 641db92e49b2..c88d09eb479d 100644
--- a/acct-group/mongodb/Manifest
+++ b/acct-group/mongodb/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb-0-r2.ebuild 187 BLAKE2B a738bf7fd489811052893d4b104ad55ef08e3059f94ae062b7170bd803ac6127af42c58c829f7db9dc5036687df29aa60d6aa6b898858faf79fc66a5d31724ca SHA512 2f790d5c4b2fb7fd96f19b709cc3028b36b4bd7291115b5849cda06585f39cf3fdb02d83b1e5c3d4c0bc37d4fafda037a988641748da017052f804aba45b6fe7
+EBUILD mongodb-0-r3.ebuild 187 BLAKE2B acaaf6c42374baff80140f3b391e616f47a583b80b3e11b23c840550426b9fdfd381e792c272706a5e73deda2812fe372e2b8243c049775ea5b7ffa074eba005 SHA512 d86061a38f9266fad1fb39188894d16be281b3224309d8d58c0de03d4cc038cd29d564da43a529d93e963079985b5ebd4878ffe7e84fe5576daa856af46ffa03
MISC metadata.xml 506 BLAKE2B 914c508b2299ec351b57287f94ab25b016f8f6459a5de86da19b40850a9a90c364218a867589963d471becd19c93b73adb668787aa0134ffd2005b4d39fca7ee SHA512 d94bdd1e741af6d113f86aa60e837c3249ec74f11c6878a6932ecdf8c420968e2236a04bcca8e33ae77d7fd3029e7dbc78054167ef6feebfcab998ca527a677f
diff --git a/acct-group/mongodb/mongodb-0-r2.ebuild b/acct-group/mongodb/mongodb-0-r2.ebuild
deleted file mode 100644
index edfa300f4fe1..000000000000
--- a/acct-group/mongodb/mongodb-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/mongodb-0-r3.ebuild b/acct-group/mongodb/mongodb-0-r3.ebuild
new file mode 100644
index 000000000000..a98136928c49
--- /dev/null
+++ b/acct-group/mongodb/mongodb-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 708ea1598b82..b061571c10f9 100644
--- a/acct-group/mongodb_exporter/Manifest
+++ b/acct-group/mongodb_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb_exporter-0-r1.ebuild 151 BLAKE2B 71e441c4245978c8163ee794ce76f5bd6da309a2a2a94b61d92d126ed7ccb3dbbde2e3ca80bc069e63a9cf0132bf731193d02ab89cf3acfdc62d12a326a8b0a2 SHA512 82ad5f1a34e11337597150d630940804f9cec971af780e8f6b3f2a3795b5a0b784302f46734ea60c7d598c0c0e640d95af8edbd19943f4d7b3952ab83de353b9
+EBUILD mongodb_exporter-0-r2.ebuild 151 BLAKE2B 0560095024a18be66ef81c9e24094f4bfac406afc56421786306b04da81e3e0e9086b2443dc9ede6704f02041be80d2e271ca1ab446a342b79d66b3bdc2b0a91 SHA512 643b2e7730629b2a4d92c013e75fba4f05de4cb52dd145f92a7a61bc080e88b3649fe789e056885d62b653c1edeab03f90c709829c867f92768a5541dc28c217
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
deleted file mode 100644
index be67ddc21397..000000000000
--- a/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7f2d700f9c30
--- /dev/null
+++ b/acct-group/mongodb_exporter/mongodb_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=277
diff --git a/acct-group/monitorix/Manifest b/acct-group/monitorix/Manifest
index ad42f2c04827..03ac0529b1c3 100644
--- a/acct-group/monitorix/Manifest
+++ b/acct-group/monitorix/Manifest
@@ -1,2 +1,2 @@
-EBUILD monitorix-0-r2.ebuild 193 BLAKE2B 9a842b9268a317e5938729742829d92ee888ee122ae86489a688db160b24f14e4df1996b83966d755d1e44c6b17cea7a1b2d219e4b063c3319908b0fb3c376a9 SHA512 e554d6cecbdd2551799847172d7a436e8920d0539413483e6dabb9b791b5ee80cdbcc4cb85a18821750a7a002af5711f5ef112ea48d8d07f190524dfd83937dd
+EBUILD monitorix-0-r3.ebuild 193 BLAKE2B dbc147fe0d417938564d08c6a5daecd6a8d842cb8502de97b0b13ae9d7180a39576c57f30381daed48f53ffba39200c39655f711ab225639289ddce9dff39970 SHA512 56da4c9d2f0efec1c8801cb7e943f93f2ed4621ff64a06208b3ae8f52de7475ac1ea70394e9587a432ac6ca567df1b4e19a1aac80b871a66fbe1134008680584
MISC metadata.xml 391 BLAKE2B 9ead41308785d3c5c7733cf997c688ae1ee8584c5eb379d8a03f14921a7597aa28951510c0bff8d5a0ec80df5b13864f34dd2b2ed962ddd870b3777187b0e09c SHA512 af160187c0209c791cfd8d497da9a9ff4b6fc3762300e309d5d75df2571fec2b52bdba990b2d13667d3fed5cf50e6d3938b70683e53d0937adb15e4897ca49d8
diff --git a/acct-group/monitorix/monitorix-0-r2.ebuild b/acct-group/monitorix/monitorix-0-r2.ebuild
deleted file mode 100644
index 54384a731a69..000000000000
--- a/acct-group/monitorix/monitorix-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/monitorix/monitorix-0-r3.ebuild b/acct-group/monitorix/monitorix-0-r3.ebuild
new file mode 100644
index 000000000000..cce945850f0c
--- /dev/null
+++ b/acct-group/monitorix/monitorix-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9f8519016e7e..e8f49745a67f 100644
--- a/acct-group/monkeyd/Manifest
+++ b/acct-group/monkeyd/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeyd-0-r1.ebuild 200 BLAKE2B 6e5ea12841f0a4beaa05224e4f878da3ec36495a63641bc8a805b1d816c1682c37bdd89f221f125a99d8100f206af95d0ad65560c111de4b42e9b6b951546217 SHA512 f91f5a3e593933768d2e6e3db79070c77df53f3810721c2aa30263235146f64fa1c396cecefd5b48c7a949c7feb95296658d394515a087d82de12e04b3559343
+EBUILD monkeyd-0-r2.ebuild 200 BLAKE2B 42cbc1b94a27aa882ed68424c56ef027c26f936712558bfc004ad932c4d3a7518476fc9960363f1217029d542738e75e3fa5b6a7d1267e12661730eec68ebde2 SHA512 945aa1976d280a2654a37afe374ea04254876696ace234ddad7d02e2ee7789855a2268ee73cefcc5124d37a6cd333f8c15b7e554fd12f761f3e8a0a24a11f49f
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
deleted file mode 100644
index e27300e4a43b..000000000000
--- a/acct-group/monkeyd/monkeyd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/monkeyd/monkeyd-0-r2.ebuild
new file mode 100644
index 000000000000..6a354f9e11e3
--- /dev/null
+++ b/acct-group/monkeyd/monkeyd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 37721c4cb712..303b4d80f089 100644
--- a/acct-group/monkeysphere/Manifest
+++ b/acct-group/monkeysphere/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeysphere-0-r2.ebuild 193 BLAKE2B 9fda991d31b7084520e0b3fb171ad02cca6c0e26d385779c695e4314d62b2aed52f6d7a57d8f8009837a21ee498631f4cdae22e19135383e4dc8878865fcee01 SHA512 b1b4af84ad1873c06e147bd08a60b59470fd73f9cb8d93a8a63f3fc0270784e91595a09d2434d591fab0c68dd4db8b57ff875353b2747d5741d4e00f54e1fce8
+EBUILD monkeysphere-0-r3.ebuild 193 BLAKE2B 002e95a37d3e083d3b112624d2eb62cff954e9dffc3b3d7e976d789a23706e86ca6fe2d26a8f01f7abcc980bc75615f9d0fa0230ddddc6700855f5509a3a98fb SHA512 45cf7363a2086746a952706849414e8312350968d2c92b51ceba30bec069da78eb2775d17f04ff91561ca7fbaaa40b7c250c00c1a6a32e4b15653ba7ae629add
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/monkeysphere/monkeysphere-0-r2.ebuild b/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
deleted file mode 100644
index a0ff0762a9af..000000000000
--- a/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/monkeysphere/monkeysphere-0-r3.ebuild b/acct-group/monkeysphere/monkeysphere-0-r3.ebuild
new file mode 100644
index 000000000000..fc6a3bda190a
--- /dev/null
+++ b/acct-group/monkeysphere/monkeysphere-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="monkeysphere program group"
+
+ACCT_GROUP_ID=390
diff --git a/acct-group/mosquitto/Manifest b/acct-group/mosquitto/Manifest
index b7246accd4f3..e4e9b08ac88d 100644
--- a/acct-group/mosquitto/Manifest
+++ b/acct-group/mosquitto/Manifest
@@ -1,2 +1,2 @@
-EBUILD mosquitto-0-r2.ebuild 203 BLAKE2B 35eaa49b7aced977eda6e5cab85e8713aaa7de3df1bcf8b03367afca40b379f3d4de98e7aa9547541a7fdfd4c1e3b2cb900eb513ec99eb156474c8c1c2eeac95 SHA512 424bc3f91dc0cb0920f3d3bf4c708a0fe7fbe1e2e7fd46318e06f95c6dcc7171ccf2eed4003e2f5d300acbe56eb6dadf15fe10c1b6d745ecf53521da1d0eb4d6
+EBUILD mosquitto-0-r3.ebuild 203 BLAKE2B c2077d72548b1052a8ab061b0c8346abe91e2134871157053b35cbdb4b564e8c1b0ab897a4d5b82ea28d5506895fe4822b8e2fa7f800a936bf004ff98ad735ca SHA512 52a221be5d658a4933b20b79bceeb58ba0ccbb641a21d4244efb203652775769b52dfcc060bb2fcb711face7472b38968392682bbe755e8a8a2f67f1a9ec38b8
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
diff --git a/acct-group/mosquitto/mosquitto-0-r2.ebuild b/acct-group/mosquitto/mosquitto-0-r2.ebuild
deleted file mode 100644
index 791a2328f351..000000000000
--- a/acct-group/mosquitto/mosquitto-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/mosquitto/mosquitto-0-r3.ebuild b/acct-group/mosquitto/mosquitto-0-r3.ebuild
new file mode 100644
index 000000000000..ed4039baf4c3
--- /dev/null
+++ b/acct-group/mosquitto/mosquitto-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0f10750ed971..01fe86bb5149 100644
--- a/acct-group/motion/Manifest
+++ b/acct-group/motion/Manifest
@@ -1,2 +1,2 @@
-EBUILD motion-0-r2.ebuild 151 BLAKE2B 879a78638edd8bdf2c021011aa06f742d9c5ace061faa2653e69a865f63b34c18f899a1fcb4b7edf7e4c8cb74909b38b8f2f830a386fd12c9c79b0825e3004cd SHA512 bba5badde514a479e82fa9bd041aa971eeb966653f19e1df0d5c951e7ad5481cbbaa2223eebd06c1b88638602b8c79532aa20ab4dddfc6caf0dd56a51bcfd19c
+EBUILD motion-0-r3.ebuild 151 BLAKE2B 2c8d0b45bf8268cee1e227d97756570c3b3dde48103f5d93700b4e925a3ec21a2066dea0eedf20140404d02208d97c7520e546e7c8a2fc5668832963109d56bf SHA512 72526f802c6c6fc53b707c680f87c13d44d586c38b5024bab90f2780be14db766063131f74d5c1c61691479de4d46d3e15d5181de3a7046be0132b1b93ef774c
MISC metadata.xml 396 BLAKE2B c23e0428f6d197596409734471aebdc88231ccdc6abf3b132414ac1c4a2aa933017b5d6368b018e8e91ca1c01f38c49933af23888f2a6eb3b9e333eee0677d81 SHA512 c5fbc86f53d46fda14e9268883cad59049f01e2f356185af9a0d0ab8d5e76de69923768027bfd0d3fe02af6af2c008adcfeed20f3d312a8bf458fa655376d19e
diff --git a/acct-group/motion/motion-0-r2.ebuild b/acct-group/motion/motion-0-r2.ebuild
deleted file mode 100644
index e62c9b8e5c62..000000000000
--- a/acct-group/motion/motion-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/motion/motion-0-r3.ebuild b/acct-group/motion/motion-0-r3.ebuild
new file mode 100644
index 000000000000..eae62b8e7e5c
--- /dev/null
+++ b/acct-group/motion/motion-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=395
diff --git a/acct-group/msmtpd/Manifest b/acct-group/msmtpd/Manifest
index a363bb6a757a..ee4ec20a279b 100644
--- a/acct-group/msmtpd/Manifest
+++ b/acct-group/msmtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD msmtpd-0-r2.ebuild 151 BLAKE2B b4f374b2908ac29ee42602422bbdbb9fda9c5949025976833ee591c3f4749936e1ffc3c3929c1ae5004b1523811789b1984c5fcdc288ad3df3607a85004c889d SHA512 d21d4b1a5cdfa3b4c50255c34144d2e3718940ee2a6bd3dd7934dcf77516468cd60fc04cb77d2a523e5ab8219783e454c5268ddeb960f32a12223d7cf6a71d29
+EBUILD msmtpd-0-r3.ebuild 151 BLAKE2B 263cca0b79d23998f4b3cdf49849290f1183529a840ec672183a55a64ea8bc229cd8770cff9947f95d649dab1193d8367b628c937b762b6cffa1d9331f1bc9df SHA512 91e7e348e8815cbe4152668f7883a4ba0f146f685d5df48d20984ea52b990556c616d42c2acbfe1b5b3c9cc667d540e1c37be4662fae750c47aab8c86778c049
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/msmtpd/msmtpd-0-r2.ebuild b/acct-group/msmtpd/msmtpd-0-r2.ebuild
deleted file mode 100644
index de4f2dbcb1d5..000000000000
--- a/acct-group/msmtpd/msmtpd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/msmtpd/msmtpd-0-r3.ebuild b/acct-group/msmtpd/msmtpd-0-r3.ebuild
new file mode 100644
index 000000000000..eae3b7d5858c
--- /dev/null
+++ b/acct-group/msmtpd/msmtpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=222
diff --git a/acct-group/munge/Manifest b/acct-group/munge/Manifest
index 2ea00f933bfd..b29f611643b7 100644
--- a/acct-group/munge/Manifest
+++ b/acct-group/munge/Manifest
@@ -1,2 +1,2 @@
-EBUILD munge-0-r1.ebuild 195 BLAKE2B 2238d5fb768ae5f63e1a10625d6950174decfafa014b3bd0918ec919d4cdd727897f270737a076be1de52b7c10694908040f07624243a72a0bd69666fe30917e SHA512 39613934c915a38330186c4784ac32c5df35650e4f786b6558311f198aad8c75edce7cd790755928bb0f1d8300ea67cf734bb62b5b8d937b14a99da47cfaa65e
+EBUILD munge-0-r2.ebuild 195 BLAKE2B f625e00749680247c742ca44bbcff3a5095c394acd45053838080fc3daa88c9222aae45bb6c601616817777eed959467714b76603749d77908e8cf587238f7cb SHA512 ae05becdc858130bc39cd8db7e830b6ee086fa4a007d56a9fdd90d902ba0fc90effacc3082e35a3ec402c5caf02dd06df7d2d24f60d19658d4cf804e67331718
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
deleted file mode 100644
index fbd452f5355a..000000000000
--- a/acct-group/munge/munge-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/munge/munge-0-r2.ebuild
new file mode 100644
index 000000000000..cb5cff2ebbc4
--- /dev/null
+++ b/acct-group/munge/munge-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ee6a04cb0855..3007934ef52d 100644
--- a/acct-group/munin/Manifest
+++ b/acct-group/munin/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-0-r2.ebuild 151 BLAKE2B 69cdb0e071971eca40d11ee63073d88229488693f8266d385e5aef456e526064cfa85cf6a0e29a8012fba5d9a4fbe2ace74cef949f90ad250e754ea129fe670a SHA512 68629e012acccb44da2830b9d732b218e63a3e586f7e575631de8fb637cb8f3be7ba5a2c03e3620ad18fd20e3e154448a9fe563eeabe8c16277e021651bf66e7
+EBUILD munin-0-r3.ebuild 151 BLAKE2B 9850ee345436825e01f46760997b9aefd44288db713006f14965c8ee7d3f2dfd985dc1a8250a4ec10e37469b7a0e5dd49d8392d71cb76151cbcee8d6ffdd895a SHA512 684c0a16e73dd8b01ef3e5e66198c1eda755bbadff5e2f5bd2483014a786f5ad81c9fb6e24e6e46b142e27ecd233c1f07b7dfcb51259bfc4a73d3a749992c15f
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
diff --git a/acct-group/munin/munin-0-r2.ebuild b/acct-group/munin/munin-0-r2.ebuild
deleted file mode 100644
index dd3de035605f..000000000000
--- a/acct-group/munin/munin-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/munin/munin-0-r3.ebuild b/acct-group/munin/munin-0-r3.ebuild
new file mode 100644
index 000000000000..22f2d7a9e412
--- /dev/null
+++ b/acct-group/munin/munin-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=177
diff --git a/acct-group/murmur/Manifest b/acct-group/murmur/Manifest
index 65decacce58f..0460707f269c 100644
--- a/acct-group/murmur/Manifest
+++ b/acct-group/murmur/Manifest
@@ -1,2 +1,2 @@
-EBUILD murmur-0-r2.ebuild 151 BLAKE2B e1584b186618c544502ae5d2e7d4f65187da705f1a2da66c6233fc1b47233cdc7ddc68bac94f0c90062e69cf9dccf580ee24aa58e1ddd33457bd813f671cadd4 SHA512 a64c980306d0456aa68a2552c932b1749b7b84589bdc213a8311d623c8289f5d9595fead47f357557fd5749e31264fb4642daaede2da2f5f62b6999022e35a54
+EBUILD murmur-0-r3.ebuild 151 BLAKE2B 28fe8eab580a8850e7f209a85c96bb3bb5b4b60d64e0111604fe526de17feed7c69fcdc1e9e172a7bc27293bb6bd1be94310bff0d59aeaf7d764e1b988b4d890 SHA512 0d3a37dac85a7ae69b7edb18215244fe220f94510d87684494f68d0d88b9b1d15b4e920483665d09400ff10b3609c97cf8ae569c9aeed5d08489067276541f93
MISC metadata.xml 259 BLAKE2B d393fe53508d06da051d73863657c1cf9f63ba80d8217c3c17ed754a7e652bc90be692dbb619d2a5e3e1d0dd258a6019c7b9a7aec0597bcc0f63e2f16c60774a SHA512 3292858f61d9b06b284b4cae18383cbd9cacbee726291402e1b3cd104f9498dfeb4074c6550ff64b5ef374f40d3d329b04f2f3010be782ff06e896d4c666c925
diff --git a/acct-group/murmur/murmur-0-r2.ebuild b/acct-group/murmur/murmur-0-r2.ebuild
deleted file mode 100644
index a7bf8b136eeb..000000000000
--- a/acct-group/murmur/murmur-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/murmur/murmur-0-r3.ebuild b/acct-group/murmur/murmur-0-r3.ebuild
new file mode 100644
index 000000000000..4e827ecab78c
--- /dev/null
+++ b/acct-group/murmur/murmur-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=122
diff --git a/acct-group/mysql/Manifest b/acct-group/mysql/Manifest
index 912c8dec91d7..98eff9e2c06f 100644
--- a/acct-group/mysql/Manifest
+++ b/acct-group/mysql/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysql-0-r2.ebuild 193 BLAKE2B 9e0d8188d9cee1e819944deb8b857e7d5bb4d1aea79a54d67cc5c1a1d993e01892433cc04eeb48772963fe7f309dbef28e96e4264da1a354e03049e23da7d62f SHA512 533730cf488bf85c92b565e0969f4466bd84067d7cfd1a8d78c9e8b7c9075fd128bf46cb1f4c7ba7de73980112448e8a94d7b050f7f257bf2f487dcbf89a9dc5
+EBUILD mysql-0-r3.ebuild 193 BLAKE2B 8b1f129359f66fedd4088eb7768feada2433747b728802bba8e56d1e3274f786ff74ae0b706a856e226016e7ef6652ad50453784aa1327807767bd2c4ac1c1ef SHA512 f107b68d656ed623f8724a082275ef7e7879be1b2e20bbab8d15319080bc496117a106af8b1e3b946cce1e83420131f5bad54bf26ce3478c9f034945f1c5357c
MISC metadata.xml 258 BLAKE2B d72173be6096a07ac4d2cb3e8cc161e6d817e7bf3f3b87c82c8c490403d67487ad3f4d65edb951b3a9ddfbe38a5c2a28b335436fd14f7af773d630a61d34f2e8 SHA512 25f8d8e566c979bffdcba13749feacf7d50ed10ec9099018bb18984d97dafbadb4787b4e49e618658390afa31c86531d08d27e13ff8119a39195d6dde26d9b6c
diff --git a/acct-group/mysql/mysql-0-r2.ebuild b/acct-group/mysql/mysql-0-r2.ebuild
deleted file mode 100644
index c3f6923ca9ce..000000000000
--- a/acct-group/mysql/mysql-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/mysql/mysql-0-r3.ebuild b/acct-group/mysql/mysql-0-r3.ebuild
new file mode 100644
index 000000000000..906ae9a827f9
--- /dev/null
+++ b/acct-group/mysql/mysql-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 cb14eef77bec..1ed0cdf2997d 100644
--- a/acct-group/mysqld_exporter/Manifest
+++ b/acct-group/mysqld_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysqld_exporter-0-r2.ebuild 151 BLAKE2B ea6d341b60b80f8d00cd9490548d80c02d5af148de0534787464e0ac3a1c83ff54ebf8a11134cba8b8abd759daf85b44ae2fbe5020948474efafecc37c0eb595 SHA512 ec4d59c2050b1bf878fa930fb53c1740fec25f36e16d01612694ddc7db69828e5ea1a1ead7afb7b3bf5f6f82212b65962bbaa33039a1e1ee76e6a6d3cfb98f02
+EBUILD mysqld_exporter-0-r3.ebuild 151 BLAKE2B 1553211b59b67249920033652041beec68a0d35a46504b08ce070486c3b17a5fc396ead81b4328a274b15cca8f00f8356b2dbf52d3b0604bd7f9d453200432a8 SHA512 1056d366cc077e640d68314a7e190acba852be460c47ca1ebcda89e79c3e0c30efbbae5d974f221a6cef42d9af8acd45a1aa5178ff2eadaa6f2c5325c298d980
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
deleted file mode 100644
index 6abb65361f3a..000000000000
--- a/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/mysqld_exporter/mysqld_exporter-0-r3.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..acb8f27034db
--- /dev/null
+++ b/acct-group/mysqld_exporter/mysqld_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=308
diff --git a/acct-group/mythtv/Manifest b/acct-group/mythtv/Manifest
index 8372f0f821bc..dc4e317009c0 100644
--- a/acct-group/mythtv/Manifest
+++ b/acct-group/mythtv/Manifest
@@ -1,2 +1,2 @@
-EBUILD mythtv-0-r2.ebuild 205 BLAKE2B 8c13607a964fc3b615d33b76925cbe7e2346c22d38db06e005138826f2b88510dcfe40a4509c8478f979e2745cf919944a10b2fe4a59fd3cee695b3ecb6363a4 SHA512 3e2e48bbd71d2893f212ff1c4392842be5b8fab6357b86a15a96681acf6590ff077af2227d68cc62870ef869ef230242b0912056a4824d7e6d6a9cef414b19fd
+EBUILD mythtv-0-r3.ebuild 205 BLAKE2B d17bfd89ee850f8dc87bec7098b32773e20fc4e60ae9d6c0ee88f7cb15d9d60f39ff632d270ede636fa3d030db93993efa6e2cf90d6348640585622d8d3859d1 SHA512 cb139d4ff73ec9b251d01e72197eabffe6b2d57df0b977d9e4f99a40c8610ca276a753598b362acdefb30101c55881daa3e4c664246258919d502f5e02230d66
MISC metadata.xml 496 BLAKE2B e22557387c28a1116ab1766aaa52ffd256b079cc8cddb3930c112ce912947f32376129b579e9bd80c9f11de245b7fbe1ff64e1ccf26ee575886b0cddc0577cd4 SHA512 64909e19b147996b6e0798de36c038148169be312e0e3546f9818baead0adfb264a6184a37ede327ba3890881f39fd38707ee06341b140d7589b9a9021c2026a
diff --git a/acct-group/mythtv/mythtv-0-r2.ebuild b/acct-group/mythtv/mythtv-0-r2.ebuild
deleted file mode 100644
index 1bae0b27c841..000000000000
--- a/acct-group/mythtv/mythtv-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/mythtv/mythtv-0-r3.ebuild b/acct-group/mythtv/mythtv-0-r3.ebuild
new file mode 100644
index 000000000000..557810aaa058
--- /dev/null
+++ b/acct-group/mythtv/mythtv-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d814944d1b19..6c5b6323641f 100644
--- a/acct-group/nagios/Manifest
+++ b/acct-group/nagios/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-0-r2.ebuild 151 BLAKE2B 9e0290f1fc1ce30d1998fa169dc39379d303335e98a32cc4b770c38fbec53039dac071f2328a360483ef2e428924c38192c74d8beef04d907a66389adb27a6bd SHA512 d2cd587dd157eb0018302230eb215ddd0c16602838e1c817cfda483195a779783ee160936b83bb4f7478a00dab657fe7c468e9fe5840429ef9e3ca4282eecfc8
+EBUILD nagios-0-r3.ebuild 151 BLAKE2B f3796bf24b0e30a9ddb21f7e21228364afedb19a8b7e7cd9a2e635eeceb5126978edc23d725b47566535c71e1675d67f5bba514db0217808742d3841837a615b SHA512 b2fceee346a14f6b125b21321442748e804256285899d8495902127b5029574bc78375925ed1025ef828d0fb1f6f9ca4c250914aafe2604474b61df36fd0e643
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-group/nagios/nagios-0-r2.ebuild b/acct-group/nagios/nagios-0-r2.ebuild
deleted file mode 100644
index 57bd2f5d883b..000000000000
--- a/acct-group/nagios/nagios-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/nagios/nagios-0-r3.ebuild b/acct-group/nagios/nagios-0-r3.ebuild
new file mode 100644
index 000000000000..4b2b6c8cc3a8
--- /dev/null
+++ b/acct-group/nagios/nagios-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=436
diff --git a/acct-group/named/Manifest b/acct-group/named/Manifest
index aeb94135a7a9..a66c76df744e 100644
--- a/acct-group/named/Manifest
+++ b/acct-group/named/Manifest
@@ -1,2 +1,2 @@
-EBUILD named-0-r2.ebuild 150 BLAKE2B dd80ba8bc1f3cacc2355af066bd414aa8bbe9167a929d3a4f8b2baf7c7774f414a34fccd1cdc597fcda351918fa87c33cd2dba6b039f1f3fecd2bd613140ab7a SHA512 4fde18850b6b9846ec645bce7781ee61081f8fe0d31b90e898e951c0ee44bb8e3fb7a65b2e040da540237d7987984d8ebdc1731ded338750d721078f3399af31
+EBUILD named-0-r3.ebuild 150 BLAKE2B 4da09de6cc35a295c7252695b19314263495b3ec0ae097b18255ebb94c38871f0ae0a0fdbbc0a429ef36754e7bb3385098c980fe3dd71c2c6e3c9312c85a1703 SHA512 51dd92d21f32fafb1997adf4f0e3b79228fd2c64e5871f83fae333f92b617d8e0921df388f08b42a492b86069d66f535d9bc9d0950f1c7b646763cad0a6222ac
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/named/named-0-r2.ebuild b/acct-group/named/named-0-r2.ebuild
deleted file mode 100644
index ddeeb7029d58..000000000000
--- a/acct-group/named/named-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/named/named-0-r3.ebuild b/acct-group/named/named-0-r3.ebuild
new file mode 100644
index 000000000000..c0f364f83622
--- /dev/null
+++ b/acct-group/named/named-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=40
diff --git a/acct-group/netdata/Manifest b/acct-group/netdata/Manifest
index eb1cf892f13e..65e61e62dacf 100644
--- a/acct-group/netdata/Manifest
+++ b/acct-group/netdata/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdata-0-r2.ebuild 151 BLAKE2B a4d4fecf591793508bc2c311d6ea8b04a4aa4d280333c158b5315609a109f1c0545daa58542645438e41f29c39bb71ea6cb275d800f68865bdd18ef26018711c SHA512 30ce78c7ae5b204bf503447767b4ad1681f73779b0329fab26649a37f880dd31089fbef9dbacdbaea03901b1898e5b95e846af6e05a27e61c29d9ebe7d93140e
+EBUILD netdata-0-r3.ebuild 151 BLAKE2B c0fffcdbe7e5ee486462dfb4d4c67a6d2750816f33f6f955896c12c9c3a69f913de685679d04d051bf47f1ba9859aa34b5be6bc1a24bdf231dc8309258b11795 SHA512 d74da0fb3ab901ce487e8377aba9d000222d82ebc78e11d9e1885f346d9d6cdfb06ef718bad60b246e160fa08e7ec4a3408d2aa7035d765dd54e3168da7e10c5
MISC metadata.xml 255 BLAKE2B 5c405696da1838a5ef8da4bb3a32993157261b449cd28da0cbfb24fa2f33ea1a15ec1415fdeee87c2c051b023c58208065b0cdfdd5de15d648ab675420d9a2b6 SHA512 df4870842bef82cb206492fb14b03f0195dab3fd6aa1eed1c6aeb9c57978bfa68fb37a523ee3d8591937e750dbb52579e24b245e0213be6805b5ee461392cc12
diff --git a/acct-group/netdata/netdata-0-r2.ebuild b/acct-group/netdata/netdata-0-r2.ebuild
deleted file mode 100644
index 38db03ef5a1b..000000000000
--- a/acct-group/netdata/netdata-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/netdata/netdata-0-r3.ebuild b/acct-group/netdata/netdata-0-r3.ebuild
new file mode 100644
index 000000000000..55b8cfbd40b6
--- /dev/null
+++ b/acct-group/netdata/netdata-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=290
diff --git a/acct-group/netdev/Manifest b/acct-group/netdev/Manifest
index 1b8c0b781c2e..060a5f16fa01 100644
--- a/acct-group/netdev/Manifest
+++ b/acct-group/netdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdev-0-r2.ebuild 189 BLAKE2B b94baa6b4f55508847cf836bad51b52f27929e584a8845054126d0ccf910737643b93f6f785316d76f25b125d880b826a81699700dc2e01104ffb3dd8631804c SHA512 6de75999b6311d41dafd3d3dfa86e41d5e05b6ec40a8c129ebccc765648e66adc18c6a90a617c0e985b694f96c36abeca8c501c31e404f4f63b04a6b304156ef
+EBUILD netdev-0-r3.ebuild 189 BLAKE2B 42e1cff1c4b77c2ad5f003f3f34377d23ed1618a127a3252c822c4d28c2d7927973a612ff683e3635b7d9f9bd785e043b9407c9ec09e4e5b8c4d882250a2c756 SHA512 3ddc34199107c01275aaf092af97b39025fb6471c8cd7e3b9d3846c5bfe7e12685cb83a87ef776cd6515f21d0c08fa63478fc5f505a97bed5eb7d78e7d06d03a
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/netdev/netdev-0-r2.ebuild b/acct-group/netdev/netdev-0-r2.ebuild
deleted file mode 100644
index 8841c2494070..000000000000
--- a/acct-group/netdev/netdev-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/netdev/netdev-0-r3.ebuild b/acct-group/netdev/netdev-0-r3.ebuild
new file mode 100644
index 000000000000..4807a4d9f64c
--- /dev/null
+++ b/acct-group/netdev/netdev-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 550feb56fa56..0d273d9455ee 100644
--- a/acct-group/netperf/Manifest
+++ b/acct-group/netperf/Manifest
@@ -1,2 +1,2 @@
-EBUILD netperf-0-r1.ebuild 201 BLAKE2B 3dd426001c463c6236e1852cead04d68d76ee966fbdd2a60d1c3250fd7c5f8caaf819fe7a3ca80afc18697e9fbaa0f0d4413ea771df4262d92acdefc6901d5ba SHA512 f9dea76c3ebac8d751b92ea816548906823eeabde18b9ca5d2cd8f6cdda34fbee8bd0f8f52714c521d74aca8a15bbafbbd73573d4998a2c88c00f0a4c1a42cee
+EBUILD netperf-0-r2.ebuild 201 BLAKE2B 1d5fa35a595119d082f7e5335626268af1ed67d700648c219acc2e8ab1aefaeb65f0e2acf902b9103868f8466ff71f33d3b9ce2a816abc0ec5e739cfc49e0180 SHA512 b1860420983210958949b4a586a5ffdeaa53aa6feed27c5ff97c30b228b9e34d1dcf6601e6c8604f90a6821c2885084bda5643fd0619b7f87ac3fb8b97201806
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
deleted file mode 100644
index eed641e94964..000000000000
--- a/acct-group/netperf/netperf-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/netperf/netperf-0-r2.ebuild
new file mode 100644
index 000000000000..6a82538c18dc
--- /dev/null
+++ b/acct-group/netperf/netperf-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/netperf"
+
+ACCT_GROUP_ID="168"
diff --git a/acct-group/nginx-vts-exporter/Manifest b/acct-group/nginx-vts-exporter/Manifest
index 7cb0fb2871cf..e45dd9b36970 100644
--- a/acct-group/nginx-vts-exporter/Manifest
+++ b/acct-group/nginx-vts-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-vts-exporter-0-r2.ebuild 151 BLAKE2B a340d114305c1e9d4e8fab39a6765b2122651f9e99515d9f1e91b4a3371eae67fa10ae1b648daabcf7d0bf02c7fefc74a8636255d37246008248778b08fb7689 SHA512 2b56183b19cfe40f5dbf8013a44608dc8e30bc4539b5b719cf6ed31a05983a06b6c0ba5dc45f3a1e72ca9525f25e5e11dd1a932c6376ac01929fcc28e9d06bb2
+EBUILD nginx-vts-exporter-0-r3.ebuild 151 BLAKE2B 6755f3155708664e66a06413afd2ad1cb811bf37169e49ccd05df7e3369b0896f395c6d1fd5807b64b9a30d26bf6cf03c4ec81ebdf0877642c586a22074e0824 SHA512 6fa326d2b0613dfd0c74fbba6b20dfac073aa7946d7f3815f0bffdd58be63209eb6071470085d4d89e03dfffac3bc00e6d6cbd8f9150795b8b7e84fb6dfc32c2
MISC metadata.xml 258 BLAKE2B 14fff3c5ded754d49480aaad0bf53ddb8cc4d824c072af60647f5bc179aebe8902564c877b9ac0199384d2823b1950a6c48cd2c6297c604e0d2f92c276a9768d SHA512 2d2417fd604c1e3dd12bcb46d06e08b1acdf2117eea460d115f66f0114a6daf2a3dbaae7af7ae74625398d336f5759a6e5456f4f1d0104bcae4e74265f6a0e54
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
deleted file mode 100644
index 392a6c4025f1..000000000000
--- a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-vts-exporter/nginx-vts-exporter-0-r3.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
new file mode 100644
index 000000000000..b4b89009ca9c
--- /dev/null
+++ b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=354
diff --git a/acct-group/ngrep/Manifest b/acct-group/ngrep/Manifest
index 577dd1d6324d..dc2e1f91fe37 100644
--- a/acct-group/ngrep/Manifest
+++ b/acct-group/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0-r2.ebuild 199 BLAKE2B e4b224fdcc2f43d364d1011f0d5abf78f0c2bbf2acc5d080441fc422b3725b1c54f3e8e3c9b775253443cfee3f14d70db2361ce95264437783b9bcdc661721a5 SHA512 5ce1505baf110f1177ec8b0f26d9fd9984056104f3ae7480515b81e186a4e6367cb997348bc5fa6d09563205a9ebaf9a4fdaea2b2e59ef403fc4d7daf2b81d25
+EBUILD ngrep-0-r3.ebuild 199 BLAKE2B 4f732e5e439f86e828631b7a015df5ebf277a94fe157874bd3205dac7ab44018488efce49c362501e2f199f4f13d86bb8882a0c5df05737a97f317e1b25c3e4d SHA512 be7438effc825d8fa1f8caff34c9b6b1420e071d34542520892c7f85aa81c31cbd14d367b6155f2671840fe73a2a92505347d848fc0b3f8d5d205fd5ec9f3488
MISC metadata.xml 625 BLAKE2B dccaf7134c266c36cbb22380e96e5dba09a7b9ce70285cc21c10168b236c7b17e7dd52e3c84dfe4a311ab600263159f7acf04243edefdfa00937bc43d54b71dd SHA512 3f7d9d8ee4647bded5bf3b73b7fe5489b19b82e27a8e0150f08a6f3cb1a2dfe9292591ab4d378f897e09d98d77b276960aa756d22af7affb4ef2e40b90737003
diff --git a/acct-group/ngrep/ngrep-0-r2.ebuild b/acct-group/ngrep/ngrep-0-r2.ebuild
deleted file mode 100644
index 4953ba08691d..000000000000
--- a/acct-group/ngrep/ngrep-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/ngrep/ngrep-0-r3.ebuild b/acct-group/ngrep/ngrep-0-r3.ebuild
new file mode 100644
index 000000000000..8c92555008f4
--- /dev/null
+++ b/acct-group/ngrep/ngrep-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8d497975fb2a..f4c7be134f85 100644
--- a/acct-group/nm-openconnect/Manifest
+++ b/acct-group/nm-openconnect/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openconnect-0-r1.ebuild 215 BLAKE2B 6bffc326b21029fe47d9321f1c2faede45ee33122ffd869c8cee28e33454f170d9cc97dd46d14d76afb92c2d58b0f363fcefb22f970345a3b70a2924d4185b7c SHA512 b2c9301dd582208f449e493ac724cebe4b9ee1c1e806d0b7d785892961b44768e0230f4e892af87787d7e2f3c5e1b15a39c10216422c0a16bfd9c22c983259d9
+EBUILD nm-openconnect-0-r2.ebuild 215 BLAKE2B 9da86b470adf8ec81c41ec2d5de6fdf42f5a6f689fa84516d590f2707e512567f29b14d868c0e604a15bf3711e62f85b10fe8ab549304ac37f8b36c20de4fbb6 SHA512 8a2d04ca7e4eb5147060342330c969a82376a7a48cd6bb71fec885e8cb109f609ad8bd6d061467d497f4f0b554f65a80d970a9fdd8e71a49b3f5425689c383b5
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
deleted file mode 100644
index 90d1a5c1369f..000000000000
--- a/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/nm-openconnect/nm-openconnect-0-r2.ebuild
new file mode 100644
index 000000000000..902e6c623eb9
--- /dev/null
+++ b/acct-group/nm-openconnect/nm-openconnect-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ca55ff3291b9..34ab50e55e4f 100644
--- a/acct-group/nm-openvpn/Manifest
+++ b/acct-group/nm-openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openvpn-0-r1.ebuild 211 BLAKE2B 740d057dde0a44b165e5a20c7fe83ebeb85dc1854677e5f2edf29397ddd05379c3aed5e346c0b5973fc12c15c15c6fcbeffb143129260cf71e39de0258035d2a SHA512 aa492b649e9cb0e88303a655d887c808f555ae3f47d661ff226f0f0597116ee738cf69e8048449d8d9e92ec29a4a22d7e9667a39a5571199c9bdbe527f1af4b3
+EBUILD nm-openvpn-0-r2.ebuild 211 BLAKE2B a71bad99ec9064f9fc3f219b33af89a87fc805d01a49974739866ef21887bc0ba6285224bc64da899f25d25166c51102c0fb81cfe644821c46e550f99406d64e SHA512 13af6c3f7169ddeedf73f003bba3f6ca2b460554ea10170d19df1cc705ef60ac42c9d3f608a263b716035ee3ce9ad55bed682f7a9f4ab61357b7f0f5d0b25370
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
deleted file mode 100644
index c97d1aab90ef..000000000000
--- a/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/nm-openvpn/nm-openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..32f04ed316d9
--- /dev/null
+++ b/acct-group/nm-openvpn/nm-openvpn-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e4e586c3b705..dec23bd76e33 100644
--- a/acct-group/nobody/Manifest
+++ b/acct-group/nobody/Manifest
@@ -1,2 +1,2 @@
-EBUILD nobody-0-r1.ebuild 179 BLAKE2B 02f2ae52eb2de462d52b91fe1ce45ad533f6f98ab32c0b64f62de469f858107b4db859d0d1b67641a14d88b91a8f6ab5ce2fc00ea0b22874819fce0f6120ebed SHA512 c8f60c0c04d106c2e1223834663832ebf363babf750067fb047f1dc0fa57e9e21239255d841080824ccad347d35ef3429873a94c1b6646afb1abac2fc0e58339
+EBUILD nobody-0-r2.ebuild 179 BLAKE2B 56e8bb7fc56e7319929fd10410bde34557add55e9b120ff4b810b5c248fddb5d75b3dec200b2c349dbc4771ec541e16dd6df6b66c32336e09087ce5fe1156815 SHA512 e240e758b81768e7b19d7cda9b73f45baed3720aeee765d48907534862c199136d2263bfabd1bc3fa6fb5e91c0d300a1c0da9fc42c6122d8ca781b1020b3ec61
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
deleted file mode 100644
index 4f32dd5f538e..000000000000
--- a/acct-group/nobody/nobody-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/nobody/nobody-0-r2.ebuild
new file mode 100644
index 000000000000..faac9ac0b18e
--- /dev/null
+++ b/acct-group/nobody/nobody-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 41e2b5646558..4d2c5cc0a290 100644
--- a/acct-group/node_exporter/Manifest
+++ b/acct-group/node_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD node_exporter-0-r2.ebuild 151 BLAKE2B b2f06f494b6aa14abac46ce60b6a1e42c93be7dcd58ed4ae2c43e6dd660ad9b6eb57a1fd7f188f4f2ed2635a521fca6cb21750b45d23c4375c831a7b7fbe857d SHA512 8f683e29cfe061fd85f80463ac72bf2138b52ffebe2a950d9548796ac110db9a1116b8370a5342458b0ce73fd36a33ff80459aae701576240bef10ba739d79bf
+EBUILD node_exporter-0-r3.ebuild 151 BLAKE2B 694608c1f198ae863dee99466467d7d577da5f72487dd8f5544ba4b3ee15ca3c635ad01060ee79bec1f3f35b6012e6add984424f2ae1235bd6c81ca5ce8f4a9f SHA512 8a5496ea757372e889f83424fb05871befd42b3d940c4e3919847169fcee7f0546b39a6a73e4dae48dc432d566b21abcffecab5b8a0b36bc5a2663f57b8cdacd
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/node_exporter/node_exporter-0-r2.ebuild b/acct-group/node_exporter/node_exporter-0-r2.ebuild
deleted file mode 100644
index 7c28a071b53d..000000000000
--- a/acct-group/node_exporter/node_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/node_exporter/node_exporter-0-r3.ebuild b/acct-group/node_exporter/node_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..53f27856de90
--- /dev/null
+++ b/acct-group/node_exporter/node_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=459
diff --git a/acct-group/nofiles/Manifest b/acct-group/nofiles/Manifest
index 2188276178a9..eae9f0405fe4 100644
--- a/acct-group/nofiles/Manifest
+++ b/acct-group/nofiles/Manifest
@@ -1,2 +1,2 @@
-EBUILD nofiles-0-r2.ebuild 151 BLAKE2B 4339829e393785c4d3465f722c4eb5bdc73215578e0dc4b85b1543013a57c8418d5e6354d41e1632a49c2d7531d3f305d6b2cbfce08c2276d1badffdb86bb5d2 SHA512 3929ea68268072d39e00fb7d2f97697c8b4a09f52a28a9a1b40d30300bd7896cb26c26f492caad846b7f3031e509134a303992eaac7c026ac360c8a40b5b9330
+EBUILD nofiles-0-r3.ebuild 151 BLAKE2B f7356bd4328028c5fb9344eb4771eac972d831017eccb2b6be94e8c56e8c04315bf31c1176c9929a85a76a2e6698469855cfeefc25ecb289cc2c048071be2e93 SHA512 ad4173981a46fba945e49033b2cb1c3b49daa3961a53a141cf5668700c1cb39cf143b3bccd128055a76069e63734bfed260273d6630cf576205e4bb1b3530310
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-group/nofiles/nofiles-0-r2.ebuild b/acct-group/nofiles/nofiles-0-r2.ebuild
deleted file mode 100644
index 1da9c58aaf7d..000000000000
--- a/acct-group/nofiles/nofiles-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/nofiles/nofiles-0-r3.ebuild b/acct-group/nofiles/nofiles-0-r3.ebuild
new file mode 100644
index 000000000000..08a5d0246053
--- /dev/null
+++ b/acct-group/nofiles/nofiles-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=200
diff --git a/acct-group/notary/Manifest b/acct-group/notary/Manifest
index bb06522bac0e..d4500dc2e44f 100644
--- a/acct-group/notary/Manifest
+++ b/acct-group/notary/Manifest
@@ -1,2 +1,2 @@
-EBUILD notary-0-r1.ebuild 194 BLAKE2B 2aecfdf6e2a7c6f693a70ee2b1a986ab30d38f7260db292714af35141e21d1179591cf282949c15b461e20bc10b5b26fdd3bf047bfeef3e468a589e2aa1f7ce5 SHA512 a7c3125ba91e7b3c05ae8d3ffa6c76845688ab1767cd12b48046ee7ad6f488446e3362adb59ea014d88b3e15360ba094cff078f2bfb227d2f2f01f8c94f4a6d0
+EBUILD notary-0-r2.ebuild 194 BLAKE2B 47b5cfec29e31447ac5d3aef04eecec743fe8dc9cc5169e9e3b8843de2103449102cb4037048f67e989337567e0a957fc1f0a4fd196165900553e9d09a81b9e5 SHA512 09484f714ba2a252d839369591b2cf8c9d371bb3066d9969541a1ac6d90745e8566bfde445d65396298de962f36830cd6afe6d143a711a75db358ced2a87ea23
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
deleted file mode 100644
index c40e97bec775..000000000000
--- a/acct-group/notary/notary-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/notary/notary-0-r2.ebuild
new file mode 100644
index 000000000000..5018baa8ab27
--- /dev/null
+++ b/acct-group/notary/notary-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-misc/notary"
+
+ACCT_GROUP_ID="280"
diff --git a/acct-group/nsd/Manifest b/acct-group/nsd/Manifest
index 2fc7d45605d7..907c32d98e17 100644
--- a/acct-group/nsd/Manifest
+++ b/acct-group/nsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nsd-0-r2.ebuild 151 BLAKE2B 7bbcf1697dc27d0d95efe7a6aa3c60566e9b87407d05cda72048f18b284d95a682c0ebba5ee21703b6fba6a2f084aab6a16a03c74461cd38805d497ff31fc688 SHA512 e472081321ee41b1060730199a0b94c3c6b6267de1eedc375ad0343572ff7d41c23ac0837775c9005fd6dff6e0458328cd42d2aef6f843a1fe473562ac4d9657
+EBUILD nsd-0-r3.ebuild 151 BLAKE2B f52d5a81581303633872109f211487419f7bb9bbd75144a80ad71f8ccdc86326a13d3df5395840d21335fc2fef41ad79d310ed7c5548d04d65111441e744ee0b SHA512 e917b28ffb5059989b2de953d2b03977d97576098444155771dae2da36128807a7bc9ad3c56ec6c61d3497d93964552c254a821dd57fe2ddb28cdb8ab217e7f6
MISC metadata.xml 248 BLAKE2B 2ebd3859067e8f8283e96840dcadae47ed3e87851182477e7238733e2d6333959fe8db0005033e3ca97e8bc0e9fe0ac8ec25ca7718ffbd1e7d1170b7b1124d22 SHA512 4063700d10965813ce4aaf3973b20a7209180943d53b249e55e58c9f980ecb3f64fd1e061958ad25d188ec4215a439e0639562ad3b608b6edbf58acc25e94997
diff --git a/acct-group/nsd/nsd-0-r2.ebuild b/acct-group/nsd/nsd-0-r2.ebuild
deleted file mode 100644
index 456480d76323..000000000000
--- a/acct-group/nsd/nsd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/nsd/nsd-0-r3.ebuild b/acct-group/nsd/nsd-0-r3.ebuild
new file mode 100644
index 000000000000..871b935a1775
--- /dev/null
+++ b/acct-group/nsd/nsd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=223
diff --git a/acct-group/nslcd/Manifest b/acct-group/nslcd/Manifest
index 58baaecc0c7f..f68c646d985c 100644
--- a/acct-group/nslcd/Manifest
+++ b/acct-group/nslcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nslcd-0-r2.ebuild 151 BLAKE2B e219cd39f60144a42efeedafeacd496a160b2b0ddf840cfb163ef4460d3f8dcbde30292aa7a07bd1ec02d2a90695ff52685d87fb65ce5c10d1314db2de3aac36 SHA512 b259de362952c8642887244a23e057474bcf800d7b4c7ac35873b9b9ad6ee9a9a5c5c5c890c29a5cac4a569b6089d3efde41e4d5746369c557566470b780c406
+EBUILD nslcd-0-r3.ebuild 151 BLAKE2B 1620c7004ae4c920140ac68e6f4dbd176a4461bc58990f450820b756dd9b2d65c543bb8e19ac8aeac8ceb184542cb9e85ee1e75769f24f26ecd67dddf0bd414a SHA512 0b272259b492b3800955ec20565e86c0944b3b9bd9b3b3c24059e02a141a129b03c8e742a556382fd05f3f5f4404622061e9dee2626af0c7744525d7a8728fd9
MISC metadata.xml 377 BLAKE2B de37a4550f576438d2d9e50c63d53758876cb174ec6a40846b0c70f377cc1d0928d24951fe803bbb28dcbffa5a30dacf89c05a814ae7304b61ead2c115cc9b25 SHA512 29c89211671ec281f5aa38644ba64d43c90dc32251074e6c0a399b8087e3d5085f0277b1f7899ea278389b406270c0b35e18cbf30cec9fa52cbfa5e7ceb9038d
diff --git a/acct-group/nslcd/nslcd-0-r2.ebuild b/acct-group/nslcd/nslcd-0-r2.ebuild
deleted file mode 100644
index 138e0d6b99e8..000000000000
--- a/acct-group/nslcd/nslcd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/nslcd/nslcd-0-r3.ebuild b/acct-group/nslcd/nslcd-0-r3.ebuild
new file mode 100644
index 000000000000..aaaca3e8204d
--- /dev/null
+++ b/acct-group/nslcd/nslcd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=357
diff --git a/acct-group/ntopng/Manifest b/acct-group/ntopng/Manifest
index 145dd0612f70..b6797ba1552d 100644
--- a/acct-group/ntopng/Manifest
+++ b/acct-group/ntopng/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntopng-0-r1.ebuild 151 BLAKE2B 4fef83e8c60800a059f8439c6a48b618511e307710df770b2f9a3ded8c2d12943f16d740940e302b024b9328c8928bd0f4df7cc0b7266bc57f06549a5d9a3d58 SHA512 aa7917340a2b0c2b2706b7a049a477fd8cba253a8f9f9a61635cfc10468478e4cbced45c6ff34cee05ecc902617b1f81bb9ae686e9f7f98851bc60454241422d
+EBUILD ntopng-0-r2.ebuild 151 BLAKE2B 2da9f393869d139ac154251cbfedeeb4edaae5ad024a9c597bf89f51d4b78f673c9c3f293a0d9add8d7f2ba1f3a0021a88fb2ed3b3845780ecc6677e0d7cb8ab SHA512 316cd4a23398d65ccc97010cb234d0145e0efe97261a2c016bfdfbb626f0d28effcd9741ef41235efa4c4ab0a26ca56e1ebdbd457adc8acafbe7c7fab532834b
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
deleted file mode 100644
index 5f19248d57aa..000000000000
--- a/acct-group/ntopng/ntopng-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/ntopng/ntopng-0-r2.ebuild
new file mode 100644
index 000000000000..a6e114615bcb
--- /dev/null
+++ b/acct-group/ntopng/ntopng-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=296
diff --git a/acct-group/ntp/Manifest b/acct-group/ntp/Manifest
index 46f4652595dc..6c2c04b1ac83 100644
--- a/acct-group/ntp/Manifest
+++ b/acct-group/ntp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntp-0-r2.ebuild 151 BLAKE2B a07b679dc328260ff4cc5f8ce52c57a4083aeb4473b5cd2aff22ee3fa8e45602d8e9f3b983488803014f5a6a2f8808b4fbcae18a7f4d5cd7c1a555955a09f022 SHA512 e4bf6d97ac8cd994e06aa5842c91fbad7da8a5d4f8867ee95b612099bfc53eb9c3dda3fc60e87c16b34880be850033aff89a942c53aa73e756e579e099382500
+EBUILD ntp-0-r3.ebuild 151 BLAKE2B 7b0fe930099f881004049e6198a89eb48f9a85bba7ceb9db86c617741bf8c76338da00105d7e21be5eb747d9af9e766a69b0e0fac401bf9b90193dd0c572244f SHA512 b66084fbec08679933552a0e539c91b6d01bea48a05acff401bde26c5f0a9fc44bc341da22cb26bd0438bab631e3cc6fa17f081c5cf76653c62b4d64627932ee
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
diff --git a/acct-group/ntp/ntp-0-r2.ebuild b/acct-group/ntp/ntp-0-r2.ebuild
deleted file mode 100644
index 45fffae0e48e..000000000000
--- a/acct-group/ntp/ntp-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/ntp/ntp-0-r3.ebuild b/acct-group/ntp/ntp-0-r3.ebuild
new file mode 100644
index 000000000000..48e56ec9111f
--- /dev/null
+++ b/acct-group/ntp/ntp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=123
diff --git a/acct-group/nullmail/Manifest b/acct-group/nullmail/Manifest
index 2d1714647085..fdf1d743516c 100644
--- a/acct-group/nullmail/Manifest
+++ b/acct-group/nullmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD nullmail-0-r1.ebuild 194 BLAKE2B 80cb08d06c3433d44217ec1323baf7f52dd3bf6082fa850901f04d737a4c7e6f32b1fa82aa9c66eb13c236f8741ffa127b10c5fa1f78b66a2458e73cf23730b8 SHA512 c4eba6605bd36ac2576a569cd4892d5e22b161bf605acb43739f79a238bd020da195e209437a2917cddd33652ef9422a562c08d57f8ede9ab12fb29888479bb9
+EBUILD nullmail-0-r2.ebuild 194 BLAKE2B 9fc8e62c9f09e143d86043147343517d642f8ce7d55862a79f080cfc4ff482d6c556826b856230815852460ce01ee8f20aa3892fc2f2877398aa03c3c1749e42 SHA512 2ba05a855fa79af643e3f27ca5ffe16b1cfecc901b3b711fcf7d3c86c23560877fc37c3c0d4439dec99c15c719e456e1538e3134809bee204f9ccec272a67da7
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
deleted file mode 100644
index c85a088847ba..000000000000
--- a/acct-group/nullmail/nullmail-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/nullmail/nullmail-0-r2.ebuild
new file mode 100644
index 000000000000..140048d5d67d
--- /dev/null
+++ b/acct-group/nullmail/nullmail-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9dd54b454fb6..ec5621536dfb 100644
--- a/acct-group/nut/Manifest
+++ b/acct-group/nut/Manifest
@@ -1,2 +1,2 @@
-EBUILD nut-0-r1.ebuild 201 BLAKE2B 0653c3ce2c220e15afa35e916fdaa054041c3f9f444c700933478dcb2b30258f93c49da5712bf53bf700840a427111826515c334c448c69ff34d84c963af9eaf SHA512 1774db2ffed5ddd306e3da8f664dbf1205e3a3cc00225ef3b7e0fd3980ab341465b2fd161592f738c450dc1eda0a518981fc58a28975e8b4571f1cfab15508e0
+EBUILD nut-0-r2.ebuild 201 BLAKE2B d1670603f0d8fb3b506d4402eccac4659823f41b4a2cbae140e6a077ee2732d4e5089f7c23c09633d0cfb6259679cb87722a05c74aafa82000d1350c6f9784bc SHA512 4a58cc6af480be40f4cd2d29c588adf67ce74cbb4d451d7a94901ff70713e6a19beb48b8870a01ee73909989d0a09c7ec4a21caf077eb941ca3d1f4c0e09a48f
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
deleted file mode 100644
index f85662f46ff0..000000000000
--- a/acct-group/nut/nut-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/nut/nut-0-r2.ebuild
new file mode 100644
index 000000000000..e29f6b91ca9a
--- /dev/null
+++ b/acct-group/nut/nut-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9af850d834c0..5df206c30448 100644
--- a/acct-group/nzbget/Manifest
+++ b/acct-group/nzbget/Manifest
@@ -1,2 +1,2 @@
-EBUILD nzbget-0-r1.ebuild 191 BLAKE2B f15bcd9316391f4f6f8be64a4637361e8cc668e3680f0b636d01a2fd719cf3d25ea341e46b968c7fde3f5cf66f68c8887dc7d1cd393588c4eb73f3986301da05 SHA512 d85411457e3fbc3fa1da702df6c30196c48354b3cf7be66a1d3c382035ec85c3b8d5b64c98ef665a29251b7a13efc561ce7137aea522b298bda6cd2e2542831f
+EBUILD nzbget-0-r2.ebuild 191 BLAKE2B 423909dc3be899e0cef7487579c3129daff0f20e3c379f60b03766c5e3dcb59617eeb97cab1f69313ff14fb72d3bd0dce3b305d53cac2af6ebf23941fd0a2e67 SHA512 dd34cca3b29a86fa095439afb392bce53ed3d12c262d620379ddde4b954b20ebc527bd4938ee8912e2867bcf6f8ec07aed58483d492bcc8bac854740ecae0045
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
deleted file mode 100644
index 63dbcc4c6cdb..000000000000
--- a/acct-group/nzbget/nzbget-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/nzbget/nzbget-0-r2.ebuild
new file mode 100644
index 000000000000..7d0b786580d8
--- /dev/null
+++ b/acct-group/nzbget/nzbget-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 69ecebdea704..594543e7d073 100644
--- a/acct-group/oidentd/Manifest
+++ b/acct-group/oidentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD oidentd-0-r2.ebuild 151 BLAKE2B 009c5a3f95ef2c335ba0342ed24a291fa324354f1cf8bc7fa629889623ce93bff98da7df58e21f73ebe89017f29370213736d88fbe4afaafb7386bf7821520c0 SHA512 2f1b0a2509fd41242678420d0ed9e0d98938ecb366cf2b73e451f01234cf4410596847fa8ebe1d93fe093e3b480d2bb4599e7fa3d56364a6e479a80c85cb4dbd
+EBUILD oidentd-0-r3.ebuild 151 BLAKE2B 9508ce6a157b7531b08477a4adad9852c7ff4a471df1002aed3261e9c4119e83f9d8b35074f5c6778682fcc741c0e380fad0e3331323abd48f1b15eaa5a5a65e SHA512 949525c9478e394cecdf55d52c3234dbf24f9298ca78bd4df01d9d5b1ea77db4553593ac341a9d4e5ed7454e91c94d69694c64babe6cffdac1b817e726e40e35
MISC metadata.xml 393 BLAKE2B cece790dd0310b08c71dfc107e0cf9d28a86714a8d14361140f30820be5987008fbb1f0954db16c6686a8c087bc54f0935960d4ce718e2f61240d2e83e67823f SHA512 4b60a9a9e648418f7d7eb82dd3f5d4ab28caf622f9f84cd8db5a782cd5db5e6bf1b20a4dae54b65f27998db671aa1ddd64ddd3e9ef26ffb1d786bcae82760cb7
diff --git a/acct-group/oidentd/oidentd-0-r2.ebuild b/acct-group/oidentd/oidentd-0-r2.ebuild
deleted file mode 100644
index 703dc5367d39..000000000000
--- a/acct-group/oidentd/oidentd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/oidentd/oidentd-0-r3.ebuild b/acct-group/oidentd/oidentd-0-r3.ebuild
new file mode 100644
index 000000000000..17779fa5c4fe
--- /dev/null
+++ b/acct-group/oidentd/oidentd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=493
diff --git a/acct-group/openct/Manifest b/acct-group/openct/Manifest
index a1982d71ace1..4faf62d2a0e8 100644
--- a/acct-group/openct/Manifest
+++ b/acct-group/openct/Manifest
@@ -1,2 +1,2 @@
-EBUILD openct-0-r2.ebuild 150 BLAKE2B 43d37aa8de1374725fcbd20dd2d3244f38b772041a72433689f005dadc33e3b0800a06f19413477fa3252c27e679efc1c39101e527d001e8fa5301ce8627f2d4 SHA512 1e1b3312779312023094ec5bb17e728154718e34767fa534083e9d5e3fa0a777f51ebf43df11cc81b13c1b11e704acb883b1417a00c625e11534bd000b2c61b9
+EBUILD openct-0-r3.ebuild 150 BLAKE2B b7189ab54ddd7433ec677b7d1e545d2a44b2b68ad69b1b1d7c8d924c7c2977c2fcfb477f664c2966c75a220808f23dc0aa61249fff1824acbec61ae1f734c892 SHA512 94fe243f440aea19849b8553d8bf0995a811cdcf602b265424e6bdbbabdb8a440a53987ef6f2f5e859988092db65bb48e4e0a02006b13b197f4fc0ffb03308cf
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/openct/openct-0-r2.ebuild b/acct-group/openct/openct-0-r2.ebuild
deleted file mode 100644
index e373f6d15260..000000000000
--- a/acct-group/openct/openct-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/openct/openct-0-r3.ebuild b/acct-group/openct/openct-0-r3.ebuild
new file mode 100644
index 000000000000..17c82955be9e
--- /dev/null
+++ b/acct-group/openct/openct-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=46
diff --git a/acct-group/opendkim/Manifest b/acct-group/opendkim/Manifest
index fb7e0b536245..6aac87b93702 100644
--- a/acct-group/opendkim/Manifest
+++ b/acct-group/opendkim/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendkim-0-r2.ebuild 184 BLAKE2B db78f98946102aba35cfb6bd5a0c0e9b4e3ecccf48140c9008caff7952106f9aadbf238ee619fd49b3e70039fdc6d379a4ced81a9efc8f3c5b6ac4596ec89b70 SHA512 3e6eb1ec5c9ecffe697872069581f63eb6dcd3589cc12ba0b056d6c43d2a8878adfd08f9f9d59e7b343f1f02157c8ae88c2670b1ec20f742ca72b228ff53cd82
+EBUILD opendkim-0-r3.ebuild 184 BLAKE2B c6e721c726e93a6f5a9948a1ee41d06954ad721417f9a0f95685ab4826dcb13d710bad41383033074bfc7f33e5c53c98d18d17aa82b0d2537b190dc763685bbc SHA512 f7d986eb59eecbab134ff454d13ba78abf0eeee87b0140c08a96e8474fa079ff25a91d38f47c9f4816257efae7a7c2067ad140106b01ee1609b7be644f21d51c
MISC metadata.xml 247 BLAKE2B 4846dc5414f3478596a37af6a99c490ce9ac8dc341903d8fff794c05354b7a73309f70aac92faa801fff9f8a6aed87860af87e5d227fb2c6425b907038bf0052 SHA512 7a189fd4e7c0f67664c0788b4769a1c038374eb224c259fc206dd1d2448eaa1deab71c612186cff31cd380fb445fa4ba066a0cf881028191e8adb0aae9d862c9
diff --git a/acct-group/opendkim/opendkim-0-r2.ebuild b/acct-group/opendkim/opendkim-0-r2.ebuild
deleted file mode 100644
index daae0306083c..000000000000
--- a/acct-group/opendkim/opendkim-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/opendkim/opendkim-0-r3.ebuild b/acct-group/opendkim/opendkim-0-r3.ebuild
new file mode 100644
index 000000000000..3e963e6ae49a
--- /dev/null
+++ b/acct-group/opendkim/opendkim-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for OpenDKIM"
+ACCT_GROUP_ID=334
diff --git a/acct-group/opendnssec/Manifest b/acct-group/opendnssec/Manifest
index 87ecabd4f8e6..239a9dfc22e9 100644
--- a/acct-group/opendnssec/Manifest
+++ b/acct-group/opendnssec/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendnssec-0-r1.ebuild 199 BLAKE2B bb1b81a91ed5ca2623ca3e7a5166ace012cbc8cb528733c43ac4ad9b6eca5f8c84864a46de365e1cf9b112bd3e4afabc65e574f5a1ef397ce8fd0c4a4eae1cfe SHA512 9901e2d05bf7c5bac8c13fee8b0dfdd99875cd70fb1d2e54a0be51bf19766bdce977c0b39c112dc9b25155682843752ed247afe2b8ca819dcbced91dd4353471
+EBUILD opendnssec-0-r2.ebuild 199 BLAKE2B ca9ffb0312ea46e77a662b9da8a16a768b961744a24b82e1ffdb78d7bb5f1f670e006574c724919eecdf1d480dda451ae91149b013555d481ee2b2ef181ba916 SHA512 c93d6847e163d70f1dcb57763b5c3defe94fee4525d955f64facf376ec58fd1abc6661367ca68689ab078e78ee77adf0a0db9c0efe32e3c52717fbf1b1603641
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
deleted file mode 100644
index 291c3d63eba3..000000000000
--- a/acct-group/opendnssec/opendnssec-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/opendnssec/opendnssec-0-r2.ebuild
new file mode 100644
index 000000000000..d69ac5763c91
--- /dev/null
+++ b/acct-group/opendnssec/opendnssec-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bb7667a5c281..f5f90a649993 100644
--- a/acct-group/openntpd/Manifest
+++ b/acct-group/openntpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openntpd-0-r2.ebuild 151 BLAKE2B ee5d94a5731250d9645b6101c3c5bfece480b5b08793f68f18023109299d0d1268e3ae8743dc52f6662be60a4e5ffd770a2509a7b8ae0cd248942cc0ecf2446a SHA512 048a83640265ce60f09acae5d0e290f37897e46b7d893de6d4011e16c42053fb1805aaa12e9d09ba707ff849f4832caa3948553e3b86cd4a939b0bffe6ccf1c3
+EBUILD openntpd-0-r3.ebuild 151 BLAKE2B 033b8e15b1ff2e96da0f851d2ca3934504f44c33a00791eabce113245b9b041728bcdcf77139685ec2f5ad171af567cbbb467bd8dcabc6984aaf50cf84fd97ec SHA512 278c0e71d3e46a581edac6cdfbee7d9243654ab4964810471df197d8dc64b713d7adae1e14f6a7fd947eb815ce9a0bf5e6f5e9e36220375389709ff90cc8a13b
MISC metadata.xml 392 BLAKE2B a875ac61061b518231ca2dc61e92dec80b9a647942ba08b241bd897a2232a6b3ab804f875de8a64a1d323f4b289193571998d867279ca135dda95ab1f056abad SHA512 4418af84fefa90044cb549d2195537df74dcfe7a8c02011b8e0a975f660e0226c942da080b20529fc5752fe0e87928479ac433de3d7ae2947182672e3508a030
diff --git a/acct-group/openntpd/openntpd-0-r2.ebuild b/acct-group/openntpd/openntpd-0-r2.ebuild
deleted file mode 100644
index 3ee1906bc806..000000000000
--- a/acct-group/openntpd/openntpd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/openntpd/openntpd-0-r3.ebuild b/acct-group/openntpd/openntpd-0-r3.ebuild
new file mode 100644
index 000000000000..332a61fa9496
--- /dev/null
+++ b/acct-group/openntpd/openntpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=321
diff --git a/acct-group/openrct2/Manifest b/acct-group/openrct2/Manifest
index d3610f3f001c..fb5c13ef79f2 100644
--- a/acct-group/openrct2/Manifest
+++ b/acct-group/openrct2/Manifest
@@ -1,2 +1,2 @@
-EBUILD openrct2-0-r2.ebuild 210 BLAKE2B da1059464e97e2b6644a16123e815013c805abdc9a1617d3f125a0bc7d723d1efaf2393eb397489d0f75beb0c261c54fcbc30debf8f585a7574ae01cd7bb4ef5 SHA512 1017a5c1345dad02c9b4fc4158d086f539270123fe837c9e53fb0b6da408ab4cc539654e9222f46469c92338e2b023dc35bf158adf6d7aa10993be9bd6a8a66c
+EBUILD openrct2-0-r3.ebuild 210 BLAKE2B f32a998043b30e7d193688406ce8f2fa69c5eb3eb43ff22ede7d5f219f144b999dc0d13e3b358cec9f47bfb44e243469bcc6dc477cdebbe2bda2e9f387ac2a4d SHA512 049cedc2a62c6bb062c714183a1292d6b27ba0eea76e9a747d8c9eaf1d4fb0f6ccc7e5f8a4e72717901bc0ace6a7c8a31d4b15f453a8078a810871598e331baa
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/openrct2/openrct2-0-r2.ebuild b/acct-group/openrct2/openrct2-0-r2.ebuild
deleted file mode 100644
index 73667b9af642..000000000000
--- a/acct-group/openrct2/openrct2-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/openrct2/openrct2-0-r3.ebuild b/acct-group/openrct2/openrct2-0-r3.ebuild
new file mode 100644
index 000000000000..2e282663a02f
--- /dev/null
+++ b/acct-group/openrct2/openrct2-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the OpenRCT2 dedicated server"
+
+ACCT_GROUP_ID="479"
diff --git a/acct-group/openvpn/Manifest b/acct-group/openvpn/Manifest
index 278441f8f7cb..8e200d815ada 100644
--- a/acct-group/openvpn/Manifest
+++ b/acct-group/openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn-0-r2.ebuild 151 BLAKE2B 18fd193096556d89b0247da4df265b517558f9dc93f228a687626b600192307e49fbca5fddea4447a296df48b66e2958161528e5602946b552b8dc797f5130ce SHA512 f8430a4d813ee9ef3f84a525af0eb56d7a83e6b694338061b4343cece1497c5786a9b67c38956162b1777e23b02b321f33e8a6988ef01f3e75895736a492864f
+EBUILD openvpn-0-r3.ebuild 151 BLAKE2B e26ae781cdef15119a379df2165e98846742da8bcf5a221f41b96d18ac40d5fe2759e5ac83670fbc79614ad41128c3650f5ab721ced44ee732203add438b8a61 SHA512 f85b231ddd66bcdb6f5f7ec97751cc753387bea7a4db8b05c4c1cfb48a00129626854b5a79cf05035c6a3a4f65b959a236463d81add85208a71afa0d9a966b94
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/openvpn/openvpn-0-r2.ebuild b/acct-group/openvpn/openvpn-0-r2.ebuild
deleted file mode 100644
index 8ab888445c6b..000000000000
--- a/acct-group/openvpn/openvpn-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/openvpn-0-r3.ebuild b/acct-group/openvpn/openvpn-0-r3.ebuild
new file mode 100644
index 000000000000..0e692961c792
--- /dev/null
+++ b/acct-group/openvpn/openvpn-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn_exporter/Manifest b/acct-group/openvpn_exporter/Manifest
index 63dbb3ca7c97..1cf7252e1055 100644
--- a/acct-group/openvpn_exporter/Manifest
+++ b/acct-group/openvpn_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn_exporter-0-r2.ebuild 151 BLAKE2B 174b95f5663a534f459d8269c3f09248f9186ee3da2854032b895547404f6bba19c4b2fbc8822e279f8a6c446c2a85a0d54c457a3c71f6ad7d0d5387c53bb241 SHA512 1ec6331b77f2b555cc6d99e050c7173a38bbed77e8c94fbd6b544f6871c7572edd4ec7930219451379f0f1eb8e1e8d5a0e86c842a26bdc2280fed361dd25f327
+EBUILD openvpn_exporter-0-r3.ebuild 151 BLAKE2B 9b9f4ed042ba403204e309851d9314ffd183dfc5f51d7bd7c1dd316676cfbdfbbeb2c3f418376cd4c1f58cb7edb1ea6efdf802f238fc2fb43ebdd8ef4edaddcc SHA512 1a9cae8f032ae4d020a87f5d160853c60bc6efdac3fec8eb744a48e3b0cee214671c38914f890313e1063cedaa860bd5f4cc6c42bebdfc07ad4a689eaf9b45e1
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
deleted file mode 100644
index 99350ce10aec..000000000000
--- a/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/openvpn_exporter/openvpn_exporter-0-r3.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..122b2acf6f07
--- /dev/null
+++ b/acct-group/openvpn_exporter/openvpn_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=355
diff --git a/acct-group/oprofile/Manifest b/acct-group/oprofile/Manifest
index f8e037568003..ec037bf74399 100644
--- a/acct-group/oprofile/Manifest
+++ b/acct-group/oprofile/Manifest
@@ -1,2 +1,2 @@
-EBUILD oprofile-0-r2.ebuild 215 BLAKE2B 9d2c4ef047a1f3d5b1f44406c6164dfb0676ac529c1f536f58c7d0978e12e0a8b1a635e7223929ee3b2240243af69f71e1961df9b039cee495594d77bf288f70 SHA512 c948502825e595e7d2cfe474a8c276faf0303c7e1cf6b09aca61d36dce6c89a292123924b7e50ec3edb67e0ec0c047621c3196006d5fe3ecadd0730db4be708c
+EBUILD oprofile-0-r3.ebuild 215 BLAKE2B d97452de21804808a4c08d36734e29168c43a109a50f54f7f27485040d5524f99a100885c269c350a642dee83bdde65cbcb938b4f2e982436fcd690d6b6a7f89 SHA512 087861d9b8ae652fc1958dd2950c970de3444a1cae1a1f979f36364f7963d4ccfb5475a942e76baaeb93563af9ed144c32608986c0e1d53d70f167f98b461c37
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-group/oprofile/oprofile-0-r2.ebuild b/acct-group/oprofile/oprofile-0-r2.ebuild
deleted file mode 100644
index 05251855d7c8..000000000000
--- a/acct-group/oprofile/oprofile-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/oprofile/oprofile-0-r3.ebuild b/acct-group/oprofile/oprofile-0-r3.ebuild
new file mode 100644
index 000000000000..b968e6eb2efb
--- /dev/null
+++ b/acct-group/oprofile/oprofile-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/oprofile JIT code processing"
+ACCT_GROUP_ID=492
diff --git a/acct-group/ossec/Manifest b/acct-group/ossec/Manifest
index 39b4059ba1fc..cf18eb30f40e 100644
--- a/acct-group/ossec/Manifest
+++ b/acct-group/ossec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossec-0-r2.ebuild 199 BLAKE2B 2ec1d0e61385cd56c4876e6c2d0f2cdb79cdbb6dcfde81fcb6127a1dec0fdd1c005316b2e260da3ed290e964f847361d8c4a583ba3abb2c7adbe0568d160eb13 SHA512 8b704f3422a55e3a29526714be9a2dc24ccec53c746d8c2af1150a7ae7afc7eb8cc457fad3eebe754fed68dd84d8312ef3909f9fe094092dbe3aa2d9a207df09
+EBUILD ossec-0-r3.ebuild 199 BLAKE2B 748861c5d820156ee2aab5a540d36fb6b6e64e674858df08e77595b89b2d817aa0089acb8c0492f03341dd9b24dbb4936ec93c23eafc0439bb13b386230958eb SHA512 1a8b3fe92f9faae0e2c3e5bfa84bd68c10ec14a5ce0583964a849705817ee07bd71858bc9bddb67ba5a5d8cefe6bb74cea8ea35fff5e8fa371455237d9360023
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/ossec/ossec-0-r2.ebuild b/acct-group/ossec/ossec-0-r2.ebuild
deleted file mode 100644
index 966abb634df9..000000000000
--- a/acct-group/ossec/ossec-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/ossec/ossec-0-r3.ebuild b/acct-group/ossec/ossec-0-r3.ebuild
new file mode 100644
index 000000000000..9b1dd90ec3c0
--- /dev/null
+++ b/acct-group/ossec/ossec-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=330
+DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/p2p/Manifest b/acct-group/p2p/Manifest
index 1a2a6ea95ecb..6cb976b59c3a 100644
--- a/acct-group/p2p/Manifest
+++ b/acct-group/p2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD p2p-0-r1.ebuild 184 BLAKE2B 9897f845d1ea6a4d854d6f1465b93f6938a14501a67c3f0d0123c0e423162f32e0c21bf476110db01769ca7c2b0aaa997cf292b1b5eb4a688684cb9fbc3a46bb SHA512 8e6b811f5915f7ba52637030d14b13e05af0b281e78a2cb0e826a55d497a4f3ec5167b3ca062b56110e17b950aa4aeecbf13708f9da443de10827f1141fe79a5
+EBUILD p2p-0-r2.ebuild 184 BLAKE2B a77148c50854eb1fd68ce72802ef6b0230d1a574468cac9a41487f1b7330bf637cf2d34f46200002e82564e5a8e1b8c52003b1012fcccc94721292fc22c6142f SHA512 a79c4b425447749c2ba91b9d7f600110bd44e174fb337ca527e4a6264185425be49c04897c6275d2b9ca5ab74e945c874be96d2b26ae3d75534e9cfbf7ea6393
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
deleted file mode 100644
index 52040d2ff7be..000000000000
--- a/acct-group/p2p/p2p-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/p2p/p2p-0-r2.ebuild
new file mode 100644
index 000000000000..e728557556a5
--- /dev/null
+++ b/acct-group/p2p/p2p-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mldonkey"
+ACCT_GROUP_ID=378
diff --git a/acct-group/pcscd/Manifest b/acct-group/pcscd/Manifest
index 833131829a45..0bce0a801c6b 100644
--- a/acct-group/pcscd/Manifest
+++ b/acct-group/pcscd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcscd-0-r2.ebuild 150 BLAKE2B 6cf563a89da076b182f7267017f6ddc96e1a92941a51742f6a17d63a1c2d942c3110297c8737be1777402e4f9271859c4f462cb48983425d08a1bab0ffba120c SHA512 6577587824482acd281589433d993cbf028a4d5b50e2e97fa825f4e59b5fb17a69aca226c4969056bd323480a635a3a43eb583c57b3545e75f7b019e434af9d4
+EBUILD pcscd-0-r3.ebuild 150 BLAKE2B 912575c643fb780a150d1b6dbb6cfb44833b7375a1d27d6854bb9b2a97d8bbcd2366c671cb8dbfb98d71994fa700ed9a2ee4402d37d4b25fd5cca5ca226046f4 SHA512 4148ce9b2173a8d5ead05e734919275748e9a78c04f294710d92493e9d568d6851d1fed6ee833d87403b46037ed76fb693dd38daaf4bc890b1dcd91391fc7598
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/pcscd/pcscd-0-r2.ebuild b/acct-group/pcscd/pcscd-0-r2.ebuild
deleted file mode 100644
index 29a733881a71..000000000000
--- a/acct-group/pcscd/pcscd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/pcscd/pcscd-0-r3.ebuild b/acct-group/pcscd/pcscd-0-r3.ebuild
new file mode 100644
index 000000000000..a1c6a5d0d49c
--- /dev/null
+++ b/acct-group/pcscd/pcscd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=47
diff --git a/acct-group/pdns/Manifest b/acct-group/pdns/Manifest
index 5f7e04cb5279..248db4785714 100644
--- a/acct-group/pdns/Manifest
+++ b/acct-group/pdns/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdns-0-r2.ebuild 151 BLAKE2B 5ccb0f5f229bf7bc729a74486d5c7afba5975071992b10e6f40e54891ad2a4b85dba3c034e8daa7190d5c0ee1cbe809f3e3860a024e054076dcf11445d903ed7 SHA512 ddc6bbb85d117f90bf496fc097aaa3cce4d357383b52b456a563fd8efba355cee63e1bcbb7f5bed99e6094167c54ab4974706d48c911681ad4cd61842e8256ab
+EBUILD pdns-0-r3.ebuild 151 BLAKE2B 373942840d753c1b53714487fc80acf378965cd38d2ac371b5548508414d42ed3245ce5fc88b014efcd3d229d38a8a706740bf54a2769ca30f7b8af1ae66c153 SHA512 8d82a6ee581b1eceff44e785f3d02ac464e3ff4f683a6dfc5d0ec0e3eb0cb1c472e2e56d21d56535e8227caa0805b837933b3db9387b6064b1f29af1190ad750
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
diff --git a/acct-group/pdns/pdns-0-r2.ebuild b/acct-group/pdns/pdns-0-r2.ebuild
deleted file mode 100644
index 660d64dd4e1f..000000000000
--- a/acct-group/pdns/pdns-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/pdns/pdns-0-r3.ebuild b/acct-group/pdns/pdns-0-r3.ebuild
new file mode 100644
index 000000000000..59700d1e0f99
--- /dev/null
+++ b/acct-group/pdns/pdns-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=423
diff --git a/acct-group/pdnsd/Manifest b/acct-group/pdnsd/Manifest
index 2e92b2e0f38c..c233f36de919 100644
--- a/acct-group/pdnsd/Manifest
+++ b/acct-group/pdnsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdnsd-0-r2.ebuild 151 BLAKE2B c47ea4171f32203184c44fcf0584c3f545ed0c1c1a3bc69923da325a30763a3a051a40e42e83ffa0f1a3dc5702e5eb332e9e9c1fe54be9c917174ff1988235f3 SHA512 cc6912f792b9daa06fc8df93c6ac36a6e10ff7c103f012d81d057d75a6fdad94b0ef187b9211eb29067adcf1d5b79e0de308c12004d942e07c5296faf144f1cd
+EBUILD pdnsd-0-r3.ebuild 151 BLAKE2B c86fd84798e257d724e23257bc434090eb3784f2e9e3d435b2c06d054c65c7f6c92262f5be1351e6e1a049ab925dd96ad9552bd64b6c2d3232283889d1dd5f6c SHA512 eccc5ca4e5a079ad463bd88e4891616fdca12a8541181f200b07cb08608279329a50ceac72f52bc1df48b393ad96b99e1f0d86f6ac362f64cf8444f29891f233
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/pdnsd/pdnsd-0-r2.ebuild b/acct-group/pdnsd/pdnsd-0-r2.ebuild
deleted file mode 100644
index 9a4d6fcc6db2..000000000000
--- a/acct-group/pdnsd/pdnsd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/pdnsd/pdnsd-0-r3.ebuild b/acct-group/pdnsd/pdnsd-0-r3.ebuild
new file mode 100644
index 000000000000..9feda48fa4ce
--- /dev/null
+++ b/acct-group/pdnsd/pdnsd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=184
diff --git a/acct-group/pgagent/Manifest b/acct-group/pgagent/Manifest
index 63cdf96048df..a1a94f829442 100644
--- a/acct-group/pgagent/Manifest
+++ b/acct-group/pgagent/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgagent-0-r1.ebuild 195 BLAKE2B 70db29c7f03e8315c863a7d886e5bb408ab16d361bbfdccf541623e1d5311949d68d6b66d26bb94f033c85bb7c6c3aa35d140ace2bc39187a7bf4178492892b5 SHA512 8e2702185d19c973062436444e46bc47c5845b4aca10382d86b868a95d51950e9cb02f5f7c8c2d12a2d9d7d5433824002b98c474d7f8a6cdb7f794b242aeea10
+EBUILD pgagent-0-r2.ebuild 195 BLAKE2B fd81bc9141c4aed3b88c83a4e7b7353162fb58c9c452574f235f7919971b9f1366f081feb11f31de8bdf6b5ce643a18a583ef315dea07c611879402c02f5bb05 SHA512 78e5744829e1b7a72640dd2abf458f1f70d9f1ec3d2a570901ae4f29f92a6bbdef149ee32ca755b71492b78c664a882f677b1cdaddba2b5f9f1c0b97da350431
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
deleted file mode 100644
index 5c1514304544..000000000000
--- a/acct-group/pgagent/pgagent-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/pgagent/pgagent-0-r2.ebuild
new file mode 100644
index 000000000000..204a47362fee
--- /dev/null
+++ b/acct-group/pgagent/pgagent-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1fa3cd4e5b06..ce9301a0d1a7 100644
--- a/acct-group/pipewire/Manifest
+++ b/acct-group/pipewire/Manifest
@@ -1,2 +1,2 @@
-EBUILD pipewire-0-r1.ebuild 151 BLAKE2B af1da4f0b494abd4ade100ddfb027d4a2d4961c01a59a5e32f326a63762af8e1034daef468eaca33799ee2ef8b313d2baced627f4d6d5a4a38a4be4cb74a0575 SHA512 655f62b8ae8ef800b042b101487c062a0c455c097e079f7ac83202034cc42fee740bb57d9e01b9ee1282d11b3ad05d251dd98a5e1e29e6117e71a4c7568d9dd2
+EBUILD pipewire-0-r2.ebuild 151 BLAKE2B 07d9ddd893b7e59755e09f501dbac807857c60d5356a812a524c61c69b0cbd00ef814112323987bbae3439977fc86976b327ae2ee8487ddd331be24ff484a390 SHA512 f036a27b3af7a80eda5ed3b16b7bea929c0d40713f329a31bd3da4a0ff0f625dea21b3974a54654c8f498b69bd81a338136c98c9f41a03533960914ea69fd490
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
deleted file mode 100644
index 5e1d25235785..000000000000
--- a/acct-group/pipewire/pipewire-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/pipewire/pipewire-0-r2.ebuild
new file mode 100644
index 000000000000..5d2a1f3c26fe
--- /dev/null
+++ b/acct-group/pipewire/pipewire-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=509
diff --git a/acct-group/pkcs11/Manifest b/acct-group/pkcs11/Manifest
index 3174dea1339f..9cfe741284d1 100644
--- a/acct-group/pkcs11/Manifest
+++ b/acct-group/pkcs11/Manifest
@@ -1,2 +1,2 @@
-EBUILD pkcs11-0-r1.ebuild 200 BLAKE2B af7cf5740fa3174d5313f1f31544a7275badd5f033061dc37baa7a601c893b4ecbdce47bf87411a1cf8c0a4ed038d3070060b8ecf997275286d7ca03a8dbf43a SHA512 053cdf7e435f58810b56e41d3787e1fa9bf41cf371bccac3edcbd53bce11457803c98f416651db7673d6bb0db664dc07c3a5e5c9377b9a19db5d705f3b1f4cba
+EBUILD pkcs11-0-r2.ebuild 200 BLAKE2B cd3c5ccd49edf17c8ec446bc9a7ea410270f43a965ae0d192c38448989dbffe60a9b0958fb884385df09670c051b1473b1719dd4d1ac3e4cfbd22e14772e2f44 SHA512 751f7c446d058d9140a3d28f6b0feae126cf05f482118d4428503137efb4ede51f36c3e0d46bab4a013169cbb37ec5c7235e4d00fe5631c76b67c7bd4af0ed3b
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
deleted file mode 100644
index 2c25489a23a4..000000000000
--- a/acct-group/pkcs11/pkcs11-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/pkcs11/pkcs11-0-r2.ebuild
new file mode 100644
index 000000000000..52fd77d253b8
--- /dev/null
+++ b/acct-group/pkcs11/pkcs11-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-libs/opencryptoki"
+
+ACCT_GROUP_ID="331"
diff --git a/acct-group/plex/Manifest b/acct-group/plex/Manifest
index 7f088f5ba2c4..4c88345d59af 100644
--- a/acct-group/plex/Manifest
+++ b/acct-group/plex/Manifest
@@ -1,2 +1,2 @@
-EBUILD plex-0-r2.ebuild 189 BLAKE2B 01596048ad3dec7d47c05b8f6a18cb1e5a2cdcb15ecc71a5a695af7c0981799f450c384335ba12479b8943cb80a3ac593086cc3839690911e6643b57aa8df3e5 SHA512 9f27b5a873096ad4fd877e6093c07c53751ee4362c31dd321e8ef44117bf69d9d2af1ce02744ffe1c6aef90c2faa6ec1b8fa168ac512ff8f21d5300c719036e7
+EBUILD plex-0-r3.ebuild 189 BLAKE2B 50cb41f49bd519ed31cfdc1279bd1d437354035eeeab16edb14553a1d5bdb0c2c6c4e103362a3f3ca43d49c6efb0491298453e03e119b7817bc94e022db270b2 SHA512 47f78f3cdd71e8dd1a1d283754949746d30d847ba98e8dfe89c4120f2e2bb0fcae08b7c470bf39d562cf8b57805ee2f9862ef88a80c93619e615ab6b83fb93b9
MISC metadata.xml 398 BLAKE2B b0364533e5e51af3ff46cce6e364786496e4a93a365d7566da1fad2f1a7a262cb18a2afb43d3e3f02d9a7e6a6f76148ae49c40653b63b3d11f242c99f113cd90 SHA512 c05d31ba64239181f746b0d3c66dbca84895f310378b754431ff3b8e27127a02ae3372c538fb21c23f94d4ad7331c9a9aa90b001a1fe581aeab2ccd913495a8a
diff --git a/acct-group/plex/plex-0-r2.ebuild b/acct-group/plex/plex-0-r2.ebuild
deleted file mode 100644
index 9239d7ea7f62..000000000000
--- a/acct-group/plex/plex-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/plex/plex-0-r3.ebuild b/acct-group/plex/plex-0-r3.ebuild
new file mode 100644
index 000000000000..33679112f7dd
--- /dev/null
+++ b/acct-group/plex/plex-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bc92340dd0b5..6fc240ec3b1b 100644
--- a/acct-group/plugdev/Manifest
+++ b/acct-group/plugdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD plugdev-0-r2.ebuild 209 BLAKE2B 8fd9464ed1bce96bbfac6f5cd9e201a23c9aa04da0575f25129f581751acb7b6ae6615f6bf7caf345f14ba59926ab62c9e9f16e014a4cdbe362d78178ee3ffe4 SHA512 60c5239e296d682e66c8a10c894f9999159964d19431f51b268854cefc0fb94f204358e9644a54047df4ef4a1f1e835b8005e955f77724a87dd24006f2a5edfd
+EBUILD plugdev-0-r3.ebuild 209 BLAKE2B 5d7e2a7c69bee54b226eb2cc1544eeccfc7dad1174d58cc9d0d892f3bed4a3ef12a509a66259ca50cfcf2e5fdbf5bfca23e354f56a077449349ce0f68907dfbf SHA512 7292f2532ace24d3dd1c41b94f17dc220868915e3b6479bf253a5784cf8d45a7329332dd797be6275f88aa7952758f12afce1a57d5bbcbcde0584ccbb87ee834
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-group/plugdev/plugdev-0-r2.ebuild b/acct-group/plugdev/plugdev-0-r2.ebuild
deleted file mode 100644
index e37da5772628..000000000000
--- a/acct-group/plugdev/plugdev-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/plugdev/plugdev-0-r3.ebuild b/acct-group/plugdev/plugdev-0-r3.ebuild
new file mode 100644
index 000000000000..736ae40ab371
--- /dev/null
+++ b/acct-group/plugdev/plugdev-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4601809bd373..dba016cb992d 100644
--- a/acct-group/polkitd/Manifest
+++ b/acct-group/polkitd/Manifest
@@ -1,2 +1,2 @@
-EBUILD polkitd-0-r2.ebuild 151 BLAKE2B f4e8357ddf0c81a5d2551cfd8c5ba814acc5391c9cf0b82913b3a0817be64a579cbeaeba89a1c8a1030bbaf32460ee678df9ad8c211859075fe402e782f533ae SHA512 f778eb02bb2bbc0e1476973c17c5e20225569b7600396075d635c58b308c4e94b91c62bdf2c1ac1e02047031ddfb52a757a4eaa5f900582b869189cd687d9404
+EBUILD polkitd-0-r3.ebuild 151 BLAKE2B c67b7e433036267df3af4eb892bfc66f641471759884bb5ec981d23ae8fead641b16b9c9a8c88e41256cc2dd1343cc67dbd78cc3db740469b284ddffe5a3f257 SHA512 232d6f07bd02986753496f16a4dc3b15edac37f8861034e4a6c8e3137d5621c84e8e515eadd248d880d7881516532bc56a483629afd8f16c7f8a0c99e92eaccd
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/acct-group/polkitd/polkitd-0-r2.ebuild b/acct-group/polkitd/polkitd-0-r2.ebuild
deleted file mode 100644
index 9398dcab7cc3..000000000000
--- a/acct-group/polkitd/polkitd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/polkitd/polkitd-0-r3.ebuild b/acct-group/polkitd/polkitd-0-r3.ebuild
new file mode 100644
index 000000000000..641e5053822c
--- /dev/null
+++ b/acct-group/polkitd/polkitd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=102
diff --git a/acct-group/polw/Manifest b/acct-group/polw/Manifest
index 75c6504586b8..c43d1e38b479 100644
--- a/acct-group/polw/Manifest
+++ b/acct-group/polw/Manifest
@@ -1,2 +1,2 @@
-EBUILD polw-0-r1.ebuild 205 BLAKE2B 1985cd8eaf2a152801d15f7182019fe61f2740f9004d6275f5f43853496e464ee904271053049372d25faa32cd0dda5f8d46a7d8a8fd2d8a54c05d7ae668ef85 SHA512 08402171a20806e25c843c115f60c3f7cd6c52008748526b8073f2553e2357219de63c7ce7bfa4193cfdb7a0b7fef1a83921d8a10ceff45f83619dfce098949b
+EBUILD polw-0-r2.ebuild 205 BLAKE2B 325095062e5d6730feb88fc80d3149bc3d89d86f34cf6c5ec3eb8958731e270b3b379ad27c9e60ec587da7e6dd24d2aa342ed609f49bee2dbe18eee8d282dd75 SHA512 f766e7ef32205171434d77430904b944322c0bc01ad44d3d3da0d3c3c0fafe6615d59ca98a71355d22831d3b19cf10969245a251a4786004e4c44fe96b27153f
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
deleted file mode 100644
index 24831f7820a0..000000000000
--- a/acct-group/polw/polw-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/polw/polw-0-r2.ebuild
new file mode 100644
index 000000000000..b30f19ad980f
--- /dev/null
+++ b/acct-group/polw/polw-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b34d46a21205..800723109f8d 100644
--- a/acct-group/popa3d/Manifest
+++ b/acct-group/popa3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD popa3d-0-r1.ebuild 191 BLAKE2B bd9eef847ba8909ff43d5542f332c8df7984b4d8480111ceec7c55c5189fa0b94c0054487f3b867ab7c2e6ce5acbf13c4590b8330f3bda7e3e59aceaddaceef3 SHA512 73b5e431c6738c498f601571e28afcb0f402891c8237003504743184469256448c8a85709bbebe01af3c83d4322ac18eebebbc91662bad0e7cf4206c43f43bef
+EBUILD popa3d-0-r2.ebuild 191 BLAKE2B 001a7802e5c2d7b9419e816d794358d9adad241a65408e96958f230645eca00cb08fab325fa8be1922627f73ee8e219f3f7df03d901f73590597ad280a1908c5 SHA512 f162ea4be1da22aa9de6a96d0b887be5e58db8b83c571a73c2ae5e24f68a6cefc4c95ee8067368d7e3740798930e72c327d8be56826a86e1c247e7270ecbf5e6
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
deleted file mode 100644
index 7857b0f08331..000000000000
--- a/acct-group/popa3d/popa3d-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/popa3d/popa3d-0-r2.ebuild
new file mode 100644
index 000000000000..e57cae22efa7
--- /dev/null
+++ b/acct-group/popa3d/popa3d-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 890ab9515183..5836f4f01a25 100644
--- a/acct-group/portage/Manifest
+++ b/acct-group/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-0-r1.ebuild 151 BLAKE2B 31062297d69dfd137a09d1391cd48d2df91abe08ff586aff11c8bc444da9822da2f903ecbf473fa084b2e06b56ea1de5fe767e34c097d3ae3165efc9488df4a6 SHA512 2852394f4b77f6492024732eea925ec22165c213ff50ea0fb0b4c5d6b42fae59d89d8ae5f96aad62cb1275ea7ef21c7988e4f517ac7bc197a0ebde1841d18949
+EBUILD portage-0-r2.ebuild 151 BLAKE2B 672f13ce399955b831006f7d932a8c392da3be96e52c1cfeb2879b2040423e61eb92d3171813d16e0b9295dd3abd3f8a3be67ab90a0428e2bc709ec7f761961f SHA512 b4defd620c0a487480939702e098a9e30aa5516f1e7b872d4f6d6dae56330e9e4c09ae00781d160c57e3001b4978e96e19d891ba4bb861aa46418d51d4ed1b2d
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
deleted file mode 100644
index 84de44bd01ab..000000000000
--- a/acct-group/portage/portage-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/portage/portage-0-r2.ebuild
new file mode 100644
index 000000000000..2e50f8235fc0
--- /dev/null
+++ b/acct-group/portage/portage-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=250
diff --git a/acct-group/postdrop/Manifest b/acct-group/postdrop/Manifest
index da11bd773346..80ebe394aa68 100644
--- a/acct-group/postdrop/Manifest
+++ b/acct-group/postdrop/Manifest
@@ -1,2 +1,2 @@
-EBUILD postdrop-0-r2.ebuild 151 BLAKE2B 5fa66ee5bca9886f86298c7a6d944b88860652e3693a8ef7a52cddebc03ae414d685ef299f6fbe18a78f268f17d3f4eee00acd6305e737b36fc749bb0016ee33 SHA512 dec47d888619d404acb350889c37919c78162e138b549ee25e5453bb161855a54b401e6d65abb34f9dca8a038981129b5f613e4a858221f9fe9836a1db9ecc39
+EBUILD postdrop-0-r3.ebuild 151 BLAKE2B f73bbf6c3972bca33324d96e92d9c451cd600f3285d9e7a5684b20b81164606254a7fc55de18accab1cdacf0638066a649da3b080eb68c9f8c1919d2772d750a SHA512 732ffd90daed8acf1b59dcf692cb7bd90e7d96c8062c490139adadfb3a8d7a48c70374cf431f30b8709ca3633be16d2192fe409e026e0dfe88c9276ccca533d1
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/postdrop/postdrop-0-r2.ebuild b/acct-group/postdrop/postdrop-0-r2.ebuild
deleted file mode 100644
index 9931f3853516..000000000000
--- a/acct-group/postdrop/postdrop-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/postdrop/postdrop-0-r3.ebuild b/acct-group/postdrop/postdrop-0-r3.ebuild
new file mode 100644
index 000000000000..052fdce27fe1
--- /dev/null
+++ b/acct-group/postdrop/postdrop-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=208
diff --git a/acct-group/postfix/Manifest b/acct-group/postfix/Manifest
index 4f26d3e9b833..e350a9ea807d 100644
--- a/acct-group/postfix/Manifest
+++ b/acct-group/postfix/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix-0-r2.ebuild 151 BLAKE2B 7fbc22dc668e039bf2c353b6cd044ce6778ac8903be6d618d298e2c3f3a99dc7ffbdb2ce8ec51727cc221962360d132d683da14a6c9958c00680a79b31102b9a SHA512 7c6953fa73592c75ad276aa87d61e2b2059fd40ed8ba0d4d1b6193d379b787ca4139594280e0fc65e68aea8d1915347cbf514c0aa7c06183fc415c94ce688e3d
+EBUILD postfix-0-r3.ebuild 151 BLAKE2B d38e98284e732296087b71302120f7facc5fe3ab5e080ea3851acedd7ccb4c3d8c24feb7aeaf670e301fd479bec46c260c3a344b834d66069b1a178aebd42693 SHA512 87b840337c220514cdcef1443bc66b0bc745e4f1a1c0b8b391670cfa5b8c662f436ede17453e4fd298de6f7f1975d013ce3512b71da025120fcddae6df4df20e
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/postfix/postfix-0-r2.ebuild b/acct-group/postfix/postfix-0-r2.ebuild
deleted file mode 100644
index 0df662082122..000000000000
--- a/acct-group/postfix/postfix-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/postfix-0-r3.ebuild b/acct-group/postfix/postfix-0-r3.ebuild
new file mode 100644
index 000000000000..5303a6f072de
--- /dev/null
+++ b/acct-group/postfix/postfix-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=207
diff --git a/acct-group/postfix_exporter/Manifest b/acct-group/postfix_exporter/Manifest
index ca0ff60116bd..7d119c03bc3f 100644
--- a/acct-group/postfix_exporter/Manifest
+++ b/acct-group/postfix_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix_exporter-0-r2.ebuild 151 BLAKE2B b84a9fce0505845646490b0630ffe2dbc6c0a441b218be3b7d6d5c873549975e25f97c50685be167f337732568c8e082fc4f57ecc47df75ce0e2110499665f24 SHA512 8d02df57851f10e949aff08ccac9fbb735971dc6daa5bf3634bb7facaee145ae8d862b5ec1ca530a6ca0762341375adb0557ec18397e1d4212e8643f4ba06556
+EBUILD postfix_exporter-0-r3.ebuild 151 BLAKE2B cd7c1e28311e261bf66078264e09677ad627041207bf97ac4c4354c1a3deb2645ec5fa412c426e3ea0db5dce195d64eec240898d760471a0e5e4875a6ff3d18d SHA512 f6e8c8aa5ba9a0c37369b5126553034e8c69cafde2f39414086001e5d419c852b9e86c62994232d20fa70742f310b638fe1e44409ece3cc1a17179e059679e66
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
deleted file mode 100644
index 727bbf6ae770..000000000000
--- a/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/postfix_exporter/postfix_exporter-0-r3.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..24fa7c36dc56
--- /dev/null
+++ b/acct-group/postfix_exporter/postfix_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=356
diff --git a/acct-group/postfwd/Manifest b/acct-group/postfwd/Manifest
index 845e3ef7305a..0ad04b0b22b0 100644
--- a/acct-group/postfwd/Manifest
+++ b/acct-group/postfwd/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfwd-0-r1.ebuild 200 BLAKE2B 1be93455b40f2549ddd921b6134f16f06922574c3889116955329cba4038537eb0b946020e1bd221dd50fca93175d89e222e8c22ac5476716f83f2ac905b4466 SHA512 28b42538067d4e4b241f32a6a93b1178c50764ab466d7b02a3a18bb5cda2b97093e30be95eb7498e246b7ff587052005eafdfbfae707e15cb5100c435b32ce95
+EBUILD postfwd-0-r2.ebuild 200 BLAKE2B 2a0e0243d9f7425502f2a197b30804e8820f5df809fcb72e8de1ac1eadc64292be3bb1c8e4b5cfe309dd203ca1fcadee35735ccda3787a17a70f0991bcde66c4 SHA512 dd6500200cccfca97e8cc3222f882b376df8df5e553e7e4e200fff5b7fd26330e8c38a44ca196de797ca705eacac2ccc97f7ac593c48576d0dded368ac0ef0c5
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
deleted file mode 100644
index cafa87134d52..000000000000
--- a/acct-group/postfwd/postfwd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/postfwd/postfwd-0-r2.ebuild
new file mode 100644
index 000000000000..a4d8e9b314d8
--- /dev/null
+++ b/acct-group/postfwd/postfwd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 364eedeb97fc..415f7022b348 100644
--- a/acct-group/postgres/Manifest
+++ b/acct-group/postgres/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres-0-r2.ebuild 198 BLAKE2B 5e9f4afc23025b89f7fd341ce145b88ce6ff74df710a59d4c3d84d818455a6f6c07e183b7e25553814215642591022f03536ecb968dabe09c66edf4e86e90e03 SHA512 e292e64eacb6cd5524ff32fb797f91ebc996599ec42cc08995cc607de5070d2fe7e85b3330876c9c6055de4d8618bb85d0a8bd3e879e58ca0410228e9a526530
+EBUILD postgres-0-r3.ebuild 198 BLAKE2B c7561d3cf5be44c33db43c2bb6a98ccf89587fa4cbd8ff87de512a4c993e5ec2a7cdd28cc15daeb296fcf448e268a7e53562a9571ebba7abfaec88ad03c6e3a9 SHA512 6594dfbd4c16aa3681cca6be326ba0587daae07c5106e522bae2c265865a274d16dff34c13a7e504758ecc104a0ccd6056350fef384b7562fbd460b94b8d0f19
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
diff --git a/acct-group/postgres/postgres-0-r2.ebuild b/acct-group/postgres/postgres-0-r2.ebuild
deleted file mode 100644
index 1331ea3b1e55..000000000000
--- a/acct-group/postgres/postgres-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/postgres-0-r3.ebuild b/acct-group/postgres/postgres-0-r3.ebuild
new file mode 100644
index 000000000000..614bccd53afc
--- /dev/null
+++ b/acct-group/postgres/postgres-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 827a8a083a23..5ec17b2dbb00 100644
--- a/acct-group/postgres_exporter/Manifest
+++ b/acct-group/postgres_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres_exporter-0-r1.ebuild 151 BLAKE2B 378b0b64df68680f7b668a864c2b983595169cc6d3f3a0c65041be4f5303939b9994e650f2e1907dba1f49f88ef58acb914c917ea5357e2603ee4b24d589a0b1 SHA512 e0b419e4a75bc6093c2eece61050f550b13b17cf0ccb119b06caa0ca9fe32e09a41b9bb58a298b15eba4491f2aa8e80ae8c633bd1e60f463b8d36c6e8ace3b10
+EBUILD postgres_exporter-0-r2.ebuild 151 BLAKE2B f757b3387e30a577a6a31dea169223d258a7fa3dccce3232a4d0c5a3b755aa82def6deb857c870bad3ef86a96a864c3c779801316775d18fbebbf58342b0870c SHA512 f5f780aaf3d94edc89e902ae68deff5aaa42f1b19b83072a74a7d91c8b08f409c410d596f1a9d8ea4e3e1df2f3dea220909299458bdc341de97d960ca316f10c
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
deleted file mode 100644
index 977c3853bcc1..000000000000
--- a/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/postgres_exporter/postgres_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..65d7da901c58
--- /dev/null
+++ b/acct-group/postgres_exporter/postgres_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=233
diff --git a/acct-group/privoxy/Manifest b/acct-group/privoxy/Manifest
index e58c695e2dab..75672f85993c 100644
--- a/acct-group/privoxy/Manifest
+++ b/acct-group/privoxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD privoxy-0-r2.ebuild 209 BLAKE2B 5e28cba94086038fdcab1bbef14bcc9ca848f847b21bd2b9674863d2d6318f10306ffcb9c4fc896ca6e488d915ce0ce8645bfa73f9322217d0065a4ead22d65f SHA512 6493c6ac80f7f8a4b0d981b6ab611184b8d7e6bee738d7c37b7c99a017d607c54b149d5a588db83318fac854d7fa9a347aa90f662301bed39116baca03539404
+EBUILD privoxy-0-r3.ebuild 209 BLAKE2B 8799ff1b91760a8f5992f2f416b304a9f52e8eb22b8086eb892e73684c4bfba1b8a7f7d3f2e595fd5365291352c4cf2ad21ccdb72a2419a4311290b602c5d77d SHA512 02cd0ea9e23b31e783fce39c04e0d556a72c5103a0b87af4ce08cb8b25a9b1445b3118198a87a401f4287faec62b0287214bdfaa9a93bf8f3b54fb5eaf0eabdd
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-group/privoxy/privoxy-0-r2.ebuild b/acct-group/privoxy/privoxy-0-r2.ebuild
deleted file mode 100644
index 152a13fb5e9e..000000000000
--- a/acct-group/privoxy/privoxy-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/privoxy/privoxy-0-r3.ebuild b/acct-group/privoxy/privoxy-0-r3.ebuild
new file mode 100644
index 000000000000..9f5cfde348c4
--- /dev/null
+++ b/acct-group/privoxy/privoxy-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c906e6c17c89..9a9f8e603aa5 100644
--- a/acct-group/prometheus/Manifest
+++ b/acct-group/prometheus/Manifest
@@ -1,2 +1,2 @@
-EBUILD prometheus-0-r2.ebuild 151 BLAKE2B 969dc4025933244f908fa2066ab0415894e7755273c8b3bbfae7d68349504fa7d33edc2d07801eb896df258de3ccb1b0043f0bbf2a9566fc2b5cb0ec6d8d0e6a SHA512 269dd0b42251e23ea180df0515751db7f76061836d0a0ddb3dcf4c3566eacd24c769ad16ab97aa4c5cbc907e18332239ef2b8f7e1a4b5ba00c35b20730045acd
+EBUILD prometheus-0-r3.ebuild 151 BLAKE2B 79b49513c2887d6ffeee28b3ce4ea7cb17ec6b1876616d6bd13ea5a4626d7c74083560eb6e08732afe3264cc6dddca297608510817f0bd15d77466417e785cee SHA512 b99084eed7975fe9f2d9b61b83003dbfa4efda9c85e6cab4a4ac478cd40af7945d7c46674f688328a6b6527bb076f20a7f3e4ca4fee7aeccbee8ce3ff437404b
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/prometheus/prometheus-0-r2.ebuild b/acct-group/prometheus/prometheus-0-r2.ebuild
deleted file mode 100644
index 7b2cae83ab40..000000000000
--- a/acct-group/prometheus/prometheus-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/prometheus/prometheus-0-r3.ebuild b/acct-group/prometheus/prometheus-0-r3.ebuild
new file mode 100644
index 000000000000..abdb21af92ef
--- /dev/null
+++ b/acct-group/prometheus/prometheus-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=430
diff --git a/acct-group/psybnc/Manifest b/acct-group/psybnc/Manifest
index bc432ebf650f..a1080b0f39fa 100644
--- a/acct-group/psybnc/Manifest
+++ b/acct-group/psybnc/Manifest
@@ -1,2 +1,2 @@
-EBUILD psybnc-0-r1.ebuild 193 BLAKE2B e1666a862dd9af2772b7e2c288dc53d6cce1d055d34cc8783b8240ee01a613fefafb763f0a87aa0c9284ea416c7edf62f5ca6427fd0511c653f7b23e18d11f54 SHA512 dea9435be7686bf63cadd0142a89159a2a22af53da0529db13aa97b48454438de1c77604dab0d53b81c3ded46236fed5dfdd78ad144da521aca3fbc429806d59
+EBUILD psybnc-0-r2.ebuild 193 BLAKE2B a0e46bbd119717cd9a7b7050e97db7ba845fd5bd2b4cf733f8de13eac43b2c8d83513a4569c3dba50a762249ad35f7ba44dc4f74ba82d560c570c32a492b1b7c SHA512 a1b8987227dc518aac1e117b9036d6e022c3b017be6b5fffbd894bc98cdbfcd74dfd2519b5c6e3cb9aab426c86aee242675204713c8a8b067581a66040647f61
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
deleted file mode 100644
index 4df3a6c278ec..000000000000
--- a/acct-group/psybnc/psybnc-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/psybnc/psybnc-0-r2.ebuild
new file mode 100644
index 000000000000..9fce853e0a30
--- /dev/null
+++ b/acct-group/psybnc/psybnc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 74569f357e55..a1f9bcebb07d 100644
--- a/acct-group/pulse-access/Manifest
+++ b/acct-group/pulse-access/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-access-0-r1.ebuild 151 BLAKE2B 7ce9faa3217da58b8b3b50ac8a5a386018a88e1e214d8aa6ed15cb749015453fedb57996953ef93b7babdfe44a982d25ce2f2f8c22cb2605b744d9201e897f86 SHA512 39a4fcad2548ce60a531bedd2ad5c5906200a44e772edb04c5f9f7bfc96db3313dd23eaaf9c775d54d84d795f162e23df879174954061d35bb2416efc170ca9f
+EBUILD pulse-access-0-r2.ebuild 151 BLAKE2B da8e0cb746603926bba675ace8e15258c360a0a158c3d0e2ebd246a9647e53005f927f656e1212ac0ed331b3b0cc27852909b8a2c22dff9627fafeed25e6abef SHA512 298f0b967706f7e8ff020870f4760fbcc850b711aa0a4e670e4e0b5f8d1ba31260157a3ef6de85cf9c3fa780fedf155e1a62e4b3d198a5fed55fe11a0856c7ad
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
deleted file mode 100644
index 763cd4096edc..000000000000
--- a/acct-group/pulse-access/pulse-access-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/pulse-access/pulse-access-0-r2.ebuild
new file mode 100644
index 000000000000..1cc6e470116d
--- /dev/null
+++ b/acct-group/pulse-access/pulse-access-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=172
diff --git a/acct-group/pulse/Manifest b/acct-group/pulse/Manifest
index 6d802d7f73eb..004ac3471d71 100644
--- a/acct-group/pulse/Manifest
+++ b/acct-group/pulse/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-0-r1.ebuild 151 BLAKE2B a2fe121e2c18839aa6e3b67fde98dca2c405e9d320d2b484befae0ae609b3ef2fc3249128cd6feb31577677d3923aa2017c71f40972bda4445f46e1c8582d519 SHA512 428e3b373b7e4e9480aff65abbe0a3bc1df2bd4826b08254d42762e836f0295c2921a33cba26036a8f4d0d30d74ad0ae514a6ed24e81a4d35cf99a02cd78cb62
+EBUILD pulse-0-r2.ebuild 151 BLAKE2B 548f6b0e730b0ad9e3ee6f42ca87a616fe9c812c77135e7cce4d796226fb53e689fa884d6f144432b9685320ccb2c06a6c7170d4ceea512a79f95d64fadc2874 SHA512 c506039c385b982de80d91e4b27b456c8750fa53067ed2572bb12bd94661a8413f1d9e9f145c3c1e4b1b82589af6870ee699b5756797e24a79c69c1ba5db4645
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
deleted file mode 100644
index dcbe29e5d3c1..000000000000
--- a/acct-group/pulse/pulse-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/pulse/pulse-0-r2.ebuild
new file mode 100644
index 000000000000..b8cb5ea79343
--- /dev/null
+++ b/acct-group/pulse/pulse-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=171
diff --git a/acct-group/puppet/Manifest b/acct-group/puppet/Manifest
index 03c538f0ed4c..df69fc4c0cff 100644
--- a/acct-group/puppet/Manifest
+++ b/acct-group/puppet/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppet-0-r2.ebuild 151 BLAKE2B d29adeeb70056243c82224c46a1718974def17655d11a98e05e9218cd33e1f7ddea0a0be9367aa3212340613561857b194acc3b9925aad26c660844a35c62427 SHA512 6d463c63447a0112a801ebd1e0c3562bb65a9dbf0698b45bfea420972e16a0a5fc69a0bbf41e5fd5e1123859b81f3aff2493d31124b3298b035984e41d8fa1da
+EBUILD puppet-0-r3.ebuild 151 BLAKE2B 513b7a1763499f99505b0608403a660080874c742af3c8f615fd69aaa9a0704c60bb62c32a5c9c2233cf25667fa75ca5e89d095d3529038d9abc72eda48b01cb SHA512 ec91f486befa904e28bbef69ed608d11dcb69b136c14726b95088010adb78f21fe7dc9ceaa0e7e8588956544fbd003b5b6fea633ee65c1e1067a4171286217a9
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/puppet/puppet-0-r2.ebuild b/acct-group/puppet/puppet-0-r2.ebuild
deleted file mode 100644
index aaadca579eb4..000000000000
--- a/acct-group/puppet/puppet-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/puppet/puppet-0-r3.ebuild b/acct-group/puppet/puppet-0-r3.ebuild
new file mode 100644
index 000000000000..27966cb04d1b
--- /dev/null
+++ b/acct-group/puppet/puppet-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=455
diff --git a/acct-group/puppetdb/Manifest b/acct-group/puppetdb/Manifest
index 4f612a19c050..119a746a0c9f 100644
--- a/acct-group/puppetdb/Manifest
+++ b/acct-group/puppetdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppetdb-0-r2.ebuild 151 BLAKE2B 701b9d6f2eefed1e3e75ec06d864cf4b22ebaca364d2bb5c9e89f574c4d3c93e9dd16aa764d02e04103217066ae134c59d680f3b0bec8755dbffaf2923b2015a SHA512 3a98adfe05768ef4c15b3c655375d30949c9a2347fdbc4c744ec33cb43ea8e2ffa599325656de9e120605a370dce84a0a9aa2ffd4ebe96c6f3a2f39d2c446462
+EBUILD puppetdb-0-r3.ebuild 151 BLAKE2B cca7e3cdda1349870f7286a1b96fac1f918171d878cdaa22251d259365dc2474a4beb89f3ee01c3656c39e16fa36be0aa47e05147f42fea7a804c12d2cd660f9 SHA512 94c042b71f30151b862937ba607225a61965ac49c088b64f564ceb9608507f2f43bf35a5cecf7c1da19ff77f0af63499e9c58485bc623fb1ef734f96cc367c4c
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/puppetdb/puppetdb-0-r2.ebuild b/acct-group/puppetdb/puppetdb-0-r2.ebuild
deleted file mode 100644
index 623782c5052f..000000000000
--- a/acct-group/puppetdb/puppetdb-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/puppetdb/puppetdb-0-r3.ebuild b/acct-group/puppetdb/puppetdb-0-r3.ebuild
new file mode 100644
index 000000000000..5b34683a921f
--- /dev/null
+++ b/acct-group/puppetdb/puppetdb-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=456
diff --git a/acct-group/pushgateway/Manifest b/acct-group/pushgateway/Manifest
index a23e954d6657..004b05540a30 100644
--- a/acct-group/pushgateway/Manifest
+++ b/acct-group/pushgateway/Manifest
@@ -1,2 +1,2 @@
-EBUILD pushgateway-0-r1.ebuild 204 BLAKE2B 4fa3fd7e4742ee8f87672e19bbaff30c925f950e8fd62b63f92a83f8687ee71269d78ec740e0f8763658b090853df8ec76184e67682dfaa23f967d8f28d52cfa SHA512 9f5381fa062d40720e250d1fc3d0d9649d0108c73e6c9ff3770c006374e9273936aa75e9d63f4b8cd0f08a0b0cd048cf84a4cf505ccb37a8ec8142c6896041cc
+EBUILD pushgateway-0-r2.ebuild 204 BLAKE2B 79b67c0a9895f796e81de013d5ebbd7a905f4eca8b2a7401720e4860d91137d73b0a39f9ba77559d011326ed30dadb82297f103bc6fe38834c4c8352655b98cd SHA512 de1cc1eedcef988f97552a12e1398b26d551fb03571cf53fae9364fff0f0d579a5b5cdf331781acf9d839eeab2c6c4ef9a2a83429412e492c352ea2f058edbed
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
deleted file mode 100644
index 013d7ec8b032..000000000000
--- a/acct-group/pushgateway/pushgateway-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/pushgateway/pushgateway-0-r2.ebuild
new file mode 100644
index 000000000000..0569bc148740
--- /dev/null
+++ b/acct-group/pushgateway/pushgateway-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 66638926c337..4c4b96fde583 100644
--- a/acct-group/pvpgn/Manifest
+++ b/acct-group/pvpgn/Manifest
@@ -1,2 +1,2 @@
-EBUILD pvpgn-0-r1.ebuild 231 BLAKE2B 62d8c7e38ed258fd3add75681d9051df7db7bbc268a53751ca2fb3f3b43d7061ea41d2fc975d0cb0da741e9df8783c9c1438e2b945559f7c66aa1fc2ee5e3743 SHA512 3c2f80cb741b0e53cfb716a2095d86ef3170e6c09a10ae59456c571c37df4a02c1ffca52d66bf9252a9b6d37d0523eb8899e8adb634b7961ca5c288a0d4e9b28
+EBUILD pvpgn-0-r2.ebuild 231 BLAKE2B e53442f6d360afcee8908bbe864482c270f1b3909a86ca3e96b1f0291c74969d18cd17e9fa136a9473b3db30538b329b8cc75a53595b455fd4a4d23b32919ae5 SHA512 28ebd5e52cf903c5092644c4cb5e04c5d49c281a7cc42a57f31e46df14be819ddefbbeac403d2d2301503a6c4f188afe85e323df1796d0da21bf2e7af512374f
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
deleted file mode 100644
index 3c9571852687..000000000000
--- a/acct-group/pvpgn/pvpgn-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/pvpgn/pvpgn-0-r2.ebuild
new file mode 100644
index 000000000000..714bb3940b9c
--- /dev/null
+++ b/acct-group/pvpgn/pvpgn-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e2af8d9fdc98..e54e72e757bc 100644
--- a/acct-group/qemu/Manifest
+++ b/acct-group/qemu/Manifest
@@ -1,2 +1,2 @@
-EBUILD qemu-0-r2.ebuild 150 BLAKE2B 0c731e9d674b09f92ce157803a962c2f07936981962792cbe7cc3614e9154cfe330bcf839d3f4e5094740483d4e29dcfaaac2d43019c19dc778b9070035b8c62 SHA512 98c04716a1131a961399f6622aa617fede4025d65a38f81d4be386f13cc61697c3b7a738a9a7e40b20e771d6784ac804e96b5682afcaabe96aa348edfc351f8d
+EBUILD qemu-0-r3.ebuild 150 BLAKE2B 35aa1e0744fa2e40c2af4169d78d35fa0ca67221dd295c5b44858869f3b4be24c4c5c067829f5580cfe8708994de012d8b23c809306d02b3a012fc92fa525f19 SHA512 9f63e5794844491a5a1eec82413fc3bd1a696a9f81d3691e1210f435d7029fe3c8b28361694616c562f7dba92cda01dfbf81f380dbe0123cdc46b9fe285a73af
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
diff --git a/acct-group/qemu/qemu-0-r2.ebuild b/acct-group/qemu/qemu-0-r2.ebuild
deleted file mode 100644
index 207fc98e46dc..000000000000
--- a/acct-group/qemu/qemu-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/qemu/qemu-0-r3.ebuild b/acct-group/qemu/qemu-0-r3.ebuild
new file mode 100644
index 000000000000..085fbdd27637
--- /dev/null
+++ b/acct-group/qemu/qemu-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=77
diff --git a/acct-group/qmail/Manifest b/acct-group/qmail/Manifest
index 435627e40a46..73b39be636af 100644
--- a/acct-group/qmail/Manifest
+++ b/acct-group/qmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmail-0-r2.ebuild 151 BLAKE2B 10392d9f6f07a41e0e7bec4af065cd72af9c846a1a53d36e047cfd759bf8f5d90142d3b1e82ce88d5ba9cd205a28533ed85325649bff160aee775975a0d425c1 SHA512 2d12b46f74af1f3a70e7a9e9c89ceec71f820faa300bba387cd44d2854bae2806d74482146c44a4b316fe63c998f6a6ed7eb48de9bb61684bbded0554ead20ac
+EBUILD qmail-0-r3.ebuild 151 BLAKE2B d350561b4437e8891532b4192c2c32a0e0d77b4de3c97af3a9f4291046447e21c047e51a5d84de0e0ee9b85ff170046432774c42750bbde4d17220e75ab82f68 SHA512 e72eac1b170922b1880c10d395548c6938cc1bbf2ca77b7f4555488348af135e12c2b7a12cf0cc79b5491c8d663013cb4ece30e7c89d47915b5ffc1fd10b9e62
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-group/qmail/qmail-0-r2.ebuild b/acct-group/qmail/qmail-0-r2.ebuild
deleted file mode 100644
index 8dd6a346f564..000000000000
--- a/acct-group/qmail/qmail-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/qmail/qmail-0-r3.ebuild b/acct-group/qmail/qmail-0-r3.ebuild
new file mode 100644
index 000000000000..3e555ecef9d7
--- /dev/null
+++ b/acct-group/qmail/qmail-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=201
diff --git a/acct-group/rabbitmq/Manifest b/acct-group/rabbitmq/Manifest
index 5b659e1dc75c..6ad8c15561e7 100644
--- a/acct-group/rabbitmq/Manifest
+++ b/acct-group/rabbitmq/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq-0-r1.ebuild 205 BLAKE2B 8dde75d4a2899add227a6074b69797f4fba2abb2e96ab4f579583f7283a33d240eb2f60488e50dc2d741e452bc36f7c1868fb7ab2f475b25550bf138bbb5b30a SHA512 007ae8f2373b42e0ede66a938450b0078f70598633a0b9fe9f866feab51d9905f805a9fcbb3dc29017b28f9076d219509bb4b157532fdbe03443c4f5f8faea33
+EBUILD rabbitmq-0-r2.ebuild 205 BLAKE2B 56bed736b0e177d19e0f0fbf2a3951f2b8220ef6cc7a4384e27139195f56b20d27512ff0c0cd9d022b1ea65c83009a2dc7d99989e4f181b4ef444279ab7e90c2 SHA512 28240b44022a32467a7f4b05895fea22a896af442b05cecbfc01d547d3f92a7e478f9b73d8ec375d37df06455d097a4de336bcc1110339f3336b00d0ca4f4c1d
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
deleted file mode 100644
index 68e9ffcebc90..000000000000
--- a/acct-group/rabbitmq/rabbitmq-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/rabbitmq/rabbitmq-0-r2.ebuild
new file mode 100644
index 000000000000..2248165b4cfe
--- /dev/null
+++ b/acct-group/rabbitmq/rabbitmq-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 01289c4d0f2a..ab88b019f8a0 100644
--- a/acct-group/rabbitmq_exporter/Manifest
+++ b/acct-group/rabbitmq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq_exporter-0-r1.ebuild 210 BLAKE2B 0553f0bfbdc161ed8fee25bd749db44f6c4e2d5f82bde712699960123f55a8c106683038ff012e37c247ebd6ea3df18a94d17f43c529e49a873676efe25d7967 SHA512 ec0145cbbfd53e41f031d6bf12e306bf6b6cd32cac16c4e59df8ebd2ac0becafffe0c0e0352af8c5643e3b4cce64e0e4a345e48c6e5c95883ccf4711a6cbf175
+EBUILD rabbitmq_exporter-0-r2.ebuild 210 BLAKE2B a45a7a374563e55e51b26d166bf6e68f2a285d62ec5ee7a427086ce4f94f3853c0a8e37bde93561d79714f2d97dadbbbf44215b5401f99fbae8630a4ed3b51fb SHA512 8905729ae57f6610be80b3c3e158a42a9f7a7671ec697c08fa0e55bc04cba2c120c54a8ed98c88dd719ac92540d5512a27320ae8c4e628fdf160a77dfc768212
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
deleted file mode 100644
index 6ebea851e441..000000000000
--- a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..88ef35c418d1
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
+
+ACCT_GROUP_ID="107"
diff --git a/acct-group/radicale/Manifest b/acct-group/radicale/Manifest
index 50f870144432..912a8dac58e8 100644
--- a/acct-group/radicale/Manifest
+++ b/acct-group/radicale/Manifest
@@ -1,2 +1,2 @@
-EBUILD radicale-0-r2.ebuild 197 BLAKE2B 35a1508c8d49961fc354cb8574c33609ff26f09c663e6d99b21deb6a2ec80587cc3962591c08e1789716164f400c01fc7495bb4697467a5c1361627c8c3c02c8 SHA512 694f42c00a07221ea1e653b9ad1f66601d6c7cf7ceea64e22e8799c1e5d3324b605b53da7bc0ef98645779be8696f31f8b7331a292330f4837fdc600cce1c607
+EBUILD radicale-0-r3.ebuild 197 BLAKE2B 92425fbf154d97082666388de7ea863f59eb542e7347feab27a9f0252cfb985ee07554ef70936449d4c0f209b5062ebe29af54c72d85369990ed4158fad1419c SHA512 a1631401efd0de73aaa17e1b423035b3ca929da92fe933cb24c14fd9496ca33501db3b7962ac73d7c5aac2f63115004e51cc132b326bc103c82478eb221200f3
MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
diff --git a/acct-group/radicale/radicale-0-r2.ebuild b/acct-group/radicale/radicale-0-r2.ebuild
deleted file mode 100644
index 3a15e9f97970..000000000000
--- a/acct-group/radicale/radicale-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/radicale/radicale-0-r3.ebuild b/acct-group/radicale/radicale-0-r3.ebuild
new file mode 100644
index 000000000000..ea28c24a5cbf
--- /dev/null
+++ b/acct-group/radicale/radicale-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f2c2f5d9089e..d1e947fa1d0a 100644
--- a/acct-group/radius/Manifest
+++ b/acct-group/radius/Manifest
@@ -1,2 +1,2 @@
-EBUILD radius-0-r2.ebuild 189 BLAKE2B 14f35032161caf3fedcfc6bc01bc59d1c4e487ab3bd68fb5f01a730aadf91ab416c5f2b90311777b033c9bb1036bde801de895f5c0f8247f66841d3dffb9b127 SHA512 c9649fa9af04dbd8a01b1cae66e0c6bfb9803b39b23265ec59d8fe5d5d21e0034ad890bb31321a9b6f1ccd8e308c2619cc5eb6d2b6349c447225121e91281580
+EBUILD radius-0-r3.ebuild 189 BLAKE2B 2652deb667b836f474f8c961fe7393508542225bedffb8e275724b6fea4aa8518b29ccdb54610268467a8faaf28a9d5f3cf9c46bf31dabc8d14e7a48be8df29b SHA512 1fc3b342a360552cab79d22d1d9b90fc2b7df19e90513fda2c54b2dbd711abe1e7775752c5a73a7523a8dce16d31c6e8f12e9e16346408e66e245c8b30fc6483
MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
diff --git a/acct-group/radius/radius-0-r2.ebuild b/acct-group/radius/radius-0-r2.ebuild
deleted file mode 100644
index 70012871610e..000000000000
--- a/acct-group/radius/radius-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/radius/radius-0-r3.ebuild b/acct-group/radius/radius-0-r3.ebuild
new file mode 100644
index 000000000000..7ac0d3197b26
--- /dev/null
+++ b/acct-group/radius/radius-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="FreeRadius program group"
+ACCT_GROUP_ID=95
diff --git a/acct-group/radvd/Manifest b/acct-group/radvd/Manifest
index 2041cf3fd6da..ef9a44ef7b32 100644
--- a/acct-group/radvd/Manifest
+++ b/acct-group/radvd/Manifest
@@ -1,2 +1,2 @@
-EBUILD radvd-0-r1.ebuild 212 BLAKE2B baee93531003ee315ea3baee0f9f4b71adbbe50b418361711a33f8d43f0300060e12116ea237fbc0c6e0d0737758a33bb327159d8cc68653d3b9b77a18d89c0c SHA512 0365bbaea4b316c755a5c26537543458e2ac419654726794b2721571d8bb2ea3a3e6be9022eb8a36b134b96c851b53be5ff410f5a98a5bd909578fb8eae325bf
+EBUILD radvd-0-r2.ebuild 212 BLAKE2B 2607e05840fd154022fc02efbac114bc421809aabff9342180fc2c6b2e9537079957c8f185076f0b9adcfb61832a2cee64de2c049d2e4e3107aa9a9144bf1349 SHA512 9e006d55092416dd121262b8bf2d7d46f589f6005e7226876fe1d21db0d96f1caaa433110e293d9fe1ca7c0c00b686f8418207a4061466e3dedd34187ff56028
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
deleted file mode 100644
index 576d1cfd0166..000000000000
--- a/acct-group/radvd/radvd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/radvd/radvd-0-r2.ebuild
new file mode 100644
index 000000000000..ce66be82a53c
--- /dev/null
+++ b/acct-group/radvd/radvd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 59d1c003e76d..8bd4cbb623f1 100644
--- a/acct-group/rbldns/Manifest
+++ b/acct-group/rbldns/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbldns-0-r2.ebuild 151 BLAKE2B 2fd5c6a1da137baf0e0e2127c56af49e2d61fb4c18834679280194fb75d0c10f1514fb6a54356fcd10634b637f4ea7b8da33be8cb9a29c59dec7fc9954dc32de SHA512 72d3b54aa6cb5b1b277057b255b8b0536910255ea4d8a945819047df648284981ca1ffae5a9ed4ba1f980c6e2d67578201b2f3ba8856c4b4a13edbd98a8f2a18
+EBUILD rbldns-0-r3.ebuild 151 BLAKE2B 070d478f23328e9319f4699d554f9ae0cd3d424ac58253f77e389647c3e18236c2af9e23b3cea6f86b431cbab6630c2be3d736b556ff803804473059b3f25459 SHA512 f264160c616ffb7195fef33697727a7cb156a6ce31deabd957d527b8e1c02a13bd8cc3711ae1b3b14c8feb79efdc877f268a4ef1d46a71e97cf4454c087af3f4
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-group/rbldns/rbldns-0-r2.ebuild b/acct-group/rbldns/rbldns-0-r2.ebuild
deleted file mode 100644
index 1034e41ae529..000000000000
--- a/acct-group/rbldns/rbldns-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/rbldns/rbldns-0-r3.ebuild b/acct-group/rbldns/rbldns-0-r3.ebuild
new file mode 100644
index 000000000000..92264ce9cde4
--- /dev/null
+++ b/acct-group/rbldns/rbldns-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=153
diff --git a/acct-group/rbot/Manifest b/acct-group/rbot/Manifest
index 4dbbaeaff994..b14c60116e86 100644
--- a/acct-group/rbot/Manifest
+++ b/acct-group/rbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbot-0-r1.ebuild 193 BLAKE2B 9568ad2dd3456d5193894d9d5402ebc1995d0931de60a6ab1934d47df70efd42e0a140a47fe3761a8faff604c9b0839080313ab74e4a015370ff089b960dc7c3 SHA512 6510b31039438833649f931764d094fb9092d7b4988705d7dbd8a23cc3878227bc01a3c2e05574f0eb686ef2ecc8ed0b7f800ac7107fbd54fdcf187604958a3f
+EBUILD rbot-0-r2.ebuild 193 BLAKE2B f14110de02774a6105581f22cb1daa41185f32536629dd2f175dcff5327da59df737c6ae0a5295563c0dde4be9a6840685d5afbbb66045f87551ae900d6b7bcf SHA512 8817557fb8bf92f41c4c3105f7bccb524d7107d78f8ccf7d16e9ba2cf81f6d683826acd462fb08e60039663481a81ef1f1c2808891c27bc23cdac258867ddebb
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
deleted file mode 100644
index aa03c16b5c3e..000000000000
--- a/acct-group/rbot/rbot-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/rbot/rbot-0-r2.ebuild
new file mode 100644
index 000000000000..160c88cbe598
--- /dev/null
+++ b/acct-group/rbot/rbot-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-irc/rbot"
+
+ACCT_GROUP_ID="129"
diff --git a/acct-group/realtime/Manifest b/acct-group/realtime/Manifest
index 2391d7978172..5bc140b43d94 100644
--- a/acct-group/realtime/Manifest
+++ b/acct-group/realtime/Manifest
@@ -1,2 +1,2 @@
-EBUILD realtime-0-r1.ebuild 192 BLAKE2B 838801f713222458043a3f658ee09de6a5baba75558cf63396c2ff9a46d4474629e757d66ed8f3a344229305161070bd3398a7222a3a3ac29dc26604eaf85e56 SHA512 5c545555c277b397ded5ccf2cd4546555b0434fc8febd1d103dc2980bab747c04bb0614c6bf376b64b568577e2058988bbeb993f728640e14f96d4807e5b13a2
+EBUILD realtime-0-r2.ebuild 192 BLAKE2B f6b326751b8cae2c6bb7dfba9a2dbe26a6d4cf9e164c8a228cb5d396de35f1db4bd1da345f0e313931555f743e88dee93f8369e09d56a3b1c8a36b443a823c5c SHA512 2a2e9bfc5aadc131a7e218d66cadff83ed03bf15ca6b14bb11c7e53bc8131c5a567cdf477341fc0a151446d57c2d7eae160f6ff7bf2485d6fc1e1c9893f17348
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
deleted file mode 100644
index a4734a21bd4f..000000000000
--- a/acct-group/realtime/realtime-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/realtime/realtime-0-r2.ebuild
new file mode 100644
index 000000000000..c93574cef25c
--- /dev/null
+++ b/acct-group/realtime/realtime-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="realtime privileges group"
+
+ACCT_GROUP_ID=206
diff --git a/acct-group/redis_exporter/Manifest b/acct-group/redis_exporter/Manifest
index d484fe62c8be..4fcc8b99009f 100644
--- a/acct-group/redis_exporter/Manifest
+++ b/acct-group/redis_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis_exporter-0-r1.ebuild 151 BLAKE2B 2e31dd57d34d4183a34be35a3d5b628dde96e0f2ed53c17fef48872ee68c9d89e02e3d5161ee621f3db4399fd58ea5f23dce8641e3ec48dc4fcb1f62a89b5a2f SHA512 8bb44851ce025f0cf9f7e877594649bd3fd6042a259c0c4bdc8b2b5af8c8c191fae84d56d410eb42f0531747612a42044ef172de989ca71b90c46627dfe6c3dc
+EBUILD redis_exporter-0-r2.ebuild 151 BLAKE2B e522ebb914325148e6d55539ca2d2c9cddf8fb3c32f0f585e300938afee62b3d05fe5ab81858487c38914d5a44946cd92adad4e1e88750d0394dbd7f8d2ab998 SHA512 96df1529330735cf4e63ab1bb20abe1edd839957dcae53e26548957db7a84d59faa72ed459d656497243d54c87e40b7b9356bb5d381268343c5ed9b3aa4f9a91
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
deleted file mode 100644
index 29ee8b117172..000000000000
--- a/acct-group/redis_exporter/redis_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/redis_exporter/redis_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..cfe71b383b27
--- /dev/null
+++ b/acct-group/redis_exporter/redis_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=298
diff --git a/acct-group/redmine/Manifest b/acct-group/redmine/Manifest
index f99df3b5811d..8c082395ab32 100644
--- a/acct-group/redmine/Manifest
+++ b/acct-group/redmine/Manifest
@@ -1,2 +1,2 @@
-EBUILD redmine-0-r2.ebuild 151 BLAKE2B 7000074dff875ae7be39f11532ee9f50dd5a0014345d69ff75c48c3dba173b62d118951c6ca03420ce35f3b4f1a135b3b054c3379260ce075f7daed9e5d4b8b5 SHA512 a82f0b251973c78061128eba7b2852228a68bf378615e579fa696d6bc992bd4537fbb883a420e47d76bd15bafd443d0c86887c7a01f52fa24cbe1aba42ae626e
+EBUILD redmine-0-r3.ebuild 151 BLAKE2B 62540f0153ac3d82bd41e541b23ece534fcc8ee262e6788e56ea6e5c2ae67d8c6c0491e041648171f6dfe840383b1530110ccc4412a68829cfd7ed3d1d1027b1 SHA512 8d47cee2097a619c4173133170f310870bf3a25f6710a92572c37c5eba79cac3069cde454c23c12722f681c509967e17da9f3805757f6dba1803e0442275e390
MISC metadata.xml 419 BLAKE2B 2c84505ed1c07ec955c61a163c3b3a400f1c01aae3dde0973c3e84a5462a7f7cbdbeb2dcf06e7fba91b49c97fc363ae5fc4af182bb26488ae98becbd548038a6 SHA512 d2ee91c4509d8d2e07dbca4a37eafb9186247aa3f37d68eb777bb0b540cf40ef5480380ee81ca69ea778f7b8b4344274008717190d2ca9c0d8f4f2566d1b6baf
diff --git a/acct-group/redmine/redmine-0-r2.ebuild b/acct-group/redmine/redmine-0-r2.ebuild
deleted file mode 100644
index f2fa23df394d..000000000000
--- a/acct-group/redmine/redmine-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/redmine/redmine-0-r3.ebuild b/acct-group/redmine/redmine-0-r3.ebuild
new file mode 100644
index 000000000000..4f6db2798ca1
--- /dev/null
+++ b/acct-group/redmine/redmine-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=451
diff --git a/acct-group/redsocks/Manifest b/acct-group/redsocks/Manifest
index 05d62e68896c..4f759b3af539 100644
--- a/acct-group/redsocks/Manifest
+++ b/acct-group/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0-r2.ebuild 199 BLAKE2B 4cf43fb765a21f4e898138827ce66bde2acd414e6941b52051515663b084f50c1442653c91789c4a9de79d10f4e8610d41640fdfa7d38c48575941cc70eeb29c SHA512 79e1f2407dd747e1f08824c4d2be07cad42815acd5a04d513fff61de6a08d80acdf439b100842e4c3399de5717f290dcd9773c7a8d7a71a07aadabd1ea3b9a3f
+EBUILD redsocks-0-r3.ebuild 199 BLAKE2B eede7ad8d5cf9f8bbc63fde1d407cc8a65de5e7f5dda5f5b10e7be306754a9f4b4d1197100fcb6e98e204dff16935f5f9550c2c2ede5db649c5391ce03784114 SHA512 aac18146666357db69d654c7c7220bb24deac494e9cb1a0c412bae6cc482e9e3525dc6852592018a5caa971057ba3b8c62b32b287a5a94e62aa5e557a6c426bd
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
diff --git a/acct-group/redsocks/redsocks-0-r2.ebuild b/acct-group/redsocks/redsocks-0-r2.ebuild
deleted file mode 100644
index af112f79b9d8..000000000000
--- a/acct-group/redsocks/redsocks-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/redsocks/redsocks-0-r3.ebuild b/acct-group/redsocks/redsocks-0-r3.ebuild
new file mode 100644
index 000000000000..28d999f1d109
--- /dev/null
+++ b/acct-group/redsocks/redsocks-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bada0d40c647..a793a77eaa0b 100644
--- a/acct-group/reg/Manifest
+++ b/acct-group/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0-r2.ebuild 199 BLAKE2B 7eaac7cf85987256035cd4e8256a09cd5ce526328597601db6b9113a8629d188c6b4ec6bf2321955e0462e56bf6640a3c7fddb089535da6bca031d4dd4c6a1da SHA512 7533957ccd000cd55ce08fa800d3331ad3d292cf8b9c9745d72f5fe8f9f1e29e37abf30f3f9494a8349955c8b769155bd2364f8754c0d61cda0646438df775a8
+EBUILD reg-0-r3.ebuild 199 BLAKE2B 2a060a82ca882fef6a0b1790b69e518fc273f07edb69b5ce209e1a3228e88b34f8997075bf19fe4fca9490a1c1a2198e21cf3fddb414e78a4ac1cf1ac4b13386 SHA512 ccf3abf66b8faf03a43d85b9986f07bee556631f71d9a1fd6234aa7f3012e56d9e8101ce65b8c7d8f91a1c23b41258f8453369e2131e120e8d3d2fe9f334e0c1
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/reg/reg-0-r2.ebuild b/acct-group/reg/reg-0-r2.ebuild
deleted file mode 100644
index ecccab5fa8d8..000000000000
--- a/acct-group/reg/reg-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/reg/reg-0-r3.ebuild b/acct-group/reg/reg-0-r3.ebuild
new file mode 100644
index 000000000000..e11738f13e87
--- /dev/null
+++ b/acct-group/reg/reg-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7574451b771d..2e74af6d97df 100644
--- a/acct-group/registry/Manifest
+++ b/acct-group/registry/Manifest
@@ -1,2 +1,2 @@
-EBUILD registry-0-r1.ebuild 211 BLAKE2B 5c191c0b4d54fc620f98aaeb1d9a431a8ca6acade0571600785f07164443dfb1a96a68902ad5f7823f37283d567b4304a54f1e56b23fdfcd063dcc6b44098e26 SHA512 428ae33717f20fd09ba351e69bb12beed70d7a4648ed98d7cbc2f84df4fc73728f6df517dc1988e948bbe0102870c944ea8dd73b9202b4a3d2bb9923df387e0a
+EBUILD registry-0-r2.ebuild 211 BLAKE2B 55dbc84e295d20e93325b7deee275c1eed32b8feb29729b2f4937c3d46c2529f142a62f538ab9208e604eb9053e1751fa5a109404235a229cad26f1a6dd393b0 SHA512 7fcb925c9afbcc386e6c57c3df854e4100db7830df6b366bf522730041ef08c5d62933894594cc40b55d39443b5ccee07261d14098ed95657049251d5cd6ba40
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
deleted file mode 100644
index 2d3b7c31cc34..000000000000
--- a/acct-group/registry/registry-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/registry/registry-0-r2.ebuild
new file mode 100644
index 000000000000..6a7122d86c6e
--- /dev/null
+++ b/acct-group/registry/registry-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9ba762b69ba0..b1825ae1367a 100644
--- a/acct-group/render/Manifest
+++ b/acct-group/render/Manifest
@@ -1,2 +1,2 @@
-EBUILD render-0-r2.ebuild 150 BLAKE2B ab7b9e652f999445d5633b6706043c019cb52d8cee22033041998fd62ad47d5c8349c3e66d407eb56aa70900e46771f14e427e5f9a9562f25a13fe651fe2e9de SHA512 522edbd56cc0f83c03224cad824ca21ced3b2a4514474b8e6cdeef00d14e8f903ee60502046715340bbe812015fd0ee7ed076758a6ee220fe0a1f6a0ddded3fc
+EBUILD render-0-r3.ebuild 150 BLAKE2B 1486cbe7c9476c80661a4098315a624c27f6f2f47e9fd001a723aa04840d08a116bb8ce531d1e584b0554151589daf94c20bda7f4007d1e24763611a9ff84a59 SHA512 fcbb5bc6f772d9af668adf02a85b6b342e98418fdba5428a75a19253f8d1e231b5f63db56a49df33eca1cdd717f7e0501ed30ed3b249bf3c14ae75f55a7fb15c
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/render/render-0-r2.ebuild b/acct-group/render/render-0-r2.ebuild
deleted file mode 100644
index 0a6ab8cd9485..000000000000
--- a/acct-group/render/render-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/render/render-0-r3.ebuild b/acct-group/render/render-0-r3.ebuild
new file mode 100644
index 000000000000..e119bdb21cfb
--- /dev/null
+++ b/acct-group/render/render-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=28
diff --git a/acct-group/roccat/Manifest b/acct-group/roccat/Manifest
index 632850f14b30..3c4dc921a418 100644
--- a/acct-group/roccat/Manifest
+++ b/acct-group/roccat/Manifest
@@ -1,2 +1,2 @@
-EBUILD roccat-0-r1.ebuild 202 BLAKE2B 738780807a93a23195d9a100762b0cb422eec3102f0f10d48d558bb356e7cee615983401a15c3a446cd28fb3196de9afa233676e61c64fbfe8d19e6be5731b9b SHA512 a440eb67607195dc5c61229ec2b6db9c59fd872a76120eb62954ee55db259ea32ee60ff051a3259a130139cf1751ee3603345b0c80c16950d80c69d84d92042f
+EBUILD roccat-0-r2.ebuild 202 BLAKE2B 38759e922aae54699321c71bafeb2fe8e2f09c8f338bd0a51afdedde54ef0a668b6e78854ae47ff676dfd387e9f3121d93fdb00d7ec4dcddf0a9d2d4a8318b71 SHA512 93ed338cc13b764b63f086c75232a5cfa9d592283cefd0445d30f727eeeaa40af8c922607bace074d704167aafebfb3d009811fb2441da5d40bff5e8f20d2a09
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
deleted file mode 100644
index 34761f2dc218..000000000000
--- a/acct-group/roccat/roccat-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/roccat/roccat-0-r2.ebuild
new file mode 100644
index 000000000000..65c89ad287bb
--- /dev/null
+++ b/acct-group/roccat/roccat-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 fd53b27396a3..34a71a5d0c27 100644
--- a/acct-group/root/Manifest
+++ b/acct-group/root/Manifest
@@ -1,2 +1,2 @@
-EBUILD root-0-r1.ebuild 175 BLAKE2B f0b811a24db05785a1249ebf05767b44ca7584cd2c2940cf50dd8d4ef12d2ca1f033833b458eebb00aa553bb4a43c7bdae1bb85e94406858af3dad4195acf071 SHA512 9a15f9fd18f6292207a452ca4881b14cbb690c7b537fbfaaf84124e86cb0be75c275095d7ed1deda32ddcfbcce32a0b01ff922f488cebbd966fbdcad7fd793cb
+EBUILD root-0-r2.ebuild 175 BLAKE2B bc44a41237c9cc8725264bcb73e22e084f4430842dbae5f2d12082f5bf755c5579687b5f79837823a42ff23be0f0fa3f72a09ce664819e5d2e5db9245ea1b198 SHA512 a33e8e668897d51f0c7175ab1b339489b50e4043bb41350ef8603dcef8062261a4676f2aa62402a122be026a813406d5d38160dde529b6d67326d468c12412c4
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
deleted file mode 100644
index 731c421a20f9..000000000000
--- a/acct-group/root/root-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/root/root-0-r2.ebuild
new file mode 100644
index 000000000000..6c40cd3e5449
--- /dev/null
+++ b/acct-group/root/root-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=0
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/rslsync/Manifest b/acct-group/rslsync/Manifest
index 1293689abdba..55c27d2c5f4a 100644
--- a/acct-group/rslsync/Manifest
+++ b/acct-group/rslsync/Manifest
@@ -1,2 +1,2 @@
-EBUILD rslsync-0-r1.ebuild 201 BLAKE2B 690b8b40364859c7c4393fd928348f3ad5b5b40d592ea557221fd9e8072efc159fb40ea25a012d14e210f2e425ebae8c30420a893cf1aca4844bc0f3ab7a6ee2 SHA512 b3c19ef2e84ceb99741e45c71612b6a3a92d2489230d01a7aa7f42e0dc165c1eebe168390a03df568a6c002637131c8a178280812423370e0489e3496cfdad64
+EBUILD rslsync-0-r2.ebuild 201 BLAKE2B c531184c97c7dd0c5e85e2c1ec3281b4504fad5072ba642d91edb88ac7d56617042cc601e530f212137ada2d63809659d1e76131b4da38e27555417249a10251 SHA512 4c2260d019edfa0d3f6017c19e023971243079313089fe6ed620a45ba7a4d0e2b520e542385dbf79a9217819f67abefb1577c1f397ccbf0b1095eeb6d1ca9a70
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
deleted file mode 100644
index 11fec48d0d8f..000000000000
--- a/acct-group/rslsync/rslsync-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/rslsync/rslsync-0-r2.ebuild
new file mode 100644
index 000000000000..fdece579ddd1
--- /dev/null
+++ b/acct-group/rslsync/rslsync-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 87d610852b01..8f263355a4ef 100644
--- a/acct-group/rspamd/Manifest
+++ b/acct-group/rspamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rspamd-0-r2.ebuild 212 BLAKE2B fcb153611b74b49edd4ac182cea02cbb64145e31d03f57ba4024dda1d17f666b15039488839c2e67b56acd32e5715b5c1625d7b652712a07b999d68dd9788b80 SHA512 accb0a26d968d1ae9765ef6c7667d487477d85e5c0b8f5a2376d60bbcb91ba4ef41ba89684546fc50e469345dbda225be2069d073af216afd90266230d11fdf3
+EBUILD rspamd-0-r3.ebuild 212 BLAKE2B acbfe83ed6f4210187169fb4eb0e8463e139c8d71bbb8c7a28b6e52dc7b65e625c56b59113b3c2b3f9ab941bcedf6e270c83d108364fd8660e56f737170520bc SHA512 5e3508b2d5f2c980f7e3be6a409b8ca7af4b9abc94a8ce14ea80d66fdcb76dc8372beaf4707930577df6c251bd751e1baa7c040d0cffb87d35eb39f59ad99992
MISC metadata.xml 252 BLAKE2B 7b4c6db66de4b1687e1efaacfff0a834b50c02d942b84c7513ce5b5f973e3afea36df6f7dd9170c3d37b44e10ff9bbc1081c20ffb2f9d403fcb78b114e3ce5ce SHA512 d040336c81e6e41b84af753049156cac544a9675591cb9ee03231065be9edf7005764e5e8d1d3f6a6217fa4155571ce56dd2edef6dcadb90e8ccd9b538130ac5
diff --git a/acct-group/rspamd/rspamd-0-r2.ebuild b/acct-group/rspamd/rspamd-0-r2.ebuild
deleted file mode 100644
index 2099e0d20e6a..000000000000
--- a/acct-group/rspamd/rspamd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/rspamd/rspamd-0-r3.ebuild b/acct-group/rspamd/rspamd-0-r3.ebuild
new file mode 100644
index 000000000000..663efde6d291
--- /dev/null
+++ b/acct-group/rspamd/rspamd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for rspamd - Rapid spam filtering system"
+ACCT_GROUP_ID=237
diff --git a/acct-group/rtkit/Manifest b/acct-group/rtkit/Manifest
index b5e2993033e6..17ecde4d6774 100644
--- a/acct-group/rtkit/Manifest
+++ b/acct-group/rtkit/Manifest
@@ -1,2 +1,2 @@
-EBUILD rtkit-0-r2.ebuild 215 BLAKE2B f5fdab34443c659d326769a189d72f6188ea72d226cbba74dcfaeffd74cd2747ffb3b038f1de6d6137ccf4dae37062838dcdb5321e3451a748aa84f2592756c3 SHA512 236b8e874906735206a64ee920ea818c8d97a00e981bbd58a2abd2f46d5949fb8e2b701900ad2e8cebf8efe6b79e4b13520417aba91e8f4b9c2ffa0696d23d98
+EBUILD rtkit-0-r3.ebuild 215 BLAKE2B fa45d2760c714434e78d856a64261fded285004c2fb7b094d1745eeb25e7b6897687a008471bc1862c3f52587e2fb023eaedec85b2a78fc4430260623041ede2 SHA512 60f67dd3f109d0f3f1dd7ce1339350322d14725c6c3c7202f4cbd5431d6013ec3b2cae438b41ee0bc9af94f3e7fbd42333e96fd18b9400bcc53c76bb8c17e79e
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-group/rtkit/rtkit-0-r2.ebuild b/acct-group/rtkit/rtkit-0-r2.ebuild
deleted file mode 100644
index df01f1e86d78..000000000000
--- a/acct-group/rtkit/rtkit-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/rtkit/rtkit-0-r3.ebuild b/acct-group/rtkit/rtkit-0-r3.ebuild
new file mode 100644
index 000000000000..620c967dc9a3
--- /dev/null
+++ b/acct-group/rtkit/rtkit-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
+ACCT_GROUP_ID=133
diff --git a/acct-group/rwhoisd/Manifest b/acct-group/rwhoisd/Manifest
index 2c8e7c053b6b..453722a6ed3e 100644
--- a/acct-group/rwhoisd/Manifest
+++ b/acct-group/rwhoisd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rwhoisd-0-r1.ebuild 195 BLAKE2B e40a688215f03d68ef09a306cf60fdc8f3274c382455dd6cf8cd392731209453137b44d5369ffbdfb8cd3104ffc41dae7422a131d6c16c9930511311534db152 SHA512 6e1b0328f2926041fa85b3a6318fbbc56c5c12551b7645929faf86e1f0a2015f25f7fa8a17047ac637e9cb7b7a2e0f226f03c45d4084addc31644c759b986fd9
+EBUILD rwhoisd-0-r2.ebuild 195 BLAKE2B 6ba826743ccc8b01386a6f221db1b602ee37fe3622ec7a1662b97983b8d51f8a6d748953edd183504f11bc15e5ba53ba0d659f147b48cf28779892bd08848c6d SHA512 7174f23593a463786847474ce11815f937bd65c531e65a60dbefa8a67ecf7d4fa3cbb53450e4d5d8923eb15911fc4e9b73528ae2dc19b16caf408e2383e7cbfe
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
deleted file mode 100644
index 90a1f5f83e76..000000000000
--- a/acct-group/rwhoisd/rwhoisd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/rwhoisd/rwhoisd-0-r2.ebuild
new file mode 100644
index 000000000000..2935c33d2ba0
--- /dev/null
+++ b/acct-group/rwhoisd/rwhoisd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8167cc374136..34aa762d674d 100644
--- a/acct-group/sabnzbd/Manifest
+++ b/acct-group/sabnzbd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sabnzbd-0-r2.ebuild 188 BLAKE2B ec1e0f7cded708fb66dd3dc89dec25cdbccb3e6283effb399285d5a0cc576a2cb56b77bac2251cb1bbb773af044bc7c0811f7e9b340483026224baf1acb30ee8 SHA512 0852d048466188e9fa768ca98ca79445b033f337d390fc0a5b81872356c03005ff686fc14f1fe4ed0df64b17e1979c028d4ce7b8a6a3054d9f09a61405838b79
+EBUILD sabnzbd-0-r3.ebuild 188 BLAKE2B 743b6bb4475e6648ca96cd7b623e0e15ac08c4954c463068d0fdbe028bc37d6a0adefb8d368d86b462f56310418c9b3de5377d406896d47ae0b058b9faa8ea81 SHA512 7b76164d58a2d3cb6f00373a4aeb9f506f1012bfab064e339f5dd8cfdbdc6ddb03f3875a88f568c27a8eb9f4fb5efbb402ef2022060c692067828fd788ab0abe
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sabnzbd/sabnzbd-0-r2.ebuild b/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
deleted file mode 100644
index a86819cbc639..000000000000
--- a/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/sabnzbd/sabnzbd-0-r3.ebuild b/acct-group/sabnzbd/sabnzbd-0-r3.ebuild
new file mode 100644
index 000000000000..6c9175b97074
--- /dev/null
+++ b/acct-group/sabnzbd/sabnzbd-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="SABnzbd program group"
+
+ACCT_GROUP_ID=397
diff --git a/acct-group/sagan/Manifest b/acct-group/sagan/Manifest
index 12a2809c7467..ddc2a62e88f4 100644
--- a/acct-group/sagan/Manifest
+++ b/acct-group/sagan/Manifest
@@ -1,2 +1,2 @@
-EBUILD sagan-0-r1.ebuild 207 BLAKE2B 7246aa03af69c27085b85a20e9c7af8c3b7fb6e0bda59b9987d5dc80985ffd69f627d8610d7041c05a7b821489af8d0fc41d9d9465b27c6a04d4b3a4e532215f SHA512 9a11c8574a85e653dbbc35ada279889bf6a054dccde6012fe8b162aa701ebc359aae9602ececa6394586e66bac329d0f4ad30953780efe28cca94e199b475afe
+EBUILD sagan-0-r2.ebuild 207 BLAKE2B cfbae5bc1c62408c97dd00f1edfe6a19db72188364188d5b46c3e23b753fb7168cec9fc81b923106b48bf02c8a9de010d3291f22b9d6a1eb563096e9bb170258 SHA512 ed8ad2b7d9dbd2519356ae8bc99d1816565fdb73cc98de990f0db834c517cee6c52cddf7303f0457340967ad1be63a64525a2e56a37b004d637bafbfbfe4cd0e
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
deleted file mode 100644
index 01d058152a84..000000000000
--- a/acct-group/sagan/sagan-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/sagan/sagan-0-r2.ebuild
new file mode 100644
index 000000000000..a61ec8911461
--- /dev/null
+++ b/acct-group/sagan/sagan-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 eccf9364e4a3..a60f95b3aea5 100644
--- a/acct-group/samplicator/Manifest
+++ b/acct-group/samplicator/Manifest
@@ -1,2 +1,2 @@
-EBUILD samplicator-0-r1.ebuild 201 BLAKE2B 3d35637a3cd8b18087215a080d3d0b35c22b216ddef0cebc7725143b137261dd5d671da0638aeb6c055359b3ce93a751151906354020cfcfe78fcdf24e1db302 SHA512 78e176a6f1bb18f0e9e2bb7b865c18af785752a5b01d761159a0fb08dcf7b62057c0bd1060692214b2807ac9bb6c7c474bccb4fe4359575fcd17e09c31df8c6c
+EBUILD samplicator-0-r2.ebuild 201 BLAKE2B 0817f149f17c8aca8ce6f04258f6c443d73e95899003db8288d3e751cf7804138e21a960d5a2e412f91cbf0aed2af937d2ca0a36fa886d4419b5b34c14402030 SHA512 9ba25ea8f1cebf25f25fe252219c062180677a15a9134c0bb010fe436e5a9e344c5b828f9a45bb30244044cf4910d768ccb9fbdbcc6e8df1c48e0ef115df4f9d
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
deleted file mode 100644
index 46a667f51ce1..000000000000
--- a/acct-group/samplicator/samplicator-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/samplicator/samplicator-0-r2.ebuild
new file mode 100644
index 000000000000..d9a31eef9b8f
--- /dev/null
+++ b/acct-group/samplicator/samplicator-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1b7fba6d6565..9cf4578cd472 100644
--- a/acct-group/sancp/Manifest
+++ b/acct-group/sancp/Manifest
@@ -1,2 +1,2 @@
-EBUILD sancp-0-r1.ebuild 193 BLAKE2B b8aa08c12e9cd585f68503f1f757a8bc1eff0bd31c064cf5db0470f6b0a25455348cc5c59d3e38bfad8f9652198602efca527b5067a38b0538059fc11b32a163 SHA512 4762626e2b010066b97fb37c0c6bcfcf9c6ed5d21b35fbedd9691154876fb2ccedc8df96d6f11ea53fdc500c35a90c7bfb832b7fe7b52df14dd4451995519974
+EBUILD sancp-0-r2.ebuild 193 BLAKE2B 0c6f918d265f07c9d534f2080d738c6eaf112193e073c5dec16b675927ffd803c60d22b05cc2ab625e50bb784148950ed1a8ef01147b72b4826752678fab9c3d SHA512 9c1c4891280a5b369a88fbc22948e1af29f6f55f89273f46f2f71c7c9d56c212bfdd7a9548aa6863d1022a3c59988c4699f85d17f1ee59f535895eb17f12b0d3
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
deleted file mode 100644
index 4f74e4e83817..000000000000
--- a/acct-group/sancp/sancp-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/sancp/sancp-0-r2.ebuild
new file mode 100644
index 000000000000..ecea1d91cc49
--- /dev/null
+++ b/acct-group/sancp/sancp-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9364361fcc36..42c9f53bff1a 100644
--- a/acct-group/sanlock/Manifest
+++ b/acct-group/sanlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD sanlock-0-r2.ebuild 193 BLAKE2B 64a6b5033ee21ca8c730786fab7302d71f0a0e3a805af9d226752e157e9d8132608c61654a1f8a992b63159f0b777ec22fb0b4acb48f924289a132d1d2de802f SHA512 a555bd273573821bede0ec7d3332da9c77fa605f88620e7535998aea6228bc0a0fe57867d1bcb0c94892ffdc250a4cac6a3ecdfaf685fea0e58348fafd16e56c
+EBUILD sanlock-0-r3.ebuild 193 BLAKE2B 5ad330c8699f97720205b01ed07881d153d3243f9b5d9a366155f1b629f5246a2cb62e598446fe2988a37de2d7dda0a1a0d9eb2985836392bd121889dfb01c13 SHA512 66e3639c50ae502650f9732e4e7108f815676f3aca116c6507ecf60a7f6dfeba0609ae6a714b8f576583dc5d41762a2bfc57c127044b231495fc955443187193
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/sanlock/sanlock-0-r2.ebuild b/acct-group/sanlock/sanlock-0-r2.ebuild
deleted file mode 100644
index 71ceac8ce503..000000000000
--- a/acct-group/sanlock/sanlock-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/sanlock/sanlock-0-r3.ebuild b/acct-group/sanlock/sanlock-0-r3.ebuild
new file mode 100644
index 000000000000..ea77b16f3bf4
--- /dev/null
+++ b/acct-group/sanlock/sanlock-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4b032009de33..b3c50195d230 100644
--- a/acct-group/sauerbraten/Manifest
+++ b/acct-group/sauerbraten/Manifest
@@ -1,2 +1,2 @@
-EBUILD sauerbraten-0-r2.ebuild 215 BLAKE2B 0561a0b3ae3906edd8f70386c6c5125ae84410e34adf1955b972025b06f7f2e242461dc2b4c1d169558b7e02c0864ad8ebc6ed54822f35b50425d360903be703 SHA512 2a814030d86c0353497f08c3ae1073108d82f559a2141505e0ce44b37cd03c649a489df253ceacb28d2cbe6a6c6465db81be75aed49d62173b93ef758dbeb0ef
+EBUILD sauerbraten-0-r3.ebuild 215 BLAKE2B 15f140b32b371fd587936aaf7c285b10a8d20c2ed5f4b9196fb82ab277839d3dc778d81e2f1a99a0fcb248c8e1a7b5508baf2da403e0d72802268bd203f7a3e3 SHA512 af16d60f6031c84b284cfee0362d391e66fb920626e4e7ad675db245235ccb2f96d84fb7c5a16c5d98d2d2ccbc08f11f0b47ff7c7da11a5f1a1066594788ba5b
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-group/sauerbraten/sauerbraten-0-r2.ebuild b/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
deleted file mode 100644
index 4eb54a421250..000000000000
--- a/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/sauerbraten/sauerbraten-0-r3.ebuild b/acct-group/sauerbraten/sauerbraten-0-r3.ebuild
new file mode 100644
index 000000000000..b24a0c328d4e
--- /dev/null
+++ b/acct-group/sauerbraten/sauerbraten-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b676909b28e9..c1e0588731a4 100644
--- a/acct-group/scanlogd/Manifest
+++ b/acct-group/scanlogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanlogd-0-r1.ebuild 202 BLAKE2B 8d36db7fa52c100d6dd76dd7d277c4c1f5840acf3b1de7fc8b9fb059cd678e995acf93c44afc4d31cde09c38a40985ad4a246aa1793760505ee6791765f026ff SHA512 977606b349f6850edf6797d7781d380016ead3ec9c8c2979b47565c2382f499cfe57cf27f89da2ac325f0e8ffdf2e05c77f7e96cf5338c33cf0c2dc5f2be6c22
+EBUILD scanlogd-0-r2.ebuild 202 BLAKE2B 3025033640779d54df8dc661b98315356e6ada37aa1bf0ff754f13d391b127c8b489571f28b8d9479f31529ff7622efcebce2fdea4a5ae3ce2bf4a6014b1ea96 SHA512 97e90f371d85a24ea3b673f9c45cdc7130448f5ce876d11efc81132fb0f0ad67e1ecfa1d195a4bbf73c78406be63889a70554d338888e9d0744fce5197f2ca3e
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
deleted file mode 100644
index 2b6b4a16515c..000000000000
--- a/acct-group/scanlogd/scanlogd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/scanlogd/scanlogd-0-r2.ebuild
new file mode 100644
index 000000000000..a1e9c3be2a29
--- /dev/null
+++ b/acct-group/scanlogd/scanlogd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 570b43864d9b..a76d3c9224f6 100644
--- a/acct-group/scanner/Manifest
+++ b/acct-group/scanner/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanner-0-r1.ebuild 202 BLAKE2B 7eed3ac2e03aaa2b5f941746a5ab3705ecb71357b5adc5f77da273287ee831030beeccc45ecfec1ef840e61ef13e372ba9cd399a8c3617faf747d048c389033f SHA512 16e4abd5666e13063febcfab435fb4496ae7545670774443d46fb7a4dfe3fda2852af0df9badadab970736d4a659cb0ef4f61c9430647e52775472973bb64f5e
+EBUILD scanner-0-r2.ebuild 202 BLAKE2B 263546fd1692b295d744fe5973e0ff6a6a585767367081e2fe51023436ca036a787d43c5de872e517daab289b2dc5dd31224520f08e077175b485187a3a5217c SHA512 40cd60af00fe204d411e70de15966de1f1c83b2708766df74fd3c19beedbe79e4b3ff37d2f2790316de6d63155c99fe9c15f765d92782ad85afda5e85f2098db
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
deleted file mode 100644
index 7a2254915859..000000000000
--- a/acct-group/scanner/scanner-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/scanner/scanner-0-r2.ebuild
new file mode 100644
index 000000000000..232a874cb5f6
--- /dev/null
+++ b/acct-group/scanner/scanner-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3078936ec033..9a8422d70c6c 100644
--- a/acct-group/scponly/Manifest
+++ b/acct-group/scponly/Manifest
@@ -1,2 +1,2 @@
-EBUILD scponly-0-r2.ebuild 183 BLAKE2B 6bf256a5a563334e1b748cd8867772a2999bbd91bbbd4769d879ae94f9952b432ee662b1db3fb9a7adcb6e5a7bb836b1216f714576dfe3bb2cd0daf207d0a3b1 SHA512 0ca1400d2c5dd5211ee33a46d04f89777094a9260b774aacfec1a3e783e8ed8b7f953fcf1fc9f35a54a3f0885051a2a18be58904efb89dcef73e9cfeaa6b8c35
+EBUILD scponly-0-r3.ebuild 183 BLAKE2B 3030088dc53c9ed1c5df52a0f42dddd1f733688d2d6ace9d5a4d01ca57a6e7e9a59095b62198be22238f6f37d472f64322059a47dce61ea006de1e3ba332465e SHA512 170fd8fc26f6a502bd2c6aa3f1e4d9a9c26e4f1295466e998050e223307bc2b3a8e071679fa44d886169f051a4331181fe8bdc482aa799d7dd0293e210b31d1f
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-group/scponly/scponly-0-r2.ebuild b/acct-group/scponly/scponly-0-r2.ebuild
deleted file mode 100644
index d5a704be9aec..000000000000
--- a/acct-group/scponly/scponly-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/scponly/scponly-0-r3.ebuild b/acct-group/scponly/scponly-0-r3.ebuild
new file mode 100644
index 000000000000..be9382651f79
--- /dev/null
+++ b/acct-group/scponly/scponly-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for scponly"
+ACCT_GROUP_ID=239
diff --git a/acct-group/scsi/Manifest b/acct-group/scsi/Manifest
index fe5875c0610a..65d49c22aa15 100644
--- a/acct-group/scsi/Manifest
+++ b/acct-group/scsi/Manifest
@@ -1,2 +1,2 @@
-EBUILD scsi-0-r1.ebuild 151 BLAKE2B f232e73bc007231db73c3858c996a5611d8d3b773c66bb47d80232062716a27c47525362f01f4b355ab216313cd695d95660f226a18b5da2aee91c2a527719bb SHA512 d593e894ea51588c237360f0be7ebc31b9bd80c15b9b9137fa3c73468f23cd50c13c517e21224cb538953a605afe14486225815a31f7b38c11262d49dac431eb
+EBUILD scsi-0-r2.ebuild 151 BLAKE2B 25759c84c5bf163706706ae0c7585b62ac231181977acb211ecd2e547137f3fbad72c17d3a17bf451d27d0eb3d0bc32483cd80e3dd9005c5947a877687b32727 SHA512 1a6fdf20af0404c7071636d1b0dada29a0d7d45ea77157a6827b700491b2e98c6bd4feaacfc5c2b72fb2e8c7d54520dbda33a8358dc6f6355722266b08eb1ad7
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
deleted file mode 100644
index f3ee233c3cdf..000000000000
--- a/acct-group/scsi/scsi-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/scsi/scsi-0-r2.ebuild
new file mode 100644
index 000000000000..258996ea78d1
--- /dev/null
+++ b/acct-group/scsi/scsi-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=415
diff --git a/acct-group/serf/Manifest b/acct-group/serf/Manifest
index 877f71bfd889..97638ae9b5d3 100644
--- a/acct-group/serf/Manifest
+++ b/acct-group/serf/Manifest
@@ -1,2 +1,2 @@
-EBUILD serf-0-r1.ebuild 195 BLAKE2B e68f412af048567c78ab9c1f18d9c24c242f53d043b99d4b06388d01eee1d9e626690a0469b8a3359112261315f0caaa4ffc12b4743ed6ff01f716b8a842f7db SHA512 3579536781f21d580b6f616b5cbf6673f00457e3c45000ed69b7f81a3946b0b4fa451e3d81bcdc7b4a7dd8f501cacde3ffc6cc961a53ce656ecb5ee5f0105df9
+EBUILD serf-0-r2.ebuild 195 BLAKE2B 447c97f665e582f951b94c1b9f78459bd262742c3c8d3db9ba861a85f20879b86484e616577c111f4d77e0172a6f1ba0c6583dff65c08a16c529f9476f99dbce SHA512 ff29178a1504bbc9be84f146f08fcc442213c8cbec161ad84e04ddde7406affe71c16a949e27230ef50a5fc5924d09f1fad8b74571a860fca220bf10ade3b630
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
deleted file mode 100644
index 6b8c298f2eeb..000000000000
--- a/acct-group/serf/serf-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/serf/serf-0-r2.ebuild
new file mode 100644
index 000000000000..fa1fb5349552
--- /dev/null
+++ b/acct-group/serf/serf-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/serf"
+
+ACCT_GROUP_ID="314"
diff --git a/acct-group/sgx/Manifest b/acct-group/sgx/Manifest
index 6e6e93119be0..fb179109ba8e 100644
--- a/acct-group/sgx/Manifest
+++ b/acct-group/sgx/Manifest
@@ -1,2 +1,2 @@
-EBUILD sgx-0-r1.ebuild 202 BLAKE2B f84ed6e9afd0c54d8810d0e1c30622563ec4e92c8ccd0afc85048b0f3cf08ff63ab5f12419ff8bc7f7521ea0e168f30670bf7f091a3cc0bbb3ceb747242504c8 SHA512 1a1ccf82fcf7c3e3b19223fcc0971ba685e99557cf694d6f9f365d8d3a3b16c3c181d13c2382ded7fcde8b866ca4609730cd7423a0c7994340f9e70f058f78ed
+EBUILD sgx-0-r2.ebuild 202 BLAKE2B f4acec18fb6d9fe65bd85c6e98bd61ebd5ead64280fea1a9e780a17f24bc21482a19ff0f43aebbed9f081831cac3277f7ca9eb400b2579e9ae771d2e2b188f0d SHA512 b640d18b7c5f2bd8134e45ec973ce41c4e3938017f01d174798417e9654d8e654ea6e320b3beee14e24f02f53ffd982be5112a57dd4c1e3cbab4fba42af73418
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
deleted file mode 100644
index dc4b0f1de0ba..000000000000
--- a/acct-group/sgx/sgx-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/sgx/sgx-0-r2.ebuild
new file mode 100644
index 000000000000..7fa33b984480
--- /dev/null
+++ b/acct-group/sgx/sgx-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="System group: used for SGX enclaves"
+
+ACCT_GROUP_ID=405
diff --git a/acct-group/sispmctl/Manifest b/acct-group/sispmctl/Manifest
index 4e6a7a703bd1..37b4065119b0 100644
--- a/acct-group/sispmctl/Manifest
+++ b/acct-group/sispmctl/Manifest
@@ -1,2 +1,2 @@
-EBUILD sispmctl-0-r1.ebuild 197 BLAKE2B da019a7ffa5080e3a400294941148d4da363fa5b2027db868c577bc53fdc3ee55c5c97534e234c311ae710f0da483bc4c9292c0cd623a57a793107af51415db8 SHA512 dd3b997b70a6a624534a2c66f2a3abb46a5405fa2afa6a79dc128334ac1cea435e99962f1e628e4f7817be512d884b05ac4dc9f9936a91534e0efca85e5365d5
+EBUILD sispmctl-0-r2.ebuild 197 BLAKE2B 3037a77e34b11fc8d4c29e0aa813166887de223ebba04513ce5af7850ba3a65b1db449a7fa16199c7e0794edf43ead60e1ab9ad987105bac8d6acf53dec06d28 SHA512 437d4663725963a184078bb77536cd08b9a4a0e0618ed98be9de83b966e9bfa1448d193f485582fc2aec488d598cf8b5ca6e8d7f9868fcc82eb21fda8f40a8fc
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
deleted file mode 100644
index 7b4269a47c0c..000000000000
--- a/acct-group/sispmctl/sispmctl-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/sispmctl/sispmctl-0-r2.ebuild
new file mode 100644
index 000000000000..cfdd67e8622b
--- /dev/null
+++ b/acct-group/sispmctl/sispmctl-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 854ec1264c12..56e4b9988987 100644
--- a/acct-group/sks/Manifest
+++ b/acct-group/sks/Manifest
@@ -1,2 +1,2 @@
-EBUILD sks-0-r1.ebuild 197 BLAKE2B ab85e0c0217d5dfdb69ef907d608683178eac24b1f4cb6563090947148392c183149ffaedebe9354dbaec298b960e87123f11dadf24c2133a692e558727e6737 SHA512 b7785d6e2acd733e4087e58248f0fb28cdaff0fc5d8221c94effab9a5aac2c78f9a07985f34152a4966ab63f2a5e885246db8717af58c27cb25ae893dc89de11
+EBUILD sks-0-r2.ebuild 197 BLAKE2B 2fb479ea2f1d3a1f26c8e242516d7014c435f735f4cc4ed7b9a9c8b19e94fc0ff7f4f08e63595be6e507880721679a12d991cbb7ba9b519b409ed831fbc16321 SHA512 4847f63b27b52fca22ef69bcde3291183376ada6e2eb861a23d5b98cb875a08b8624578556ffd8a7242ce425b083d7651b058af275603c6e8c012ea2f51c8feb
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
deleted file mode 100644
index 27cc84dd7259..000000000000
--- a/acct-group/sks/sks-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/sks/sks-0-r2.ebuild
new file mode 100644
index 000000000000..1bf1f311e958
--- /dev/null
+++ b/acct-group/sks/sks-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6d8d0df69e2d..327b9bd68d99 100644
--- a/acct-group/slurm/Manifest
+++ b/acct-group/slurm/Manifest
@@ -1,2 +1,2 @@
-EBUILD slurm-0-r2.ebuild 222 BLAKE2B 26cbd503117d77bc7cb7fff93f9e46e3e8b4d3a760395da9b27b9e180bea98023645cab749ef091d133e5037b6cc23a0dfb28ec6c9b64a4930e75611f2c4bce4 SHA512 4d073c8a785930f0e80518a8272f63f0de078f0b62f7bc933053e64bb28fe5105e8e5b0ad1f64fc1d7f3ee5115305d42684dd6cac1bdc9a9811ecbf985c10949
+EBUILD slurm-0-r3.ebuild 222 BLAKE2B c87484e981119c1b3ad67205c8f4a7d19a990f5b58647fb0561ae170a0fc9312d661e97858eadef64595807b9490fa918ba2ca8afbfc5bfaa704c791f3a78791 SHA512 36636ecfd6d0a055c9515603c5417ff404b32a06ad5e95e6b55d5414a77fd3fe291366472f0a589766f75eca7c78a47abed2cb5cb1b2ea344bd52b31d79dec15
MISC metadata.xml 367 BLAKE2B f7377cc4c8ab6161736e0b676f04156059b020ebb1bce3eba0277b419458a520c595dc43dcc2ac7545bd91a93630d5809ab8194757dbdb092d06473ebbdc9bdc SHA512 07ecc9173013e5b0d47c90f5c5fda05bbb127e4401ccc2bc2c92ca04c4e300f1b6fef8f40f12ea58db212e3f66f7f9085af42ca8e0c6fb1e7be5d193a8a09831
diff --git a/acct-group/slurm/slurm-0-r2.ebuild b/acct-group/slurm/slurm-0-r2.ebuild
deleted file mode 100644
index 4d77700fd816..000000000000
--- a/acct-group/slurm/slurm-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/slurm/slurm-0-r3.ebuild b/acct-group/slurm/slurm-0-r3.ebuild
new file mode 100644
index 000000000000..9bd00de4ddc2
--- /dev/null
+++ b/acct-group/slurm/slurm-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 127092b4d4d4..6b6c49559d3e 100644
--- a/acct-group/smmsp/Manifest
+++ b/acct-group/smmsp/Manifest
@@ -1,2 +1,2 @@
-EBUILD smmsp-0-r2.ebuild 151 BLAKE2B 631eeb908cf76df13ba171d5dcbf187ba592dc597dc6c68d54078be9abf2e8b012b24ec175c7ce69063221d9b9117631d3dad9610df4164266b069a5e7e7649d SHA512 a95b06e4e65baa649633adbdf6da73a164bc4c415d299955f88217bb431fff71405f975ed4762e2bbb41a4c4b52f2f722317a9997dff4d0020ff7771e891b8c1
+EBUILD smmsp-0-r3.ebuild 151 BLAKE2B e3d278f2e3980a9bfad94f1f21b56755540ef4f7c5c4090b5cfe93ebb72af5c2c1b16ab9e637e0f53780ca2a9a3bb0a0b6ecdea1e134cb1c57f715a5bb6386a3 SHA512 77f8699fdcb0154211ec200d3497e85ae704394d52719f67aac92655680c4fd345635151f303c01503a5f80c15a16cf5a112de7e7134c506d5206e010d668c7c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/smmsp/smmsp-0-r2.ebuild b/acct-group/smmsp/smmsp-0-r2.ebuild
deleted file mode 100644
index 1b08887f6648..000000000000
--- a/acct-group/smmsp/smmsp-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/smmsp/smmsp-0-r3.ebuild b/acct-group/smmsp/smmsp-0-r3.ebuild
new file mode 100644
index 000000000000..50afe1912aed
--- /dev/null
+++ b/acct-group/smmsp/smmsp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=209
diff --git a/acct-group/sms/Manifest b/acct-group/sms/Manifest
index 818712591f51..5677559030bf 100644
--- a/acct-group/sms/Manifest
+++ b/acct-group/sms/Manifest
@@ -1,2 +1,2 @@
-EBUILD sms-0-r1.ebuild 151 BLAKE2B 976cab984911cf08824ba78de251139ad7cb78608fd15c0c327e031e117f3e107524571f3c412667f580dcf6ecd0b66231ee913b4d0b5e720542a69dd75e48a3 SHA512 41aa77a9a98782f7e51c0f0e87cce90280a03b44e7e6a166aa35d5361178a25663d71d6a021495268483953300753842134039853be4f1934804cf88cd6a0256
+EBUILD sms-0-r2.ebuild 151 BLAKE2B 5446a753d0a8b036d465704078a9f7254de653710ebba58a9d7fa3c3cc1181f40413e7fc85b5ede49b308192c506fb4a84f70eed8c6e7f7399e33a9ff71049c0 SHA512 634ba74075382787a94b8df2a815ff10cb23744b257dc8383f669a7719e2b73dc5658b7fc0ead82ea59296c081fc3dc034e8f6a6511b8609ee94a4b0a0c1fd63
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
deleted file mode 100644
index 5de57373dacf..000000000000
--- a/acct-group/sms/sms-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/sms/sms-0-r2.ebuild
new file mode 100644
index 000000000000..c487d421c714
--- /dev/null
+++ b/acct-group/sms/sms-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=359
diff --git a/acct-group/smtpd/Manifest b/acct-group/smtpd/Manifest
index d3751b46c33d..3410caa230cb 100644
--- a/acct-group/smtpd/Manifest
+++ b/acct-group/smtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpd-0-r2.ebuild 187 BLAKE2B 847e763b2bb6e641c089d0fb9780b06caf02c4a02c9008cce09da0d519eea477a94b8a8f0e2f83ea931255d0be3a5b3eefed8bb81179c49e58a320620e078318 SHA512 8831f90e5ffb95d75dfc05a939ffcdb1a16ec7a512ea61cdc38358ef1e51469a33696012520eae86b7d539b13e3f84a3580f13836bd6fd9fdebc2ddb8dcd74fc
+EBUILD smtpd-0-r3.ebuild 187 BLAKE2B f175d520982420816d8958f936577d7e2d008a7107a0087bf912c706601d6addc3b5996d61c3e7ed05e8b34c1e1e712ba4f30932f7b2d205304ca86a69fab186 SHA512 9072fca675b8e24e8132caccdd07db2b47018c7018fc76d2a45415a401dfeded8b74edf86b82c96cafac39a57ae81fcb7d6de5c8bc85783c6daa73f6d0487ccb
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-group/smtpd/smtpd-0-r2.ebuild b/acct-group/smtpd/smtpd-0-r2.ebuild
deleted file mode 100644
index 7c6daeb449a8..000000000000
--- a/acct-group/smtpd/smtpd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/smtpd/smtpd-0-r3.ebuild b/acct-group/smtpd/smtpd-0-r3.ebuild
new file mode 100644
index 000000000000..96fb28b15fed
--- /dev/null
+++ b/acct-group/smtpd/smtpd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 317513080681..aa2d0665ccfd 100644
--- a/acct-group/smtpq/Manifest
+++ b/acct-group/smtpq/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpq-0-r2.ebuild 187 BLAKE2B 33489d5794405aa9ac21c614a253e00da5af06e4ddad8724b8ab20581fff3c1e1f4de2f1e6aaad32b8d906c1f57243aa11c8eaabc3542b34faac72845d7aaf0f SHA512 4bfc674e8392bd53c1f67893ddf80407b360f0548002fb9489ee2ea305c2958fb4463bd6c1f00c97d5eb32acf39dcf192f62550f46e71375d24c319b40bce84d
+EBUILD smtpq-0-r3.ebuild 187 BLAKE2B 0dfa957e1ff4db1b176cc97c8807f9ea06ad82e80fd330d6189f05dc86bf9cc9cc399add057f887cd0b76dc290dd5374650d579d858c4c40f7259768de491f18 SHA512 28efa689ca9425db1d33a63371e5b9232b9f469dcb45807bcd53f70d9cd4c04c315f7c0607e225af8e3b2ef6ba6181facadb3ceda134c0ff6126e97fbd9dfef7
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-group/smtpq/smtpq-0-r2.ebuild b/acct-group/smtpq/smtpq-0-r2.ebuild
deleted file mode 100644
index 1bc8ae7786bb..000000000000
--- a/acct-group/smtpq/smtpq-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/smtpq/smtpq-0-r3.ebuild b/acct-group/smtpq/smtpq-0-r3.ebuild
new file mode 100644
index 000000000000..92f7ff2b5fcd
--- /dev/null
+++ b/acct-group/smtpq/smtpq-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 97a127ea3384..593cd1f92a01 100644
--- a/acct-group/snapserver/Manifest
+++ b/acct-group/snapserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapserver-0-r1.ebuild 203 BLAKE2B f6bbc96d20358390eecf073829719cf8ec2cec81d031a909a84c4c6a882caf8665a633e375f33f290cde18f8cd2fb95226c77b0c318917287605713c1e89a5d7 SHA512 33b76d985c3eeee588b7a390e941ffdc0159004ef73e96e7fff1b07801ea2d5d79e876677c2300381ddc7d8462a3ce5776c3fe59b3a0a0df5faabc81b7e077cb
+EBUILD snapserver-0-r2.ebuild 203 BLAKE2B 0c9dc09d0110f10bc210133cbc5bd178b67172eae04833926e280898a973015a9b07f5fd440a1690d0b3a225ea431c36043bdfbe6bc74cb11008a3f9fff85b17 SHA512 d6fe8201cf802665fc65c4dcb81052359a5e25625eda9e2b78644318f46dc35a82426364d2431a96ee11fe831df9a6e169b54dd9d5543b9714c2327fa966208a
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
deleted file mode 100644
index 4742c6cf0de7..000000000000
--- a/acct-group/snapserver/snapserver-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/snapserver/snapserver-0-r2.ebuild
new file mode 100644
index 000000000000..bba8052c19a3
--- /dev/null
+++ b/acct-group/snapserver/snapserver-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9625b28e158e..c709948677b6 100644
--- a/acct-group/sniproxy/Manifest
+++ b/acct-group/sniproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD sniproxy-0-r1.ebuild 151 BLAKE2B be39028ff064e61af597f99d207b65671a0150e8b5b995347882052757fad29c06a33b47390d6a9d223e612355b4526cce7f83151e201d4553d20be10613e5a7 SHA512 4dc8765e65c676b17e8eabcb044ec0362a003381e30230d95502236f1e6ef2ea3a2e8148788e689f1d3719ff96342568f80f70edbc5ee23de3a1fc1861601a59
+EBUILD sniproxy-0-r2.ebuild 151 BLAKE2B 4ef9b11fea194f40a183a59e2890abea4c674f755ab7611ad7b8203e60713844cfb02aa5dd2796a0a9b472c77440a9726bf5a314f4eea49e79e107206d8e9b17 SHA512 8cff27d0e9b603c0570f0fc25a39de4443cdf5e4c446722c8eb3bf3f07237956e381c4c7bb1789224c7541bcfb0df8662413707d5a85faac43541085c334b72f
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
deleted file mode 100644
index 0858202737dc..000000000000
--- a/acct-group/sniproxy/sniproxy-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/sniproxy/sniproxy-0-r2.ebuild
new file mode 100644
index 000000000000..0fdcd080d067
--- /dev/null
+++ b/acct-group/sniproxy/sniproxy-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=366
diff --git a/acct-group/snmp_exporter/Manifest b/acct-group/snmp_exporter/Manifest
index c95f2c11dd56..396c0154aeec 100644
--- a/acct-group/snmp_exporter/Manifest
+++ b/acct-group/snmp_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD snmp_exporter-0-r1.ebuild 206 BLAKE2B e583223ae1346e89340723f70324a82b84d2ef9c34c89b62f8c01141a46c4e61370c87c52043c585bc62da1588d88420a5e8fde71821966b8ee675dce620aa25 SHA512 7bf3f11a795f260aaf3415c5665e2007686a6935ed50dccdb7c40b4fe7a598b07a9a9a16d1cce7270ca7a1ac109c3ae8c77333ed35239d6d639cd7474ef727f5
+EBUILD snmp_exporter-0-r2.ebuild 206 BLAKE2B 781af4fa409d7b179a81f74ee4569cb5b09856397224bffeaa1e19059bda87e32f2c806434b3476a34bce1e0501d2fd80f3e070401891abe16258b028110e219 SHA512 165f62df27161ba70b3bac21de8b5aea72d82b9b9c9a6401540ec2fef5c4a24a036d7864ffd7856d7b5b8b09747b11147d1a7377f25bc2c575594a9c6586f7ce
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
deleted file mode 100644
index d5970e69065a..000000000000
--- a/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/snmp_exporter/snmp_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..899c7c85e40d
--- /dev/null
+++ b/acct-group/snmp_exporter/snmp_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 54bad12ec3c9..a57e5dc8781f 100644
--- a/acct-group/snort/Manifest
+++ b/acct-group/snort/Manifest
@@ -1,2 +1,2 @@
-EBUILD snort-0-r1.ebuild 151 BLAKE2B aee311c453167531018ccca5c9468d2399b8e1b5af18eacf41d33ba5ecee878d10fc030f99c0000ffbd78ae5b77fd8cd0774442493e88e0eb36aae3cc3f8bd0b SHA512 85716b7613961341721b31effb95ec7e6ca225a2d71b072af0e2d9f8ee02f0628d3a7220621de95489a895d40d1fea851bb3a0d548b8b15f4b60e934748e0d8d
+EBUILD snort-0-r2.ebuild 151 BLAKE2B f34e942e5484433a9cf1289bed23a16113235e4077429f4ed8b959b797a7a6628d24942386f1f19f8b6c8f0599493f25c22fe7848b4ddafd76a24f073ecdbeab SHA512 5710d5ec01b968ce41b1a96b21ae0d1637f070040859d57c053b6ae2262ac14336cebb099b85992452d658c1f08e3a6700b8a42d485de6e95fa3a9600cd02788
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
deleted file mode 100644
index 0ad19e1d8cc9..000000000000
--- a/acct-group/snort/snort-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/snort/snort-0-r2.ebuild
new file mode 100644
index 000000000000..eb66852afa54
--- /dev/null
+++ b/acct-group/snort/snort-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=328
diff --git a/acct-group/sobexsrv/Manifest b/acct-group/sobexsrv/Manifest
index c564faabe00d..ff191e8cc674 100644
--- a/acct-group/sobexsrv/Manifest
+++ b/acct-group/sobexsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobexsrv-0-r1.ebuild 208 BLAKE2B eb64c13702518de31f2c436f2f7b9d3661b07063e3b666c417c68fd29544d2b198032e8b1d0fde1ffa9a541c7ce6b90e593f134e925e6d5a3ae43e45fccd0d47 SHA512 7d5049401d0afd1c4bcb9c279ce0336d44d45945cdf07d4f47630ca6b93391b7fa1eccb1b137853497adf2c839316baa72a34984ca3355151674bd7444781807
+EBUILD sobexsrv-0-r2.ebuild 208 BLAKE2B 6fac8e8eeef1641091c586c0094f04569e8eb7512d784db57a705b9e36d1a2cebeb790edb3695d9597d020488db00481d160633467f97f929bb7c037f56cd227 SHA512 f02aba47befef33f93f40d0468cdb9ce6f63e8ed9704fd3ee1e223142dba9f274a14f8933de74917759cbcd2aa35847db416ff53accffee1fc3c735032add7e1
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
deleted file mode 100644
index 7f01a21751cc..000000000000
--- a/acct-group/sobexsrv/sobexsrv-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/sobexsrv/sobexsrv-0-r2.ebuild
new file mode 100644
index 000000000000..31ec2b5a2276
--- /dev/null
+++ b/acct-group/sobexsrv/sobexsrv-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ddb3cd9a1c9c..419b4f17b4be 100644
--- a/acct-group/sockd/Manifest
+++ b/acct-group/sockd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sockd-0-r1.ebuild 196 BLAKE2B b93e855bfa19ec6f08cfdc0d46a2085282a540594cd5b48d707111ebc7184331bea376207a28ef957d162cc1cd61dc2a492002533b47e3196037c57e775f8e35 SHA512 cacd55e2cdb9024944f56c91b38d7439c32ff51f7f33815057301b1912ffe13c969f538a6c582f89fe2e38b382514efa8208afa0d5addd9c0b9ee5ae13fee415
+EBUILD sockd-0-r2.ebuild 196 BLAKE2B d861132e10e11fa9f1e31b8c3abefbd850f596ea5bd000eb694578d4c64fa6c0c1580ba7b1cdab4734f10b173b05d91afae8fbc4b77424411c073ca13515c89c SHA512 fcb4a7f1ec07bc3f8da6aa03d23325378586e8c4cb954ba15cc7eeff2917235ae049876187b202779f65ce5f0057f30930f0480f1e1b843d6d68b0c9698c6f46
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
deleted file mode 100644
index d72ccb7e0e9e..000000000000
--- a/acct-group/sockd/sockd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/sockd/sockd-0-r2.ebuild
new file mode 100644
index 000000000000..40ae4042f312
--- /dev/null
+++ b/acct-group/sockd/sockd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6ba2825df55c..dd8c3a5066c8 100644
--- a/acct-group/sogo/Manifest
+++ b/acct-group/sogo/Manifest
@@ -1,2 +1,2 @@
-EBUILD sogo-0-r2.ebuild 193 BLAKE2B 276777bb9cafc56739252f6fce69ba6d5426cfd77adf4d72e74c465aa1a1e6a658291daa7ec6ce0319531528ea83d2130db5e575d779e4e7720a0a6d8c9f73d2 SHA512 5820a31161b4b5a28cdfca1ac5d85b4a13f4b0b6174d56a64d57fa7ad5b295d606502fb635798fc6b532ac38568d638ae002d1375880e465297ca0dfeb5da2a3
+EBUILD sogo-0-r3.ebuild 193 BLAKE2B 0de0cc44eab25bb4e44b0f2cc820b6b1847d0a88503fe4e2f8bdb9c4c47e1a57c3eb863d4ce70467d41e6950029cff723903b7081ec2cbac5fee070aeda0108d SHA512 f3108acda86f12fe5b5886fe649906fa3265253fbdddd788874552287e57c4f94808417fae9c23c87992be6a9e4ea00e7960dcac08432df244f81c87e6dba994
MISC metadata.xml 254 BLAKE2B e0f44b5b45dfaee5d78327c0a786de9629c29eb26b6ef1e06e499f8ebc1c72c0d0cee20d68992fe79df2498d1664a49f2bae19b5a115b97896300d741cb4a0d1 SHA512 48119cf18eaf9e217ca2203ccbfcd28aa8c6d2f7de7b21e347ba3c4d5f23147908620d158fab2bf0b0211670d091949b5ee3bed0044d4c86656703d20bdc6ee1
diff --git a/acct-group/sogo/sogo-0-r2.ebuild b/acct-group/sogo/sogo-0-r2.ebuild
deleted file mode 100644
index 46692a2b3bdb..000000000000
--- a/acct-group/sogo/sogo-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/sogo/sogo-0-r3.ebuild b/acct-group/sogo/sogo-0-r3.ebuild
new file mode 100644
index 000000000000..50caf4678247
--- /dev/null
+++ b/acct-group/sogo/sogo-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for gnustep-apps/sogo"
+ACCT_GROUP_ID=475
diff --git a/acct-group/spamd/Manifest b/acct-group/spamd/Manifest
index c37cff2e3b6a..b205dab110ef 100644
--- a/acct-group/spamd/Manifest
+++ b/acct-group/spamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD spamd-0-r2.ebuild 199 BLAKE2B a63633c111920baac3b17faf152fdddf67899b02d1d0a99ad82efbd29840c83e160007f7ce4a437d1ef7534580b02e1256c6456e76bb085e8ac10f0fc46f26b6 SHA512 56d0fea61384d5cc7e768d42d3f57d2c271b8dfef937f5fc117872ee66f2a810e214c3f25061fed21ff6a2bb6e1eaf2418322e25b28353370b71f6e826cc7c38
+EBUILD spamd-0-r3.ebuild 199 BLAKE2B 99bb8618a447d20bc840e8a2c1fcb7474a226714b2f3c24b7a32c0719eff9dcee3d94a6c18c67418a080aa471773e97ed5bde4ac57083d5c7dc158a38872fead SHA512 28ca1aa70f1ab8442909aa9ea9f9609c5576b607fa494773843430162eae64c43e93113c53aefcd4c535fc1c4032d967eca4c602445b9d674e403d3b91103516
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-group/spamd/spamd-0-r2.ebuild b/acct-group/spamd/spamd-0-r2.ebuild
deleted file mode 100644
index 05d1b1f0d616..000000000000
--- a/acct-group/spamd/spamd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/spamd/spamd-0-r3.ebuild b/acct-group/spamd/spamd-0-r3.ebuild
new file mode 100644
index 000000000000..c868dd100372
--- /dev/null
+++ b/acct-group/spamd/spamd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 02310bd8abfa..2c7ef4e8aece 100644
--- a/acct-group/spectrum/Manifest
+++ b/acct-group/spectrum/Manifest
@@ -1,2 +1,2 @@
-EBUILD spectrum-0-r2.ebuild 213 BLAKE2B 830f0c0ee6466e9fa6f4d4bee2eeacb483dfc7688d62eb1a9667b96fbc7ae7cb330073421c0348ce3bc2069e897cb9995f0f9266df09ea041be69f9cca42e27d SHA512 f79406afc269180e29bfec6a76bca5b0d588f7052efb9f9af49780d1738d27b72d10e49c0e21f5341a4f3c0048a7c2e295cb40b05dbedb52d433120a30b7c9bc
+EBUILD spectrum-0-r3.ebuild 213 BLAKE2B baa1d6b6b1ff3f2a628a56ff05d2441831415aa0284ade467abcacb0d86ebbaf8ca6c2c284877f3f04f5e930394fe61bc3870509ad32ab6f7959874029429e2f SHA512 d62532a7004fb89e2461f91d8506641a001e0c5d815bf80eafc205ff05e4d8e65376f34b7586509ad48f1225b61523b6b9ae8412020066841be2f36c554605e9
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/spectrum/spectrum-0-r2.ebuild b/acct-group/spectrum/spectrum-0-r2.ebuild
deleted file mode 100644
index ca2ce6dd11b6..000000000000
--- a/acct-group/spectrum/spectrum-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/spectrum/spectrum-0-r3.ebuild b/acct-group/spectrum/spectrum-0-r3.ebuild
new file mode 100644
index 000000000000..df991ed0f6b9
--- /dev/null
+++ b/acct-group/spectrum/spectrum-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Spectrum messaging transport"
+
+ACCT_GROUP_ID="486"
diff --git a/acct-group/spire/Manifest b/acct-group/spire/Manifest
index 2451f1ea1972..5767aa628bd9 100644
--- a/acct-group/spire/Manifest
+++ b/acct-group/spire/Manifest
@@ -1,2 +1,2 @@
-EBUILD spire-0-r2.ebuild 151 BLAKE2B a31246f5b0dba7becf0c0f70e0d05d313d13ecf23c792b2aac6e9579f212ad3d9a9c36cbc152e5aa9931ca148daed891c38ae77b7e57dce6e3f3d0e03e233dc5 SHA512 3a0890ee421b9f359c5fe065d2915615f07da3565cf7b6458c7e9ea531611eb48d37d68bb972e0e84c12dd6f401be9df2aa04bc37dcedec9bead435022f426ad
+EBUILD spire-0-r3.ebuild 151 BLAKE2B 164c01cd10665c8c450a5c3ff59e10903ccf17df9c01f6154fe2bbe7bc6ac14b1728c1b4051765bb5a0a89a61ced819cf9b908104828e95f03ffc3f1adc8c51d SHA512 c7d0d97520e5028d68f2cb984ea8dcb6be5951e3be5f401edbb893eb3fc1897d84ae0c5c03bc5001d81006f71aa8cd2dcc5445928ff86728916f1e9e36dcdec7
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/spire/spire-0-r2.ebuild b/acct-group/spire/spire-0-r2.ebuild
deleted file mode 100644
index 493d68009803..000000000000
--- a/acct-group/spire/spire-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/spire/spire-0-r3.ebuild b/acct-group/spire/spire-0-r3.ebuild
new file mode 100644
index 000000000000..0d6ea0374f1e
--- /dev/null
+++ b/acct-group/spire/spire-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=271
diff --git a/acct-group/sqlgrey/Manifest b/acct-group/sqlgrey/Manifest
index 2251410c4944..8fe0fcb15147 100644
--- a/acct-group/sqlgrey/Manifest
+++ b/acct-group/sqlgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD sqlgrey-0-r2.ebuild 183 BLAKE2B 04881c0bcee9b238f91fc591097969f63f60df0d599fa7d1633cd26593587c4319457928cbdbc26e75539479d6043ecde82188dc67bb7f283c3d38971717a518 SHA512 1e6a15d8a94c6c7169e8301d121a36627fb79e90513082d6a0566fd2e8a3418c60107f871a929b8a344398729ccc7b73a199c81f98b5c49709d03fcb02e2b0f0
+EBUILD sqlgrey-0-r3.ebuild 183 BLAKE2B b224d9aa0f558254fd56ba793062383c2d951dd567809cd896dc1482007a6fe0c7bea36fc865d232bcfcab43b4e545c6c7a193b71e74a7610bbc93b7f3d8131c SHA512 5fc2d4438ea872ee75052f47b90de58c5bb21c06ac5dd414f96ed492956a6c3e48d35cd8a3c85ca8f14ab5dc5ccaa855031b1d60bdf560ea39504981519bf55a
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-group/sqlgrey/sqlgrey-0-r2.ebuild b/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
deleted file mode 100644
index fb26a5e012d1..000000000000
--- a/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/sqlgrey/sqlgrey-0-r3.ebuild b/acct-group/sqlgrey/sqlgrey-0-r3.ebuild
new file mode 100644
index 000000000000..36f39da12db3
--- /dev/null
+++ b/acct-group/sqlgrey/sqlgrey-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for SQLGrey"
+ACCT_GROUP_ID=336
diff --git a/acct-group/squid/Manifest b/acct-group/squid/Manifest
index c11ad0cd9bd6..1153a51b3b7f 100644
--- a/acct-group/squid/Manifest
+++ b/acct-group/squid/Manifest
@@ -1,2 +1,2 @@
-EBUILD squid-0-r2.ebuild 151 BLAKE2B 086d19e24ee9d19794a7cc4e1790c9f6a8a66f8bfed35e272b299c88080c505f61f9c3d8d67fa82fe0ddecf9e8c0cc0143ad6460648bfc3e4ab3ce15fcf3354b SHA512 6b7b379518b10237361d6dc02c38944308942b59fff50f823f6694af0b083aff21c080f805945c01eb47286cfacd755203e838454c46c2278fc03158ad84147d
+EBUILD squid-0-r3.ebuild 151 BLAKE2B 058e042446cd0d3c8b9bd2b307065eae11c016d8fbd9a52e0908c5c591e76cbe2721cffdf474f133806a4c80175f2d1e491a9927da5d96e0abd468692c4e85d5 SHA512 df3f18d3ecd5238dfac6304695f49f78cce6b97ff24b96b64750e41f035418c99395528cb74fd1ec5006a159a7af79446df37fef2108f1f35b276e302b341627
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-group/squid/squid-0-r2.ebuild b/acct-group/squid/squid-0-r2.ebuild
deleted file mode 100644
index 4aaa19a79641..000000000000
--- a/acct-group/squid/squid-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/squid/squid-0-r3.ebuild b/acct-group/squid/squid-0-r3.ebuild
new file mode 100644
index 000000000000..7aa69fd432f6
--- /dev/null
+++ b/acct-group/squid/squid-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=301
diff --git a/acct-group/sshd/Manifest b/acct-group/sshd/Manifest
index 6be4cf79ae6a..0d7ece2513c8 100644
--- a/acct-group/sshd/Manifest
+++ b/acct-group/sshd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sshd-0-r2.ebuild 150 BLAKE2B 79144ff7cae6f447120dfef13c4ff1670993acd93143399f00ea2a0152ed8d82b3331df623be2dda5f6ef3d3f144b6b2a33f01886f0ee92ebbde644c25560e7c SHA512 ae3b9334d5fe6f39836b7af29ff42590f3b5b82901d283aa408a5a718fabfad2c3c83ef4754865f935bf07e22877e53bf02be1593f358bf05d3cbad69644159a
+EBUILD sshd-0-r3.ebuild 150 BLAKE2B 7d4dfa0265976683b07d6f9f48c96db2603bc78743701c177e24c4b16577608b98bcd3a2bc4bade11d9ec786c9208cda447d7465ef383bc19ab3745e877894a1 SHA512 633a40cfb751381f4df6a1abafee4f38fb1b6b10ba2aa4bbb603a29d3a215a4e90f955ae75b6e63450ce1adf1ea61f6d08b4981082066081a109ae07aca49a03
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
diff --git a/acct-group/sshd/sshd-0-r2.ebuild b/acct-group/sshd/sshd-0-r2.ebuild
deleted file mode 100644
index fbe8efaf9c1b..000000000000
--- a/acct-group/sshd/sshd-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/sshd/sshd-0-r3.ebuild b/acct-group/sshd/sshd-0-r3.ebuild
new file mode 100644
index 000000000000..8c6e5d5da485
--- /dev/null
+++ b/acct-group/sshd/sshd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=22
diff --git a/acct-group/ssmtp/Manifest b/acct-group/ssmtp/Manifest
index 2104a9a3ddf7..3faeadd43afb 100644
--- a/acct-group/ssmtp/Manifest
+++ b/acct-group/ssmtp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ssmtp-0-r1.ebuild 193 BLAKE2B 16bdeadedc9f4069c9daa0f14bc3b0ccecfad6a855f181e92fcdcf81408a558d610821e8a390bdf00ed7ae33893e9cb38c94edf084402006eb00f7935986219c SHA512 d59dfd0641bcd303ad5d9bccc0a39d0ddc5daf49ce875ea3a09fc454dd9cb60ac142fd960ca7f2f8d5162ddc864d66346d02e6acc4dc8bf711ecc37da223c7a4
+EBUILD ssmtp-0-r2.ebuild 193 BLAKE2B 6a9ec3631ebbd5f1293c4f3bb811a9a8785b20524677b2b8a84ec6d08c95324347461d5867950a68f018b3817fcad9601617e628b2b15892e4d27b58b424108d SHA512 988010fbcf6481769231345a6ddb79712481c6a6511318e0f6b46c6ee113e04d4e35cb6bf98f072fb62da951d6284d9a42ed734c4a04d05f05726987e22c0e51
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
deleted file mode 100644
index dd67498912e9..000000000000
--- a/acct-group/ssmtp/ssmtp-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/ssmtp/ssmtp-0-r2.ebuild
new file mode 100644
index 000000000000..2f49395099bc
--- /dev/null
+++ b/acct-group/ssmtp/ssmtp-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 29e3c9d9fcf6..b4fd363fdc62 100644
--- a/acct-group/sstpc/Manifest
+++ b/acct-group/sstpc/Manifest
@@ -1,2 +1,2 @@
-EBUILD sstpc-0-r1.ebuild 199 BLAKE2B 623d3062bca2b2ad5268488597309851a154f3ef05cbc6ce7b20ef79200061988f37ccc1f5d3cca76e18e33c1c4169f14f2bdd748e07ac85095813ba04dde2fe SHA512 524dfd0921da648825db4bc1e2e5dc3d1d7e3c4464f81ea6b82afadd2cc71d6798711bea0fb9b984916cf6ac5ce32948b7b322d8dd9e5696f6ec7ef156c1d7db
+EBUILD sstpc-0-r2.ebuild 199 BLAKE2B 6fcad5e50375fc9e24ff8c6005c1cdd241b080948096fc5b9930ce8eb589bf8c7d5e853a7a9e28817957551c0d6acce82ccbc5c3bd1d8120be5a59ce6d9a9f12 SHA512 bea25f64a25fd4403b4358cf39a5f7e16ffe8366bac89a2f064a214a560962709e7e8bf042a94c8dd63558e17ae498f4e85061565e7b81de4c4269133b9b8b91
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
deleted file mode 100644
index 3a0e888cd978..000000000000
--- a/acct-group/sstpc/sstpc-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/sstpc/sstpc-0-r2.ebuild
new file mode 100644
index 000000000000..9c81bf83fc1f
--- /dev/null
+++ b/acct-group/sstpc/sstpc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 47891150841b..708fc0390f58 100644
--- a/acct-group/stapdev/Manifest
+++ b/acct-group/stapdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapdev-0-r1.ebuild 151 BLAKE2B 72b4e18748bf09d197e7b22df463d19057304750a43136585d443f5f020cff40a6bfdf0c4025bb19521b33c4f05184cc3e05612d7a99cfe75413c99cd9a45a8c SHA512 903f195c082a272f2d43b5af83e4519b2d456889b16c57ac9592038f849d37de0a5238a728a5e2066c8b834f6b02f64d48b7375096f123e393c1763b48cce03e
+EBUILD stapdev-0-r2.ebuild 151 BLAKE2B 91a9cf1a606576eca388e9e50fb8aa095cb9dbf018a384ab6c22da3a78937c5f7db13c8e669860afc4fff172ef7e9b4daf344d1616a0dbdd9dc753b97c56e059 SHA512 01b81613e92a00ca170f90cbda8a015163b2f9c976eb166f35e6d9a68aedfd459064b787d351f545a2b35f8a58be280e29a122c645f9bc52732c569b5fe324e5
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
deleted file mode 100644
index 8e55b5a002f7..000000000000
--- a/acct-group/stapdev/stapdev-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/stapdev/stapdev-0-r2.ebuild
new file mode 100644
index 000000000000..1845a9d59991
--- /dev/null
+++ b/acct-group/stapdev/stapdev-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=158
diff --git a/acct-group/stapsys/Manifest b/acct-group/stapsys/Manifest
index ef4673541a7d..125ddbb88724 100644
--- a/acct-group/stapsys/Manifest
+++ b/acct-group/stapsys/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapsys-0-r1.ebuild 151 BLAKE2B 9dac690ff017f30ccaf78c0f1540694f0900a90c5d3829380b561087aa2389eecd9aedd008c03ab7bcaf6006080bd2ef8d50aca6e09e39960a304e8433fc22b2 SHA512 6bb736955fe457e4300b48afb051bcd7d8f99af1a31296c220ef7b2b972d1e089200d1cd036b719984de695fd070db37d56ad74f2c071eee961c13631f5879fc
+EBUILD stapsys-0-r2.ebuild 151 BLAKE2B d2496b32518e04410972454b1ed961c504d1a405f61ba1cd7ae65f216fe4220827bb8e6080efd09230ca67f8db69e8b297a6022708df69a0ffcb8e94896cd9f6 SHA512 3e884c5101a7ac85e7cd5c38f1a69e569c23a553de6da1333acb1e4efc09276da404ae066461800b6bf4e17f68b1657fe432ceee96f64a01a581f3dfd8de4522
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
deleted file mode 100644
index 60dd89044f9b..000000000000
--- a/acct-group/stapsys/stapsys-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/stapsys/stapsys-0-r2.ebuild
new file mode 100644
index 000000000000..c65bcda5bd2e
--- /dev/null
+++ b/acct-group/stapsys/stapsys-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=157
diff --git a/acct-group/stapusr/Manifest b/acct-group/stapusr/Manifest
index 4df12e523436..5604231edf3d 100644
--- a/acct-group/stapusr/Manifest
+++ b/acct-group/stapusr/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapusr-0-r1.ebuild 151 BLAKE2B 68d5d9ae9a47325776aa7b9549926e1398d378636993934649b67143614bc28ea68064da9c48f69767ffffe91a34b07505b7150c024ac65981e1c786387907bc SHA512 4ab3e1c8492b9b4e4ac9df2ded025f909afc8e6c906067440d807f0156e0453271d042887c02d73fb2961e2f60bf803c3ace10369fb59d57f347c50d4d837957
+EBUILD stapusr-0-r2.ebuild 151 BLAKE2B 54dfb2607542e4abf251ca7f164e12c87c9daa1b53af97fac37aa0dea5d74d227f6d0000e2fc0c476efe241faf80d416c4ce7ea54ad8898d0c1a1a0fd512b679 SHA512 a264a70cc3e4a2a7b5c8698e0e680daf873362bae06da07a7f7cf0cec4baefd22c15534aa7aaa29134a74d746da02cbc2c35a5bd1ef94ae4060138890453b669
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
deleted file mode 100644
index 5e1a0850f61a..000000000000
--- a/acct-group/stapusr/stapusr-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/stapusr/stapusr-0-r2.ebuild
new file mode 100644
index 000000000000..2c47c78ef7b6
--- /dev/null
+++ b/acct-group/stapusr/stapusr-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=156
diff --git a/acct-group/steamcmd/Manifest b/acct-group/steamcmd/Manifest
index d5ad39bd0f00..ccef3e5d26f3 100644
--- a/acct-group/steamcmd/Manifest
+++ b/acct-group/steamcmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD steamcmd-0-r2.ebuild 200 BLAKE2B 45f2b501ac929a5614a40bb14ffa72f8c97845097188bd176c5dbee62d4bf4bc9d325cfc4f66532404280ce9b118f3f98589da9ab77aa6412393d1e7eb74f984 SHA512 4435784d2295085afe36938fe95a60f151da2341b4409809de39cf4b6eb7fa576b3ffb52091d1012f347a96d3756b555e556e57e94105e1c14cc911cf6743532
+EBUILD steamcmd-0-r3.ebuild 200 BLAKE2B fd6eecf9336454f00ab7e5b9e5314fbed742907cf168387c09beda2dbcd91c4c8292245351bc94716d0288de74859ce382e28a122eb458c6879c18b4e16b3d64 SHA512 0eddc8f6942210c66b8a0363b249112ad567e6755e075e054b17dbd101d1ae7b91db6f068f05c2197a8b91cded292d99c73ef412e358272819a33d352f263d5a
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/steamcmd/steamcmd-0-r2.ebuild b/acct-group/steamcmd/steamcmd-0-r2.ebuild
deleted file mode 100644
index 0857f379a59f..000000000000
--- a/acct-group/steamcmd/steamcmd-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/steamcmd/steamcmd-0-r3.ebuild b/acct-group/steamcmd/steamcmd-0-r3.ebuild
new file mode 100644
index 000000000000..ec41a6c6b715
--- /dev/null
+++ b/acct-group/steamcmd/steamcmd-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the SteamCMD server"
+
+ACCT_GROUP_ID="489"
diff --git a/acct-group/stubby/Manifest b/acct-group/stubby/Manifest
index 63f0a07bfa82..69cbffd66a2c 100644
--- a/acct-group/stubby/Manifest
+++ b/acct-group/stubby/Manifest
@@ -1,2 +1,2 @@
-EBUILD stubby-0-r2.ebuild 208 BLAKE2B fc464d97fe409c314ed36386c29698a300dd06e6a153be3cb74566c74a81c565c69d08abd3beee4b174ae2b38d3aedb50f1e4bc0bbc6fbe5eb7062cad86ac7cd SHA512 3cf24c6d0b21e350d4b957fad95e79d1fa03ce682de0e0a165ef52a3943e01ed806a29addfb7f53ab11a391c4ecddf9c8b37da918386445d852d7c0a5c7f583f
+EBUILD stubby-0-r3.ebuild 208 BLAKE2B eabad9f4746dac726d4da2a5f37b524b3e6944eae3589b3daa97570c0502dca4d593855036b80ab2784e1896d83a85b327150470c7a63107cb060e8307b11520 SHA512 f86a9323cff6521924c8879c25a8b1cff5d7a519cddd6837ccd604685156759b6611908286ee773c81f69e1410c2dd4d01a4fd9e2f6c804d9f3d8d8415dc7222
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/stubby/stubby-0-r2.ebuild b/acct-group/stubby/stubby-0-r2.ebuild
deleted file mode 100644
index c87d37f3702a..000000000000
--- a/acct-group/stubby/stubby-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/stubby/stubby-0-r3.ebuild b/acct-group/stubby/stubby-0-r3.ebuild
new file mode 100644
index 000000000000..78a7d23e7625
--- /dev/null
+++ b/acct-group/stubby/stubby-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 853ef5388990..54ddf1ccba17 100644
--- a/acct-group/stunnel/Manifest
+++ b/acct-group/stunnel/Manifest
@@ -1,2 +1,2 @@
-EBUILD stunnel-0-r2.ebuild 183 BLAKE2B 994446851a385671a0f66857ffdc172ddf8b53333e02974bf861d35d8f69d299eeaf4eba1939ae006befcab66df530736230495f0b5e4de345a73e8c5168a7e8 SHA512 6807d7a25b9d0feca96ef87e53875a53229b6e6b5219becbed46dd176da337939d340eafc27c3849395665cbd7a358884e9fbe21cebb8be8d883db8ce3e205cf
+EBUILD stunnel-0-r3.ebuild 183 BLAKE2B 59f7983b32b194c4a14b4b30906cf0e24779152779521261b31ac7acb1e94837e166ef5f944786a8080b8edf5e61f8fe8cb6149661293eb9c30ca0560ef0927a SHA512 2159af4f2e3ad6c305254bfb392540120e0378064fff2049765ebb82604a0db1e7cc5af9a6fae81016f0bac1572a745c82afeaec3cec0372662dc2069d75e347
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/stunnel/stunnel-0-r2.ebuild b/acct-group/stunnel/stunnel-0-r2.ebuild
deleted file mode 100644
index 39785b30995e..000000000000
--- a/acct-group/stunnel/stunnel-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/stunnel/stunnel-0-r3.ebuild b/acct-group/stunnel/stunnel-0-r3.ebuild
new file mode 100644
index 000000000000..06adffbb0eb5
--- /dev/null
+++ b/acct-group/stunnel/stunnel-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for stunnel"
+ACCT_GROUP_ID=341
diff --git a/acct-group/subsonic/Manifest b/acct-group/subsonic/Manifest
index 414156cd4bb1..7657a0f51fdd 100644
--- a/acct-group/subsonic/Manifest
+++ b/acct-group/subsonic/Manifest
@@ -1,2 +1,2 @@
-EBUILD subsonic-0-r1.ebuild 205 BLAKE2B 787fe139cf7faece2ac0d901a2f26b922a9292724b0c3850be1c53ce921da5de2dfa86be7448d3baaea88c114af0ef1a04b22567c392fe4abb6a293bf1a79708 SHA512 3c4da8ee17416366f9358d7c3459efc4c5045fe598bc2b222b5db28f7b139aa5dbd9f42f43a36fc90090635fdf92f7fd7336434b2831f467034d8828b44cb688
+EBUILD subsonic-0-r2.ebuild 205 BLAKE2B d5862d5a6ba1dd8cb3291bb2b0a09bfd80a76f617a660ff3257194bb1950d72eb776faeea3adb541c2a594ea3763019483bda64c378f9616863382e17390bad3 SHA512 7abb9eea8cace818de00209ec76cd428552d3212d6eccc16dd58f36c945ad7a1a8ee746349792cb438d67b38f9f03397cfe6aed0969d8b5068f6e13f9b4d9f04
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
deleted file mode 100644
index d4297cbcd2e8..000000000000
--- a/acct-group/subsonic/subsonic-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/subsonic/subsonic-0-r2.ebuild
new file mode 100644
index 000000000000..c3679fce4f3e
--- /dev/null
+++ b/acct-group/subsonic/subsonic-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a358de1d4afd..d4722cc6b3c7 100644
--- a/acct-group/supervisor/Manifest
+++ b/acct-group/supervisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD supervisor-0-r2.ebuild 224 BLAKE2B 0c1d7aff1c1664315387b705d8508e9401f90cba0b11126dc3c88fbdb6d592cb2aba20623f243199efac4e6ac95c06b64981885125d787b9081b0e094f9ff8b9 SHA512 15c2d2cec0dab6e068a67d1c1e2d88e572bcb2a34ea0776ab5a1934bac12d148b217afb6573b024ea22896bcd3e44effc1cadb8221ec80616bcd9b8d368bde2f
+EBUILD supervisor-0-r3.ebuild 224 BLAKE2B dd1e9fde71a800b212025fd685b8cfaef9b555109b1bb80a64a2af0477002f087b548f9de7cd8c4a61ab49e4a48997c93eb377be97927db0f9af304bc989eb4d SHA512 ba8014e4d307a70fdf585cb74e42675c3bf316c5ba2a3e978e19b300b33eedd90eec9931215fddc02ee166498968442ad73a42fb50b8cb32993d46e297c81411
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-group/supervisor/supervisor-0-r2.ebuild b/acct-group/supervisor/supervisor-0-r2.ebuild
deleted file mode 100644
index c617112584e2..000000000000
--- a/acct-group/supervisor/supervisor-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/supervisor/supervisor-0-r3.ebuild b/acct-group/supervisor/supervisor-0-r3.ebuild
new file mode 100644
index 000000000000..219841f99d95
--- /dev/null
+++ b/acct-group/supervisor/supervisor-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b088eb34a4f4..184eb83ee460 100644
--- a/acct-group/suricata/Manifest
+++ b/acct-group/suricata/Manifest
@@ -1,2 +1,2 @@
-EBUILD suricata-0-r2.ebuild 188 BLAKE2B fa04c4d4147e3d6585cbeef8fc4b586e00bde8f8362041a67615069a205a8b9fed482be3365eb9a098a2f175dbc5a83eec487903c77c72a52762e9ebff93b6fc SHA512 13d0366aa2555d3e08654c1aaf7f35a072fef559103174c0c33f686ba5f2781bf5d10f30530e5d2d145fcd23a56d528ddead97e27f99025e11ec149ea0f6ea3e
+EBUILD suricata-0-r3.ebuild 188 BLAKE2B 41e4c64617486b261a83cf24e396c3a5b8a2888ae751b73a3a8daeb314b4fc432839ad8f22085b373f0495a49bb359726c22b1832db061f124513e208bb2f63e SHA512 db04882ee0a9b9cd5acab9577d5fb65b40a1c1e7ba923293aa43ed61a3a729ac01102aa21975cc8b17658461b669e04da28d1579d8c23bc05b32a4f8d57c3b23
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-group/suricata/suricata-0-r2.ebuild b/acct-group/suricata/suricata-0-r2.ebuild
deleted file mode 100644
index 93bfdc32e360..000000000000
--- a/acct-group/suricata/suricata-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/suricata/suricata-0-r3.ebuild b/acct-group/suricata/suricata-0-r3.ebuild
new file mode 100644
index 000000000000..03acf179a233
--- /dev/null
+++ b/acct-group/suricata/suricata-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c2b88be5c2d1..3bf3e1326022 100644
--- a/acct-group/svnusers/Manifest
+++ b/acct-group/svnusers/Manifest
@@ -1,2 +1,2 @@
-EBUILD svnusers-0-r2.ebuild 151 BLAKE2B d8cadc511c84fd7f9e4522ffe70ab4e9992f4a60e585dfcb051f8a05b0fd876beaf906b7dac56a299090fcb8d816cb84c092e3070431780f2550903d1597f0eb SHA512 758b514e382e47af334a68c1533041151fefa4a704290f3d2da5dd232424db89c40903a54e5ba9abeb49a6e182bc24bb9df1f67a9eb2000c6cbcbee3bc61b798
+EBUILD svnusers-0-r3.ebuild 151 BLAKE2B 3bcc12cfb7775fd669aa6df6f7ca7ec126d8394e7ef7b87c40b477be22d95b6314557175c7d18b83f9164f1578dd9d87ad000c913757803854f1fd423888f266 SHA512 c50aa025df6e1afdb0c8ee1195cb4f363c28f8aaa46884f17cae3446db306bf3e90693ef059e43ab2a5ef8d92ba752e49a9cf9a3b8ad757f129b0b3dc1bce020
MISC metadata.xml 255 BLAKE2B 6d9704c53f3cb2feb306acb4fda9d377fd979897237080046e5e5285bdf057281bbb32309764e654c06cce3f6690196f39896508ae6c1dc937e5d3e632fa3cd3 SHA512 ec50c1a81ca10bd96a826462eaec981359cbc400462e7ba7c3d0ded5edcefda5433c21be5df7644adf567e518bd865775e298e48f7d13c92740a80e5be044be4
diff --git a/acct-group/svnusers/svnusers-0-r2.ebuild b/acct-group/svnusers/svnusers-0-r2.ebuild
deleted file mode 100644
index 5f1ff202b155..000000000000
--- a/acct-group/svnusers/svnusers-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/svnusers/svnusers-0-r3.ebuild b/acct-group/svnusers/svnusers-0-r3.ebuild
new file mode 100644
index 000000000000..5fc0c83c0c1e
--- /dev/null
+++ b/acct-group/svnusers/svnusers-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=399
diff --git a/acct-group/svxlink/Manifest b/acct-group/svxlink/Manifest
index 31ef4cc1839b..33157247f774 100644
--- a/acct-group/svxlink/Manifest
+++ b/acct-group/svxlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD svxlink-0-r1.ebuild 196 BLAKE2B 93fc7952c2c2f9fbe32bed27e3816ce0724ce6cc3bc4d6fd5e44e10246043831b5cfac837cb9c247a40f9f53fa3f4f5c6c6763714cc0d8426d4ea986c6ee9958 SHA512 2f9268c53afdfa51fa1e3fb12f7b8a21c2ee9b0f7bde33e1f0d092165c7f3c5259f4db897ead65371588709a5bed4aa4d9aed3c67eabd6da25c4a106d0612c4c
+EBUILD svxlink-0-r2.ebuild 196 BLAKE2B 254a13d58fa408f738d25350278a06293c846d86ef62f6f753570910ccafc6f7e97cffda62a1088677a1b94b98a7ac6e3f572896e15d8675fa09775f14e3a883 SHA512 6bb0eda7055ffc0d03d54c9108ecbe18868d1f0ac84f5182c26625c76fc93cbd9fa71d1c27ba414ae2dda7036236e1f6fb739e1e31e9b2164dd11755070e6ab6
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
deleted file mode 100644
index 85c420295f38..000000000000
--- a/acct-group/svxlink/svxlink-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/svxlink/svxlink-0-r2.ebuild
new file mode 100644
index 000000000000..e868e7be23a8
--- /dev/null
+++ b/acct-group/svxlink/svxlink-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the svxlink server"
+ACCT_GROUP_ID=247
diff --git a/acct-group/syncthing/Manifest b/acct-group/syncthing/Manifest
index de700ed0c1ba..bce57e24a9a1 100644
--- a/acct-group/syncthing/Manifest
+++ b/acct-group/syncthing/Manifest
@@ -1,2 +1,2 @@
-EBUILD syncthing-0-r2.ebuild 216 BLAKE2B 48ae3599fcaf34c207b87e2f94c470b721b971daed3ca7ee5cda0279adc6be98a2b85563cd1e0995ea58765a5f01d83e8c159c8def0f6ad2a59628c6c09128a0 SHA512 a7ccb4e558dd0b7ef8b373acd55ece3b6532cf61c3d5556227ee04bd400e2bb75a8359f4f912666d7d36ceee05aa0fe2f4b56358b3653b4f4a75b1407cec7139
+EBUILD syncthing-0-r3.ebuild 216 BLAKE2B 8a6cb0e55a545a9e01ee2f32ef1dc964b1aaae60cc8e555bf6edc5325d03d2e2dfbc9e1b94fd6541648f73ffda7527b47714cb0e13346d60863a6a88d97ae989 SHA512 d7f9bc49f915bc0c131330b7854212eb97b3616a9b94de99dbe4565b266c8a8c3aa34437bf4aae5c0c72a42cdd01b67e6084b9a59c60c522729f3d864fa487e0
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-group/syncthing/syncthing-0-r2.ebuild b/acct-group/syncthing/syncthing-0-r2.ebuild
deleted file mode 100644
index d97c9cd968c7..000000000000
--- a/acct-group/syncthing/syncthing-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/syncthing/syncthing-0-r3.ebuild b/acct-group/syncthing/syncthing-0-r3.ebuild
new file mode 100644
index 000000000000..f8e67d201edc
--- /dev/null
+++ b/acct-group/syncthing/syncthing-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d0fff5f3298e..9f76bfa9267a 100644
--- a/acct-group/systemd-coredump/Manifest
+++ b/acct-group/systemd-coredump/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-coredump-0-r2.ebuild 151 BLAKE2B 4ea3a13f639d4cdc6f97f0f69bf541a6444fb96d653357f7400f9f5f8b829ef93b9dd3a9283eaedb1955ef175b56243e2aa247165fcc0dc3abc6ed20ac2b1da7 SHA512 a0069a6017f81c8c51ddb2413f3c25b5ae54a82ea433ce3e934560c4cbaa20e7c2ff35dab4c32b4ce8a6a89889ec7bfc8d85ab3de7878abd5e52435f064eaa43
+EBUILD systemd-coredump-0-r3.ebuild 151 BLAKE2B fd35104e2d8a49f08db851ac731909e8afcf74ae57763ac70ca5a9e4b71221190f332fb5103880d5c68305d7cd132178ac85a3bd72f73d5549a8e1dbdd4b99d1 SHA512 1944c688a1ddeee69a14948eb978fc496fae5ac3eb4ea0d622ee27883b57960f086b6c2e70a03c910f29433c1ab9cd0516acd361cf807dbe4ad4e2783b62b84e
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
deleted file mode 100644
index 1d7bb6544080..000000000000
--- a/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-coredump/systemd-coredump-0-r3.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r3.ebuild
new file mode 100644
index 000000000000..e90b60fad0e0
--- /dev/null
+++ b/acct-group/systemd-coredump/systemd-coredump-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-journal-remote/Manifest b/acct-group/systemd-journal-remote/Manifest
index 74a41f2caa3c..375a0439679d 100644
--- a/acct-group/systemd-journal-remote/Manifest
+++ b/acct-group/systemd-journal-remote/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-remote-0-r2.ebuild 151 BLAKE2B 44c33c505d2228efa8f62facd9ffd8d70e7bd37c4b6f8dcfed14e374452f82fb06cb01371ac2a3e8a6f0bb7947f8c4fe5b326b4023e8ab93f6e5a33143e23404 SHA512 5900dfe994df089fe65e10048a3da1bac07bb7faba42f18671b0a319f83dff2e92be4cb5e79e20cedd75517512c0d10f0f679285e8bbe5a160f8d86b4079e217
+EBUILD systemd-journal-remote-0-r3.ebuild 151 BLAKE2B caff03bbce4e539759ed2e644d267f18091d21c238cc1d6ed78818b084c44c3c1f4bde2087a684769e7ee0bd7a0a796fe974ab5824d7d557656c90330949dbdd SHA512 caaa68ed9df71e54778946895f3b661034dd536b83780bf6edcfa26a7bb1dbaaf66bc5effce6f4a2fe97469bd14775fef0a8e6551b43d3063c4fc70ec24be3c3
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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
deleted file mode 100644
index 85c381bd53ea..000000000000
--- a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-remote/systemd-journal-remote-0-r3.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
new file mode 100644
index 000000000000..747c4643e742
--- /dev/null
+++ b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal/Manifest b/acct-group/systemd-journal/Manifest
index a2b6feb61aa0..24a783178a06 100644
--- a/acct-group/systemd-journal/Manifest
+++ b/acct-group/systemd-journal/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-0-r2.ebuild 151 BLAKE2B e0627ceced92e707852e820b3505f928d15f96b72f74580a5092e97b08440ad01ba048ca2d2bb69b62c2305263c38386a9296835db2d91250f68d8c021a966d0 SHA512 e7172b47ecfe205811c3af31b094c493a3fe7cacd2ef56756f61256b98b1ed0c6737c3d7425a34a646314a6643e31ecfa2fb0f449b40c237117177648be1e5f2
+EBUILD systemd-journal-0-r3.ebuild 151 BLAKE2B d692c9d197c8dc7ef67b9aa6161dcddc95dd937e15dff8f63d28b4fc4e90c9133ef390090eba0ec3cd0f594b833ba61b993a13a2e87b30770d9b678808b28a81 SHA512 8087a0982d6adbf2bc66699c8e30e06c1fd2f544184cf49b286d2e4f5d7cb848bd27a6fc00c944d9fc8c47786398d53f978e16317453f859a00b135c5688b299
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-journal/systemd-journal-0-r2.ebuild b/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
deleted file mode 100644
index fa6af68a04c4..000000000000
--- a/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-journal/systemd-journal-0-r3.ebuild b/acct-group/systemd-journal/systemd-journal-0-r3.ebuild
new file mode 100644
index 000000000000..123a0ce62fb0
--- /dev/null
+++ b/acct-group/systemd-journal/systemd-journal-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-network/Manifest b/acct-group/systemd-network/Manifest
index 2e9876ca709c..1da8c4301fdf 100644
--- a/acct-group/systemd-network/Manifest
+++ b/acct-group/systemd-network/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-network-0-r2.ebuild 151 BLAKE2B d600976caa02c880a538fee0c462616f94b3dc49e856f3ab1668e03f3acc8737365c26dcdaa0de5c32da4cf082e9b00d9c373b646d865dfa14a84f3905fdc483 SHA512 346a81ee81f37036bdbd57cc7ca88ffdfd7057f59de8b47a0dbddc5e464281301887c6c94f8b5621f8451ece5d894e0c11e2368390663c945169e2cecd98a5c6
+EBUILD systemd-network-0-r3.ebuild 151 BLAKE2B c9b186ac6c9713a28ec655596adf472ab60b53c27f31d2558a329a71b2a17bd364c1ba58722bd413f97d091bcb1a0c42fe0506c1ef52b2b9c1bc57261f57d8aa SHA512 db4594594c059c8e9f8ceee8d3a3b787d9278e30a0a803ef092fc2685affa6187469be6cc78067e61078cd95e852bcf5682439266741db2294ae475bc11f0629
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-network/systemd-network-0-r2.ebuild b/acct-group/systemd-network/systemd-network-0-r2.ebuild
deleted file mode 100644
index bb6b7af62bb3..000000000000
--- a/acct-group/systemd-network/systemd-network-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-network/systemd-network-0-r3.ebuild b/acct-group/systemd-network/systemd-network-0-r3.ebuild
new file mode 100644
index 000000000000..a8bd4128f2c1
--- /dev/null
+++ b/acct-group/systemd-network/systemd-network-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-oom/Manifest b/acct-group/systemd-oom/Manifest
index 117007794ec1..5725ea6e305c 100644
--- a/acct-group/systemd-oom/Manifest
+++ b/acct-group/systemd-oom/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-oom-0-r1.ebuild 151 BLAKE2B d2d65dc6de36c11031447499f619fcfb58e4ab0d10741215994ce376a37b77a4b41bc8828aad165683138cff64f42ef5b4f65620239a69bf9dc5e2e33f54a2e9 SHA512 b92144c103e3757739b5b57eaa00bbc940884d955badc42deb33131da6d9b8c3b557e60127664b2d10c4ba9222e94d2aeab47ac522acae7f6f6afe744d1f6337
+EBUILD systemd-oom-0-r2.ebuild 151 BLAKE2B d1ecb39ffadea8b61d66903330f7c276c36dd5a7549431658a6c6b401f0b52732009ed97d95e0cfc061a677876a2df755184d0f864e9d113354c6aa10b23c93d SHA512 d6964865b24e500732dcb75604ee71c4b7d0a67190fe3d1b140b171c72ab3031ea704a9c5a31d2dfc0d27ff034179f2d3ccb46237fd90f51de88b8771524792b
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
deleted file mode 100644
index 9d1b0e6de967..000000000000
--- a/acct-group/systemd-oom/systemd-oom-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/systemd-oom/systemd-oom-0-r2.ebuild
new file mode 100644
index 000000000000..5af0fb5e734c
--- /dev/null
+++ b/acct-group/systemd-oom/systemd-oom-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-resolve/Manifest b/acct-group/systemd-resolve/Manifest
index a183d1ac2f17..29594640436d 100644
--- a/acct-group/systemd-resolve/Manifest
+++ b/acct-group/systemd-resolve/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-resolve-0-r2.ebuild 151 BLAKE2B a146f51d1cf9ca9eb2ee266df8b46c6b01d0daf3acc1389790f72fce8b74e2b05b53bc14c2028ed52e9f56ac69c712e5998f9d48e7c60d15af64024bfa4955eb SHA512 481d7c657fa37db95f8b43af69730b0ef172236b228cd8c3411eceb9ef842fb993346d212783119bd40684a7bced500a4facc663fb1ef1dec965b51f3e944d1a
+EBUILD systemd-resolve-0-r3.ebuild 151 BLAKE2B d0a8f9bdbf2a3787edf31cf6c2e6d16fa47a3be1a8a69f45c99d064383898c48401de5874fa6b14054a20ac62ec099abfe653a5d7d1b04d10e5e8ccc652e5143 SHA512 f9cfaba4980955560b42bbc65b69d5948fea5324d482f8d7dce56b5b4bda2e7d19c11b119e2fbe597b2e2e2ff1bc5ec4c095e6df6900d46c4b8104f5220d1bca
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
deleted file mode 100644
index d5a49e0df40a..000000000000
--- a/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-resolve/systemd-resolve-0-r3.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r3.ebuild
new file mode 100644
index 000000000000..b201257ce596
--- /dev/null
+++ b/acct-group/systemd-resolve/systemd-resolve-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-timesync/Manifest b/acct-group/systemd-timesync/Manifest
index bca0ed2f2193..4cb7119ca384 100644
--- a/acct-group/systemd-timesync/Manifest
+++ b/acct-group/systemd-timesync/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-timesync-0-r2.ebuild 151 BLAKE2B 2b2c8138994aad2189601ed5b22b02964532c6bd79a07f0aa30251609a0c77d2ebc170f7fb7095e377fd1ee57d3af2a39ebebc9afa69f8e890c65da02101db61 SHA512 a16bfd2df40aae66a0eacb7118d12d877eff474f856ab09223b3fb09393a3b85a89475d68fe61f968bf43a4da8e14d12b2ac645f110659372a94efed073da780
+EBUILD systemd-timesync-0-r3.ebuild 151 BLAKE2B 21161f94b8d4a87e0555188b4424ea772aa7b31dafd9463fd89d57d5b3f7bbdb50b1f7c39cb2bc083036e5b8b8941935f1ab9f86ab8ac0694da3c5b64d848c81 SHA512 e67ace8220cceacd952c1783b881888e19240c58d1902820f1f055a7dcdc4ae50442c71a133615367cad018df32d01b76765eab72ee2fd25b7988b5b2600045c
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
deleted file mode 100644
index b3acdb6f39cd..000000000000
--- a/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/systemd-timesync/systemd-timesync-0-r3.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r3.ebuild
new file mode 100644
index 000000000000..f0e27bd89598
--- /dev/null
+++ b/acct-group/systemd-timesync/systemd-timesync-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=195
diff --git a/acct-group/tape/Manifest b/acct-group/tape/Manifest
index e2a04261d81a..b52377850043 100644
--- a/acct-group/tape/Manifest
+++ b/acct-group/tape/Manifest
@@ -1,2 +1,2 @@
-EBUILD tape-0-r2.ebuild 150 BLAKE2B 8837eb6612772caa5893cfb8aad601b65ba452520795a91e2dd256723e110b76fcad7b59cb895ad55c8af44e57fbaf1839d9a1efd1a82601829be750116eae22 SHA512 af89d6217d68c0853af0aa8c16905127e8c23803531b09891dd7ffd3c0bdab167ca976d4867cd0179d61a25ea4976fc1206b2edc310cb708bc9122780312357a
+EBUILD tape-0-r3.ebuild 150 BLAKE2B 46f767397d7cd843738a80ee461d44a10d75c2f12b62d449d557fb704a64e52933ee7ba5da9f9dd185fba035dd676d55ce2bf256ac5c9da96b773589dcf8c535 SHA512 065936e4f54779b8de422e861f10c77784926c2afe548983eafc88953579fd9fd0ace43c8aaecd6bf00cda4d2988583cdc97c8b56da5f06144d38822bc5631ce
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/tape/tape-0-r2.ebuild b/acct-group/tape/tape-0-r2.ebuild
deleted file mode 100644
index 87743a734062..000000000000
--- a/acct-group/tape/tape-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/tape/tape-0-r3.ebuild b/acct-group/tape/tape-0-r3.ebuild
new file mode 100644
index 000000000000..52b016f26fc8
--- /dev/null
+++ b/acct-group/tape/tape-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=26
diff --git a/acct-group/taskd/Manifest b/acct-group/taskd/Manifest
index 6ee6c68b6a12..8df21e129a54 100644
--- a/acct-group/taskd/Manifest
+++ b/acct-group/taskd/Manifest
@@ -1,2 +1,2 @@
-EBUILD taskd-0-r1.ebuild 195 BLAKE2B 811973d86e393d626a3092381b40bfdaf966c10ae8fc3e5dc1c5c0bc5f9b0f7664649fb3417efcc0ca5a60285e81e2ea3baa56cfbeb43c5ef88671bd7e26c24c SHA512 def45afb18bf9b4bbef2b950bd55c834214c2bbd38dd26303acae94ab9e787c2ba79f0f66d18ef6b1d1817318ec98a581b821b31d160d83b9edc1f81a42b081a
+EBUILD taskd-0-r2.ebuild 195 BLAKE2B 083954bdbd332eb25a3a941bb8b388d5c88d1dc1d84d22dbb9ae5df69d610be5360acdf28397305719fee88801a0eb6b47f518e459f1427e9d24ea0449913e2e SHA512 8e83c9e2bca13fe2bf3b0fabaaf58734c073088d3798832fda38dd3375744762734fb228db52847a16100688da77ff785acd2a22793b55f5b0b7761bd3cb8c24
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
deleted file mode 100644
index 65a47cc845e3..000000000000
--- a/acct-group/taskd/taskd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/taskd/taskd-0-r2.ebuild
new file mode 100644
index 000000000000..daa10d6df9b1
--- /dev/null
+++ b/acct-group/taskd/taskd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2db42c9160bb..efb8c1feed4d 100644
--- a/acct-group/teamspeak/Manifest
+++ b/acct-group/teamspeak/Manifest
@@ -1,2 +1,2 @@
-EBUILD teamspeak-0-r2.ebuild 201 BLAKE2B 9954ad269e8d3ff904300cef195f1b378e8eea7b0343b6bd08e8ff4baaca8cfdcd144b1cada40a5b3a4cac64d8c873fe96070825550918c2849cef437a10d150 SHA512 105c3aa3ca6de3678816e503e95e8fc4a47ce9e9b979e77dd418b8a90b833fe236e1502bf18cf54b6535a2a4375aa6ab9171c0319d989ac169784ad80a5339d2
+EBUILD teamspeak-0-r3.ebuild 201 BLAKE2B 7079eadd75e1a9cb8088f50f098fa2f390eaf3259b3c6c59d3f2323af48b93617dd6702ef7138efb010f42a05cbc8a6c4ee3c685ce4301129f95001aa48ece52 SHA512 d78f9acd828aec4968223f68427da0e864dd5d862523091d244bde93e449db469a3ddc3096b067c696cc2f3c05acc702fe9c67c20a80132cb23518cdb9515a80
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/teamspeak/teamspeak-0-r2.ebuild b/acct-group/teamspeak/teamspeak-0-r2.ebuild
deleted file mode 100644
index 3387dde0dba0..000000000000
--- a/acct-group/teamspeak/teamspeak-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/teamspeak/teamspeak-0-r3.ebuild b/acct-group/teamspeak/teamspeak-0-r3.ebuild
new file mode 100644
index 000000000000..58a4fc1e1d9d
--- /dev/null
+++ b/acct-group/teamspeak/teamspeak-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c05f34987c63..198c4975a4fa 100644
--- a/acct-group/telegraf/Manifest
+++ b/acct-group/telegraf/Manifest
@@ -1,2 +1,2 @@
-EBUILD telegraf-0-r2.ebuild 151 BLAKE2B 7197afea3b7e95d5455d83b36a528ffb962697363b114483ef1abc5dc78700221c2607f39891f902adc97ae8f397a611c872b51363b7b061da89239b862ff8c2 SHA512 1f6bc299f35097682589b173be60857bdae380596cbd2114b751370d13d5fb08684a033552dcd7be60496b34c8220f21a7954a4b604bc469329c5f8bad82059e
+EBUILD telegraf-0-r3.ebuild 151 BLAKE2B 66c25c5ac433e397e7147cae4377d3c31c86b2376f4b6b5b25b2951608500c2c445c35d878628c11e50c7a24f91b77db3516d94609610cdf4887f902560d22d3 SHA512 d7ea7648dd4bb1da81078ad75395c0be3beac357b29aaaf9609b2597d435de06fc5f6bdf602f603bec3f94317fdbcc56629373a59bf928bf7d8ac842b3053ce1
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/telegraf/telegraf-0-r2.ebuild b/acct-group/telegraf/telegraf-0-r2.ebuild
deleted file mode 100644
index 593c2d977184..000000000000
--- a/acct-group/telegraf/telegraf-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/telegraf/telegraf-0-r3.ebuild b/acct-group/telegraf/telegraf-0-r3.ebuild
new file mode 100644
index 000000000000..7e21326907a1
--- /dev/null
+++ b/acct-group/telegraf/telegraf-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=428
diff --git a/acct-group/tenshi/Manifest b/acct-group/tenshi/Manifest
index c05a0f77655f..16446f48e693 100644
--- a/acct-group/tenshi/Manifest
+++ b/acct-group/tenshi/Manifest
@@ -1,2 +1,2 @@
-EBUILD tenshi-0-r1.ebuild 195 BLAKE2B e8c2564c93742297ce038ec86e3c87b6c6f3fd9233ceba809693737caa5c0a651c2cff9f03af4547eae78d2d030afcf5fdb2d9cab2ab5789306c24079f5fbcee SHA512 3b61dfd27d5c0e7695640f29768915a9a3d85e6c01c07298f285d19beca97046de7a8c974f5db753282bb56d2741dbad595b90da17841e5622078845fccee99b
+EBUILD tenshi-0-r2.ebuild 195 BLAKE2B 71e3cb51c8b0933889d656e76e91cf453ef3347042e75661afa3cd5f8c8bd86c94d47dcdf5b91e8962bd468bf7ee18011bae756b43ee4c20f5e2d636bd89bab1 SHA512 231ac6e371799aff3376bf682ff03d310c6383ec0ca5c448d20be2034d412e64276da644c331a5d4272c9d5447d741d30f18c0575c59274c31e9a04131e1c7e9
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
deleted file mode 100644
index 577b6e34ee6b..000000000000
--- a/acct-group/tenshi/tenshi-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/tenshi/tenshi-0-r2.ebuild
new file mode 100644
index 000000000000..137aa247862b
--- /dev/null
+++ b/acct-group/tenshi/tenshi-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/tenshi"
+
+ACCT_GROUP_ID="283"
diff --git a/acct-group/tinyproxy/Manifest b/acct-group/tinyproxy/Manifest
index da12eb22ec89..dd0319261aec 100644
--- a/acct-group/tinyproxy/Manifest
+++ b/acct-group/tinyproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinyproxy-0-r1.ebuild 194 BLAKE2B 5931d01745e1a994d64a91360072e0f57551f43593dd8a65de479b60076c21e99fa39e225cb5740eec604979ec060ef0cc8b0a8c27c11e6ac871b04cdd30a9bd SHA512 72eac8f4abf5feffc0063f65bec2e665a07b1f5a645757a53f5f6e05176f919245dcd19fc70a51de26f32299bf16c072c2bfea1261d967aedd08a4dcc20a8d1b
+EBUILD tinyproxy-0-r2.ebuild 194 BLAKE2B fc2daba19233c833f09042a980023ec8d6657013f3c0cc5e1ac03b157405b0939d9fc398b066b37135f49b7eb4618767a51cf3ce1abaa020815ed115a903045c SHA512 c9a395311adeae16ba700ec00f773b35a571dbc6798cc65d3475c7e748a883adab62825dba1cd92af599ae7090814202db15c762e355c3a2bc72642af041248f
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
deleted file mode 100644
index 6f7689c3c3df..000000000000
--- a/acct-group/tinyproxy/tinyproxy-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/tinyproxy/tinyproxy-0-r2.ebuild
new file mode 100644
index 000000000000..117d3f6feede
--- /dev/null
+++ b/acct-group/tinyproxy/tinyproxy-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e06db9f1b56d..802a2146140e 100644
--- a/acct-group/tomcat/Manifest
+++ b/acct-group/tomcat/Manifest
@@ -1,2 +1,2 @@
-EBUILD tomcat-0-r1.ebuild 189 BLAKE2B 5d512a8428fc19e9bc25236b4c6d0da5b4c350fb8a7884bfbba382469be76db8bb8670afa2b949f3735cdd179637fb6086bce2d306dbcd24496fc66282e88f15 SHA512 798ba9736d4531e7c035b993b2e5b3dad988bf6f8856cf69d21df4e192d90439e9711a86b2c9b5451cd62291213ef84dfab7aa996a11e663f23df9ad9aca6db8
+EBUILD tomcat-0-r2.ebuild 189 BLAKE2B 2688e04c5dce5dbf1adedad0d44372e2906f846a34b8fcb1660376d0b2831c9adbfddbce8e346a42eb03a1acb11cf640326cf242999dfd4f9673b8975b1811c8 SHA512 89e577739c53e50e53340b2e0c860de8dab0c3e55f2dff12a8a98fb14f36638e2f6c6edeb2bf1a3b97d204c1a86112506527b7aabb7af7bc44b12c4e89cf1f68
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
deleted file mode 100644
index d9b3c7ed3296..000000000000
--- a/acct-group/tomcat/tomcat-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/tomcat/tomcat-0-r2.ebuild
new file mode 100644
index 000000000000..97379c2748f1
--- /dev/null
+++ b/acct-group/tomcat/tomcat-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b46b5dcfd61e..d263e52b7e89 100644
--- a/acct-group/tor/Manifest
+++ b/acct-group/tor/Manifest
@@ -1,2 +1,2 @@
-EBUILD tor-0-r2.ebuild 185 BLAKE2B ed654ca647d3fdb313791bd9c2f0f464ed75fa7357489b970f0b0ff8e4c89e1ab7cebab1d181c1260dc56a3f98af8f82e72b3b3da738ad2b2a4a21ac5f567840 SHA512 490b0b9c8b1a7424ed364fa9952e771645a91740f4ee32e885fdb97569417eb9b299940ee917ffb52174cfa12d4c75efd0c2d9ba2915bec8185462a53101cbef
+EBUILD tor-0-r3.ebuild 185 BLAKE2B f3b4c12ba5e0878089bb49b077bbb55a7189adb95582b7490bf1976b15af0f1222f8b949b249bec2e84073762f0cc527f89aa0b092410f1780ed60787e3fe4dc SHA512 c92ed7064ec419415f1ecd28372f5caaa437fa327712331d650e9f616ec8401cd3fe07c5bb9838941aa4462b6559d85a918c72e8f38d5a91e7dcb900aa6d5828
MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/acct-group/tor/tor-0-r2.ebuild b/acct-group/tor/tor-0-r2.ebuild
deleted file mode 100644
index cb5343bcbdc3..000000000000
--- a/acct-group/tor/tor-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/tor/tor-0-r3.ebuild b/acct-group/tor/tor-0-r3.ebuild
new file mode 100644
index 000000000000..88d38d9bfa89
--- /dev/null
+++ b/acct-group/tor/tor-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 42c8bdcb0237..0d7234fffe8a 100644
--- a/acct-group/tox/Manifest
+++ b/acct-group/tox/Manifest
@@ -1,2 +1,2 @@
-EBUILD tox-0-r2.ebuild 250 BLAKE2B c85ffd39d442bc96690958d5ec4ffaff801dd4df3b3a2dd9684d1ea3838bb896f1781a847e035a289d249deb2e1163f1e16ebd0a8c5c7acb36613289631bb7a1 SHA512 338077b194bc6092fa9492dd580d83aaa02b6de74bb1d56a9345485a33ef2db4a2829cb351203af08567deb55f0135f91207da29cecd6defafe60ca934a0b4e5
+EBUILD tox-0-r3.ebuild 250 BLAKE2B 4192b2fef66e0e4813fc919e95958091c7bb094a89893ba3654503ffb2e128107a247a71862dfa6bffc4301f4438fc5dcc817a24f9c03165f36b1aa36b7fdc6b SHA512 d96e4bb1ce0aec481418fc1ba133fe932391d53da75403d03c674af4504d75348dd3ac283d59b4bdc4d054503ca16a29edd9b87cdf4bbfd50168db8204b77a62
MISC metadata.xml 401 BLAKE2B 0a0d5a25868d5ad4b1b9b6212ab038e94628f9b2428fc62dcaf1e0fa672a6a4ef4b555767dd6d1ae1e58f82e31a194e6ac5f914fcb21b7a4a5f52bee97ad2eb4 SHA512 58b858736e5503593517b113c9e5417306caf20137303fc03afb43071c088ad5314495f6203e401544e48a87793a0d09d8d231d6f6740639836415c4857a22a2
diff --git a/acct-group/tox/tox-0-r2.ebuild b/acct-group/tox/tox-0-r2.ebuild
deleted file mode 100644
index e0df3c1427c9..000000000000
--- a/acct-group/tox/tox-0-r2.ebuild
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/tox/tox-0-r3.ebuild b/acct-group/tox/tox-0-r3.ebuild
new file mode 100644
index 000000000000..c2718143e11e
--- /dev/null
+++ b/acct-group/tox/tox-0-r3.ebuild
@@ -0,0 +1,7 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/transmission/Manifest b/acct-group/transmission/Manifest
index 77e2ee62b05f..931ce1747864 100644
--- a/acct-group/transmission/Manifest
+++ b/acct-group/transmission/Manifest
@@ -1,2 +1,2 @@
-EBUILD transmission-0-r2.ebuild 151 BLAKE2B 92f6efb13c384b365c8d4f105bb2ac7570a4fff57564b6a5b5007380148b805bdd98858bb20e8544cffabe65cc01f28afb95386fbcb5bff2d81fbd906c628c1f SHA512 fe61b89ef80e081c9940d0f1c809520d18f7f17a30e8f1257339f8da97e9da2a6db9d90fa8767c29931d394dde77cbfe82991cc4880ec9c1000d5660aa69375d
+EBUILD transmission-0-r3.ebuild 151 BLAKE2B 11d254da77e0db77d479315a2fab6bc0ad23675de421dd232e0157b5a698f5fc561b0f778dba58a053848e6a54662527065ef8816f30e0d3696ac4397c6a1a93 SHA512 072e6cbb76d786ee2263abcab56b2bb55db88cfa4dc15dfefbe3e6b15d8d68b18d2d8b0c8f5d048830267d1ce45b3f4ffac838370053fbf5c631c8cdb037ff97
MISC metadata.xml 247 BLAKE2B 9dcf90d404c84f0ce3da367274c25984b6497a2d8fb68496f497e76c7061c9c7ca7f444f7e4ccb62ba06223caaf0eea4d6aebbb2409ba1f08bb57123e72f0836 SHA512 4681b02c210bf3f869157694af1f80cb3e9b2dd619283a249aaafa85d3bc328c1306af5d61c69040fc503feb3271490bdd2e38e61479a94940fa225810b9e8cb
diff --git a/acct-group/transmission/transmission-0-r2.ebuild b/acct-group/transmission/transmission-0-r2.ebuild
deleted file mode 100644
index ea7be7a6a2bd..000000000000
--- a/acct-group/transmission/transmission-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/transmission/transmission-0-r3.ebuild b/acct-group/transmission/transmission-0-r3.ebuild
new file mode 100644
index 000000000000..84a48da79986
--- /dev/null
+++ b/acct-group/transmission/transmission-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=169
diff --git a/acct-group/trickster/Manifest b/acct-group/trickster/Manifest
index 873c1af730fa..d536d06b717e 100644
--- a/acct-group/trickster/Manifest
+++ b/acct-group/trickster/Manifest
@@ -1,2 +1,2 @@
-EBUILD trickster-0-r1.ebuild 199 BLAKE2B 5f6ba7e91daa719f819184ae9206c3c7acf54e8137e19159eaf2fab45ff620c8d9609cfb044334f012f8d66b83c179c5455889a14635e20a6f7561e63023dca1 SHA512 61e1d8de5a7032a49539f854550845a2096afcf17717ab31982e0cb1145839ecf0d863420e205b22f14912693087968ceec3c88cbeb32dad5695311dd063f8d5
+EBUILD trickster-0-r2.ebuild 199 BLAKE2B 329d5409479b48174a3e38dbdeda3bbf913ce71eeff2a10f3b59ba5d8285bb6b6e08324efa265c5921687ad22d384bf4f738060251bc44e3dee308a4915f07f2 SHA512 cb36b76796bb95c4c254f1774d279b974fb240ffbd613eeacdbc2c5c5cc0a699fc0b0cd6e5fad04cb19b343e900e1dade233b87ab70e1185028328db645b0dde
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
deleted file mode 100644
index f52d9309fbfc..000000000000
--- a/acct-group/trickster/trickster-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/trickster/trickster-0-r2.ebuild
new file mode 100644
index 000000000000..563175bbb774
--- /dev/null
+++ b/acct-group/trickster/trickster-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 613fa563af3c..797dd03ebfaa 100644
--- a/acct-group/trojan/Manifest
+++ b/acct-group/trojan/Manifest
@@ -1,2 +1,2 @@
-EBUILD trojan-0-r1.ebuild 151 BLAKE2B b0caf43bfd078a1ab3faf1d47188da3810fd15a7612292341cadb8ff76297347dbecd75f12864474ca80f987a0b22c8278f61218a3c30cfa5f2af6c28727a526 SHA512 fecccbda1cd9f70733853aa5316c0e4b25a2c8f4e82d79725caabd5bb8bd62c1c00aec01065fe55698c7e45e2195d03c7f7f8630760cc0dbfa3b4ad069aff146
+EBUILD trojan-0-r2.ebuild 151 BLAKE2B ba5f329900f3635e68e1ee8fa8c0403a685d0e3337ea69761fb0d5210574ac065ae7371d00bb65f20ae076bed39f82a8e442238e11223bde13d0114ab1d403f4 SHA512 836610b6f3dcd05679351e5ad2d31873f9e0f89653dc89a919e771b579b1b57c4b93805f58bb035b0b88b414743284afa62abd9fd4ee726049182f539cab95ab
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
deleted file mode 100644
index 8c754f0d94e6..000000000000
--- a/acct-group/trojan/trojan-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/trojan/trojan-0-r2.ebuild
new file mode 100644
index 000000000000..8d8aa02e3984
--- /dev/null
+++ b/acct-group/trojan/trojan-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=326
diff --git a/acct-group/tsm/Manifest b/acct-group/tsm/Manifest
index 042c68a3252c..c5963694429a 100644
--- a/acct-group/tsm/Manifest
+++ b/acct-group/tsm/Manifest
@@ -1,2 +1,2 @@
-EBUILD tsm-0-r2.ebuild 151 BLAKE2B 53a3824ad1c2302b6aa7dc8906d83e4be3e6c55e91a4e53a0017e1531267653c3a6127584f9a04cca3ab026337626983e43496c10eff1517270aba2ba7adfd2d SHA512 e0fc00398574603111d67135374d5263fd8bbfc88644ac829ffd661f3adf0dd85ed0d621258fb464324cd5826966ce03b3a9f3883596ea50e7dd614414242cee
+EBUILD tsm-0-r3.ebuild 151 BLAKE2B f77fe2d97504a2de7a0867afec3e63e4a8d37f275acda40bac30bf12ceb3587c1752ca6a6a4b3b780da20c015079b2d4e1e555a201cfce2969e534bf4b96edc2 SHA512 cb0581235e15b48400b2205a87f269753a66789ec2e792d84c55e62026ae04352088b1843efe7034bae3d7e4b169cd98ead31d2d0f7d6a2cfa351b1b8258d667
MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
diff --git a/acct-group/tsm/tsm-0-r2.ebuild b/acct-group/tsm/tsm-0-r2.ebuild
deleted file mode 100644
index e992130a445e..000000000000
--- a/acct-group/tsm/tsm-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/tsm/tsm-0-r3.ebuild b/acct-group/tsm/tsm-0-r3.ebuild
new file mode 100644
index 000000000000..06786eb47f3d
--- /dev/null
+++ b/acct-group/tsm/tsm-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=465
diff --git a/acct-group/tss/Manifest b/acct-group/tss/Manifest
index e18d54f389e8..876001f32e69 100644
--- a/acct-group/tss/Manifest
+++ b/acct-group/tss/Manifest
@@ -1,2 +1,2 @@
-EBUILD tss-0-r2.ebuild 202 BLAKE2B e8ee01b70a82c4bce6e80f41e1aa6bacbc2fc3d63431e4f290221aaa78e4a8345461b13d04e08bdd7796e02257b5239a3adba396deb9f3dd61261c20c1616ac0 SHA512 0286df408299ea0d411b978bc85eb8b20f71a762b99ce872d59d85a0da875c340ab238825e77b8209ad89350cd8cf06a3c2853bda24782bcdd4d9fcd1ffa7e90
+EBUILD tss-0-r3.ebuild 202 BLAKE2B 61ebe7cab0fcc9e1735c711bb35331a067f4bb90f5fed1ca3146e728afc8b3745a083688afd89723e7787eae6316efcbec9d950dcc6adcc8c70449b791d345de SHA512 fc98d852b4d4abbca0adc54ac06c418eef498b58efacd35ed7b1c8302f801801ec2e1a2cea12d8f3d7941cd495f70dce4a419fc1162aaad147fb423a7ccbfbe0
MISC metadata.xml 404 BLAKE2B 08ad2d09bfd3697b69bcfd85280cb3965aff26e91a49f0840c2fe81d02a5795254a283b95124bfc97a610034e668332d06abae1db1c34657d7aab8ed6963654b SHA512 9b8ca2c33c33a1f4e3f30244069486fb1dd970555c9bb719a5bb8c4e2bc979745e0511216ec70481f0c3b1e716dd631662a1986e1c89628b29b0a85d6b4b9f76
diff --git a/acct-group/tss/tss-0-r2.ebuild b/acct-group/tss/tss-0-r2.ebuild
deleted file mode 100644
index 24626e201848..000000000000
--- a/acct-group/tss/tss-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/tss/tss-0-r3.ebuild b/acct-group/tss/tss-0-r3.ebuild
new file mode 100644
index 000000000000..70875fc89c8e
--- /dev/null
+++ b/acct-group/tss/tss-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 79836a6397a4..57b8b0a525ca 100644
--- a/acct-group/ttrssd/Manifest
+++ b/acct-group/ttrssd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttrssd-0-r1.ebuild 191 BLAKE2B a887dad328b21a8a5defd3e2a5d2413e539a9c1fa8fedef6f886eb7fe9e55bd3ccecb2c68055afee98c7d91a21d5c9fa105b7006f49b66372aabcc20d9eecd54 SHA512 836c814a6341f548c86f5d3ace96a8137fd74de90a71f1421819222e0fdcdf8737b42c6f3b09f968d49863508ff12ad20bfb0b718e146b23cbd287a2edf4d5db
+EBUILD ttrssd-0-r2.ebuild 191 BLAKE2B d7fd16841dee8153e0cdf6858ca1096d7ed6ecd4a661f5d91186ca03f248102e631db2d7d28a035fdf1227a893dedf435ed3c1beb39f31c1f563f8067c18e34a SHA512 1ab2812a15820849f671cf2bf1de3e6f1c3e48fb4cbf504b3e0bf8044131b2658f2908733095ec01cf9280c4500122cd35ab9031a21d96c0ec2b4b6ff5871d76
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
deleted file mode 100644
index a42e44e4631c..000000000000
--- a/acct-group/ttrssd/ttrssd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/ttrssd/ttrssd-0-r2.ebuild
new file mode 100644
index 000000000000..ca7b68e26c37
--- /dev/null
+++ b/acct-group/ttrssd/ttrssd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bbb52a6c6060..52ec5886e83e 100644
--- a/acct-group/tty/Manifest
+++ b/acct-group/tty/Manifest
@@ -1,2 +1,2 @@
-EBUILD tty-0-r2.ebuild 149 BLAKE2B a640cb1baa5b4c90c0e3124bcb97ec60a1c3f516dd28c516fadafc964e278ab49a01b9cc541562a9f0d4a27559260d23678d44b5b1ce8edb2c3ea204d8ae17a0 SHA512 37b805e9fdee538e0ef6509346e9a60749894aef5ab57e2780feabc403ee9594c7f00b56e4db4fed90b600eb3493edf875568ee77595c9b2c9d0f7dc0b81b831
+EBUILD tty-0-r3.ebuild 149 BLAKE2B 3013ccf29037599d6a9aa18319b28809de30498e494a0e6b16cae985cd5094b60400fb7a8bdb35c6f03abc7386cebe20491b0a1dfb1f2e34a0e9ca164ec4c354 SHA512 9e291e3cb968e1bd48a8c5722d74e69118bb0de4954633b82f2a643ffcc69d68e25d986dd8dbf0f0cc46bb15b3ebb15288dd323f2501e4c3ab6fad268060aedb
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/tty/tty-0-r2.ebuild b/acct-group/tty/tty-0-r2.ebuild
deleted file mode 100644
index b6a00ae485fb..000000000000
--- a/acct-group/tty/tty-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/tty/tty-0-r3.ebuild b/acct-group/tty/tty-0-r3.ebuild
new file mode 100644
index 000000000000..9d2bce0646a3
--- /dev/null
+++ b/acct-group/tty/tty-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=5
diff --git a/acct-group/turnserver/Manifest b/acct-group/turnserver/Manifest
index 0c94cdead682..ddffcd051e3d 100644
--- a/acct-group/turnserver/Manifest
+++ b/acct-group/turnserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD turnserver-0-r2.ebuild 206 BLAKE2B 24c74a3cd1672dc137163dd3e8916afe7d76924c78cedb165a28f738b817360dbc18ed3ac100a1954de642373b4c82510e78d121ecc5b07b6790997efa266f5c SHA512 66c125c68f4f23bb285048725381baf1b11cd6a8ce8fbbbb37db575d6dbfdecc1990d0b9839f9d30d38784989988ab7022c51d24c21e8a9ed40db00ed3688a36
+EBUILD turnserver-0-r3.ebuild 206 BLAKE2B f18c36eabb9970708712c9a9d1685dab549e3f7a8b0c7675b7e6e1b77917625e83e2df2e8cfd6512fdd418ff9820caf5b30635692038c91af60ef550e3e60515 SHA512 a401312fa7c51bc158086ce3af96b01033aeae70971744796c520c85a650778983542dc6deb7d42cfefb1f669f08d8d2c1be93c191c5c78ee3bf512530a2efce
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/turnserver/turnserver-0-r2.ebuild b/acct-group/turnserver/turnserver-0-r2.ebuild
deleted file mode 100644
index 557eba9e0b1b..000000000000
--- a/acct-group/turnserver/turnserver-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/turnserver/turnserver-0-r3.ebuild b/acct-group/turnserver/turnserver-0-r3.ebuild
new file mode 100644
index 000000000000..bad6fb14e84b
--- /dev/null
+++ b/acct-group/turnserver/turnserver-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8e0d9dff0d78..23cd2464d4ff 100644
--- a/acct-group/ubridge/Manifest
+++ b/acct-group/ubridge/Manifest
@@ -1,2 +1,2 @@
-EBUILD ubridge-0-r2.ebuild 192 BLAKE2B 91d9ca9e2a4d379d6100b762dcc3663cad57d232a1afa5b52c0525a3afa2da0bfe5901e95c4c7fdda46db281e003dabd88f3c0c8e595985ba3cfa9ab97e34fa8 SHA512 001827a7c6b2accfc0e07a79c7c08a05a12c1e55f710a133061ecd351299fdb39a5980c11dbb6241532843a0b04a16a260239f716bd64652b815880aca460064
+EBUILD ubridge-0-r3.ebuild 192 BLAKE2B bfa7d781569dd47dee8c2d5d0469f42baf5ffb7d3662f73587ec53a80d175df3bee8685967056c05be0ab74af52971a6a6e6cbc7e113a79c928f49e8ab890ba6 SHA512 bbec71c3e786106e3337eb2be7096c4f624e5c2e0d6dc84e10a716cdf50397bfe2002aa11fcc209dd9839ea0a3097f7204245ecce86206507377a2886fd26cf8
MISC metadata.xml 403 BLAKE2B 540d7c483a9186f4ca9978cdd0d0bb3dc1a2746819e3dc895bf415c42ec19205649caa3a930c9db9f4efbfb913eef7eddc3e1b51ce7b483d3ed0ba0a25d1feb4 SHA512 440a7f7342142224f72f63e887d8fb1071dd2446fd16ee68074f2a08255eba500de9865f48427da8d215c644a1cc6206052940b4ad3a0131dca4b9582c443426
diff --git a/acct-group/ubridge/ubridge-0-r2.ebuild b/acct-group/ubridge/ubridge-0-r2.ebuild
deleted file mode 100644
index 20ab07a4c9e4..000000000000
--- a/acct-group/ubridge/ubridge-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/ubridge/ubridge-0-r3.ebuild b/acct-group/ubridge/ubridge-0-r3.ebuild
new file mode 100644
index 000000000000..527e6c949c15
--- /dev/null
+++ b/acct-group/ubridge/ubridge-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 01ac76464881..b32d63584046 100644
--- a/acct-group/ulogd/Manifest
+++ b/acct-group/ulogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ulogd-0-r1.ebuild 181 BLAKE2B 6c30def491d8da2aafe8b404f6b02eef11063550e3aabb6e30ffbc5f24c60610e76596d1539d420878a5a5dbf7784b181f5aa590e8e1fe1f05a45cf9f1c0cfe8 SHA512 6abe409cec070791bbcb8598135bc98f8693e20e74b55ae5f8d054d5ca6412d909ce7b37021520b4862d610b398d9f63325609ad178903aaa8fc7f4f35726359
+EBUILD ulogd-0-r2.ebuild 181 BLAKE2B 78a080e28cd1886720b2430a1861b388bb96d74c83f3d9ea5da3be72100b14808bca6aace7ca33f4aecbcf767b04a90caf84ef01c76aee220407089146771405 SHA512 36b393eaf6a87c7af71ecda706b0f6b1219a78cdb07f1aa1e7469620c14be185d28a5a204ac762e6879305fdc3cd027ddb63925702447457ed191f76698b548d
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
deleted file mode 100644
index 15b7a3bf99fc..000000000000
--- a/acct-group/ulogd/ulogd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/ulogd/ulogd-0-r2.ebuild
new file mode 100644
index 000000000000..bf6696c9432a
--- /dev/null
+++ b/acct-group/ulogd/ulogd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for ulogd"
+ACCT_GROUP_ID=311
diff --git a/acct-group/unbound-telemetry/Manifest b/acct-group/unbound-telemetry/Manifest
index 575c24dbe1a2..fc5b0ea72f07 100644
--- a/acct-group/unbound-telemetry/Manifest
+++ b/acct-group/unbound-telemetry/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-telemetry-0-r1.ebuild 151 BLAKE2B 1ae4b254ddff8bb6dc5d710daefa9ae93dd9e9da76c5221660d1ee0695c52d9fb623ea50b0991579e9e8e0c6dbf16fc547ba1f2221c1007c733be912f43c5028 SHA512 197f24b6159729e4a25a4b8217661b7cfb539f327d444bfaea9142a5c15998eb1eeae1e92626ea575b0a58b8d700a0a5bfc8bfd8f74d61e8b42a2e38fea5d913
+EBUILD unbound-telemetry-0-r2.ebuild 151 BLAKE2B cd46bb3c514759fa27fd1fb64cb4d678c45290f5b593d4a30b341017f63d21585be8b6e31f21de7dbe5e5af5ffbc03ecbfed67f2c4949ed4f350502326ef32a9 SHA512 f0744dfcaa81902e9778773fbce0b507956abb784c50869a24839b82a8b461fa5e3d08404521f44a7848147938d66d1cab9e23f99a1e8aa483954de307d8a9ce
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
deleted file mode 100644
index 59e9459f0fdb..000000000000
--- a/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0-r2.ebuild
new file mode 100644
index 000000000000..37d8549b2a9a
--- /dev/null
+++ b/acct-group/unbound-telemetry/unbound-telemetry-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=279
diff --git a/acct-group/unbound/Manifest b/acct-group/unbound/Manifest
index a1f605ab1203..53151933fcef 100644
--- a/acct-group/unbound/Manifest
+++ b/acct-group/unbound/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-0-r2.ebuild 188 BLAKE2B 808f48587fda39d06045820bc1cf24ef86b6303e35c77a2e60bc4f9c004628c9482ee03a1c67492750ebe46b20be5877880bc4578d9ea1b5772731715ac393ed SHA512 6a3461755e88819b83afa32cc28312f4081806b34ceb012f57d201adf1a37347c44164735cb45817b1c9cac1451d7cc9c6e99928e83c931bffbb61f423d5196a
+EBUILD unbound-0-r3.ebuild 188 BLAKE2B 1b55f26db2eaccfb2f98caf1fe5dad17a278646c39d4301354a9d93ae1b8db1972c5ebc0c397287acd88f795d019cc50a7a9c3fed3e09f53f3a7c94ebde68658 SHA512 9163122dd5c25d3915b188964a1076aab7624489093d78edb2ea8c0b5d217c41d9a1d6d9ded6653f6aad328826c0d373a32c5b92a8c0857fd5ba988899c02753
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/unbound/unbound-0-r2.ebuild b/acct-group/unbound/unbound-0-r2.ebuild
deleted file mode 100644
index a9047bfb0b5f..000000000000
--- a/acct-group/unbound/unbound-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/unbound/unbound-0-r3.ebuild b/acct-group/unbound/unbound-0-r3.ebuild
new file mode 100644
index 000000000000..0b76ff60af6b
--- /dev/null
+++ b/acct-group/unbound/unbound-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4be02fc4e125..601f47b53348 100644
--- a/acct-group/unifi-video/Manifest
+++ b/acct-group/unifi-video/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-video-0-r1.ebuild 187 BLAKE2B 973851f1f48af6337f34b79cc8e5766a253f347d404b343b84740dbfa4d8069039a72d4ae49d860086f0018f7c1eb1e63c0517ed8efba8b8008db691df9898d0 SHA512 76962ed1fc0928f67affa7af5fe9e6a02f9e9ad0fcee51ecd76d9480bd4c729afc6bfe396694afa0dda2f26e64cc6203f89431d8df413213f2e814cf7b46feb4
+EBUILD unifi-video-0-r2.ebuild 187 BLAKE2B 9a4e56f33e1a2567c6fc6ade1d653085463a5cad44601d6f6efc36c1f1f826c87e9b3f9c0a060bad1cbde073c05e76feb3697c64dfe76b17e689ad8771c1ae65 SHA512 a96ad7371b0226638eb1fdb0262106c6e1567fd2cc0f1c38757ebe053303abf04655910234bdc7a36e67d959437b8803f35626691c196e88b59ebe90796e3357
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
deleted file mode 100644
index 21165892f5b5..000000000000
--- a/acct-group/unifi-video/unifi-video-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/unifi-video/unifi-video-0-r2.ebuild
new file mode 100644
index 000000000000..cbe292142236
--- /dev/null
+++ b/acct-group/unifi-video/unifi-video-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 685fb7822117..7212afefd106 100644
--- a/acct-group/unifi/Manifest
+++ b/acct-group/unifi/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-0-r2.ebuild 201 BLAKE2B 2e17de492122e7abd80443864bdd212fc2f53a7ae57578cac8ef5efe339171b9c5884af97322cbdcde84577fb9fab2e0bf329513d9bee51af3d79e75474e52fc SHA512 b3e41bb8039921425c1c6b2331629523bd642561796f49b631354b29c62222f5b2aabdb358b3f6569af7c5e679c057abe5ead9647592033fed436926a2ff467c
+EBUILD unifi-0-r3.ebuild 201 BLAKE2B a9348de4da958fd5d03c5f1554aae8efae65bfb6f5da27c91e52393d943afcdefb90415372b48f7202374df49d12ac595816ab035664ecb392b722cf5d1187df SHA512 95c97cc0f9fcaa3e5e3249ade43c067d48b73f724f591a28c8b9d5ffe82cc5d38f10632c07fbd8a2164deba2046535f30ee5d157920b3a4228dadfacf53b89a8
MISC metadata.xml 580 BLAKE2B 29e2c3d6f265a80010ab1c110bddcf2b32d0609c6cba665096ef1842d1f964f26672fe4f1fb051861115b7796888c98b8f458cdce4b5bdbc1ee94d5c2ea69c47 SHA512 87b708f2edca5e9b1bdbecf9ff34ab59ac4c2523840dd011e86fcdc91c7fa9cc7a908ae55b11eb09f3dd435124cd5689c1d370eeaf62ca163722ad75b9bf1e98
diff --git a/acct-group/unifi/unifi-0-r2.ebuild b/acct-group/unifi/unifi-0-r2.ebuild
deleted file mode 100644
index 8cc4b89e2b27..000000000000
--- a/acct-group/unifi/unifi-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/unifi/unifi-0-r3.ebuild b/acct-group/unifi/unifi-0-r3.ebuild
new file mode 100644
index 000000000000..da21782da096
--- /dev/null
+++ b/acct-group/unifi/unifi-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the UniFi controller"
+
+ACCT_GROUP_ID="113"
diff --git a/acct-group/upmpdcli/Manifest b/acct-group/upmpdcli/Manifest
index 36b8595fab1f..a9e779521941 100644
--- a/acct-group/upmpdcli/Manifest
+++ b/acct-group/upmpdcli/Manifest
@@ -1,2 +1,2 @@
-EBUILD upmpdcli-0-r1.ebuild 184 BLAKE2B 3517baea465a902eac2e35adfdeb536819a3f2718cfd9a79ebf34822fc996bc32ee64cac5b68891fb0575ae58b4cd710974e34e06fb5b31daed6ac590cfd73cd SHA512 190a825e5a0ee959d9981d57d22e520311211b1708d8b459a095213dbfc2623a757d4de5f3d43f6191d5cb9c93bd5be33bd4574a1c6a81b84994837e44ae160a
+EBUILD upmpdcli-0-r2.ebuild 184 BLAKE2B 2eef8d6728623bd10e5c6addb06204c2cefdc5c5bb2e3696ab188b1ebc34496d35cdbfc07d089c0a90c24aeefabed4ca9684ea58b2e1cad3a7486cb2d893f2ab SHA512 237d7585586b89b2b3e1005ac1567f2b8aae5e07326f301ae285b55f76c957c8d970d9a330508e11f097576f56603e6c40550941dac9f3dd1d99de344ac2e627
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
deleted file mode 100644
index ad99f3ce7935..000000000000
--- a/acct-group/upmpdcli/upmpdcli-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/upmpdcli/upmpdcli-0-r2.ebuild
new file mode 100644
index 000000000000..bb0ab71e98fb
--- /dev/null
+++ b/acct-group/upmpdcli/upmpdcli-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for upmpdcli"
+ACCT_GROUP_ID=372
diff --git a/acct-group/usb/Manifest b/acct-group/usb/Manifest
index 386f72ac86af..9e11b53b8ed6 100644
--- a/acct-group/usb/Manifest
+++ b/acct-group/usb/Manifest
@@ -1,2 +1,2 @@
-EBUILD usb-0-r2.ebuild 150 BLAKE2B e4008cf7dbf83d2d9cafa1c5e91e47f137a49a977f61313a56d21e5b3e1274559306a834ac7a17ad2e0209646217c812c4e8f8710ef660cf8f1e7765d9695b53 SHA512 d7b2eeda566a681bd0fd6e9bd102bbc047611d299b284b23bd5460eda0478e299b4d908f3d2340616e8a58a09e4d13435b86a607944c5dfc8d7dfde947cdf2f6
+EBUILD usb-0-r3.ebuild 150 BLAKE2B 64a0726d4fd6fd10a95d07cd02b8c3fff600269574bce85ed5946f7bad5c8adb0a735b75e6cf7a92411e5d6637f7b75cf082e0777f8ab357587473885b4d8905 SHA512 6727a6d51134b665b9e9528494de3a980ffd21ea669c0d1407439f88ec88aa3f289bb7bf4c5b5dab9a1c48a229300eaabb9b67094e74fc4a204ec0360f6b8981
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/usb/usb-0-r2.ebuild b/acct-group/usb/usb-0-r2.ebuild
deleted file mode 100644
index 8f739063b3e6..000000000000
--- a/acct-group/usb/usb-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/usb/usb-0-r3.ebuild b/acct-group/usb/usb-0-r3.ebuild
new file mode 100644
index 000000000000..f7d9798c06cf
--- /dev/null
+++ b/acct-group/usb/usb-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=85
diff --git a/acct-group/users/Manifest b/acct-group/users/Manifest
index 787e86cbe311..26968c9c38a9 100644
--- a/acct-group/users/Manifest
+++ b/acct-group/users/Manifest
@@ -1,2 +1,2 @@
-EBUILD users-0-r1.ebuild 151 BLAKE2B 2d7ef6ea09a7705d6fe03b621364f658f9821c19c1e2f6197239f3f321c7bf8ad08e3e09e96a31693f8f62b87bef35fe915805e24d00fe09021340a9e633e859 SHA512 b9fb583bee7c842945eddbd1afe6709b29aacd2836980403fc439ef293ddc978e271763281064b55a6cec175ee2047204ead2302f52d7daf0c33d34ce0bfd81c
+EBUILD users-0-r2.ebuild 151 BLAKE2B aa40e8d2657034febd850f0515b3d38f72c032dbd2757d2de9a5af1521d053b01d5cfb01b62e9260ffaf24bd63442d91df55c9c8fb2cd6752361e4f742df0e48 SHA512 59c799eb8bb3068fc7936549792fec20f6b6c0f62f7786c436724bf87fb38dd41266ce5a0c78edc3cab467e9a3e4cc52f656d5dcf7916d22ebb9fdd9ec78db17
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
deleted file mode 100644
index c0c91d1e11a8..000000000000
--- a/acct-group/users/users-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/users/users-0-r2.ebuild
new file mode 100644
index 000000000000..e54d2837d148
--- /dev/null
+++ b/acct-group/users/users-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=100
diff --git a/acct-group/ushare/Manifest b/acct-group/ushare/Manifest
index 27e475fdf384..188b06439981 100644
--- a/acct-group/ushare/Manifest
+++ b/acct-group/ushare/Manifest
@@ -1,2 +1,2 @@
-EBUILD ushare-0-r1.ebuild 182 BLAKE2B c8455c24a937da477950b97ef6e2a861d264e8e2f069d06912b6c65ac8455c7c21cebb3696147c2ec3682f49304713d5bf97df5eea4ea978511c051c0871d5ad SHA512 3781596c0471938d0d7237580090ab698c95b2bd328900326a3a35131f0195c3a5fb1488a3c2b9db350848746cfe569779a05f30aad8f28293500b54bfda7ec6
+EBUILD ushare-0-r2.ebuild 182 BLAKE2B 739ac5468c9d82ea288bd3eb476dfb74bb3c3e61f9b3dc5bbb77527488faf3dc50c665fa7ba5fc7a3d197082e90601983bb9380f01d83d90ac2287dbb9f7d46e SHA512 72710a849525a39b9a7e50ea780bdaf11a6e896f0da550bdf5e8d22354a84f76c85eea110895d88ddfe8f7e231f80d0ab16f40b2308671a24d1521401b009f10
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
deleted file mode 100644
index 3cfb444c312f..000000000000
--- a/acct-group/ushare/ushare-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/ushare/ushare-0-r2.ebuild
new file mode 100644
index 000000000000..89a643abcf84
--- /dev/null
+++ b/acct-group/ushare/ushare-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for uShare"
+ACCT_GROUP_ID=349
diff --git a/acct-group/utmp/Manifest b/acct-group/utmp/Manifest
index b69fbd58238d..38515959b35f 100644
--- a/acct-group/utmp/Manifest
+++ b/acct-group/utmp/Manifest
@@ -1,2 +1,2 @@
-EBUILD utmp-0-r2.ebuild 151 BLAKE2B 1b0455e23248d518445789208048755d495b4ed0230018cf26efae0a79a417ae250e8d2b1f9179176e0a8ae258365c9beb56c9bd9d5ed3ca9f562372c15d1288 SHA512 bf65da29c7ecf0d6dd23e429755fdfba37258ed5e4f3469ec0bd9f201f04978a56606c3f879bde7ccd1449fab4f1727279871d7882cff5ec7c723f58683003f7
+EBUILD utmp-0-r3.ebuild 151 BLAKE2B 68fce764220522e231b003a05851fb059f8e6d35a62bed56cc79bbbe28e2f5f2870e7764f98d53013fe721eafcd7c6aa47844929b3bafe6f4b0b2d5c681f64c0 SHA512 a301db7fb57e890806782041f8d1e5b1bdc4884dabbb578e83a1d55b6a438bfa59918b16cbdfa6350e8b1c354ab511a8f455d0ce18bf1f19f4c3c1b4240b41aa
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/utmp/utmp-0-r2.ebuild b/acct-group/utmp/utmp-0-r2.ebuild
deleted file mode 100644
index 023d71c363c8..000000000000
--- a/acct-group/utmp/utmp-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/utmp/utmp-0-r3.ebuild b/acct-group/utmp/utmp-0-r3.ebuild
new file mode 100644
index 000000000000..0c9596d87dee
--- /dev/null
+++ b/acct-group/utmp/utmp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=406
diff --git a/acct-group/uucp/Manifest b/acct-group/uucp/Manifest
index 816f17f4018a..11b1e81f817c 100644
--- a/acct-group/uucp/Manifest
+++ b/acct-group/uucp/Manifest
@@ -1,2 +1,2 @@
-EBUILD uucp-0-r2.ebuild 150 BLAKE2B decbbb641e19e96fb1cb2c63cd527d4b00707300eb839eb3cedfcfc9f2c861f93e80fedeb7795ca58ccce3f732fd08e85295ac35795ee32604f5a2d39a3c6964 SHA512 287d6ab34c410f269a7750d8d344e4f6f0eea95e450a1dd2fa557c5a3724d15528195b88194493f1920aebc81fcf21daafad66eae9c263a45452324e9db4ee9b
+EBUILD uucp-0-r3.ebuild 150 BLAKE2B 026bea0d36fb5e53f0cdd940179f3ddb1e94e11c52d967ef0f114caa0540c3ffebefba9c7289e6e85659558db573cec0537d6f942ef7f58ef3d06c6f9e271261 SHA512 83846750467c9e278ac8160279250559e1088a473486d2864aec221a743bc27aaec80582dbc23790554b4dd36e423d0af58e561ca9b986e731b76d751f45359f
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/uucp/uucp-0-r2.ebuild b/acct-group/uucp/uucp-0-r2.ebuild
deleted file mode 100644
index 4a2dba7d1e89..000000000000
--- a/acct-group/uucp/uucp-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/uucp/uucp-0-r3.ebuild b/acct-group/uucp/uucp-0-r3.ebuild
new file mode 100644
index 000000000000..ca0aa96d1ea8
--- /dev/null
+++ b/acct-group/uucp/uucp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=14
diff --git a/acct-group/uwsgi_exporter/Manifest b/acct-group/uwsgi_exporter/Manifest
index 4d985d5ce24b..d381b80a9f3c 100644
--- a/acct-group/uwsgi_exporter/Manifest
+++ b/acct-group/uwsgi_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD uwsgi_exporter-0-r1.ebuild 207 BLAKE2B 9a306afaab5a91d464ce55917670fa8c4d5ea43a79503b2333ab0250e9c18e2048e4fca00ab908944a062cdf338be5e32159bfc3aadd546befdb3a363d729db4 SHA512 1d49291fbf3eccfde79a394ea20797c69e5447686e11a37c1b7df12f73880d08bf191221daba527db9b762bd74e435790fa4c753f1fc66a9a4927cfec8b66c92
+EBUILD uwsgi_exporter-0-r2.ebuild 207 BLAKE2B 58b7b903c05edd6022d0e8fa79d9f68f0d4b3dfb3bcabd1959281310f2bc66a0f09b519071fea52fc87ae9d7a092aebda893e9c54f7b029c5da094f8942374a4 SHA512 32cddaa13e443df996c43cc64cce813027dae590c5945c50872e6d3d1ede2f028a6c67983024c4ed01084a40b9e73c3304cfd62eef76dc7929669255ba6b5502
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
deleted file mode 100644
index 2d2d1d5b3ec5..000000000000
--- a/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..cb8885374b40
--- /dev/null
+++ b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 55a9ea515a82..4fa73759f77e 100644
--- a/acct-group/vacation/Manifest
+++ b/acct-group/vacation/Manifest
@@ -1,2 +1,2 @@
-EBUILD vacation-0-r1.ebuild 202 BLAKE2B ec3d19e0a87a65491d9c0500b4619fad2074de1c931fed82c1b11ed9485716904a2cad082cd61ec72c22118437ee744beb97f2fc662ea83027dbbf87021a75be SHA512 c6eb275c2da76d4317c0fb269a3ec26418597ed72057709abb9911fd27df49c8881fc76fcddc5b7d32a114a080274ce2ecf7980a7b3e5afc4b2a5d4b9fb5459d
+EBUILD vacation-0-r2.ebuild 202 BLAKE2B bb8f3afb4b9b1de83911a3dc2303d6809f61490b9f6f117c25225d7ed8e65d94115d83eeba74e7d90c700afe2337536de62c1f4798a8b54be9522dfddd14820b SHA512 24019d999dfd80441da7827d60485ae9c263a144bd2c7ead88e5febcc2c8beb69b9fa14d3ae41b18e3d9f444a55fa5cf84555a022e9d2b83a56d67f5d66f5635
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
deleted file mode 100644
index 6214a9b58c91..000000000000
--- a/acct-group/vacation/vacation-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/vacation/vacation-0-r2.ebuild
new file mode 100644
index 000000000000..bc00a8b9dc98
--- /dev/null
+++ b/acct-group/vacation/vacation-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 eb607d6d594e..4d9022ffb485 100644
--- a/acct-group/varnish/Manifest
+++ b/acct-group/varnish/Manifest
@@ -1,2 +1,2 @@
-EBUILD varnish-0-r2.ebuild 183 BLAKE2B 6f8733fb61f7c9521c0f9f9442c54b1c7a9eb46bcfd1ccd0e243bb218e69eead01951a6cd4c598cec0e1e59c6467048d2e007ea6143d7fe347681db0f4859b4b SHA512 3a5922dff413fab90e408525880266e98a8991c2cefb989af2b1dd4f33802d4002274518913d8aec5a2e5144bbc96beb122e2e13360bf7d447ca13802412f25e
+EBUILD varnish-0-r3.ebuild 183 BLAKE2B e47ee5ef3fe7f47236c4fc59c2d2afddc978f439e6292ff3480b2f240711276568504a0cefd4b537bfb6fa6d5d42453708f3cbfd2ac6baf39f0c5267f773d758 SHA512 f0697a4f89f43911ef9cf15ec4efce6404afd67bbc7f4d014aced6a55f052e1a83c9a34bd7f54a6437fe4cf7cb89026fe665ba2f2986022cc28baf8eca4ad184
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/varnish/varnish-0-r2.ebuild b/acct-group/varnish/varnish-0-r2.ebuild
deleted file mode 100644
index 78dafd64efae..000000000000
--- a/acct-group/varnish/varnish-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/varnish/varnish-0-r3.ebuild b/acct-group/varnish/varnish-0-r3.ebuild
new file mode 100644
index 000000000000..500b2966ff59
--- /dev/null
+++ b/acct-group/varnish/varnish-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for varnish"
+ACCT_GROUP_ID=474
diff --git a/acct-group/vault/Manifest b/acct-group/vault/Manifest
index c43d46851972..057bd514373a 100644
--- a/acct-group/vault/Manifest
+++ b/acct-group/vault/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault-0-r2.ebuild 151 BLAKE2B 70410d1bfb12d8cb811c8ca35991da974791ba397d97c47dc1ceacb7b0c08671adc5da2ad6527eb8d139d7ba282071c296efec2fd79e25e41080e0482a46f848 SHA512 e712b1d284054785ca2e7206d69753a942fff2720483f77d5aea3eb9e18c5cc58cd311f8bfa9b086cf0b330178f6ed7c06f641bb7610fb440eb19604e07ea15d
+EBUILD vault-0-r3.ebuild 151 BLAKE2B 62180e1b6f4d96b3f680a994956a44c9f758da65183602e1f6e13e9a4af42a528544a44a01a585540695e6a970619d266264bbb3c646a5880805c37917e88269 SHA512 e28aa6a91ae9ac4455712599a21e4f8a09128a6e193b7718a8e6b4d8f9c1303371db1ecc2bd246168fd8e2158be3983d89d501e2d2c8e41dba483aa30023c39e
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/vault/vault-0-r2.ebuild b/acct-group/vault/vault-0-r2.ebuild
deleted file mode 100644
index bd459568b12e..000000000000
--- a/acct-group/vault/vault-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/vault-0-r3.ebuild b/acct-group/vault/vault-0-r3.ebuild
new file mode 100644
index 000000000000..6eecdb882a13
--- /dev/null
+++ b/acct-group/vault/vault-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=410
diff --git a/acct-group/vault_exporter/Manifest b/acct-group/vault_exporter/Manifest
index 729befaae5e6..6c0976b85ca9 100644
--- a/acct-group/vault_exporter/Manifest
+++ b/acct-group/vault_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault_exporter-0-r1.ebuild 207 BLAKE2B 33029b82bdb9520c4da9abd68c58af54874f346db8b5cdc5fa19c3c75652c4e0286a82684a2a991324f5d1afa900cf3f7b732bc612c22f7a67140b2b4e510761 SHA512 e455408cddc43e81348f7b7758c52ec0a110bb0b2c11f69b9eafaa92b0e8cd418374ee938c40b1e6d4faaa7230d27fa58061807e8331c8b5bb002d3faeddb7ba
+EBUILD vault_exporter-0-r2.ebuild 207 BLAKE2B a3e6b3798f796ff171f320e94baa014c8d87855f6cee6c6070f9f3e46d94d0258f22585bc8bb84244cbf147ec6fb3175a90e64761eda99bf6d110d7b9a5cc7a6 SHA512 08d0c699974b8147cf895ef40532b362058ad64eb4e956f8f5168a588c188ff4b46698f90563034a7414e19de9b641216116b6d0069fef0fd3cd1251d883446e
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
deleted file mode 100644
index 75c5cf1352b1..000000000000
--- a/acct-group/vault_exporter/vault_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/vault_exporter/vault_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..77da12a31c43
--- /dev/null
+++ b/acct-group/vault_exporter/vault_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 96745e60f191..760822e22a02 100644
--- a/acct-group/vboxguest/Manifest
+++ b/acct-group/vboxguest/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxguest-0-r2.ebuild 151 BLAKE2B 33728c89d068713d432e646c1acad58287eae12e61753bc9b2827f77347049ee3ef7fa5d38db322808006615d580eb2561720fbace767182ba3409cc5013e39a SHA512 8d621f4a59a8cdbd91a216bf1988b6b1a69a509418afbb4b5121a7e0a2ed7b84636f20b529cd8ab8950bdd34a6cf2cb8e2691511841a02b1323b437d821e11ab
+EBUILD vboxguest-0-r3.ebuild 151 BLAKE2B f6655e2f4470f8fcdb97c6e8d0fcd0004fa26ba16b2b0be74ee27464336817628e139f7d9c571d593c508756c4d96b2252153b35a52d59565c5eeea638af4d0e SHA512 58f30cedc2434b61ff5a73a2951e1dd004b39dbf05212869f365e1acef7eb7cce6a94c0f32a8ab037bbf215e540f299c5015c55884227846c8a0918a2d754be8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/vboxguest/vboxguest-0-r2.ebuild b/acct-group/vboxguest/vboxguest-0-r2.ebuild
deleted file mode 100644
index 41282da59a0f..000000000000
--- a/acct-group/vboxguest/vboxguest-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/vboxguest/vboxguest-0-r3.ebuild b/acct-group/vboxguest/vboxguest-0-r3.ebuild
new file mode 100644
index 000000000000..1d3eafbbbc16
--- /dev/null
+++ b/acct-group/vboxguest/vboxguest-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=305
diff --git a/acct-group/vboxsf/Manifest b/acct-group/vboxsf/Manifest
index 829ee89ec027..f0732978ff2d 100644
--- a/acct-group/vboxsf/Manifest
+++ b/acct-group/vboxsf/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxsf-0-r2.ebuild 151 BLAKE2B 12f6fd40af950124d9508fb38cec43bf4e82b661e806e7ab40a5b579271c7386b408ae66aa9c97a92377cf0f768bffdfeff02aa93ccb366c25e3a1bc2a472915 SHA512 7601139026acdaa7e7c35a93a5e1c156c2ee3ddf7c08c62c2579f8823417eb352fe26efe323cb56b16846ac1f308dd6744592912202da82c4678d5dfd9fa6573
+EBUILD vboxsf-0-r3.ebuild 151 BLAKE2B a01e7455593dcf54b062e89b147065c18f329842fb2b8f64e4fa1ea8f8373f094452118f62c258aa5a0cbba263ac477497e702200f0e1b113479f32a318be32b SHA512 1f17dfd623ae0d9cbb38088c2579346673f138b4cb1ffa5593ae4d004cf38be17abcc32ed26adff371a69c08eef8de30241435e5754ee4310167902aa4a654dc
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/vboxsf/vboxsf-0-r2.ebuild b/acct-group/vboxsf/vboxsf-0-r2.ebuild
deleted file mode 100644
index 2b8cd4dfef06..000000000000
--- a/acct-group/vboxsf/vboxsf-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/vboxsf/vboxsf-0-r3.ebuild b/acct-group/vboxsf/vboxsf-0-r3.ebuild
new file mode 100644
index 000000000000..e910cc5e3e08
--- /dev/null
+++ b/acct-group/vboxsf/vboxsf-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=306
diff --git a/acct-group/vboxusers/Manifest b/acct-group/vboxusers/Manifest
index f546fdc8a8d7..50af8b897394 100644
--- a/acct-group/vboxusers/Manifest
+++ b/acct-group/vboxusers/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxusers-0-r2.ebuild 151 BLAKE2B 29345d8ee8afcb19a6142e33b755a6e00c24b7bad4c7ed698155937e82ef9613ca09df71b8fc77d45761573969765e9a0e800adb02139599959c7164f32384c0 SHA512 588748d5268c5a9ef92a6d2ea6447dfebdfd8902e594533f1233f85d7cccb2b921481b59bf4d2c1b39b7af58b4b999ccc9320b59e5c409c0a4b3636610d0dbd6
+EBUILD vboxusers-0-r3.ebuild 151 BLAKE2B d11ab6a8ba18f2d4186770c4be83456a5a3fee521ac399d320a732d3c4112f297ff0647fe8ae89ab019684fd0963d9a585c855b0e628d1ebfdbb93227c1f0b14 SHA512 3eedff40a165377a1d42fadd02b06427028585eb8c17d00041acbe45885ce4945c03fa0396e1de2b085312bc4cace1a0fdd304407a9a608136fac18d26100f79
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/vboxusers/vboxusers-0-r2.ebuild b/acct-group/vboxusers/vboxusers-0-r2.ebuild
deleted file mode 100644
index 81e73edb6bba..000000000000
--- a/acct-group/vboxusers/vboxusers-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/vboxusers/vboxusers-0-r3.ebuild b/acct-group/vboxusers/vboxusers-0-r3.ebuild
new file mode 100644
index 000000000000..ce3ed3b28e42
--- /dev/null
+++ b/acct-group/vboxusers/vboxusers-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=304
diff --git a/acct-group/vdr/Manifest b/acct-group/vdr/Manifest
index 668373976a86..1b603b911d3c 100644
--- a/acct-group/vdr/Manifest
+++ b/acct-group/vdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdr-0-r2.ebuild 208 BLAKE2B 0db8986d109ff819b6e39f77330cfb9c89b0006348f359bcee3b352b03aac923bfee1cb31188dcd7fbf8ee1d1ef99f66059fb926d5bd21f5941ac0ce7424b466 SHA512 f2ccddf86e748881cb2aa9a5da7926a69edefe14ee5bc65169c2b4a10d8e7d30f0ae3526636b9a00ef165a9f2d636fc2142fe169ee65f3e29c63d16e8300221c
+EBUILD vdr-0-r3.ebuild 208 BLAKE2B d457611ac48424f9d3636ce82a22b2537481027df94761a89beb0baffe19ab3715d9c03fca9c41b650638cea36480a8287fadb8ee281938e0d97905a7ed1512d SHA512 90c3c87752068bdc58858adc38e50f374cd7491b79f990aa0d44e35f2608235a7cbebb857ce6a6ac64f3d0a7057d03e94a8e5cd4ff71e60184db8b2d33a97a4f
MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
diff --git a/acct-group/vdr/vdr-0-r2.ebuild b/acct-group/vdr/vdr-0-r2.ebuild
deleted file mode 100644
index edc442a09c5e..000000000000
--- a/acct-group/vdr/vdr-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/vdr/vdr-0-r3.ebuild b/acct-group/vdr/vdr-0-r3.ebuild
new file mode 100644
index 000000000000..f8863791446e
--- /dev/null
+++ b/acct-group/vdr/vdr-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e3e5b5ba215d..98affc25351c 100644
--- a/acct-group/vdradmin/Manifest
+++ b/acct-group/vdradmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdradmin-0-r2.ebuild 197 BLAKE2B dd5c45c1a8a084d7d8d1c37976077b77d9000a736ffefefb7b0e42031b2007378bb5d82c532a820d58ce1001c250de7eaa7db58d23d410a100acebaea0da7a35 SHA512 2210e0818fd3a251b9b21e7d0ce3246b4ecb0e6aae624b1d00d73a7adc36a1c20bb9c615b23ec1d7ef3a5a4572784f139af71f267dbe5ee08adde0d59fd59604
+EBUILD vdradmin-0-r3.ebuild 197 BLAKE2B 53291b39b4c49f2e1ddd7faf0f91c8ce1b391364e7686f89a5b05e9f8721d8194db353780fe536ecaa393c49dfb625bc6e7d25354b5f63ec5dec05bbf3082e47 SHA512 ac6a08277d04955b55f2af72cd0b0fff5a4cf1ddba06d1d71268f678a45b2b86f28d6edb5a76a1974ef99a0cd1b910e01f7d4df199356dedc4797ce3fe523e47
MISC metadata.xml 246 BLAKE2B fa708d64ea2840e21fa1a00402de140be19ef4c1cf90b00fcd40f2ab10fe5e1397e5bd0a259162c3571a01056535d42d4cb492e97e6ae1756d38831019463db0 SHA512 503c7151fa63101f3a082546d033ecabb7f5ac47f752200d450faaa46c2cd6dfdfc387aa029ad8cb5786d91f7217a3ba64d92dc21ce9268de823fd58feed7db6
diff --git a/acct-group/vdradmin/vdradmin-0-r2.ebuild b/acct-group/vdradmin/vdradmin-0-r2.ebuild
deleted file mode 100644
index 88460ab332c4..000000000000
--- a/acct-group/vdradmin/vdradmin-0-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/vdradmin/vdradmin-0-r3.ebuild b/acct-group/vdradmin/vdradmin-0-r3.ebuild
new file mode 100644
index 000000000000..4dbd3738ba1f
--- /dev/null
+++ b/acct-group/vdradmin/vdradmin-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 055b62e8bd83..c5db48027fcf 100644
--- a/acct-group/video/Manifest
+++ b/acct-group/video/Manifest
@@ -1,2 +1,2 @@
-EBUILD video-0-r2.ebuild 150 BLAKE2B e19a3d6161d312b898d0464864fb02109950b183f703069fd71c81d3601b9eaa458b473efbed8d31d53b0912376b886717b23ae10a8baafc49b621a38c2a8b67 SHA512 4a28cf20576a27380ee5ab02101b16fadd0f5fe8d12be4a67a2f2838976bac7c7972d0858e2ec589105fef816a28090bbb9b40befc7198765fded99a9ae03b28
+EBUILD video-0-r3.ebuild 150 BLAKE2B a521e8ebd927c094729d988c82d3f24355088e7efc57faab66c671916a5ec5897452d6cafc7f55cee2971128e345baf23b98c008f8036df8097593e389a838ef SHA512 c8d2884b01f89fdb78c4e73f4cd10593f209a6bc95bb8eecbe7aaf92c21a65137c003976c33ad82ffa498accd39d3c2105b3c87280b0d972af8d91161d17ac69
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/video/video-0-r2.ebuild b/acct-group/video/video-0-r2.ebuild
deleted file mode 100644
index cbcaf294640b..000000000000
--- a/acct-group/video/video-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/video/video-0-r3.ebuild b/acct-group/video/video-0-r3.ebuild
new file mode 100644
index 000000000000..dff475349405
--- /dev/null
+++ b/acct-group/video/video-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=27
diff --git a/acct-group/vlock/Manifest b/acct-group/vlock/Manifest
index cb70aa170c8a..f1523b77157e 100644
--- a/acct-group/vlock/Manifest
+++ b/acct-group/vlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD vlock-0-r1.ebuild 195 BLAKE2B be39c82a52657adf0d7f320e18d0d7824df3e1a6a2a2de2c1c0a86711a7c4353d67272021c4e8875a08ed25ba993d4e6d3ebe40d67227ab8d16211b55f1268aa SHA512 17e25e209c226d14711f6fab13d579379b8456efeb91985c6de018c88129a9d55929ef673867af5f11a4125359997f7dfc4a99dcc116c5372d213c58aa662889
+EBUILD vlock-0-r2.ebuild 195 BLAKE2B 0336a7081c55e6075c331549699eee421467027684719340babd270c3ff291a13661ca4b87ef98aef154afa5d62728fd033c7b971aeeb532688c263abfb9f5cb SHA512 376ad7eba77240ceb8791c674125d65a496802a9b457838a202b5f81c3cb2984bd30826b038ea1ce018f738edb7bdd2b19d0fb64ec8ce799b0e8c36bebd2064d
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
deleted file mode 100644
index 086049300d62..000000000000
--- a/acct-group/vlock/vlock-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/vlock/vlock-0-r2.ebuild
new file mode 100644
index 000000000000..4ce0fd00783f
--- /dev/null
+++ b/acct-group/vlock/vlock-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/vlock"
+
+ACCT_GROUP_ID="178"
diff --git a/acct-group/vpopmail/Manifest b/acct-group/vpopmail/Manifest
index 2481536eb926..f3c7d526d20d 100644
--- a/acct-group/vpopmail/Manifest
+++ b/acct-group/vpopmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD vpopmail-0-r2.ebuild 150 BLAKE2B 31279202a990e3137ff476fde27265c6eabf82b2b08fad162a26c0a20e4d25378c4fa9a3300d40f65065a8b3171b33b5bf7acb91b7b52a11e5c9f6eafa922d97 SHA512 573fd8827efc4ec8ddbbe36cdff8e360322aa3c779f6b4ce13b397ffd0ea4b54ef2f4880a5a7cbbcd17c0a5e4659227a6245603a0590fb10cae03a7a5a31e53f
+EBUILD vpopmail-0-r3.ebuild 150 BLAKE2B 08b11b65b352947b8b49975d874d208432b69b90d085e9ba89e9f98986b37d553ce4eea804d25c83d37229a2ac624e0051e889e3f121728bdce2b9acf47858ac SHA512 b75f11fe4b7232101582350e6b258477460deb7d9c5d88815cc08a9c9b79cedaed9ab28ca6e7d667aaad9c0e30f06ee732ed78e24e5f4d07dd2a5dc7ef8ae883
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-group/vpopmail/vpopmail-0-r2.ebuild b/acct-group/vpopmail/vpopmail-0-r2.ebuild
deleted file mode 100644
index 970296853684..000000000000
--- a/acct-group/vpopmail/vpopmail-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/vpopmail/vpopmail-0-r3.ebuild b/acct-group/vpopmail/vpopmail-0-r3.ebuild
new file mode 100644
index 000000000000..0fbffb112f25
--- /dev/null
+++ b/acct-group/vpopmail/vpopmail-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=89
diff --git a/acct-group/wesnoth/Manifest b/acct-group/wesnoth/Manifest
index 35297f7153e8..5d110c9a1525 100644
--- a/acct-group/wesnoth/Manifest
+++ b/acct-group/wesnoth/Manifest
@@ -1,2 +1,2 @@
-EBUILD wesnoth-0-r2.ebuild 151 BLAKE2B 6b4930d92187d8371551aa565659df41487ca6fa292a0ea56511bca7ceee4147c6e5097559927ddc9233e47744d68331843552fb7c29bd36edc2bc03ad1e3ffd SHA512 be2a7e02f2b9ebb5d95e3ed1cb1428cc3e8baf7e389cd246f7c2a129380bd5dd441bfa44e33793adb498de7d697038a9fcbb2542116682be66b4ec6b9e98547f
+EBUILD wesnoth-0-r3.ebuild 151 BLAKE2B 8f5ae3d93257f5f322c67f74eaf9e18e4b5ec381699b841d3243570df74b4413bc0f392b1bd40279df332a1eb7aca3172213ebc51480481763c7d3299af74c04 SHA512 117134ade9eb19d4f623445d9615a33c14d30003ceda836cf7485e09dcd6b2979acd32cbdb357f169623fa813fbc1873e1424d87247ccfcc88a541476f1ce160
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-group/wesnoth/wesnoth-0-r2.ebuild b/acct-group/wesnoth/wesnoth-0-r2.ebuild
deleted file mode 100644
index b5b457394987..000000000000
--- a/acct-group/wesnoth/wesnoth-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/wesnoth/wesnoth-0-r3.ebuild b/acct-group/wesnoth/wesnoth-0-r3.ebuild
new file mode 100644
index 000000000000..b639e69c68bc
--- /dev/null
+++ b/acct-group/wesnoth/wesnoth-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=419
diff --git a/acct-group/wheel/Manifest b/acct-group/wheel/Manifest
index 33f131062524..18e10af21224 100644
--- a/acct-group/wheel/Manifest
+++ b/acct-group/wheel/Manifest
@@ -1,2 +1,2 @@
-EBUILD wheel-0-r2.ebuild 150 BLAKE2B e37344d28cec22235dabd50c52fbe54478cc14f35715b2bc138c3a19259bc3c2ddb9ea4a486f03d1eb95aa0954437a41f27115eed0b73e0322b89e39972882b8 SHA512 868f1e1442cd9dabb74f4ad1a25d56b07eba7ef954daebc52bfa3f14577f7cfc0bf4f6596c4d216e367c55111bcf918c1bb1688c85538755c2ae23ea885f4775
+EBUILD wheel-0-r3.ebuild 150 BLAKE2B 51e54ca045e623dfd550d2c9d34414c178ef9ea8c09280151a654030c316feebc596e627eb3dfc62dd5280ac08fd7c6f916459a0df7927e0ae39b8dd522c6603 SHA512 32d5dc13fa0cecca2763e8081a09d1323094e9e3f9d89506da25d4d9101b3d5c41486ec9deebf02f3ccb1ccfa72a71b78ac08af14bc6d5dc335021fe860ecdc2
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/wheel/wheel-0-r2.ebuild b/acct-group/wheel/wheel-0-r2.ebuild
deleted file mode 100644
index b1925f5da53b..000000000000
--- a/acct-group/wheel/wheel-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/wheel/wheel-0-r3.ebuild b/acct-group/wheel/wheel-0-r3.ebuild
new file mode 100644
index 000000000000..e06f86e95533
--- /dev/null
+++ b/acct-group/wheel/wheel-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=10
diff --git a/acct-group/wwwoffle/Manifest b/acct-group/wwwoffle/Manifest
index 2af1231be790..7b9eca65155f 100644
--- a/acct-group/wwwoffle/Manifest
+++ b/acct-group/wwwoffle/Manifest
@@ -1,2 +1,2 @@
-EBUILD wwwoffle-0-r1.ebuild 197 BLAKE2B 48561f60bc2b23145c105b82933842d495b85e4bd0b0c3b7c491c8d2a6a7c95da13464d65b44ba850247569d20632302b9a3b24fc84f119a44bb3ec7316d7d6d SHA512 77685f0059a401d5093427494ca219d7f4594ca35d3d5d54d964c261e25b87dde1d9ed5d0337a75b461751ad00f6574c4e76741c58fcdc53655896df71c1fbd3
+EBUILD wwwoffle-0-r2.ebuild 197 BLAKE2B 50186dbc22b996c8aa339fc557ac56e118748758c98bed6e82a70465fa5c2b072b6d37604077e0fb0e572bec51027399c0c0eb137737118ca16ca463b024866b SHA512 20d1cab30280df8c30d82fe05537e6d4a848a119cf255d23fb0f7933cb3268a3ae0e198e64e4c1e7c0a2d36cc227dc26fa376a276799a802f78a22fcaeba1a5e
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
deleted file mode 100644
index 56285ff1380c..000000000000
--- a/acct-group/wwwoffle/wwwoffle-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/wwwoffle/wwwoffle-0-r2.ebuild
new file mode 100644
index 000000000000..700f853b33ea
--- /dev/null
+++ b/acct-group/wwwoffle/wwwoffle-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d74aeb7b491c..65d0e71fb1ca 100644
--- a/acct-group/x2goprint/Manifest
+++ b/acct-group/x2goprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2goprint-0-r2.ebuild 195 BLAKE2B b21efe9c46f49ee2fd8f3079b3cae493b0d3c5e5450c26c3549e401b4c83c9f6dfb0e7b16dcbba9800f70dbdae59dbb801ea749c20c7a49afcc91fb45f95f5fb SHA512 71ea1ece28193deef03f30875c321ee779eced0d531c9cfd6a561b8c1fd6d44e4f16506432784a2349ef161e606692e711018ccfdf694e696a22761b48c347a1
+EBUILD x2goprint-0-r3.ebuild 195 BLAKE2B ff6c192c604624e55680aaef0cca0d7b58c70beb54795654802f9cda2a402f3ebeb7b0b6ff2b592efb36b08d8534e7b4669072efbca4868830396f91294154cb SHA512 2c0703c1a455f60f6db3b5fd93212dde96f59a51eb25669fc82644b3e09b19223c85983425a79d0941ef14b09052e3535a356807301dcbba760d6896b074b48c
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-group/x2goprint/x2goprint-0-r2.ebuild b/acct-group/x2goprint/x2goprint-0-r2.ebuild
deleted file mode 100644
index 16275e07002d..000000000000
--- a/acct-group/x2goprint/x2goprint-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/x2goprint/x2goprint-0-r3.ebuild b/acct-group/x2goprint/x2goprint-0-r3.ebuild
new file mode 100644
index 000000000000..c2fa21f4f67e
--- /dev/null
+++ b/acct-group/x2goprint/x2goprint-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 675f48a9398f..dd367fdea810 100644
--- a/acct-group/x2gouser/Manifest
+++ b/acct-group/x2gouser/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2gouser-0-r2.ebuild 195 BLAKE2B 5dcc59ca83ac2c17e3262edf0f47b9d88b650dc7a87535905b961156f0f5b8f36d36b5d8a60a70dba3d36992039817e9c8bf80a2e1a326c16da0ea4562749a9a SHA512 ffc86c567c9fa68c2b0210aa564b4e6149fe985b7ae73dbcfdea127465c9e7f3e10658a08bf6823eba38aa92d72356b48a9efdd3255348bfb5ce6d3bc133e605
+EBUILD x2gouser-0-r3.ebuild 195 BLAKE2B bcdb844fabc951f0a4a20f99cefbe73baac1878c6a336f09ce1849b7426ef4ff07bde216dd34b1e013608af88ef12edfb2270ad35d528defac4dd950a16f1948 SHA512 8147a784163ad0b63236f5eebeaecc3c0e876eb39bfd0e1e0bb414f928c949634bd518b600043e3e4d60988b655ee9b158fbfe4a99c26dc70b796eff81094072
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-group/x2gouser/x2gouser-0-r2.ebuild b/acct-group/x2gouser/x2gouser-0-r2.ebuild
deleted file mode 100644
index 800125020e8b..000000000000
--- a/acct-group/x2gouser/x2gouser-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/x2gouser/x2gouser-0-r3.ebuild b/acct-group/x2gouser/x2gouser-0-r3.ebuild
new file mode 100644
index 000000000000..b31d6f51fc54
--- /dev/null
+++ b/acct-group/x2gouser/x2gouser-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4c50e68876c1..b76d4cf89ae6 100644
--- a/acct-group/xpra/Manifest
+++ b/acct-group/xpra/Manifest
@@ -1,2 +1,2 @@
-EBUILD xpra-0-r1.ebuild 187 BLAKE2B a10e3487a7099c7c5b763a0d39ebde79f59c49f4aab5b57b273e1795a0fdbddbd0413851bb41eb9a7e9ecdce90779c3b705bfb81f081c1186e64000607f4192f SHA512 41216fe41818c41e39dfc245c5233da6364aa46fcd1736a2a1ce59ef94ce8d04977f0edb5191625655358ca149e068e5e90a164172bb7b67584d0aa46a39fe3d
+EBUILD xpra-0-r2.ebuild 187 BLAKE2B f7e563dafca96329ac4a13507f9d9eeed984b15bba6cd718aa3a2b3dd1a53fa9f2b0681e4d14589fa5121cb9d6fb2afa67b59f8b6ba44f7d9b224ac477333d16 SHA512 d88e3cb6197d75be0ff1fce103b9ee86eb8793554610205189f93f6b5584b5568a396c022b7f3b0cfcbc7fa6bcc3d0f93fc4c8ab512b0dffc8f32ee2b1b45b6e
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
deleted file mode 100644
index 0f163b260c1f..000000000000
--- a/acct-group/xpra/xpra-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/xpra/xpra-0-r2.ebuild
new file mode 100644
index 000000000000..23b641671d34
--- /dev/null
+++ b/acct-group/xpra/xpra-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a2d2f27c9179..63dc4891aef6 100644
--- a/acct-group/xrootd/Manifest
+++ b/acct-group/xrootd/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrootd-0-r2.ebuild 193 BLAKE2B 6f30133d56fa41a5d59bb667f0921900899c4b9b107627e888750b055e22c73574c0d15a4b60f6f0a6c994953d2077f5ab7d6df15eeb1672f04878df77d8b9b3 SHA512 75f1ef96f384626328e8e5177dc4cad12a6ae8331c17f897ed6292bddaf913fd4f78efd314f63335bc343fac8fbd71820dcf0bc5108d6d829263eb60a54c1742
+EBUILD xrootd-0-r3.ebuild 193 BLAKE2B b4a126db4b10d745443b0ab234a2d2ee842973db956be9cd03f07103fe3bb4f2fcfe466a7facd301662b54236f522b7d52ccb961b5e33973c1f9f8155e26f046 SHA512 06cd203c3d412504c00719b1718d3d3974b0a31b02d231d0319ec21e33376faec440362b37ec093959aad43e64c4090b758cab89f23479722e56f29a62db7722
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
diff --git a/acct-group/xrootd/xrootd-0-r2.ebuild b/acct-group/xrootd/xrootd-0-r2.ebuild
deleted file mode 100644
index 37258ac9342c..000000000000
--- a/acct-group/xrootd/xrootd-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/xrootd/xrootd-0-r3.ebuild b/acct-group/xrootd/xrootd-0-r3.ebuild
new file mode 100644
index 000000000000..d03f0eecb488
--- /dev/null
+++ b/acct-group/xrootd/xrootd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 29d6537374cc..67b34d5b42d8 100644
--- a/acct-group/xwax/Manifest
+++ b/acct-group/xwax/Manifest
@@ -1,2 +1,2 @@
-EBUILD xwax-0-r1.ebuild 197 BLAKE2B ffb900c27e12a38895bda02e6647f73570a2d18f230cf1d632e848ccc1f749945e907bafdc751ec39bd91b394630f33c78059f80e01fb3be80c3081484624eb0 SHA512 5aa88923d7461f329723c1f0987b62ded7ef2367bbc9eb4d01cf15ce02759eb35ea8d7c99a1d312e624b2eaadf0499d07fe2ecc2bca0549fd0fc75557dedee49
+EBUILD xwax-0-r2.ebuild 197 BLAKE2B e3aa5f654fb3f3a369ad0287d36392d870101c51253a7c4b3cfec1ea5933c6bdc8850ef681eb1c30da46655d01aae5c76f66f6f262ddb24bf44a67936614ad13 SHA512 19d04b1b78e2d4b513e4ad0d9aa964a396b4ebc541f7268c66b08490e5e0b68999df330f5931f6228bb89d8f81ca367c0a4f85d59296894013d1ef1334e636e3
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
deleted file mode 100644
index 9f208e62f068..000000000000
--- a/acct-group/xwax/xwax-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/xwax/xwax-0-r2.ebuild
new file mode 100644
index 000000000000..6b67a3f8520b
--- /dev/null
+++ b/acct-group/xwax/xwax-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/xwax"
+
+ACCT_GROUP_ID="205"
diff --git a/acct-group/zabbix/Manifest b/acct-group/zabbix/Manifest
index 80b902dffab5..673021c98367 100644
--- a/acct-group/zabbix/Manifest
+++ b/acct-group/zabbix/Manifest
@@ -1,2 +1,2 @@
-EBUILD zabbix-0-r1.ebuild 182 BLAKE2B d374b5320d1e2a73bcbb02aa2bfb56824c8e51e5c27a70de55705344797eac17e0048ed623228595264409f18de9256b3140ab6cf0b7be1c823861032a562a4d SHA512 2c6adc9769f6ce456acfa4e0ad3cd01056607f7867134dc6017ceced991b517c012e52b78658173321e179fb3c72d3973460e22c2599838a2d39faf616c2013f
+EBUILD zabbix-0-r2.ebuild 182 BLAKE2B b9faec0e328a7ce4adf0bdc6cee8e4424a2cb878f8de82e688c290f40107ee6b19ece7227270e4d87c791a8d62a71abf99d1bc2ebc77f21f1e6b3467fb7a15d1 SHA512 a7b7ad36bdf22d29b2b2213ca9deb3812297765829280ab0d7b1bc01311fafe6def819f2a1e707a6899a4bedbcdc07ce3f19d74d2fd6f736c6d2be0e5bf5c9f9
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
deleted file mode 100644
index 0d2ced4b507b..000000000000
--- a/acct-group/zabbix/zabbix-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-r2.ebuild b/acct-group/zabbix/zabbix-0-r2.ebuild
new file mode 100644
index 000000000000..320984b106c5
--- /dev/null
+++ b/acct-group/zabbix/zabbix-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Zabbix"
+ACCT_GROUP_ID=329
diff --git a/acct-group/zeppelin/Manifest b/acct-group/zeppelin/Manifest
index 708b6ab9decf..79768d9107a5 100644
--- a/acct-group/zeppelin/Manifest
+++ b/acct-group/zeppelin/Manifest
@@ -1,2 +1,2 @@
-EBUILD zeppelin-0-r2.ebuild 209 BLAKE2B 4806febd9d884ebdb29d961de2a920ee34ef5d48b32d3c0aa9305af168baabaeb487dd7f316b1d2c45b593fb45e76e624fb74e420e644cd285ad19365ba1d6ee SHA512 861dd34473d13f99f3ed85167e744ac80d5dd02f0e09eb9cf9d03fe1f34c09afe8c57e1c221498a49b834230906ece72d93628de0e9e7cbdce7727f3b99fd272
+EBUILD zeppelin-0-r3.ebuild 209 BLAKE2B a54020c88ee5e0ee2f43a915c2432c40e981fedb690d88ac186b9e7a061239ebed804e4f12aaded149b0507ef605c2024d17faa8c3607902e65161e88d273efe SHA512 de27087135c8f5176a1e694b6aa0452be2d640186193d0471eddcf27110197f3605c3b64b2a28cab7116c220b9668d555d6afdccde083233711b3b24e6b9a4da
MISC metadata.xml 342 BLAKE2B 1684316dabed0d0d2468052855244c3bb2504173b417c5b6f9ff9d2263ed3adf90d406201e19ca132d46ef7a5f072e571e8f16f9f5dc0a95ef0e0723c229ec5e SHA512 cb9dd8f18c328d49b61d1de97b20bebbd1261e944f7a56949e1ce72e7b62413716d83d77f72bce4387fa245d3414fe1b379f0d283487f7be55f2e2c256718a68
diff --git a/acct-group/zeppelin/zeppelin-0-r2.ebuild b/acct-group/zeppelin/zeppelin-0-r2.ebuild
deleted file mode 100644
index 96d38d3b6e2b..000000000000
--- a/acct-group/zeppelin/zeppelin-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/zeppelin/zeppelin-0-r3.ebuild b/acct-group/zeppelin/zeppelin-0-r3.ebuild
new file mode 100644
index 000000000000..1da03a61cd9e
--- /dev/null
+++ b/acct-group/zeppelin/zeppelin-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 97a10667296f..9838dfd512a0 100644
--- a/acct-group/zetcd/Manifest
+++ b/acct-group/zetcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD zetcd-0-r1.ebuild 196 BLAKE2B a616092d4c23965db6fb37fd35d8f8153b495cef36c52630cfa45aaa3f9d2ca91957265042c1933ab430ace6d0da367719be21fb13b6b6de37023b0a4e6d95f2 SHA512 646694ca46c575900785b00b54e7303ece5a398be737681e489709c8bba16b3ffd6fdbd3a32920d1435e689e492749c4b2bb40644f3272d7fd69b756eb64ce35
+EBUILD zetcd-0-r2.ebuild 196 BLAKE2B a28ff8f33ee4372af5783e2231ff75496188a066ec218f28f198accea069fd88a429343c3fcbe7d8068edad2d9538aea7ced1c06944abf0cd75fcdb8b515add6 SHA512 b455629ed01498e8169534ed6026db53a76614e68002cde7b53dd3315a66cfead02c34f6d0a3b3f92e76a5d8cf875a7bd3cc24fb07d6af3caa9436029336e436
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
deleted file mode 100644
index 7b5d55eac3bd..000000000000
--- a/acct-group/zetcd/zetcd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/zetcd/zetcd-0-r2.ebuild
new file mode 100644
index 000000000000..a95becae3515
--- /dev/null
+++ b/acct-group/zetcd/zetcd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ca54945cfdbc..ac6eb73f9d85 100644
--- a/acct-group/ziproxy/Manifest
+++ b/acct-group/ziproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ziproxy-0-r1.ebuild 151 BLAKE2B 9a1589cf0c76bda8f4d85b1a0654cd1a59d300def2c23f56fb983a2e29efc6104e67ac19856c292a2d8bb5e32a83dd36b08bc2d4c20088e639471bd4ce549904 SHA512 818a4131d4b7a89d484a49fdfc5ba1ea484bc6a8d750a9f4f56f301d8e28358f838aecaea6bb8a30b4e565007f0395f20fb50e3fa3c157b3c1a1b17cbd8c9878
+EBUILD ziproxy-0-r2.ebuild 151 BLAKE2B 04c8236059e002785e065fd9b6f1eef438375a285a4da64f15d3dd8187bd608ef1dc7f46a69edae2c7084c904feeccfb9d3db9144f8284d0bc396e4617098625 SHA512 d3cb3bdfc8a067ddcb0ae71a866df71d7402c16a63bdd9ab9172c909a731908a96a61704db28df5d85ea6f590520b0c4f93647db5d9f46e7139c2ea611169823
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
deleted file mode 100644
index c9060c781154..000000000000
--- a/acct-group/ziproxy/ziproxy-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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-r2.ebuild b/acct-group/ziproxy/ziproxy-0-r2.ebuild
new file mode 100644
index 000000000000..4998bf71fe10
--- /dev/null
+++ b/acct-group/ziproxy/ziproxy-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=367
diff --git a/acct-group/znc/Manifest b/acct-group/znc/Manifest
index 9aefebc8e5d6..6f81f44d3bf9 100644
--- a/acct-group/znc/Manifest
+++ b/acct-group/znc/Manifest
@@ -1,2 +1,2 @@
-EBUILD znc-0-r2.ebuild 187 BLAKE2B f1e0a024421ae57821c627330e8376b982982b9b3986af25dc505d5fd3d95863bf61ad994cf40de3d2cd828d9eca9cbaa8861984542a268d4ea05cc43fb8c1a4 SHA512 d289c3333469c6bffafbf783bfb40ac82b4853bb92f53317768a912b5ffc744cd7b86ddd1be07611010ce47d927c6df82cf12296f29d2eb6c0cd54877b493c54
+EBUILD znc-0-r3.ebuild 187 BLAKE2B 1632ce8dcd7196537d95611b2d049a88d25843de0e3d2ae712098ace9f6e3658f1ad6be51c4334be184e4fdea6d1d07444d26fb8be6dd02a81b46ce4f3acc547 SHA512 a1b811af59f2102b7277e3f4b662ccd83ad95957f8ed7d5de81ca4cadcffcbdca0651e4fce155c2fa85d568344edf7157e9c90ddda087a56766c99552b205d11
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-group/znc/znc-0-r2.ebuild b/acct-group/znc/znc-0-r2.ebuild
deleted file mode 100644
index 7475710c30af..000000000000
--- a/acct-group/znc/znc-0-r2.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/znc/znc-0-r3.ebuild b/acct-group/znc/znc-0-r3.ebuild
new file mode 100644
index 000000000000..c49700746a35
--- /dev/null
+++ b/acct-group/znc/znc-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5d93ef035662..d501d7fb0ef6 100644
--- a/acct-group/zookeeper/Manifest
+++ b/acct-group/zookeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD zookeeper-0-r1.ebuild 206 BLAKE2B 3cb11ed011df3b06a471b3bb8b22cc01aef534fcc40070be89653f5bfee0390b71f04af66a821d92f939055f4f38a886425a84f9f768d55302931eb991e7b02c SHA512 e62652d90b7dc750592bc19b870b04a28308caf8411582ddb96f5d09b96087e83928830c59815528402f4215206979c1636d868c82a64fab47efc7a950072ea2
+EBUILD zookeeper-0-r2.ebuild 206 BLAKE2B 06084414112167f7e3f8feec4d3000e8d7f6d1d695f18d1267dec5e842e94552818b8074842747c4169d396066e15da246627811b654361cabbc52f2ec8f7ce6 SHA512 b5b0f0922bcd5ef623ebfe1289be92b97cb9c6d6f02e80ec23f9c410f43b34a03f1849e060d139105d89446259c466337adae6321f6ded55636116293189b45d
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
deleted file mode 100644
index 23e22ef66749..000000000000
--- a/acct-group/zookeeper/zookeeper-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-group/zookeeper/zookeeper-0-r2.ebuild
new file mode 100644
index 000000000000..49601e8da8c1
--- /dev/null
+++ b/acct-group/zookeeper/zookeeper-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2fb56b0bb3c0..f4aa24a9f982 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
Binary files differ
diff --git a/acct-user/aerospike-amc/Manifest b/acct-user/aerospike-amc/Manifest
index 3358693b1d6a..0752f1147141 100644
--- a/acct-user/aerospike-amc/Manifest
+++ b/acct-user/aerospike-amc/Manifest
@@ -1,2 +1,2 @@
-EBUILD aerospike-amc-0-r1.ebuild 268 BLAKE2B 409c3a1f1bf640c28fac4b9a6c26cf375e2e48b57f52e1a7475d9034435164321d9394db51a497967c3a62cf84898741c8eb71925d20ff66dce50b270846d842 SHA512 3e6365e074e283cbcbf4eb4bba526aa9fa85377af371fd5ff22bba625d95daad7e388ac5d3404ebf637d1023b975c1aef06d3ce72ef715584b998009325c739d
+EBUILD aerospike-amc-0-r2.ebuild 268 BLAKE2B 82761e034c50ae7aab48470798880f52c70acbfb22ac3fb7d0ae6ce534df3b2c2565b714cee29d5bf16ff1eb0b897a609e548efb1b07e3a80119fbbf6e5b2ae8 SHA512 ffc9d8c69d83b34d9583b6c7dc1dd7ac64ac5227889528c62af260bb6814d80c6e639e21555145761751b7f5b145ffcf68de42ae251b779d8cf2d90eea067679
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
deleted file mode 100644
index dd0e1d7b8aa0..000000000000
--- a/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/aerospike-amc/aerospike-amc-0-r2.ebuild
new file mode 100644
index 000000000000..9bbf2445629d
--- /dev/null
+++ b/acct-user/aerospike-amc/aerospike-amc-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b4eee8c6a11c..89eaa9267221 100644
--- a/acct-user/airdcppd/Manifest
+++ b/acct-user/airdcppd/Manifest
@@ -1,2 +1,2 @@
-EBUILD airdcppd-0-r2.ebuild 373 BLAKE2B 4c1fe97226c7600f3aa5540ac3888980b407968eb778eb0b7a0c1a3c4d3e23bb528357f10f40dee3261de9fc21c634092a1506324fe9210e1e6755e93dbd469e SHA512 35d5c5b8ea61a09c95188acfb471651be3f026b2cfef515bf25bcbd14dfed4ec69393ceaf5bad316dd48532523f6b2b038778f958ec32f6f7d1ac304101f3c71
+EBUILD airdcppd-0-r3.ebuild 373 BLAKE2B 6aaafcbc08673949e8f2fbedbd5ce8fbbb2c1507ab74bfa32ab6c249526c13dd24b9a0295992d0b057518f55eac6b20e42676eeba6f144349e6e65ca9fd14af7 SHA512 4eea7545cf2e3ac1ed729de61b4fc10f870eddff85632cb73289b5fb1ae9c990b6ff8601d4990215d8f4b2b6a3dcbe2e062adab3c7509a4aad382990baa06cef
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-user/airdcppd/airdcppd-0-r2.ebuild b/acct-user/airdcppd/airdcppd-0-r2.ebuild
deleted file mode 100644
index 11aec89a5d06..000000000000
--- a/acct-user/airdcppd/airdcppd-0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/airdcppd/airdcppd-0-r3.ebuild b/acct-user/airdcppd/airdcppd-0-r3.ebuild
new file mode 100644
index 000000000000..595b5be3b93c
--- /dev/null
+++ b/acct-user/airdcppd/airdcppd-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5ea13e8240fe..2a6d727f5751 100644
--- a/acct-user/alertmanager/Manifest
+++ b/acct-user/alertmanager/Manifest
@@ -1,2 +1,2 @@
-EBUILD alertmanager-0-r1.ebuild 241 BLAKE2B a1e258d0e2115433c30fd5e27c8d6b210bdc7a7ed145c98acd13d342fe0c18efc32a92ace2ebbb877dde88fbc652666307264a1a5515424481011de37714ea10 SHA512 28ff636cb39ceb2d226d02ea4bb6d29b5f771a5b44197ec3ac339314fe3e7524012d2469e0ee36dfbb8e8e3142aba56a4cd280fcff53e9f7b0843dc4264a4bfe
+EBUILD alertmanager-0-r2.ebuild 241 BLAKE2B ffb3c4b59a6b94b5348d886215d0c387e0d81a70875ab587897d2019da281bc6775f855773f7706e79341d93bc2a08ca8d11a1249dbc13f044abe6f8454987ad SHA512 bacddc73d84fb9dc6890e83ab2479ff5d988dd9f72e27f58dcd032669a5497728a9bb4660951f9068c3c5025987ac9ed0d5d1c339e584a5f140c7f0955df7608
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
deleted file mode 100644
index 867ecaa994db..000000000000
--- a/acct-user/alertmanager/alertmanager-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/alertmanager/alertmanager-0-r2.ebuild
new file mode 100644
index 000000000000..ff85e1c7faa8
--- /dev/null
+++ b/acct-user/alertmanager/alertmanager-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 14aa9c73fef5..53b5a9c0edd4 100644
--- a/acct-user/alias/Manifest
+++ b/acct-user/alias/Manifest
@@ -1,2 +1,2 @@
-EBUILD alias-0-r2.ebuild 399 BLAKE2B 5773219de629f8f1830666d1433effa0a7bc79103dde0b9dc189136fa6ae3474ec1ddceb76fea08bd552539c7851d9ee33289e3db6e0922e0e9920a6407cef7c SHA512 94ad82ca56891c3e64c4f8968f3c2282d11e028448251ca8ac61b0d6587a875d4ffb553c2c0bffa628915e2afc518015c87618e41dfc53f96a0982997f783db8
+EBUILD alias-0-r3.ebuild 399 BLAKE2B 02b3f24075091183ecbf76a14ec049e36fd60f55ada9b6b8561eed7b9c8c7fcfa32171217cae75d4fb081126ecab6c3306fd02e636ad2809955ff5ce07558a4b SHA512 7cd08d4b9b4aefe79829d263b4ed080aa4a1bca249494025f497b2cc100f2b3e0de981fa427397062fd4139b1a14967a3a9bf3b0f889037b6af0de8c24d07063
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/alias/alias-0-r2.ebuild b/acct-user/alias/alias-0-r2.ebuild
deleted file mode 100644
index e02890f71c60..000000000000
--- a/acct-user/alias/alias-0-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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-r3.ebuild b/acct-user/alias/alias-0-r3.ebuild
new file mode 100644
index 000000000000..cb182ce2d9d6
--- /dev/null
+++ b/acct-user/alias/alias-0-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5ec87100211e..72ff24e950df 100644
--- a/acct-user/amanda/Manifest
+++ b/acct-user/amanda/Manifest
@@ -1,2 +1,2 @@
-EBUILD amanda-0-r1.ebuild 231 BLAKE2B bebf7a6053e2619e15f6d149ba6b8546b78da6d7bc6fbf8f58c0f579831495c65516f6ed9ef216d35bfbc512b351bd5ed18d3318c330c6a156344dc97e38210e SHA512 5aa86bc791980cf44b1c2b60519f118b2eae6b3bf1a5242f1d3cc5951f10d57fc80bbd923be6ebdddcc265ed0a1120c5fecb22260cc09c8261dba711e44666f9
+EBUILD amanda-0-r2.ebuild 231 BLAKE2B 6380c1681b103457162c39bb10116011a1077ddc6398f054692eb89c7819e245a5407ab3a3f992b9f7236cb674ab913dc8d109f3071f06584f284e832d2381fd SHA512 aba68d99dc44c803909acb52eb031af6444f4cff3ddba117efcb4c341baa382ba89100ae7934e7e791d969639c28fec337d72f3ff4fbf725adc27c1c69024b5a
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
deleted file mode 100644
index 0bfd30545fc1..000000000000
--- a/acct-user/amanda/amanda-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/amanda/amanda-0-r2.ebuild
new file mode 100644
index 000000000000..6ecb59f88e5d
--- /dev/null
+++ b/acct-user/amanda/amanda-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 427dcc3f4582..a39b0bfbc305 100644
--- a/acct-user/amavis/Manifest
+++ b/acct-user/amavis/Manifest
@@ -1,2 +1,2 @@
-EBUILD amavis-0-r2.ebuild 279 BLAKE2B 5db9c52f3fcbf2db90246c02e40cd3ffd93416c9162aea082bdf8233e2ede955c5e7fdd569d5fe8f75315468dcd660ddc3e098c88122135240061a26d8fdad60 SHA512 b34df0cc8fd7c5334cd030f67ea6a34a6cdb898ce4dba9c35bf30719c30019ccc5524968dad15f3dd99805d76d5af5e2cfa295a5d7734d0306ce831d3b364d65
+EBUILD amavis-0-r3.ebuild 279 BLAKE2B 9a025a2ba8276ade16cf7cd93386b9d0c6dbe896b77494fb49da96c5e13f06cc43fc4c1fac9d12c1c6c4180aca4f632601c6879d3d414336ea2e00ea0f715ab7 SHA512 a21a3e98c5e5b41b1bcaaef33262a051146d0f10a89609d2bcaf763f8832c9c60fbf773cae3ea2087be0294c8eb61dfacdb5009823fa562933608f80f7fa6b1c
MISC metadata.xml 262 BLAKE2B bdf88a65e34409c3f65204337925e14be06c13ab53571f864dc58309b72d50a9968dacf93110bd97acc5ae729f55207718d4ffd6ce321210e220bc6d57fc61a7 SHA512 9836f7da275ae8424e0494ee38313d62f90a180ed9fcbf7ff6391b3a5b4c3679f566668f0acd82ad0fe5f036e70a0e0a33b95df87475e4cbf8aafe1ae6974774
diff --git a/acct-user/amavis/amavis-0-r2.ebuild b/acct-user/amavis/amavis-0-r2.ebuild
deleted file mode 100644
index cea1b1964c03..000000000000
--- a/acct-user/amavis/amavis-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/amavis/amavis-0-r3.ebuild b/acct-user/amavis/amavis-0-r3.ebuild
new file mode 100644
index 000000000000..dbb4af5ee17d
--- /dev/null
+++ b/acct-user/amavis/amavis-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/apt-cacher-ng/Manifest b/acct-user/apt-cacher-ng/Manifest
index f91853619c14..7f5681d29470 100644
--- a/acct-user/apt-cacher-ng/Manifest
+++ b/acct-user/apt-cacher-ng/Manifest
@@ -1,2 +1,2 @@
-EBUILD apt-cacher-ng-0-r1.ebuild 241 BLAKE2B 33036cc27dc1d6b4bbae54bf66d47d5b41c46f0c98ea1814a63f3b22d2291e20ef66e5d39caf24c80f7799dd8fe06543b605ac34501b9b99a588568461fc4e2a SHA512 428e409cda8f2e7cad1c34540aa412a92c63ea66a9f2abc7ddbbf32e86b8c75c1e45a9cdcbf7a6dd7581644cb7a50b317298408ccfe2fcb042c480f365b022d8
+EBUILD apt-cacher-ng-0-r2.ebuild 241 BLAKE2B 293c0fc9aba1c27240a96df771b004a0ade37105d271c15f28887b416c18a310fee19a1a5b891d431abc492f821a33a1b2fd1010bfa2cd471e43197f2f97d039 SHA512 e5320b2b7c5472f67ab8d950e23325908cbd046c87de77072e3eeb640bb0e4a4b3df7c86cc183fbaee843ae28683ff237d3e7b6a68797a28c5a62b8b87e6b1ca
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
deleted file mode 100644
index 5ff5cdddbc60..000000000000
--- a/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
new file mode 100644
index 000000000000..7f085d9f75dd
--- /dev/null
+++ b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 954c24135b24..8fbdb7aacf11 100644
--- a/acct-user/argus/Manifest
+++ b/acct-user/argus/Manifest
@@ -1,2 +1,2 @@
-EBUILD argus-0-r1.ebuild 267 BLAKE2B 3435d446de84e1291a0cb967a9c9297fc0cab1066f152a6500c61f62815549c82b5b8fb732f660fb9e30450ae8324cd0d2f56865ab3f4de65255991000091bb1 SHA512 211bbb995e83ef8801acdc9ebe0d5d16578dbe9e07390e70a2c600196d7ca0e8727bc2feddf78d5d7f5211da611fbb5102c12271b215c7c3e29f7b53160fe5a7
+EBUILD argus-0-r2.ebuild 267 BLAKE2B 7e86bdf0d691140fd8bedadeb3fe0be6f93597a24ca7ab41d7e823ebd5ba977ee2116c180c06faaadb7e843302340857052ff533efb19265576aab1b8f831dab SHA512 6b1de6d69c37d3e4116981bfc06807c97b067992bd8f8ff135cc42651eb38840e034e477a893a1068b19a8e35e031b5b76e17b76e332d2711e1282190bd7b4a7
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
deleted file mode 100644
index 52b0c4b0a391..000000000000
--- a/acct-user/argus/argus-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/argus/argus-0-r2.ebuild
new file mode 100644
index 000000000000..a9154cf5a639
--- /dev/null
+++ b/acct-user/argus/argus-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5894e9960f64..6c01096f026a 100644
--- a/acct-user/arpwatch/Manifest
+++ b/acct-user/arpwatch/Manifest
@@ -1,2 +1,2 @@
-EBUILD arpwatch-0-r1.ebuild 251 BLAKE2B e44d696a212216d809a12cde634b920e5ab43bda3ff77e113758cf0c3023e9a066d6e183eaa1809ef3b1e65e816afac26ca126d86b693d24c360f797bbcefd48 SHA512 4f5af4432e8eb647ecaaca81d44673fea2857eafe6a46f08a5ba0f7bc1c2afa6f2cf2e0b57a1f6742f5d0786d29dc69b2835a0c57aff6dc316950a3730d10821
+EBUILD arpwatch-0-r2.ebuild 251 BLAKE2B f636d372db4c85d41c75ac3bf9b3393b42a2a8629a4c12cba905957e44288a06e5b96450a8c3e1862617a7764fd54ea708e2332a0e550b24787f843f2da0b904 SHA512 09ec13ea431807db13920e98432f45668671eb59a1ba188a4423b2d60fba4a8e467210cf7896a65baed841746d0dfefd44372964e36eac195cdd06c0a8187fcf
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
deleted file mode 100644
index e85389c061ea..000000000000
--- a/acct-user/arpwatch/arpwatch-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/arpwatch/arpwatch-0-r2.ebuild
new file mode 100644
index 000000000000..18b782da390f
--- /dev/null
+++ b/acct-user/arpwatch/arpwatch-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/aspnet/Manifest b/acct-user/aspnet/Manifest
index 904c3100a671..9501af5cbf31 100644
--- a/acct-user/aspnet/Manifest
+++ b/acct-user/aspnet/Manifest
@@ -1,2 +1,2 @@
-EBUILD aspnet-0-r1.ebuild 255 BLAKE2B b7b58dc7693a4ce0e18bf48efdf5de54ba1fc6bb458b910fde45aa7ab5f98d093f77437efdd1f73ab49cc448104b528c303ca3a222882c0924e05902fa868317 SHA512 10d25b8a83108ccc80cfed85cb513514218b27e24fd1291ea4c4e8b6ac983ef07cbedd4789d93420191e9221a614382c78fd7e0739212323d492e84cc28acecf
+EBUILD aspnet-0-r2.ebuild 255 BLAKE2B 69eed240397cd24c7e864b55fa9a052dc769a39f3a15b4c5a6595c6e8f606ca3f393856b2e4b4bc087c12eb6dd8c4d57bcafafe3f0c34a227650c78ce66f74d2 SHA512 6d2dcff7764f4ff53b91d3780e59fe04eb75e5c749fa68dc9fc32a9b3bc6444caf8667256c4e0e8761baa692f8c0a0446ccaa329d80917f0c76601852b6f0466
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
deleted file mode 100644
index 051c267d59f8..000000000000
--- a/acct-user/aspnet/aspnet-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/aspnet/aspnet-0-r2.ebuild
new file mode 100644
index 000000000000..308a7f8b6aa6
--- /dev/null
+++ b/acct-user/aspnet/aspnet-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 970e83fdf0c0..27572353f014 100644
--- a/acct-user/asterisk/Manifest
+++ b/acct-user/asterisk/Manifest
@@ -1,2 +1,2 @@
-EBUILD asterisk-0-r2.ebuild 239 BLAKE2B 16ff6ce6438b72cff3fdceb2af9982a2c47bb2f3bbcb3b008282a4b37d9ec2bfc568412c5404fb6014e329dabfc3c5a34ed23e92a1e9535461a7922bcefa32e2 SHA512 6cf9100cf7358f77761fb9acecbcf6d2d645eb5b6f65b07680406431a0c99220bfad447e1b572f0112d33a841918c3d291aa33e5201170cd01c8a78204044a11
+EBUILD asterisk-0-r3.ebuild 239 BLAKE2B 40aba722b033923c290aa15378a2c1cae8009471999da4cdb81a9d357d598ff3c9b8cf65ad9914e09c346900b6657c05965695d54a83353a528cee8e7bd0e4c1 SHA512 c3011c34a42b2d6b9f77ea2a7cba6e07aa886d6821ad9368abfddbbdaa1f2d64d98239fde7e2eae05aba465ea612cc9ae9ae605aa3e9591b5f270564605b82a2
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/acct-user/asterisk/asterisk-0-r2.ebuild b/acct-user/asterisk/asterisk-0-r2.ebuild
deleted file mode 100644
index 03d2d8b69fe0..000000000000
--- a/acct-user/asterisk/asterisk-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/asterisk/asterisk-0-r3.ebuild b/acct-user/asterisk/asterisk-0-r3.ebuild
new file mode 100644
index 000000000000..ca4cbc36d55a
--- /dev/null
+++ b/acct-user/asterisk/asterisk-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2e68213afe10..16fc0988f2d6 100644
--- a/acct-user/at/Manifest
+++ b/acct-user/at/Manifest
@@ -1,2 +1,2 @@
-EBUILD at-0-r1.ebuild 226 BLAKE2B e6f3f561bb4d5de906428f31679f2706fabb9484e8e530ca2c87eb3e1806ba5fb2a9a3b57ca5b6275186e217241fc964090a41eb7f665a658e8464e5d9d9bdcc SHA512 173fb4251a80ca206010b2d2e466818df05eaad6645ed350de8678dc1175cc50e0594a4318bff2ce44bf257c0d20147d6d7204fa78e4d3cda74ce00db55642fc
+EBUILD at-0-r2.ebuild 226 BLAKE2B 03c02abc7c282ec986e061296c34fd5a7ba82e37df49e5efc7b1e6c82f2ddb3c5503f398363ec202585b9bc4908f80513d760b4a987af3833f7dbb9a45f1fced SHA512 c38d98ffe96f952cbdee6f6ae0f5587a718432f862717066e5069082a7a1b5eb3fc18806ba5ff414ba916c630a51225aef653ce50b861b6f71b208ebdd6c0638
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
deleted file mode 100644
index 4ab9f746daa6..000000000000
--- a/acct-user/at/at-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/at/at-0-r2.ebuild
new file mode 100644
index 000000000000..a9c031480f43
--- /dev/null
+++ b/acct-user/at/at-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 56abcb3cdc70..b85f22c16e4c 100644
--- a/acct-user/atheme-services/Manifest
+++ b/acct-user/atheme-services/Manifest
@@ -1,2 +1,2 @@
-EBUILD atheme-services-0-r2.ebuild 239 BLAKE2B 3f45cfd09f6b26edca4ca1dec69ff6bc6fb7589e20041e985e4c61bff31345c2fb9d67199cb926f5fd2540ae2d0c08508054dcf14bec7bd6bcd4fd20c99573a9 SHA512 851d80df563f9a323b6ab3860148a68f18bed8cb1521ccbde0ea52ada0c0c853ff875cf5726a4889ddde35527cf9b5940713bc7dd6cce48dad3abee32538554b
+EBUILD atheme-services-0-r3.ebuild 239 BLAKE2B 9904b873c4b58890990b8d22926580d7150c8db9b27b646bc258141f24516c6231afb6d1a9511951e802d00fefc3b2750007ac924c068b3f21231f5106e740fb SHA512 bc67e61ff58c749791cd57fc7e6a313b24d32b31b1124a1eb84930c7cbe360cf05cca3941224da88faef257b46d9a515751a35068ba50c1a2fefe6231f99842c
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/acct-user/atheme-services/atheme-services-0-r2.ebuild b/acct-user/atheme-services/atheme-services-0-r2.ebuild
deleted file mode 100644
index ced19e695ddd..000000000000
--- a/acct-user/atheme-services/atheme-services-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/atheme-services/atheme-services-0-r3.ebuild b/acct-user/atheme-services/atheme-services-0-r3.ebuild
new file mode 100644
index 000000000000..e829bc73ca78
--- /dev/null
+++ b/acct-user/atheme-services/atheme-services-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7be4ecb6d4df..cc5098adc8db 100644
--- a/acct-user/automatic/Manifest
+++ b/acct-user/automatic/Manifest
@@ -1,2 +1,2 @@
-EBUILD automatic-0-r1.ebuild 236 BLAKE2B 05c81c7d98b6063259cc40fdf5dd209acbb26be1b0f912f45fc2fa73f0b7cd844e1675d20ad225d06df1762ee4f63e0943ec8be80d5f04cfd4ef1a6bc634bc4d SHA512 6c6ef4c25b039bdb145fc51e2d4fc3b990a196b594abe0cf63070afe346a7d36b6c6552cc64592a2fd8014d8815491cf40161e6ce3c477ecfa3b1b5a8e7a31b0
+EBUILD automatic-0-r2.ebuild 236 BLAKE2B f0966a239840f51de81c701bf26defd6ac2d399b532f3b73aa7301940de07f4bc61f70dfcf7cf33e37f2f8c6331d3005e7047e5dc67572b214431f57a64b0068 SHA512 8a2d36de7cdfc558bcc4e86d5cf710f1cfa09cc30ff068d5525f4102aee40987be3c5f86652b15270849887707fa40e10ba15540ab9525a2b4ee8890b20255bc
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-user/automatic/automatic-0-r1.ebuild b/acct-user/automatic/automatic-0-r1.ebuild
deleted file mode 100644
index 8972c4583c61..000000000000
--- a/acct-user/automatic/automatic-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=338
-ACCT_USER_GROUPS=( automatic )
-ACCT_USER_HOME="/var/lib/automatic"
-
-acct-user_add_deps
diff --git a/acct-user/automatic/automatic-0-r2.ebuild b/acct-user/automatic/automatic-0-r2.ebuild
new file mode 100644
index 000000000000..d1cbcd3efbed
--- /dev/null
+++ b/acct-user/automatic/automatic-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=338
+ACCT_USER_GROUPS=( automatic )
+ACCT_USER_HOME="/var/lib/automatic"
+
+acct-user_add_deps
diff --git a/acct-user/automx2/Manifest b/acct-user/automx2/Manifest
index 224ad50cc204..407a49176924 100644
--- a/acct-user/automx2/Manifest
+++ b/acct-user/automx2/Manifest
@@ -1,2 +1,2 @@
-EBUILD automx2-0-r2.ebuild 273 BLAKE2B bbb370903703717ad9bc6009f338586748d58cd235b06ac560e02b1307bb12e9f9fbe5a808a72e0108d3bfa2a0d696f90ce0534380055400ebb0730dfcc205ff SHA512 9237bf2926a3f5137c980a449f9f8ac7a591fd7ef2280021ee51fe69693673c56b2591923e77acf2d29b6a1ccc47fb56d591fe51b3d8cbcd3a8506928aba1769
+EBUILD automx2-0-r3.ebuild 273 BLAKE2B 377ba4d027b75245c2f3d87870680a71dee54f099c98e4e5be1b8cc14b384ff4582fb52f1108de42c274631b397472934fe0b06761b5991e029d94d938372426 SHA512 70ce0715051511bf7c9d73629aa8da4292d0cdea362413d81c1fac7298e7a9ae0fcc6d46ba1ab886dbe561fbf32b4525b6be2224bed13eaf84d3826ffa90e196
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/automx2/automx2-0-r2.ebuild b/acct-user/automx2/automx2-0-r2.ebuild
deleted file mode 100644
index c35accc7997d..000000000000
--- a/acct-user/automx2/automx2-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/automx2/automx2-0-r3.ebuild b/acct-user/automx2/automx2-0-r3.ebuild
new file mode 100644
index 000000000000..333c03217a32
--- /dev/null
+++ b/acct-user/automx2/automx2-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 cea354550c91..aa385a9c6138 100644
--- a/acct-user/avahi-autoipd/Manifest
+++ b/acct-user/avahi-autoipd/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-autoipd-0-r2.ebuild 240 BLAKE2B 6d4eefce8642b4d4b66a2c2fa9b8628259f8bd312ba12d3a59a21f86563db697edbcc15e120a1c89714ac37e25fcaaee56be014b472a9337ac74502177bc1e04 SHA512 59462015e8cb9d103ef2f1282c19bc3cea90cb583916ba70190aafcc4d4d83dbaf146565358addfb67bd6f07bbb8f3fa107d928f603bab2904a602c9f1f76271
+EBUILD avahi-autoipd-0-r3.ebuild 240 BLAKE2B f94ba947535f87283e06561f5cd945d821b527d70e67b67dc4bd683e4df967f6b630a438e66772b1a1e6c900426279a99219e224e330e3e7621a37db52d01a5a SHA512 ee1463b14a027eb999c5089aa45c8148b55962cdd53cf1b968b875063329736d90d830dd16fc75919d0508eb9b0a7c25d3c972656afc7cb96d900f4ccbe1e8cd
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
deleted file mode 100644
index 871a5fe4d3c5..000000000000
--- a/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-autoipd/avahi-autoipd-0-r3.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r3.ebuild
new file mode 100644
index 000000000000..3948fac9c6f2
--- /dev/null
+++ b/acct-user/avahi-autoipd/avahi-autoipd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3eb6007d9ebb..012c25f9fedd 100644
--- a/acct-user/avahi/Manifest
+++ b/acct-user/avahi/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-0-r2.ebuild 224 BLAKE2B ff2162870498a62c79ad9c42643829850069d23b0fce842226ba5fb085f3d75b60dcbcd70a3a299ddca080911f701401e54c7ca24e174bb1874f99a619a83e1a SHA512 0972c2e0e957eda3bbc9d1d97f74021bc4875fd0d0764b1f13b3911c05284fc8ecf8a238d69c956811bb73cb30a8cc31c3346f0ce607d2498bbfe933c2ec4efa
+EBUILD avahi-0-r3.ebuild 224 BLAKE2B 86eaa5b61a01b6b332bb0ee2f4ddfd77ca10c16379ff68e9775f41b22eebf1d6ffde06d5c69eb30549433d93437994c1e8ed087ba536d7f71f0c109b7542aa36 SHA512 e8cb9e0a7f750400fddfa748257741f2c729fe328fc18b54d3222653044b70242e6e78d794f679757589cd47eb10476f8bda97c1abac9678b193bb0521598f53
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/avahi/avahi-0-r2.ebuild b/acct-user/avahi/avahi-0-r2.ebuild
deleted file mode 100644
index 0db7ea604121..000000000000
--- a/acct-user/avahi/avahi-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/avahi/avahi-0-r3.ebuild b/acct-user/avahi/avahi-0-r3.ebuild
new file mode 100644
index 000000000000..55f2dc0e63eb
--- /dev/null
+++ b/acct-user/avahi/avahi-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 37976ab2c8dc..997f953e70c1 100644
--- a/acct-user/axtls/Manifest
+++ b/acct-user/axtls/Manifest
@@ -1,2 +1,2 @@
-EBUILD axtls-0-r1.ebuild 241 BLAKE2B e77b2483b4e25fca65e4bd05a3711862c4c0504e1e012f0fed0c85910886caae911d50fdbcdf71cb7115cc6bb0ac604be26792dbb89dab45c3ecfab74bedbfbe SHA512 d259a8f22e8d0ddf106e63a9fc92a4f9abb886fd8fbc70f80d15e470ef06d3c16a45a8a261ed05ba08abb93dd57dbad071235ad82b31c984cc68ccc482f75bba
+EBUILD axtls-0-r2.ebuild 241 BLAKE2B a6a16dbf7708780752f68ee6dc94418c59331203cd405f8e703b2fd31a1c823c5a11191e185ac823fa8050f9b9aacef3010c36bb996a530e54a0872bf640a6a7 SHA512 55e5edb9e203d8627e8ef222c3eceeaf5be98f7afcd04847076a89b9ef2130b57395296ba97e29903c59d39203f937e0f28263fb190016e9e9cba6d60e368c18
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
deleted file mode 100644
index 9dc12cc02cf7..000000000000
--- a/acct-user/axtls/axtls-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/axtls/axtls-0-r2.ebuild
new file mode 100644
index 000000000000..1823074dacaf
--- /dev/null
+++ b/acct-user/axtls/axtls-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4155eb47d044..874f5afc31ce 100644
--- a/acct-user/backuppc/Manifest
+++ b/acct-user/backuppc/Manifest
@@ -1,2 +1,2 @@
-EBUILD backuppc-0-r1.ebuild 310 BLAKE2B cc2520f496781482bfe988e6e1fa9efaa919727ee2fcd8119466fc4e5ed9ac1665506ba63453370af29bb461c324983df47a322f97719ba0f2ae374af98af48d SHA512 178ff63d1fc06010ebc6976c8267e2ea4e493e149a3b55e6aa039b1be201f2f311de87a3224e8b2fc2888d25c9dee86901c134d9f36de6b17e2568883cc2fea3
+EBUILD backuppc-0-r2.ebuild 310 BLAKE2B 01536e54f40888c8260e957b72ed7036f385305e12f4d4ddba3b9c8b75b0bb2304d6b47ca5892616ff97f08acb66b0afc3632e7fbde1fc79c88d3015d95279ce SHA512 c7fa22646e9814fb63bd522bb47c843a6d30a5b45934487cd0103a49ab015f175fb651edad2e37ca886e854217dc1a50c9b43b1be0af6754384b937d86973d42
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
deleted file mode 100644
index f5b1713025df..000000000000
--- a/acct-user/backuppc/backuppc-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/backuppc/backuppc-0-r2.ebuild
new file mode 100644
index 000000000000..de230cf45518
--- /dev/null
+++ b/acct-user/backuppc/backuppc-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7e8e544b53ac..76dee6ffaa62 100644
--- a/acct-user/bacula/Manifest
+++ b/acct-user/bacula/Manifest
@@ -1,2 +1,2 @@
-EBUILD bacula-0-r2.ebuild 295 BLAKE2B 901d056a5afb0c2c7f13cce381b9de0f98a9dcd059080cc0689761fcfb73944ef071ae3b170559525b903cb33d9ce97fc4f3b1e088a60b9c2b26da76bf8c8e6d SHA512 63ef67688f3328efdff6b51e6d11a6077e8bd8a474ebfe7003a0f3dd0d1d615b5b08975c652907636e5e550641b3f4c2d8df14b4bbd6ef19212ba222c3cbd663
+EBUILD bacula-0-r3.ebuild 295 BLAKE2B 6822e09e8c17fbb04736901a3cfe618941b9eaf3761aeca214a01e877bdae22b4c151a04a4d4ce79bd7c82198356120fbbcdcbd70fcbda63ede2e173aa03b072 SHA512 c5ac0df73eea4a1a31d261ec2bd6ec84dbf5aab7b3d65cc41d965111c9cb066faf9df92a6a726525af4ecbeaeb8e354661ffd72180590db2580e3f0f08c7c038
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/acct-user/bacula/bacula-0-r2.ebuild b/acct-user/bacula/bacula-0-r2.ebuild
deleted file mode 100644
index 4158074868d5..000000000000
--- a/acct-user/bacula/bacula-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/bacula/bacula-0-r3.ebuild b/acct-user/bacula/bacula-0-r3.ebuild
new file mode 100644
index 000000000000..56a6cf7b0da3
--- /dev/null
+++ b/acct-user/bacula/bacula-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e49433193a9c..47bb90fa970e 100644
--- a/acct-user/bareos/Manifest
+++ b/acct-user/bareos/Manifest
@@ -1,2 +1,2 @@
-EBUILD bareos-0-r2.ebuild 297 BLAKE2B d59bace020c8c76e2b7d76cd3783c3f282b8ad356764913c2f06a8a0e90f13501ce84098720f0d20794fc15ebce19eafb1ce8fc0fb2914ff6c672ffa63a767f4 SHA512 d68be10638c368765c1b0b67da06d37dd3dcef54dece234b6b7c29d36cda1c49ec5675ef1cb23d66dc46f6356e1232eaae1ffb95b0838d30ee9dc45c5b0eac16
+EBUILD bareos-0-r3.ebuild 297 BLAKE2B e30abd9878c629d30f837ef2bc388ba4fa3e52b18904c00664a9309eb53d1fbc19e475157d6f326142bb76715e5082fc87323e48d05e1d0d0be02a14dd37897c SHA512 df6d37d5b6be74224ba586ecc18ab4fd0c6077fe42c576c918ec5fb42cfaa474fa20f03bd49cbeea24c474514c4a8d827732eb7ef031ddbc2dbffb9b66999eb5
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-user/bareos/bareos-0-r2.ebuild b/acct-user/bareos/bareos-0-r2.ebuild
deleted file mode 100644
index d466e8c22273..000000000000
--- a/acct-user/bareos/bareos-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/bareos/bareos-0-r3.ebuild b/acct-user/bareos/bareos-0-r3.ebuild
new file mode 100644
index 000000000000..3071a988da67
--- /dev/null
+++ b/acct-user/bareos/bareos-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ba12db4663aa..29f9a300a4dc 100644
--- a/acct-user/beanstalk/Manifest
+++ b/acct-user/beanstalk/Manifest
@@ -1,2 +1,2 @@
-EBUILD beanstalk-0-r1.ebuild 287 BLAKE2B a0d428189c5eb30b704db646d48d5cf68ad0732139e2cf4d3c2e4bc86d9173758b0b66c3b133e77fb6dc170b5a19e81952a0de6e5b0dacbbca9268bb3d117e99 SHA512 d31b24fd8f2f8e3b63adf32ca7a8bd869f328a0d9b029258a0c48e3a2188468625f2dbc78e590f0eefe456d4e5f34d2560c51b946252cabf9b698b85e32f3189
+EBUILD beanstalk-0-r2.ebuild 287 BLAKE2B de3c5dcbc46fa28c8dfae07cf7adf98d3a42e66ee1c92916b44aeb95a93e8c31291bba7ed694b2042808e68b88b7d9e7f9261d409930db684da6b3c8d9f91c7d SHA512 f097ddd9ac2db747318f13b1a5f9d6e4a8cf4f87363f9d507e6aaa05b5359e66121b03058d30d923b179b4efe61ede01f6b22e5048e197df8e893048db6d1bdb
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
deleted file mode 100644
index 9aa2f7e50a26..000000000000
--- a/acct-user/beanstalk/beanstalk-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/beanstalk/beanstalk-0-r2.ebuild
new file mode 100644
index 000000000000..93e982b2ab46
--- /dev/null
+++ b/acct-user/beanstalk/beanstalk-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c21db147a54b..ea5717997d21 100644
--- a/acct-user/bedrock/Manifest
+++ b/acct-user/bedrock/Manifest
@@ -1,2 +1,2 @@
-EBUILD bedrock-0-r2.ebuild 257 BLAKE2B 73fccb05968b0b40cae7a171b646bec253c47a61afa884b23f53d8f8069592587784428eeeefdbdf8e4aa5b36d51f9aa4cd9a0a9dc8fa887a37c6a51fb0e1355 SHA512 2470f6767380a250912eda1e96baba67cee09d1b1f7eb6a1084e689e14ba336ea17ae3e289685d6277327c602b37ae368fde823f6847732bf6bda0bcf6ecb680
+EBUILD bedrock-0-r3.ebuild 257 BLAKE2B f983898c6828fa65f890fc4e06966e3301aa60ee82a7ab568b68c113c4141f1a814f91acca0e4fc0b582af585ea7b741501dc5e3a2ff22a81defbdf505bbcc09 SHA512 e6313394fd52c4f8995599b9bd9f3f1f86091388d2b0dbcb3d5de7e66dfe340daca1e7472a5d343b5b86b24905a67eec2b521ef6e06ef1d74830e2fb58bc4155
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/bedrock/bedrock-0-r2.ebuild b/acct-user/bedrock/bedrock-0-r2.ebuild
deleted file mode 100644
index a96d60d2e1d0..000000000000
--- a/acct-user/bedrock/bedrock-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/bedrock/bedrock-0-r3.ebuild b/acct-user/bedrock/bedrock-0-r3.ebuild
new file mode 100644
index 000000000000..3a64571e7623
--- /dev/null
+++ b/acct-user/bedrock/bedrock-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/bind_exporter/Manifest b/acct-user/bind_exporter/Manifest
index c99c3e6f0de0..18fe09a3107d 100644
--- a/acct-user/bind_exporter/Manifest
+++ b/acct-user/bind_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD bind_exporter-0-r2.ebuild 241 BLAKE2B 3b3a129b4ea853bed61d935fe6fee2f5e4e4080124b17bf45eac2e1ceef5d9743e93f2f5cb6e18c0140b794673dc3b8b8e3cb8102939ea8d908738953220cc6c SHA512 4dfb630c67997b68cf51efd21040f2a88c745a33cf2421c95b591e72ff3313a556008ce9fd4cd6cc729a82325c43ca5e6853668863a083a364899125074e499d
+EBUILD bind_exporter-0-r3.ebuild 241 BLAKE2B b70389083d96f3cbb29332da54474f624de1ecf51f916658d27d447972f162aa61d6bf0329b94e261cae0c5b94d728138b53155579f734a67d5c489ce5fd3899 SHA512 c532abbe97320d35bbc9d89d7be4eca0d5c796e1f32f2ff98008c14f04016b6a84bffb161cbb1c26033ceb6a3e0893f1bc3050f73a9569bcf38f2410c233d556
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
diff --git a/acct-user/bind_exporter/bind_exporter-0-r2.ebuild b/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
deleted file mode 100644
index bfb761c4b06a..000000000000
--- a/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/bind_exporter/bind_exporter-0-r3.ebuild b/acct-user/bind_exporter/bind_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..0d6dd3bb2e87
--- /dev/null
+++ b/acct-user/bind_exporter/bind_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 55eae8d659f4..3febfd51dd26 100644
--- a/acct-user/bird/Manifest
+++ b/acct-user/bird/Manifest
@@ -1,2 +1,2 @@
-EBUILD bird-0-r1.ebuild 283 BLAKE2B 0af4f2467cf792292f423cda9b11923f78a09cc794770278a3589a0afd0e7ab2310d66e00d72a6d5816a35005e0d966e0d4ad3bbe8f5109c5d71c465e6d60be4 SHA512 a6baaba913725d87a3a25ff3e03ef9d4db4377a206214bdc21a1f9a9eedf1bfe7cb662a2bd6666a23d1ebfc713ec5c2a7347f812bdc42419981c932f9e8a7af4
+EBUILD bird-0-r2.ebuild 283 BLAKE2B d87e46e34b2a5780c36632d6718f311c8b87fa4b759cb67edd69da66cd2a3c5f690e2d8af0783576533de0272e73b2866dfa171edb8eedf04b2d1fd10d7d218e SHA512 578b5788b8109adc02e091f2ef81edeca11ab5e3b0cfc37a08e7906bd3403ec2581ce79b1f92f6c48d4ff1e1eee783ecf28545802a9450bed2dbbd2dd134d753
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
deleted file mode 100644
index fd0539f6f221..000000000000
--- a/acct-user/bird/bird-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/bird/bird-0-r2.ebuild
new file mode 100644
index 000000000000..1ce8458c6ec2
--- /dev/null
+++ b/acct-user/bird/bird-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f60c6d6ab02d..bc193613f6fd 100644
--- a/acct-user/bitcoin/Manifest
+++ b/acct-user/bitcoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-0-r2.ebuild 246 BLAKE2B a72e59e340b154f1612c6959827d6c565e4e5593ad28951438a4e052b6b84d1f1d03bc6ef1d10b0f8d4f1aa5c1381aeb14491fd6356399d3979635a28709feef SHA512 564b8ecbd26f0cb370f7955454580aaab7c5cf6710609426f4a2fe9312af4663d5217dae12749308be9505a7e17671d43d29338b1ab1973a3a0cb65c3fcc750b
+EBUILD bitcoin-0-r3.ebuild 246 BLAKE2B 5c8e496e345718ca0418e7c2b8820db0c93101a0003f29d21ce05f008aaf6f248a391b7b8a041d666979945fead3b86d08d4a3ec36763463d06693d693c13a25 SHA512 41f7623d30c99b83ff6f3861104e3fa1708eebaf38301453867d1f5d9054faa517caa96d459f3dcb5283a0e904c634b0b589cf045e8b8d56541a0bb5573379cc
MISC metadata.xml 405 BLAKE2B 3eb2845f129f9c7ece1f374a0bef8eeba29614c94e714afa75d9193c5238539d48de1c761de7568eb7a1e3497fc8afc0e876be8339292e7e020d14531b963a59 SHA512 2ef8d9eb38092901821728d198e438c169f57cb38772267e62dc352ec7e35586a578802492682705fcd1d387ef9987344ef7d501d254d2743a35c9f0692d3f75
diff --git a/acct-user/bitcoin/bitcoin-0-r2.ebuild b/acct-user/bitcoin/bitcoin-0-r2.ebuild
deleted file mode 100644
index b19975c4a120..000000000000
--- a/acct-user/bitcoin/bitcoin-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/bitcoin/bitcoin-0-r3.ebuild b/acct-user/bitcoin/bitcoin-0-r3.ebuild
new file mode 100644
index 000000000000..c9b0f036c573
--- /dev/null
+++ b/acct-user/bitcoin/bitcoin-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 51f3cbb94146..a9b4002c5268 100644
--- a/acct-user/bitflu/Manifest
+++ b/acct-user/bitflu/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitflu-0-r1.ebuild 275 BLAKE2B fe459f0f4b60c81cf2adf3bae2998b70907c907c6d27a5d479c8afa539196f795c8e8ae6579e4d520069b700c68dfa5392f7a83c874370f0397b0a518193a7d7 SHA512 98372ebce121fb91f5bd0957fa9677d99be013961186e457a2acaa914d927aebbdbc59325bb2a8eddd98c13c778750acc2212bdc179d74f259f30b2429c76228
+EBUILD bitflu-0-r2.ebuild 275 BLAKE2B 6c98345f3d71a7f74351264d501a9ab3349dc3ffdfff35d9dabeaab523f59b6e01a5854b3ad3be23ed0d995a01ddfd0d5266be927ca41d94fa31d9c4fbad48ac SHA512 7b8bb8206251bf5f31bf9d0cbf92e2cb98a8c10c2ffa4cc23c7499545e1c2b51065d95a59aeb3600bdbab2057b374abd57be9eb5f3d3eadbd45dfca93f5d1c8d
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
deleted file mode 100644
index 239af8cbb540..000000000000
--- a/acct-user/bitflu/bitflu-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/bitflu/bitflu-0-r2.ebuild
new file mode 100644
index 000000000000..d94cb81ba2c5
--- /dev/null
+++ b/acct-user/bitflu/bitflu-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b68c96eed8f7..fa2304b494a6 100644
--- a/acct-user/bitlbee/Manifest
+++ b/acct-user/bitlbee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitlbee-0-r2.ebuild 229 BLAKE2B 72b159be9a00e774fea8350d608710571836c4474f214cd17028a1e6c7311dcd7c7a66dfb95a51c0715a5c0abc01592eab3c67ff0b794804dd7517bef29564c7 SHA512 4165e0296eef6d2345d8bcd159a7dcaa95036d956db3564abb37f5c91d0165a717a2c2c4ed7136d27cf8f92e6d3c3dcc1c8badd5eb20bdf26717a0f4db6808fe
+EBUILD bitlbee-0-r3.ebuild 229 BLAKE2B 9f696e7f4c2d14a2960d1256d2216bfb7bbcbaadb123849b442b9dbdbad7847a240f376f2006d3e63e5494111b14925e270d54c62fc0b624df25a0b6293bd0b1 SHA512 468452621e819604819d383ead07597c6db0ae1d2e795a639eef8003e7e2ed214579fa1d19dd0d8de87851f7337a3c46d52702ef5a341dc71a589654e05e3ac7
MISC metadata.xml 246 BLAKE2B 10aefa483b0d2464cc54717a1e00c5474059fb01c51ef76d09d2618a3f22d0bcf12d67d0bc625757697d7cc07ac6516718fa254e67163410241794b2417d7417 SHA512 e05bd4e45e37c5246d1a8d144d348aae094aa7ffb63651222eb91c47f6e08bc84d6cff93d3622a218cb9184fa64dee598a1a9041853321e417afc293b6135f04
diff --git a/acct-user/bitlbee/bitlbee-0-r2.ebuild b/acct-user/bitlbee/bitlbee-0-r2.ebuild
deleted file mode 100644
index 7a1497cec9eb..000000000000
--- a/acct-user/bitlbee/bitlbee-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/bitlbee/bitlbee-0-r3.ebuild b/acct-user/bitlbee/bitlbee-0-r3.ebuild
new file mode 100644
index 000000000000..a19ceed8b819
--- /dev/null
+++ b/acct-user/bitlbee/bitlbee-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 dbd21e96747f..094808f53d81 100644
--- a/acct-user/blackbox_exporter/Manifest
+++ b/acct-user/blackbox_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD blackbox_exporter-0-r1.ebuild 251 BLAKE2B 5b515ca8425aea745e83bf20929fa5280d8f2a675d39be197b46087d78d5194a9eeef76d2b26a048efab31c0edea9155cf550a13e114a3792f042509bd071bbb SHA512 c7099232d5cfedfbdd4539d0e9b802d46c14ea7488eb8659ae748a072929d6a8d5e30255c6cca1a1d719d133892bb8b73fb826533dcb15f17dfac93738da92dc
+EBUILD blackbox_exporter-0-r2.ebuild 251 BLAKE2B 5a8079281d8841f9f7dc372407d39e92dc6e2b40541a2d8bf702e381ffcce1fad397091dc0fb15758f6bf03b6a0723aba6f92c35e2a3e8c60b7c596de5568834 SHA512 730a8b23cb47bdf968a7e92c37d153dcac14a8be88879674ac6c66009548f9ad4cf332f70645882be95c41424128a81a16d58e46ab420941dd917782cd3419e7
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
deleted file mode 100644
index c4ac2c198c67..000000000000
--- a/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..56973d4f1e9d
--- /dev/null
+++ b/acct-user/blackbox_exporter/blackbox_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6b33eb34a11c..7665938084dc 100644
--- a/acct-user/boinc/Manifest
+++ b/acct-user/boinc/Manifest
@@ -1,2 +1,2 @@
-EBUILD boinc-0-r1.ebuild 296 BLAKE2B e9c0dcee6b89f8a607e12385d89f18316757a8c32337efad1475a2684aaf85e0511179aed57ebf9c47586dbf8fc3c1d7376886f524af3e9ed94c3b5b02dafbc3 SHA512 61d690938af6bb9081cac559b72fb2447f84d2e87dd8ffdb09a77c804ccab89358ea9a46914d2a7a25e8d948e0f2331af16a261e9697d9a8365c220db0940dad
+EBUILD boinc-0-r2.ebuild 296 BLAKE2B 7eddbbafdb5977975ac98b6537dd1d71a331b98b3344ca4c6a4485589f034f9c92cc1e5dc2e279c2e5e7a90f31265797b4c80e60382b7b182588b1de435e75a4 SHA512 3e8e87bc966fdf03f8594bd1564026ed4e36855f7a9035652911ecb9ad99480a3cc6e3613f5b6967aa0967d85df08d0b725df445e3a1afaa026336cfcf2fe85f
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
deleted file mode 100644
index 5ed25f7d5ffd..000000000000
--- a/acct-user/boinc/boinc-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/boinc/boinc-0-r2.ebuild
new file mode 100644
index 000000000000..9ddb6ae7ec09
--- /dev/null
+++ b/acct-user/boinc/boinc-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a15f42a43213..bed6828df41a 100644
--- a/acct-user/brltty/Manifest
+++ b/acct-user/brltty/Manifest
@@ -1,2 +1,2 @@
-EBUILD brltty-0-r1.ebuild 307 BLAKE2B 1a7b98d1e8a4cd6295ac977c7f4a06a74b0f5d05ff705b642f9818a007ed6aedc8aa38bf4945facf08de7d7d5f0fbf5624a9489b13262fddaa060f7d7f31872f SHA512 eec326ac476c0e420c9afd0b3d03e6c6df7567c89f1a0434ea119678439e03bc130c09c9260765f6e9311736511690c35dc5801876e5db057ae76a6384c441c5
+EBUILD brltty-0-r2.ebuild 307 BLAKE2B e2991897061bef8942d40ad03fa4f5a7a7e4752ba2cd4a115cc4a1560a42874b4093029cf36c8b838b86925d22aa7675c9fc4ed805095f41bb5b4e9705ec9b8e SHA512 3d7edbd1c97555eeb049900eba8b31b68d02001a1b66e03bc98d91b1937f6cc1c3f7dbbffaf081afc3fa8715ee5346dc1eaa9374a66562781dfb505d8dacd178
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
deleted file mode 100644
index 5ec59c18540d..000000000000
--- a/acct-user/brltty/brltty-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/brltty/brltty-0-r2.ebuild
new file mode 100644
index 000000000000..0e55de6d70c9
--- /dev/null
+++ b/acct-user/brltty/brltty-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f0d2be84371d..0ff970afb9f4 100644
--- a/acct-user/buildbot/Manifest
+++ b/acct-user/buildbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD buildbot-0-r2.ebuild 243 BLAKE2B d472f563118354a2dfd412730b242010691e56da5ca103ce08ea2e9a2ab377f5a0bdde7a0892cae0ab5a8b103a4b8685cb98132564e5d639601693ca506a742c SHA512 a08863d678c3eceace1bc8df737ca9eefa36d163d7d770fac7198e5571d710bc20bdeb4b24b91c19de4a65e14335cbcbcecf2b9b2c9096a762c5fe8002ced1e4
+EBUILD buildbot-0-r3.ebuild 243 BLAKE2B a9e959ae82d4dfe0af0fbfcd729b142a2235504b78d14b4e98cb012f222e32039adf5882592791fadaab4f0ec3cfa867a85432840dfa76a900a2f02d42fc390e SHA512 8d73a0d80f2c6a9b495b443bd317e49b91130ed9e6ef701a6c430113c926588f7d8e9205e8527ac832d2ace4827f923cbbe663e7ac3fd21272168469eeb020c4
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/acct-user/buildbot/buildbot-0-r2.ebuild b/acct-user/buildbot/buildbot-0-r2.ebuild
deleted file mode 100644
index 3ecc7b0a3f19..000000000000
--- a/acct-user/buildbot/buildbot-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/buildbot/buildbot-0-r3.ebuild b/acct-user/buildbot/buildbot-0-r3.ebuild
new file mode 100644
index 000000000000..f12b5ef50cdf
--- /dev/null
+++ b/acct-user/buildbot/buildbot-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6b2f129ece12..cb98f0c6d6ae 100644
--- a/acct-user/burp/Manifest
+++ b/acct-user/burp/Manifest
@@ -1,2 +1,2 @@
-EBUILD burp-0-r2.ebuild 245 BLAKE2B e07331e4975a684a86700dddc2997326c7e6c895c56b06340332a37ab08b191055c00647f81b431dbd056c15d5b3717941f37c1668b99fbfb8094c617cef6f4b SHA512 5e09a914d8705a3bada323b4d9b957797f419c3acec310285a2d28d6760eaa51171ff8ac1e7ab2d70d036aa32af14b908511a5221026f352b1672a82d560d02d
+EBUILD burp-0-r3.ebuild 245 BLAKE2B 720d4dfa31efaa91490b6e29ed8c8fdcea9d57ed214fd6c488a4d309242d41003ae5b09052bfec44bebac570387131687fc64c099932ed38a854ad5650069c47 SHA512 00987a5cf451357d56d64793de89e99a04bf8b845094c3afc1bf73aa5d6c22c2cc5d6f110e4a91fa98c076d4f6b5b842c8fe77c85fd9909bbe18c9769dcb8f23
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/burp/burp-0-r2.ebuild b/acct-user/burp/burp-0-r2.ebuild
deleted file mode 100644
index e39e2f77d21a..000000000000
--- a/acct-user/burp/burp-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/burp/burp-0-r3.ebuild b/acct-user/burp/burp-0-r3.ebuild
new file mode 100644
index 000000000000..743316673dff
--- /dev/null
+++ b/acct-user/burp/burp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ee0a648c6c05..3a441dbf358a 100644
--- a/acct-user/burrow_exporter/Manifest
+++ b/acct-user/burrow_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD burrow_exporter-0-r2.ebuild 259 BLAKE2B aa7e14b0bd0ab64d8488bd52e41d804e7a3e3beea7feefbfa607fe0bb6ea15fe05eb1902ac20f5c327649e1e40da0a725c60db23a318e80c5c5b07f3fbf49bba SHA512 278fa1eb0be53f6232b61884bc0b556cef41d57f3127e9caf5b79a08ba065a8f0a4cbb5d495fed3ddcd8a1d046e65f942169aa531b37d6740623fb0547a70b96
+EBUILD burrow_exporter-0-r3.ebuild 259 BLAKE2B c3449919bd1744bf13a2ee83e99e55511c4f21a6788a712f7fe91ba2daa7af10a17ea0079f79e85d1e5b2a0da84d74d9ee2b68e772167d4ebe9d1344ec532b26 SHA512 ba7f682ad54e80fddf0afe40b26510b7034d5e6f985ce28831bdfe2ab4f1d499d87621c0736fd209ad18e62b5bfbfb3fbd24a547ab3fe5e137e2dfd62eae5f4c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
deleted file mode 100644
index ef0c97a228f5..000000000000
--- a/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/burrow_exporter/burrow_exporter-0-r3.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..a73b9505ad76
--- /dev/null
+++ b/acct-user/burrow_exporter/burrow_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 1839ed8464cf..f97b3ca41df7 100644
--- a/acct-user/cadvisor/Manifest
+++ b/acct-user/cadvisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD cadvisor-0-r2.ebuild 231 BLAKE2B 909213ea3500ec2adeec3bccaec0de0f358bef7af5c4f15fb2fec187c78404ed29f63aa4bdefc005e49b487f0e72704b50a269a1e79d8f9465daaf8951de7ebf SHA512 a4962b54fb574b05f446fea733e525947dbb474f8cfe4f55d73db9ef0381d76be7597ec2fe0d94c32a63e3cfe50158e9883dd88108e90ac214ee95cb8c1069e8
+EBUILD cadvisor-0-r3.ebuild 231 BLAKE2B 0787ff1fcc86e4d2fdb951f073a4b23cc1c5ff505b3530789624194ad6626312701e5a2e1d22ad7595c35b3d331cf33efce341d8d1e1a0c149651eba635a9257 SHA512 83827af6456b6818ddb5c8234e23f42b0ab961ae6164b8de01012a8381751f43a2916e619f70334335d24f19effefd56cdace1f102c8114cdf84e28bed40055e
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/cadvisor/cadvisor-0-r2.ebuild b/acct-user/cadvisor/cadvisor-0-r2.ebuild
deleted file mode 100644
index e4fbf56e0e6c..000000000000
--- a/acct-user/cadvisor/cadvisor-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/cadvisor/cadvisor-0-r3.ebuild b/acct-user/cadvisor/cadvisor-0-r3.ebuild
new file mode 100644
index 000000000000..b35737136f19
--- /dev/null
+++ b/acct-user/cadvisor/cadvisor-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b0d212d33413..85aab8bdcef6 100644
--- a/acct-user/cancd/Manifest
+++ b/acct-user/cancd/Manifest
@@ -1,2 +1,2 @@
-EBUILD cancd-0-r2.ebuild 251 BLAKE2B e103122428a0aabb79292bf54604319adc59921e084c4ea53ed051e9ae9e2479e71841e7ba0419b294d0674648fa56134f74309dba3b451bc01ae136f6e5330e SHA512 988778d5b60a607b878aac3452fea2321e63a15df853f3c6beba9e2b825b1f6a46f359fe5015c3e0bd74946a4ab652cd3275f116f205538fe786c53d2962b4e6
+EBUILD cancd-0-r3.ebuild 251 BLAKE2B ce1f878953dc8873b0612b973f097d283cb9e45418f799a2c4d711e4d2d5fd6143fdd61c8c02e75b20e3372cb40e1a34b3d14633aa9dc94aba4afdadafdc4ec1 SHA512 c29a96ee450ca4553293aba089abb3740cc91f6617d513616c1a4c306e57f801871463b5dadf562249f681499db1c10dc556fb3e2d529723393e5ca30a296560
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-user/cancd/cancd-0-r2.ebuild b/acct-user/cancd/cancd-0-r2.ebuild
deleted file mode 100644
index d5f370bd4a36..000000000000
--- a/acct-user/cancd/cancd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/cancd/cancd-0-r3.ebuild b/acct-user/cancd/cancd-0-r3.ebuild
new file mode 100644
index 000000000000..70eb5f81b16d
--- /dev/null
+++ b/acct-user/cancd/cancd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 29e1bf6bcbe5..160103373319 100644
--- a/acct-user/carbon/Manifest
+++ b/acct-user/carbon/Manifest
@@ -1,2 +1,2 @@
-EBUILD carbon-0-r2.ebuild 242 BLAKE2B 06d9d88bc1c90a67c53119d317f94d94225322865358e482cc24609a98116b6f641412438db874ffa412536d5b2032bb15808a6a330f2d1847d7e0e19cf72645 SHA512 687d5ed988728e662f8a78fa1651412a2ec91f552c9ceea3f72644a0dc86bda1f8ebaaf81449bb639a712157619157bbb95372a71047cc2f85c7c5bf4d635169
+EBUILD carbon-0-r3.ebuild 242 BLAKE2B 87eea7486456c8ae3e22a38fae6e0ac18da0a01eef8264b9bfe47c2ca50a482e498d78243efa81a7ce55895a8c8a092f6caf11d9fc33638aed96ca685a3eab3d SHA512 79670b26f3821e60706add9b0a55ce10156156e5fa3ea3804561e6e95f8361ba8891626cac800bff7db70492d7efb508997ac5a167cbb38042b1f842f96a4634
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/acct-user/carbon/carbon-0-r2.ebuild b/acct-user/carbon/carbon-0-r2.ebuild
deleted file mode 100644
index c7145d21b9ab..000000000000
--- a/acct-user/carbon/carbon-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/carbon/carbon-0-r3.ebuild b/acct-user/carbon/carbon-0-r3.ebuild
new file mode 100644
index 000000000000..ad1b54f6209f
--- /dev/null
+++ b/acct-user/carbon/carbon-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 567638d14874..95bcbff13bb7 100644
--- a/acct-user/ceph/Manifest
+++ b/acct-user/ceph/Manifest
@@ -1,2 +1,2 @@
-EBUILD ceph-0-r2.ebuild 253 BLAKE2B ff583dc61d2da7c33b829ea708680f88c867f216af7e5ad243538a6a2dde8cbd78c7f5dbe895cb2f5eab5f41b4e22e0e52d0f91c766820ddc046e7d7620647f6 SHA512 e54c83fe130736888c4a24ab3b31045ffe2c5c5e7fd04f3d9df359e9c04cfc0b936c1b3330ded3949e60c21b974e030a0b58bde9603a31613e0b92441ec87e73
+EBUILD ceph-0-r3.ebuild 253 BLAKE2B 6ad76ca7730aa3bab68b0d4dedab4e3f12e4ff6df42cca3196b01a931b1768fdf0b29ca9849c0c9116f8f5ac06e00818cd5c54a19d95559fb0e0da1cd92e5e5f SHA512 a217bfa4daec9ba0a25f4b757eae3875a0f478b69fb8b45c022ec846ad1f06c08e399630dca21d0efe0e351745b19dde2ec732c1ee1c694430a8cc8e5276871b
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/ceph/ceph-0-r2.ebuild b/acct-user/ceph/ceph-0-r2.ebuild
deleted file mode 100644
index 56098366e894..000000000000
--- a/acct-user/ceph/ceph-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ceph"
-
-ACCT_USER_ID=267
-ACCT_USER_HOME=/var/lib/ceph
-ACCT_USER_GROUPS=( ceph )
-
-acct-user_add_deps
diff --git a/acct-user/ceph/ceph-0-r3.ebuild b/acct-user/ceph/ceph-0-r3.ebuild
new file mode 100644
index 000000000000..184428e6057f
--- /dev/null
+++ b/acct-user/ceph/ceph-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for ceph"
+
+ACCT_USER_ID=267
+ACCT_USER_HOME=/var/lib/ceph
+ACCT_USER_GROUPS=( ceph )
+
+acct-user_add_deps
diff --git a/acct-user/cgit/Manifest b/acct-user/cgit/Manifest
index e9e57b6fd462..06429e1687e4 100644
--- a/acct-user/cgit/Manifest
+++ b/acct-user/cgit/Manifest
@@ -1,2 +1,2 @@
-EBUILD cgit-0-r1.ebuild 252 BLAKE2B 063656fc6110180fb3f1c7cf3b734c5c16859cf2b6aa3f760a5f48553e8d01d9080056991817f95d44e40dd966edcb370eceb92a2b21f988ad951249d1b63899 SHA512 43449043a699d441e4ef448e3888242c02f2cae7e411e784c06764ff158bbf4077d3cd9db01cb3a914685b9cf463d4842cf84bd076a31afc5c16582afb14b96e
+EBUILD cgit-0-r2.ebuild 252 BLAKE2B e98a73ae05fed05883ba3b9d5cc8ad228f0b86045219421a54b8018c5f3dba2147e4853a67a052a587e81c1f7e1267b4704b6e62c8a6a28b2029d60665ade85a SHA512 331b679d41232fae65f4a38cfc92d8a932dbcdbcf166023a01d1224e3ca25f18be8a44ffab31025708153bdf3a21bf2f5c3eae8d0684593f308350950b189ebb
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
deleted file mode 100644
index 24d621614f49..000000000000
--- a/acct-user/cgit/cgit-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/cgit/cgit-0-r2.ebuild
new file mode 100644
index 000000000000..0c1eeda79c83
--- /dev/null
+++ b/acct-user/cgit/cgit-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 00a56e4b1876..dd1e847e5daf 100644
--- a/acct-user/chronograf/Manifest
+++ b/acct-user/chronograf/Manifest
@@ -1,2 +1,2 @@
-EBUILD chronograf-0-r2.ebuild 270 BLAKE2B 5ac9d2bc3a77534bfa271b9171a2d7e2c2c571c40ff129cad3d86394cc6c33c3d2259f841ba51cfb630a251afceec9e47d0c288f9443a04f66a771654d72a61d SHA512 3a6617833da974722167872627436a6a076ea50b369f2aecc254b05ec88af43a3e5d24d1603d07c56dd8a82550002a43e3d7f8e1597302e17e0f6b34f4b30528
+EBUILD chronograf-0-r3.ebuild 270 BLAKE2B edb6f2dfb414647618a56f805134658813ef182ebf3e381f4b96e1cdcc52fe9b9817ecd3c259d4b151efe10d346df2aa1386c0e57ad02ed4c34bc3cef05a9eac SHA512 99a11a4fcd2651a797399840a4219f33cf08bd5be02b134649cd24a674d30fce31a3135218d4503c33249c4ef3b17d4d3004424cf8e7343925a333b8ac179537
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/chronograf/chronograf-0-r2.ebuild b/acct-user/chronograf/chronograf-0-r2.ebuild
deleted file mode 100644
index 825dece24629..000000000000
--- a/acct-user/chronograf/chronograf-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/chronograf/chronograf-0-r3.ebuild b/acct-user/chronograf/chronograf-0-r3.ebuild
new file mode 100644
index 000000000000..05d56b84f770
--- /dev/null
+++ b/acct-user/chronograf/chronograf-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/clair/Manifest b/acct-user/clair/Manifest
index 605b5209cc51..4eff19669d69 100644
--- a/acct-user/clair/Manifest
+++ b/acct-user/clair/Manifest
@@ -1,2 +1,2 @@
-EBUILD clair-0-r2.ebuild 225 BLAKE2B b56a855acfaae1e1f08d0ff9b55aa9676c0dfd7d47dc32d2cfad356fd8fe9e083d30c1e840a3314e84a7d57d993b94e9ea37323123584bc96c636ba1f106c095 SHA512 744a29d5b10adf2fb18d3eff5a7133c8636515dd74b53e42971087bd930c04f76e0f902e10eecc67c1091d219ce360b30cffd4663d3e47b1e845441cc19bb68a
+EBUILD clair-0-r3.ebuild 225 BLAKE2B b1c8e9cdc604b6dd0d684dcc5a98234f89af0feb6d926f8cc26348ecdb4aeca35981a8416f5d07faf653bb838547b11f6bdc992fcfc1e35659b51a7c2a145c02 SHA512 c0ae2c2a0cf8e223cc7b93e5173a84cdef84cf4068fde1717f176fc3e48fdc8fd31c7a0bdcb0ee91fd8d0aca31b2d4b10c5b96906c7c6dcc7f4f640b028c7567
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/clair/clair-0-r2.ebuild b/acct-user/clair/clair-0-r2.ebuild
deleted file mode 100644
index 20127fc6d174..000000000000
--- a/acct-user/clair/clair-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/clair/clair-0-r3.ebuild b/acct-user/clair/clair-0-r3.ebuild
new file mode 100644
index 000000000000..4ddc4165a34e
--- /dev/null
+++ b/acct-user/clair/clair-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 22b32ea9da61..26e3723cf341 100644
--- a/acct-user/clamav/Manifest
+++ b/acct-user/clamav/Manifest
@@ -1,2 +1,2 @@
-EBUILD clamav-0-r2.ebuild 198 BLAKE2B f81b80438f73f4fc07338b83a7aae9d14af8406c971de57fa782a2f0097cbb6fa12abd01e55585df54ed2bc86596bf76036419089f884ee403b1fc8ca0e81139 SHA512 a887c59940534dffa3101adf5d792a721888ae7ae85269fbff305b97e3d7bebeec50a124e27e77c2fdcf373d074c04929aeda400b5bc68a7948a7af3bd105c7f
+EBUILD clamav-0-r3.ebuild 198 BLAKE2B e5b15b84be4514d60aa67dc94325d38a9b3ea976384e95d0116fe61b8759277dff622ad3250649cc37257fc7aae8ed87dd6bcc24d1b8d5285f78595de6cbec60 SHA512 87fe94d408fba06739cc6a96a2f176cdf9e88c19d757634ceac541d875088d308565ab0ce6c87fd48907f7ae12b1745d7ed21719e601f387c2f10c72650b3fa3
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-user/clamav/clamav-0-r2.ebuild b/acct-user/clamav/clamav-0-r2.ebuild
deleted file mode 100644
index 957eecb6b483..000000000000
--- a/acct-user/clamav/clamav-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/clamav/clamav-0-r3.ebuild b/acct-user/clamav/clamav-0-r3.ebuild
new file mode 100644
index 000000000000..a7d444c1a54d
--- /dev/null
+++ b/acct-user/clamav/clamav-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 35d7d0fd0353..ad33a8ba4b87 100644
--- a/acct-user/cntlm/Manifest
+++ b/acct-user/cntlm/Manifest
@@ -1,2 +1,2 @@
-EBUILD cntlm-0-r1.ebuild 240 BLAKE2B 28185570eb694987477cf4de3368b8da00b5f7e4d53275bbd80063f1d237cacffab69d3fab76be30b3a498df0796f836ebff8489576aba16911dfcdc7cdec74f SHA512 c1f2a7a57b5edcf8d4759d4d7b7a56943164cff0b71fa438d56926a7c3370200f61908a2bded868c296520c656cef50520cf65c41a466a973081a804727d51ce
+EBUILD cntlm-0-r2.ebuild 240 BLAKE2B 4531cfdbd4c63325204a21130e4e89b289ad3e3bf751def5c2190277412efccb2ebeb1e759a20b36e5d53e1d8ee09a8221d77a3603c5797fcba22bb5c382e599 SHA512 38ab143b84a5c3517196cbe5c537e8a6acace308f4a8640db709b481896897ae2adc35078f32abaf748cdf82c8f878cf3cb680518b6d8ece96a871b629c8c7c9
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
deleted file mode 100644
index 938462f1b567..000000000000
--- a/acct-user/cntlm/cntlm-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/cntlm/cntlm-0-r2.ebuild
new file mode 100644
index 000000000000..f37625a0ca75
--- /dev/null
+++ b/acct-user/cntlm/cntlm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b63ce4f5823e..989c0381334b 100644
--- a/acct-user/cockroach/Manifest
+++ b/acct-user/cockroach/Manifest
@@ -1,2 +1,2 @@
-EBUILD cockroach-0-r1.ebuild 301 BLAKE2B 2a6e272be31089d0c33792b94181f77e27b0cefd840d938ca95f9add840e0cd8c6c30ef6c94b8852402baa2f0faf1627a18a223347f555e694b6e9b95dbe68ea SHA512 318c09aafba47ec575426ef1808b87dad29b27a866b0d2527a9f35424ade18db4c89bc7f9d46f53973f765f0fac83c30673cf479dc1151f47ae8c3cc8c4835e1
+EBUILD cockroach-0-r2.ebuild 301 BLAKE2B 3aa97c95ceeae5974c9bbbf95fb953995f07e4ede9f9d2a4961096ae53b184debb43e3ca1d167ced9d1ce967475b9d85c58dd9cd68c836edbddbc81901ca8631 SHA512 32e578f30808593794a1166b607be7490167ef71253da75199122b66fd0d1825c0b3de3d5ce8da6235f9f8c0d7dfc771fe51592f498341d8bf906ff219a89dfe
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
deleted file mode 100644
index 5be8db3263c9..000000000000
--- a/acct-user/cockroach/cockroach-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/cockroach/cockroach-0-r2.ebuild
new file mode 100644
index 000000000000..5e08d80314e4
--- /dev/null
+++ b/acct-user/cockroach/cockroach-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f6b84e7ec747..6a557608ab07 100644
--- a/acct-user/collectd/Manifest
+++ b/acct-user/collectd/Manifest
@@ -1,2 +1,2 @@
-EBUILD collectd-0-r1.ebuild 265 BLAKE2B 6de2810a3158297b89751f773c55217ec1b1b22209b2c19b53e4cca1f03933b21c71d0a113e525ac4652a7a05405e4f6b55cfc0e46da4c7d5b83967650650351 SHA512 86d7d8bfa73326987766b3382bced8888da8ae9941dbce5488e178eddcc8d6b907be02b67da26dc6a1188b93ed58cfe559493c25654f441f866a3361018965fe
+EBUILD collectd-0-r2.ebuild 265 BLAKE2B 4b28d2f0ccf9b26649e04e6571320e4c7d63a87d0d1724390f5b4f5a6d2a28a460674a25a461e47e451890e7ee92d2f19e00533108a53582bbf1cd2cee874ef2 SHA512 735481ed4683bfb4f27609f4d1f76f47e8995a2620231c22345b31a4022fdf7a4739abff096b7a851bf788b352284cbc58cdc648dd20277d8ace03ea8e29b17c
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
deleted file mode 100644
index 8ca7b28f5fa9..000000000000
--- a/acct-user/collectd/collectd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/collectd/collectd-0-r2.ebuild
new file mode 100644
index 000000000000..ee9b4385ef6c
--- /dev/null
+++ b/acct-user/collectd/collectd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8a2695a15028..39214a29e7a0 100644
--- a/acct-user/colord/Manifest
+++ b/acct-user/colord/Manifest
@@ -1,2 +1,2 @@
-EBUILD colord-0-r1.ebuild 278 BLAKE2B 4c9b8f90585e05b72f3fa08c382fb37ef9817ce8cb999719a7fb2c512a07d6af83944d6d996b4743b6b9959ab504e61e34408d331addc82492624476c6748e17 SHA512 0db9fabb714a91ab60cc0c54e36aef9836e28f347f53f35e35992dee5d9c30279e68dd2612a79d74282673ea4b77fbd4fc817b489b551152379079bf9a9a0d29
+EBUILD colord-0-r2.ebuild 278 BLAKE2B 30fabdd85807bfbbc2509dac253158c9f87ef9427443ec19d41064e868bc67867082de59f2e04851f63b9260769a610dfc4de805db7b9a74d93904f2243956d2 SHA512 b472fd53f46a3c0e2cc9db122131af438183e2cddc9a820f11971f46b1c10528af426bceb9c9c6302ee4837028ec2345153c8c9aaa09626fd6f4a0f1aee18c15
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
deleted file mode 100644
index 7ad884c93ae1..000000000000
--- a/acct-user/colord/colord-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/colord/colord-0-r2.ebuild
new file mode 100644
index 000000000000..4b3326f3ae67
--- /dev/null
+++ b/acct-user/colord/colord-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 13f5cdbe3191..2d7a0a593176 100644
--- a/acct-user/consul-template/Manifest
+++ b/acct-user/consul-template/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-template-0-r2.ebuild 245 BLAKE2B adb54afa76d7c4e2313579b3ee3049fd3bbbfe7c4b0c541ed3b59b7f5512cb74178c99f07dcf4f2fec62f28e2c1e2a3d4481147c788e611d421ba2ba2a1a0efe SHA512 ba681d663dfc207ffde2a1080ac9f997aef42470a6104e0ddc414f8b71311bb23c237525b04e60e40d179141edb966e4a24260ebfcb89b14f68836f6efe53f4f
+EBUILD consul-template-0-r3.ebuild 245 BLAKE2B 3efc04b1cef2252c15ba83fd8f318317b1346378826add399f7f220e93146f472080ccfec19dd2af586405e945089cec50f2cb81a1496c9216d3c6bbdc08e3ab SHA512 8bf1efa53e95701a7ebb96a35d932b66df8e45d0e6674e751bafe3b229bec828e9267c2b71a433f8b4407bd9b041bc56dc40cbaebe2ab71079dd9eae34e3ebe4
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-user/consul-template/consul-template-0-r2.ebuild b/acct-user/consul-template/consul-template-0-r2.ebuild
deleted file mode 100644
index 52a1fcfde90a..000000000000
--- a/acct-user/consul-template/consul-template-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-template/consul-template-0-r3.ebuild b/acct-user/consul-template/consul-template-0-r3.ebuild
new file mode 100644
index 000000000000..c9f04f7a0f1e
--- /dev/null
+++ b/acct-user/consul-template/consul-template-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1e4ac3f55b35..32d298b058cc 100644
--- a/acct-user/consul/Manifest
+++ b/acct-user/consul/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-0-r2.ebuild 258 BLAKE2B 2ad6b4c7ba6d192593276f22c74367fbd5eda43c1e30fd8446fd42702e9c9c5ed9ff6611d44285360bad916c4864144b90716c7ec8f1d335d608add2fce5f123 SHA512 c3b6d910f25ae255cb926e818dca3bc4c9122eda2a047fe28fd8afbf4b19684cf0e945e711b677cb58be6aa8164ff59b5558cc8b08800ca67153c3b6e1bd1312
+EBUILD consul-0-r3.ebuild 258 BLAKE2B 17049b0b178f9428f0055d2db6ecb1552c38959e9d4680644d659305db74b50b146b883d797c21a1d1cd3b9fd16f40d1eec3fbbf5cbd4006317163786d89ea55 SHA512 f0d02fa2006ca1d820b2ce38db609e8100fef20c8e3c10bd912ac2bda56c5291710d1513575766505adb771131cd173d3c2d452ba07b0c9318d72c381b649ac8
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-user/consul/consul-0-r2.ebuild b/acct-user/consul/consul-0-r2.ebuild
deleted file mode 100644
index 8cf68af0bd7c..000000000000
--- a/acct-user/consul/consul-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/consul-0-r3.ebuild b/acct-user/consul/consul-0-r3.ebuild
new file mode 100644
index 000000000000..675e14656621
--- /dev/null
+++ b/acct-user/consul/consul-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4e51a05bbd38..7bbfd6ae4f8e 100644
--- a/acct-user/consul_exporter/Manifest
+++ b/acct-user/consul_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul_exporter-0-r1.ebuild 245 BLAKE2B e68e0fab260c0692211afc1f57db7b110d6781f5a9cf8f9c740dcf81b1688eb5adc236b29bfd6ce5f1e38c959357829047c36148da924555b61d19f788ff6baf SHA512 3a93c94c5361714507a41e51a75b38dcfe4bb7bd57b563807b646f0f91c1167abead1815ed79d7d9141d7edb33f1fc85486a5183ef194dbe3e0d37c942b9a741
+EBUILD consul_exporter-0-r2.ebuild 245 BLAKE2B 73e133d4502b3b64a767bad8dc7220386360eb56ba13c173eea9a577d23846422d5661542f775d43faf0d9d88bc07cdf03e996fc1d7a3a0505f7dd26226b8966 SHA512 35229ae4225844802a9e5f956fa01d1326b723cca235fd44148f711ee8257709f8f5fb8c1b018272421c70fba4d2568b9948d010540fe76f2c4594e98b5ac0e7
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
deleted file mode 100644
index 90b769bcce2f..000000000000
--- a/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/consul_exporter/consul_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..f56e1927e72b
--- /dev/null
+++ b/acct-user/consul_exporter/consul_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0d4020f68c94..01480719f4eb 100644
--- a/acct-user/coredns/Manifest
+++ b/acct-user/coredns/Manifest
@@ -1,2 +1,2 @@
-EBUILD coredns-0-r1.ebuild 276 BLAKE2B 48f3c5e4145e34ea0b01585375d87a5802202bc306dcbafd8e662d0a85c486347182f985661094ccca9e8e71024b16df222ab0b1f0004728c858adf7923f4ab0 SHA512 7168782643aa9f427bb5f27fdd37843159fbd672759a65135641cc5aa0790010bd54d45c4714fae9d776b82d99fa598187b3faabdb9f2f9feb52e1b8f48dd24c
+EBUILD coredns-0-r2.ebuild 276 BLAKE2B 44f6f7b13a11342d11198f4350edf29c8a3acd91118df1ae5e031f286aece7d28a8a59b83e5549ab4902bd8797fd5cff4268fdfb5048fd2f2cbb402691a2cd8f SHA512 042525d8158e030576bbfade436f2520b1e07c9622fea3564569383aba0151ae0b5402d247139f574c47581f036680c1dfe139977e4a9fc4397a26fb24c48856
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
deleted file mode 100644
index 49377d1566d4..000000000000
--- a/acct-user/coredns/coredns-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/coredns/coredns-0-r2.ebuild
new file mode 100644
index 000000000000..61ab6d4d9952
--- /dev/null
+++ b/acct-user/coredns/coredns-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/cron/Manifest b/acct-user/cron/Manifest
index a6e8362b7ee1..088e34e2fad2 100644
--- a/acct-user/cron/Manifest
+++ b/acct-user/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0-r2.ebuild 339 BLAKE2B 251c88e95f2b4585de39bd72cc61d91615f513a967b751f140459fba5ca04c6b9240ff2dc3a6cab5ae3869dafb8a1898f6458f8518a07f6e5fc5d81b99e67f35 SHA512 bd5685cdec72a5a93094a0a858465ea5b4e7b60a3e083d7c064e5c44b1d78cc5c87d9126eb18ca2d7dbec697792225f7d94e5f7d69099fa59c695b0b4e618488
+EBUILD cron-0-r3.ebuild 339 BLAKE2B e3afb92309afc7da6c5a77e63e54cb35d082c42bbb5c611fe8f5590d78ced4a3d17eb1450a450919156fa2aa9211e8915760e4618436aad99256b13c2790f7a4 SHA512 565346984825b8716e292b809003a3c4e3ad6c3af90aa900ca162ae6e1ebcc6c83f2a34e166c9820330c84079727507c2c9522ecd2a4ef75fc50fc1af5c7d51e
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-user/cron/cron-0-r2.ebuild b/acct-user/cron/cron-0-r2.ebuild
deleted file mode 100644
index 882965270c4e..000000000000
--- a/acct-user/cron/cron-0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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_HOME_OWNER="root:cron"
-ACCT_USER_HOME_PERMS="0750"
-
-acct-user_add_deps
diff --git a/acct-user/cron/cron-0-r3.ebuild b/acct-user/cron/cron-0-r3.ebuild
new file mode 100644
index 000000000000..44f715a89a0e
--- /dev/null
+++ b/acct-user/cron/cron-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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_HOME_OWNER="root:cron"
+ACCT_USER_HOME_PERMS="0750"
+
+acct-user_add_deps
diff --git a/acct-user/cvmfs/Manifest b/acct-user/cvmfs/Manifest
index 632f71dcb8e6..e2abe21f76ba 100644
--- a/acct-user/cvmfs/Manifest
+++ b/acct-user/cvmfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD cvmfs-0-r2.ebuild 255 BLAKE2B 2c8ddab9cbe3cd353031e1fa2c61831aee2646d2ded1e4a913c0b3ac075cea1b5a46a73d65f6316670acd18048849b1d5ac8cb5b44062530a3fd2dd7ffcb91a1 SHA512 48f7d5a14f57ec02cc3fae749869193d41dd33f75dba0bfbbf9bd7348e98f7409141693b8c8dc7744bfb261f1c1ffeb89ac44478efbecad532fbb4ed52dd3049
+EBUILD cvmfs-0-r3.ebuild 255 BLAKE2B 8575cb3508e98281bd1786a6704a3d3f60686d896c0f6e120ffa10585263b863fc5148772934b2003535c46fbd8728a04761a1007c4df411f48f2e8bfcb1fd3f SHA512 6747f302763b3ae5fcb6ee315b8c6e302f621e346e1eee78849cc9584f6060bcc6e379bb8c48145ec786ad7e9b83de46d39f82ffb551170af89d650bb0354bca
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
diff --git a/acct-user/cvmfs/cvmfs-0-r2.ebuild b/acct-user/cvmfs/cvmfs-0-r2.ebuild
deleted file mode 100644
index aa027b43a791..000000000000
--- a/acct-user/cvmfs/cvmfs-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/cvmfs/cvmfs-0-r3.ebuild b/acct-user/cvmfs/cvmfs-0-r3.ebuild
new file mode 100644
index 000000000000..27e6fa206e37
--- /dev/null
+++ b/acct-user/cvmfs/cvmfs-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e4093ce7a9a8..7e75958f927d 100644
--- a/acct-user/cyrus/Manifest
+++ b/acct-user/cyrus/Manifest
@@ -1,2 +1,2 @@
-EBUILD cyrus-0-r3.ebuild 237 BLAKE2B 3f24837dea38630c8053872e0f7a597133ee6ec3d101efe6e52d1164e5ed305d9ac22d01ce841a1f17a7e4d03b78fa5a20ad338cf30b98931da84b8c0d27b87e SHA512 5866d8110598ceac43df3fa902c2c31d1f769433c774eb0946830ebd5e0d413f99423695a13c8c083ad212dfc3ac4bcc8b45977d575974d0002a725ad6bc47d6
+EBUILD cyrus-0-r4.ebuild 237 BLAKE2B b0ad7fb2066bde0a5204521c23e1f595f6647448de413b798ee7c5ff45627fb85ada0a1010c58c5c27a2e9f3f7b45db1c8f997c620603f07900c8bfa93aa29e1 SHA512 d6878de66d019af7c48856b3ac3e0070d1e724a379b6f589dbc3a9572dbbc917d36015222bfe0ef56a0a09f16009beba2af588f20e0ff2d15dc4d4d54ad13e2d
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-user/cyrus/cyrus-0-r3.ebuild b/acct-user/cyrus/cyrus-0-r3.ebuild
deleted file mode 100644
index 44c206ccbbc0..000000000000
--- a/acct-user/cyrus/cyrus-0-r3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/cyrus/cyrus-0-r4.ebuild b/acct-user/cyrus/cyrus-0-r4.ebuild
new file mode 100644
index 000000000000..5e3cc0b87ddf
--- /dev/null
+++ b/acct-user/cyrus/cyrus-0-r4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 fab949f40c5c..9d54a273dc45 100644
--- a/acct-user/darkstat/Manifest
+++ b/acct-user/darkstat/Manifest
@@ -1,2 +1,2 @@
-EBUILD darkstat-0-r1.ebuild 242 BLAKE2B cd2686931e8f09808de74f5ac1fc54426c2eea254d112c3d84c621a3450365ce5ca8a045b91f5d36e3b14461a9bb88b5cdfa8b097da880121dde32150c0c0103 SHA512 fa447a2da3dc866783dcc51ed37c6ea36558db8beccc9e17624c30db6518734f0c825d5e73443d7f67425870638dd68b286fcc7160e8d4cbfb879b7f526984ba
+EBUILD darkstat-0-r2.ebuild 242 BLAKE2B d6856fdc600c05a9ed9e21f2a737f52f0c14d78acde97f2f0c6939456122c9bde6ae43013c25f97bed6855af377ebdae31930b3a42b72e595e0979471070b9c5 SHA512 2fcb6d15f10743cb097f51717b4e70c17795a45c9ab7248072599d384474661ef4fae0a542e6cb6d43c50e4e15b7b39e7dd200baf23f94c786aeff701e91dea6
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
deleted file mode 100644
index 27c0e44a253f..000000000000
--- a/acct-user/darkstat/darkstat-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/darkstat/darkstat-0-r2.ebuild
new file mode 100644
index 000000000000..36216f8a76f6
--- /dev/null
+++ b/acct-user/darkstat/darkstat-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4459f232aa73..53f62f88a6b4 100644
--- a/acct-user/davfs2/Manifest
+++ b/acct-user/davfs2/Manifest
@@ -1,2 +1,2 @@
-EBUILD davfs2-0-r2.ebuild 197 BLAKE2B 2ba3774305c3c36b5d801a0f84250df45e089000480d3ca3baa5b099764af4fec74a3e2f2f974a63305fa93b9ea3cf456bc8ab193b551b609574720a5718f78c SHA512 a4a778cc12a06539a1927cc242b04cd7b81739ff37a52c25b87605f636a98eddb80da687effcf90f7112afe9dee8176ddc734b38bc0695a93fc3f6bce45812b5
+EBUILD davfs2-0-r3.ebuild 197 BLAKE2B 58bd8e0fea02408a74e6b052722f4ed6c6827211170bc1e1e8d89197aafc80a379fba68ee0d98de122ab21202fc47584082cc5143d7ac43da146da52d78a03ed SHA512 79985454c20d3e8e6ddb5fa3ad7c3d3a00c87341e8405c040d6fc4b8b9138ba8e3f8c158cf96e3680f4bca52ee4687ec46a3ad1f6f8b90b2fa0b3f4de6a3c045
MISC metadata.xml 219 BLAKE2B c0192fc2c685f564929ff304a18b20facdcc8638726bfb8711803a633a109780747e98c42b14cd3e8dd674a92a7ed783a40d56e617e414b6cbc3d4fb18a63caa SHA512 f702a981fd2afe5f23c2814fdf91a540e6335e50e3cd85003e28ec2130739001ecfcfd824cfa91780c6b1d5999cdcfbb06857dada1c53b4f9580675a5491eb46
diff --git a/acct-user/davfs2/davfs2-0-r2.ebuild b/acct-user/davfs2/davfs2-0-r2.ebuild
deleted file mode 100644
index eb92b96293fa..000000000000
--- a/acct-user/davfs2/davfs2-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/davfs2/davfs2-0-r3.ebuild b/acct-user/davfs2/davfs2-0-r3.ebuild
new file mode 100644
index 000000000000..647e36d54c4f
--- /dev/null
+++ b/acct-user/davfs2/davfs2-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 efd254b77ab8..05c1015872c6 100644
--- a/acct-user/dbmail/Manifest
+++ b/acct-user/dbmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbmail-0-r1.ebuild 198 BLAKE2B 83be3994f39a547cbc397750ccce419062207568a587ce47f759f8ae4f4c1a2ea8a41f00e163fdb023fed441a93a888fce777c4fe9b2aefbbd857c60f84f368f SHA512 dc868064e20a1701094379b82b24534cc554a42fff4dcec20b455507ea05821784c183c0a9bc5b8a11bcc04b43103fa03f45497adc22262871dac2a76b8cb28b
+EBUILD dbmail-0-r2.ebuild 198 BLAKE2B 3b5034d8d000453e15028fd54ec3cfb1f5d10bdeb25108e7a88335f2407768666e13400a9e697c3af7a9617381d485ad13c4ab0a5649072df569cc75173fbb5b SHA512 abd2d1ac5a14105f1675d6ec55fbdcf5469225fad59aad8326b5078aa16d6405248c12453a7768fac41830091fda135c641049a1de3b96d8223cf0ecfbdc1e40
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
deleted file mode 100644
index ac0c219fdba1..000000000000
--- a/acct-user/dbmail/dbmail-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/dbmail/dbmail-0-r2.ebuild
new file mode 100644
index 000000000000..4e151d3db76d
--- /dev/null
+++ b/acct-user/dbmail/dbmail-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e1fcadb3196b..f57a7b6fe063 100644
--- a/acct-user/dbskkd/Manifest
+++ b/acct-user/dbskkd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbskkd-0-r1.ebuild 247 BLAKE2B 148bcccd5b04f7388556db0cfe51e81d217773583913665ee0046cb53d22d7a2bbdccec3b9491a28673507b8446895c3ce365fbfcb87595e844f01dcccd75449 SHA512 480fac7b4ca01d36170e8fd9482139068d5850463f8cc5f889266de3e5874dac559c4f5870fbc9434f70e3c63eb3009c4330d0beb25dce16952e656c3a2729fe
+EBUILD dbskkd-0-r2.ebuild 247 BLAKE2B 83a9b9d2d6aebf8743989b8951f9ca2a26eff451b00739dbb933bc7a1c1e2eb466a33373b8d464ca9ac1e21ee5de1f0f7e0ec08e99acdc858abc087b8cae23f3 SHA512 cd8cdb9b67ac9c18b19bd10638c5291dc0895c510e5977ae8f3bcde10205ffa0b1940d222156c4940e1140f12f270d5dbbf7680bae00786c8df3d333eac360ca
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
deleted file mode 100644
index fe53f18a5880..000000000000
--- a/acct-user/dbskkd/dbskkd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/dbskkd/dbskkd-0-r2.ebuild
new file mode 100644
index 000000000000..d5ff6ddffb72
--- /dev/null
+++ b/acct-user/dbskkd/dbskkd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 54d2b514b36c..0f738fdd0395 100644
--- a/acct-user/ddclient/Manifest
+++ b/acct-user/ddclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD ddclient-0-r2.ebuild 252 BLAKE2B f70b65d99fdc90f10cd1addeec14171c924e1dd3b4500e3196da5f62d3e89334c8d9ea664624c9b34693e0a4ecd03e1b806da737f05e14e7ead9e06572a031e8 SHA512 90d25a804be2173144e74f09c641ce2a075b263af1c99b3334658067926973fb3f1004363670715d1136814b8548ff0669c4f16d5a99bd030dfeadf87a6a7ea5
+EBUILD ddclient-0-r3.ebuild 252 BLAKE2B 9e5a32e00b870274649ed9f9ad698791f76e3afcfbd19f5a573e018d509efbac1f5d729c276a75baa9bb92fbedaaa01ddbd45518962cbdcdf24bcc9d82aec1a2 SHA512 ec33b4d6a565ce00fbaf60d6d406e0e483636a54a62e84433b234e9ed41540ff7ddf12458c1c7cf922c529fab93b074c4c32f44de5ae77a280f251b2b021a068
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/ddclient/ddclient-0-r2.ebuild b/acct-user/ddclient/ddclient-0-r2.ebuild
deleted file mode 100644
index 0ae2a8ad0574..000000000000
--- a/acct-user/ddclient/ddclient-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/ddclient/ddclient-0-r3.ebuild b/acct-user/ddclient/ddclient-0-r3.ebuild
new file mode 100644
index 000000000000..5d29cfa358e9
--- /dev/null
+++ b/acct-user/ddclient/ddclient-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 35d46e526790..c813f74403c3 100644
--- a/acct-user/defang/Manifest
+++ b/acct-user/defang/Manifest
@@ -1,2 +1,2 @@
-EBUILD defang-0-r1.ebuild 250 BLAKE2B ec111240eb6f5837eca4b2b7557a51a4d9ece7d5526db7fda8c82ebacd5101af9807638d7cdd5bc7d86360135af6df00ddac2ee57671edf68ae313e18310bfd8 SHA512 b762e43b12ce112b807fb8fefdad6cc64347e95189c704f99e8d8b26e9efc8b52b7f40ba7852e27a4385231567eb4b54ca848d671e274ba28175b99563bf6fb2
+EBUILD defang-0-r2.ebuild 250 BLAKE2B 066bd68b12543518bb91d8c6cca793b820194d8ec61df7557f6925f82921b49b348d6dec1e5f9c049d3d546ccc66618ffaf10bce535c9507e9792ad781bc73d5 SHA512 2f30eecf9a5b0b8a599f2d70245c0165838a5b2e904876aa76a2677a5da9b0abf9a333ef5a0627fc074d98acbba48477d9199f3b040546745b3b07291aaf0945
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
deleted file mode 100644
index 168d014590de..000000000000
--- a/acct-user/defang/defang-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/defang/defang-0-r2.ebuild
new file mode 100644
index 000000000000..974675638706
--- /dev/null
+++ b/acct-user/defang/defang-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8bbe8e94d71d..0c6eb9d0b51f 100644
--- a/acct-user/dehydrated/Manifest
+++ b/acct-user/dehydrated/Manifest
@@ -1,2 +1,2 @@
-EBUILD dehydrated-0-r1.ebuild 265 BLAKE2B 905819585e2b1139109d519387ba573ba701cedb1218b091d8b61d95d9dec532d1bba888cde3241c93181183484a3705d26089aab556ad0789960a431bdb66c8 SHA512 b21ea04d0b37faf4920e027d4557fa2bf6a3a99dd84abf7ff79e574f3efcb9eae2b81c7816c6f6cb0cc5fea725e7aa182a5160e673a5f44668c18870cde312a7
+EBUILD dehydrated-0-r2.ebuild 265 BLAKE2B 1a999081673f0ed4e275242732d765c596f850a6ecb680c417634ba1eac4075d51d573a386d3d0c1d7134c171cfc03e9020482dd0dfa9a933fe6b749130006da SHA512 211f2ac6a358b3a1ff11ec36d281afc1916fe4a800c6d06b84884b1773e54e40146bab5c85f74aa189e7965387960eddb95414998458a9a2db9ce07132ec0579
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
deleted file mode 100644
index fa49bb0e2d49..000000000000
--- a/acct-user/dehydrated/dehydrated-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/dehydrated/dehydrated-0-r2.ebuild
new file mode 100644
index 000000000000..a8302844b851
--- /dev/null
+++ b/acct-user/dehydrated/dehydrated-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 082b85a9e7bd..6a4eb45b6edd 100644
--- a/acct-user/deluge/Manifest
+++ b/acct-user/deluge/Manifest
@@ -1,2 +1,2 @@
-EBUILD deluge-0-r2.ebuild 258 BLAKE2B 7822697aab1c4daad787e7c42d41263e5811668a5bad80a175bf0dd38d90a033fa4ef72dde639d70cd0199c4d816ca103d7508c4b9ca6154203f2ce0e34e2822 SHA512 a8e6f801efc0bc60180b5fc260f6b1ca1618ee37148cc47e424c51ca7870429aecd4576c15d081073fb35edd323da07bcea9119297bee529eca8d62931f54630
+EBUILD deluge-0-r3.ebuild 258 BLAKE2B bd67495386d53e2fc4f4e02da56955f71b0c75b62aa99665abe9f3bd125bf36e69d5d1920289a78a39c326b94a75021d251533936eb5fe556d94112947389d7b SHA512 c1ce15cafc2718b839daf6f4e7af713ee1f136dc5a3c4b20e24fe4a132ed67497d63a9895b31c7f4475dc9b2c08aa4337b810320efd61700c15bd8fa5e120703
MISC metadata.xml 521 BLAKE2B e4adb92b824153ea2e9d79164c2111a1e49049286cbe9e1662ff0ee8300031092d65b3ca97c3cf449ca7a57bcdb78f86c9988154244686879194686f0bf3048c SHA512 d37d8f08b7b7d5a5a00d1c0ecbcf27d42610df9c4a1e68dbb2f17272cbc73fe000bba406f0f9ca40aba22f081ef2de097029886af6938d1b64e63a6d25fc8bba
diff --git a/acct-user/deluge/deluge-0-r2.ebuild b/acct-user/deluge/deluge-0-r2.ebuild
deleted file mode 100644
index 328da7731618..000000000000
--- a/acct-user/deluge/deluge-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for deluge"
-ACCT_USER_ID=454
-ACCT_USER_GROUPS=( deluge )
-ACCT_USER_HOME=/var/lib/deluge
-
-acct-user_add_deps
diff --git a/acct-user/deluge/deluge-0-r3.ebuild b/acct-user/deluge/deluge-0-r3.ebuild
new file mode 100644
index 000000000000..081edc55aac0
--- /dev/null
+++ b/acct-user/deluge/deluge-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="user for deluge"
+ACCT_USER_ID=454
+ACCT_USER_GROUPS=( deluge )
+ACCT_USER_HOME=/var/lib/deluge
+
+acct-user_add_deps
diff --git a/acct-user/dhcp/Manifest b/acct-user/dhcp/Manifest
index e07b232be041..bda97e4a0d12 100644
--- a/acct-user/dhcp/Manifest
+++ b/acct-user/dhcp/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcp-0-r2.ebuild 230 BLAKE2B 5e16482a0c8cf27691e1cf6fb89aee054eac48833c1275788515b4f8a5da6d5dc7c9d64f42b18d6f3737f14cd3474251bca1a9d502228e106c452eb71fc80498 SHA512 1af187e33a649671d1fffca92169b0052c18ef26b8e2a98756f9a11ce6a0c5363fc599dba39fb12d5ade497ab98d813639d46d9a65263d84cee0a186cc835213
+EBUILD dhcp-0-r3.ebuild 230 BLAKE2B 3d215a66929f36e2e4dd54721dae27011246dc57106981050cc349b800483599e9145e3c861baf30bf42629e0facc9716b4b7efd60ea0a24655bc8c774cc2e8b SHA512 63b864bb6db0a6cbe4091b31c511cb40dbbc413973c73760c92f0c4d2c6031b12d37cf9f8a158017abf6f00f8ee7726850820666e9fb1dd9a9c77a762e1626d5
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-user/dhcp/dhcp-0-r2.ebuild b/acct-user/dhcp/dhcp-0-r2.ebuild
deleted file mode 100644
index c526b058b798..000000000000
--- a/acct-user/dhcp/dhcp-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/dhcp/dhcp-0-r3.ebuild b/acct-user/dhcp/dhcp-0-r3.ebuild
new file mode 100644
index 000000000000..54413005c8a2
--- /dev/null
+++ b/acct-user/dhcp/dhcp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7926187bc3da..5f61720562d5 100644
--- a/acct-user/dhcpcd/Manifest
+++ b/acct-user/dhcpcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcpcd-0-r2.ebuild 270 BLAKE2B 476ef4f27d2f176cd08dd08548a896f582578a9867e03b4dc1544660aa795449124f98166c1a5b97b72d09b40990bb1282f4eae75a41b4828121437767aedc02 SHA512 3c6693917cfad9041334122af0768fc3320f3429bbf76ac9e196511878fe153dba0f0f70f37d9736e31878a2b397d8521d011542362d537024ba9c5ea3b044f1
+EBUILD dhcpcd-0-r3.ebuild 270 BLAKE2B 01eaf455313ca41464989237e4ec9657e43300391a52fa841b1ac9cd98f4215434c1a69470b517492f323dd89eb3ee2677ff016f772663207d718922ac724dd5 SHA512 2e231356d93b9fab25fd5ffc9ea6cae0d028885f1b1d63d1dc3cf4dd3d7d601158d5c44172b1eaee672de5ab61aaa1de7c6bb08bccf19db1910e0f5eb74b2890
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-user/dhcpcd/dhcpcd-0-r2.ebuild b/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
deleted file mode 100644
index b9d9b0944546..000000000000
--- a/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/dhcpcd/dhcpcd-0-r3.ebuild b/acct-user/dhcpcd/dhcpcd-0-r3.ebuild
new file mode 100644
index 000000000000..bba0ae42ea25
--- /dev/null
+++ b/acct-user/dhcpcd/dhcpcd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 fbc3357a3d74..bb83ffd37dee 100644
--- a/acct-user/dictd/Manifest
+++ b/acct-user/dictd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dictd-0-r1.ebuild 233 BLAKE2B 7daafda5d14821d45751a4fe0e68a599d2af8c963284f981b387e8486b5e8e8731dd1abcee9f7d7ef988c30a4822c2778522d80d9818c4f745bc452cdefffe62 SHA512 46e931f939111d3931c8477f0b2afec67cec40bfcce0300a0bf1fff2452a487672babdef83c358913229403d92657e96c61bee3b19e460decb8b29295096421c
+EBUILD dictd-0-r2.ebuild 233 BLAKE2B c59a80763e031a9d4880aa1bec12f27b047f33fd9884ea7de9dec5f9d7c816f21e8f4e47c8cab059971c74148e30838ab2bb876d87a16194b5dc56fa78abc421 SHA512 ea7251ecf2fb5ad457a8cde43db9d55d991813c8e0681e54936dc65ca92fa93cdbd6730661f69dd1c603c2b0c5c16f7634f6da3d2d12e008bffcbff84d0c2014
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
deleted file mode 100644
index 8b54a5ae197f..000000000000
--- a/acct-user/dictd/dictd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/dictd/dictd-0-r2.ebuild
new file mode 100644
index 000000000000..f7e7d102737d
--- /dev/null
+++ b/acct-user/dictd/dictd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b70b69ffb454..a686805085fd 100644
--- a/acct-user/dirsrv/Manifest
+++ b/acct-user/dirsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD dirsrv-0-r1.ebuild 240 BLAKE2B 82fa9c61d7f43009e600e2a835d41583ef0a7a1663932b94deb801f2c8b627c91484aac64421cc2bf80ac826577b5cc2f4f082093aa51c5dc35fd92414097d0b SHA512 36af0fd90f924e0e51a9af685cdfdb05408f96529bb1c266352294cc6fad1b901de62f8dc72d467c100345f0617a0f384e27d8dc46a46858948825d3dbeda076
+EBUILD dirsrv-0-r2.ebuild 240 BLAKE2B 4201a4d107f0205cc5ae1d8de48fafd0b72175bb5bdfaf13a8b3617dd4d62ee7280076bc3a2852db00cb1636cabd0f51bd745f4ff129c53ea23c83c6b5aafc2f SHA512 005c1e4001083ed658f97c4d0f7dc594de0c1766b24e8f8bb22312141d43186a217d5d0b7c39b0e6f561ea21599b7777488f105f1d61ad74d55b8c59b001570d
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
deleted file mode 100644
index 047daaddeedd..000000000000
--- a/acct-user/dirsrv/dirsrv-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/dirsrv/dirsrv-0-r2.ebuild
new file mode 100644
index 000000000000..9e0c7a03c694
--- /dev/null
+++ b/acct-user/dirsrv/dirsrv-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a584d184ebe5..d5d12b5fbe6d 100644
--- a/acct-user/distcc/Manifest
+++ b/acct-user/distcc/Manifest
@@ -1,2 +1,2 @@
-EBUILD distcc-1-r1.ebuild 242 BLAKE2B 210b907f4cc77b114e5454a564d7be59cbe0fedfec4b596cc5c9769764b9aad9b3fc9933bc0c89687a9838778567e79df64c28de6d65833bfeda47b143d46008 SHA512 68f38aec2d3f7707a92bcfcb35c897ffeb24f02703fa17c5ac21f27fb7eacdcacc38b5195f3e1cd6274a001459fe8542d1423b3f3b6ec87f47cb0bc7fe2ffd8e
+EBUILD distcc-1-r2.ebuild 242 BLAKE2B c28caeb8c7223d6e043724b0c03a63d56075f6809c58573432767d9935bc977645792409aeb782b78f899b011a1c6b15873f1a4cc4e2034eeda9e21de3509674 SHA512 1fd3a62392914189067682be2fda9586073904df4200fa98fa86fc97ce7ea19d47dc4c736cb63f2032a5afd9efcaea3a559f9031fe624e19d10d09666e271377
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
deleted file mode 100644
index 47daaacfdefa..000000000000
--- a/acct-user/distcc/distcc-1-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/distcc/distcc-1-r2.ebuild
new file mode 100644
index 000000000000..2de2ac894570
--- /dev/null
+++ b/acct-user/distcc/distcc-1-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3f62a08f53ec..d0d452706329 100644
--- a/acct-user/dnrd/Manifest
+++ b/acct-user/dnrd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnrd-0-r1.ebuild 236 BLAKE2B 1ee697aa9eee2c0463c1f780bbc823d9a577d9c5b376f527bb515d28b6ae64e0d26df0235e23db343f528e3a203bbd1a1fe4d34d451cb224c57004b7b499e81c SHA512 08cba9860e63d34a5b020d26d9dc3b5e70a675a84a4a0d9f69e38bfd2dd6ab825f76aaf3639efcc3a1ee7af2a2690454c81ba5a54b062efdfbd2ee6b7d2386dd
+EBUILD dnrd-0-r2.ebuild 236 BLAKE2B 9f6571e10f3766b3576e92b52745746b03e0c3b74f954ccf20e835b7b7db6fd906437a31ab90c123ca9d9500d8a3f37057afe5744fbc34b99a816d433ae4b421 SHA512 e1b59ca397fed3fe931aa38c83c407f8404e276edd85cf48689aa09eec581908d75d6291d00ee501423d9a1833216d09814a4a01795d07fddfb6417e9b8297e1
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
deleted file mode 100644
index 3ec8bafd53e9..000000000000
--- a/acct-user/dnrd/dnrd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/dnrd/dnrd-0-r2.ebuild
new file mode 100644
index 000000000000..88dfa3e9a4d7
--- /dev/null
+++ b/acct-user/dnrd/dnrd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 67b3bd2fcba4..292c884d1bff 100644
--- a/acct-user/dnscache/Manifest
+++ b/acct-user/dnscache/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnscache-0-r1.ebuild 198 BLAKE2B bc68077935cb8e5449e427cc93b9cd12e8c2f0a0e5ff2d919ec7c7a04ed5e101f0b5bc9619d5256099cbab164d02bf6c71ba69fbd10652621c173859974bc053 SHA512 5161558a85c6bfc264c5c702070cd8ac454fbbce983315718fdcdbaf8d9169c285a8178d17a2c3ef5a8450065279d0b39d038a6726ead03726c366c629f5f534
+EBUILD dnscache-0-r2.ebuild 198 BLAKE2B c189527b284ca3bbc608eda2dee7c4b5736bfff105696c84a176417724cd026be53e37ad26e7ff4aaf3884e0e2fd9593a9f5f92226031ea4dc8cc477f13a881f SHA512 16aa58b260acea16f3b6bbf08718f61e279a167ef1b2f2b04c22c2883d9078d49500346ac7877b95a63c96e97e903d29a4dc7c8a43c1f9a02919940b6b5dd284
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
deleted file mode 100644
index c0b54fd7cad7..000000000000
--- a/acct-user/dnscache/dnscache-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/dnscache/dnscache-0-r2.ebuild
new file mode 100644
index 000000000000..4ff8de18dfde
--- /dev/null
+++ b/acct-user/dnscache/dnscache-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=225
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/dnsdist/Manifest b/acct-user/dnsdist/Manifest
index 74824d28a091..fffe7ce0e225 100644
--- a/acct-user/dnsdist/Manifest
+++ b/acct-user/dnsdist/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsdist-0-r2.ebuild 244 BLAKE2B 87844e2a6163549d52e2c0904951bc6ddb005a43f08f3894227a973c10061a0aee1469be5329839463e8ff21905e59ec28afa1599456a115e1a8f76105e3355e SHA512 266812df1ccedf343fb7081260df27cc7964637e82837073d6d4fec8e89e57bee0b8854f7506c854e118a8fb8c2daa39ac5abd391c4c783bc688e747711c6483
+EBUILD dnsdist-0-r3.ebuild 244 BLAKE2B e76cd7b988d20c902ab90b9c270a308b20449b56e38cda077cc819eaa83d235a2ff07814e3644a971d6de82a79b3c61caca3f70d337c5a2fa684e7ba9116796d SHA512 93395a63c844bf1f4142781faf6d7da760ad28aadfebf52da038e4114de2b9a650f7e9e1387a47ca4d22cccb654c02064224e8f098834537399a92a7b585524e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/dnsdist/dnsdist-0-r2.ebuild b/acct-user/dnsdist/dnsdist-0-r2.ebuild
deleted file mode 100644
index 8b89e209e152..000000000000
--- a/acct-user/dnsdist/dnsdist-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/dnsdist/dnsdist-0-r3.ebuild b/acct-user/dnsdist/dnsdist-0-r3.ebuild
new file mode 100644
index 000000000000..d3e28b4f4d3d
--- /dev/null
+++ b/acct-user/dnsdist/dnsdist-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 acbbdc48defe..d7a1bb1a135d 100644
--- a/acct-user/dnslog/Manifest
+++ b/acct-user/dnslog/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnslog-0-r1.ebuild 198 BLAKE2B 59a55ea3323e902d1fe99575e741d62e5168a972276026e6011e871dfdc060bf121c18297fac4ceb65de0d12ddb4886f9f0cb77cc64b27ea9203a9584db7623c SHA512 573fe6655a4a30c5503a0cef9e04b1a163a4d286775863548e72675a2d703e6880c867dc21eef1507371cc7abe2f0ea0c5c7ed8b8e0e78eeef029225b15e2fd1
+EBUILD dnslog-0-r2.ebuild 198 BLAKE2B a044cd4e6ee301ecbf8e67cd9f1a2f2d0b180bb8881fe9991afbb84ea9c89839f1f3cc78ea0c6df2b9f13b246ec7a13cb545cab36f9aed7991bf102d4f533c3d SHA512 9d905e53eb227657f2d8d15f49ee97e08dbc0f08659895ae9d4792cbd610f24d8702cf3a57b71cb5c4b870761fa629d04b4678b12a92746107cc6351b6dc8439
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
deleted file mode 100644
index 0c794b383e53..000000000000
--- a/acct-user/dnslog/dnslog-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/dnslog/dnslog-0-r2.ebuild
new file mode 100644
index 000000000000..99d2481c26b2
--- /dev/null
+++ b/acct-user/dnslog/dnslog-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9906488d1159..19e3e4aa2a80 100644
--- a/acct-user/dnsmasq/Manifest
+++ b/acct-user/dnsmasq/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq-0-r2.ebuild 238 BLAKE2B 6ef5b6c7aa1390ccad84ceb9435037a016fd38932d0787fc15008223fd50d064a198876da014118a033ec797ad83d33ae87622861409619fb481155669054fe9 SHA512 f5595a3c079b141da96972b14a38240adcb585f1b98188b11bf9c8c4469ae3be14a2dcd15c1f7b7845dab76eaaebb8252aa3cc265aee03282728b65b37ae57a0
+EBUILD dnsmasq-0-r3.ebuild 238 BLAKE2B fcd02500e40c8e0d46f1abf7930ae5959a08b7a0de47e6733478f76176f8d96e03ca9b17e59dd56d69a816b9a58fab4d0d4842c3dea484a4ea5a3726bcfe0f4c SHA512 fe59afbf58a07fb37b8581220aee2b3c227690a6931c78f3428863999838d6e8e2efd29e40a0da3d601af621f9c5c38b3ede96f283edf849959744917bce1a8d
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/dnsmasq/dnsmasq-0-r2.ebuild b/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
deleted file mode 100644
index 548af2c0d5a4..000000000000
--- a/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/dnsmasq-0-r3.ebuild b/acct-user/dnsmasq/dnsmasq-0-r3.ebuild
new file mode 100644
index 000000000000..4cd49ce844b7
--- /dev/null
+++ b/acct-user/dnsmasq/dnsmasq-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5bf9f84a8af2..849310652127 100644
--- a/acct-user/dnsmasq_exporter/Manifest
+++ b/acct-user/dnsmasq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq_exporter-0-r2.ebuild 247 BLAKE2B b24232206f28ad79a1f8cea7afb97e44ca8ad95f73f408d5b062bdc13f55ffb28869168c96dbd739c3ff35c8dcf7a7f9582adf4af4da4af147524ecdb459d8e8 SHA512 fc0c67a87a55d50acd7a7016f635e500c1fa127bad1128c4c6a7d44240399afc96b3f264c702f52e1a4d88ca48c7ab77d0df6a594d9d6b044352d243573dd014
+EBUILD dnsmasq_exporter-0-r3.ebuild 247 BLAKE2B c5fade80ac41ca7c5d7e504167fbcdc544ae09c0af5341eab427e26728c1cc33819c012773898dc9549cc962c3060bad03a1dbffc1c8f02fd740e0b66538a24a SHA512 47f12eaa305ac1839c2d03de3eb41d0a43173c1c6f8c79e70dd316d788117f9f3a57baa630a2b484f20e8a52b3cbd2b01858dc3cc13a6b555d3be638aff7a1f8
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
diff --git a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
deleted file mode 100644
index aafd1d549d4b..000000000000
--- a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..d140aed6eebe
--- /dev/null
+++ b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2ccda4ddbb21..896603eaedfd 100644
--- a/acct-user/docker_auth/Manifest
+++ b/acct-user/docker_auth/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker_auth-0-r2.ebuild 237 BLAKE2B 0730bf539e7704f54a321dddccd15d34dfcd9811d0ba2cae2d2ee0071611a67e7e758f77c80c8d97b3a4e5ce11f21561eefbad3125ee1e007332b8bb5a5f1905 SHA512 32ccb1e7ad9cdb5a1d76cb06c7e8dedbb1cbb571ff9b6bbc152368632125c9d0a936169109e776d5df397d0bce326d72f3efa13694f3bfba73b3241de67d79e3
+EBUILD docker_auth-0-r3.ebuild 237 BLAKE2B 3478e33f81e227958a252a0460dfbc1f54f1162d21f4e2c8a926ed7a730496f531963c6e721c51e4d9fb355edffa8b56a4e30867554619a8bcee287d2146bf4a SHA512 cfe668f4e88956d305595980eb0d9ef57dc155817772f578a23df042d54e96c454dd5b3384fe648e5488241e54eda3baedab0c0d18ae0cca26f4a34c0580c045
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/docker_auth/docker_auth-0-r2.ebuild b/acct-user/docker_auth/docker_auth-0-r2.ebuild
deleted file mode 100644
index 4b43ec91c96f..000000000000
--- a/acct-user/docker_auth/docker_auth-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/docker_auth/docker_auth-0-r3.ebuild b/acct-user/docker_auth/docker_auth-0-r3.ebuild
new file mode 100644
index 000000000000..04a36a0f6ede
--- /dev/null
+++ b/acct-user/docker_auth/docker_auth-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ff5e15d725cd..5ce3a079bcb6 100644
--- a/acct-user/dovecot/Manifest
+++ b/acct-user/dovecot/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovecot-0-r2.ebuild 235 BLAKE2B 6b21357401d5a2a18aa28563713b5c57cfbcbcd61db2fb12748bbc198e97a1b96e718c6456bedc0b163714bd9db11c0b2ff6a45316e5dc7edf6548e23b20b830 SHA512 2b1f355ca84e41e3475076f621c5a1b2afea59d8f06309445f772caffd1636035dc7b8b4030252f290e8c068a43ce627ec688d45bfc52e451a95c98fc00a174f
+EBUILD dovecot-0-r3.ebuild 235 BLAKE2B 843a721af39910b227c90dff7e18513f61ac9c98f4e95044ec3495dfbbed6c5144fa913923a4f25fe1acaddc2d514a0e8ff836df691df08cf050414e92ff73a1 SHA512 121d7f38cf4376601d836df632a29bb5b9e2c5805e8e5b2ea4cdf860d1a12542a6eca17a6816e4000bca2ee4a0f20409992da82582d487db69e8d19437daeb14
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-user/dovecot/dovecot-0-r2.ebuild b/acct-user/dovecot/dovecot-0-r2.ebuild
deleted file mode 100644
index 107dc2b7bf7d..000000000000
--- a/acct-user/dovecot/dovecot-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/dovecot/dovecot-0-r3.ebuild b/acct-user/dovecot/dovecot-0-r3.ebuild
new file mode 100644
index 000000000000..702791a628fe
--- /dev/null
+++ b/acct-user/dovecot/dovecot-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c153498b9865..6008dccad3c9 100644
--- a/acct-user/dovenull/Manifest
+++ b/acct-user/dovenull/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovenull-0-r2.ebuild 236 BLAKE2B 8707ce0bb796ef7759544f4e65d51365b3bf02b9a18955671c752335d513b6c0ab8cbd11ddee08587f0989886852efb74169669e13a7d3cf98e4aca7762d983a SHA512 2f54c879d9133ce8e3d3bc73f24c9e5fe8a72c876d2ca7e7e628956438354340be30637c1088729412b46bc79facd693107f4c66034557e8244b8be2bb18bcce
+EBUILD dovenull-0-r3.ebuild 236 BLAKE2B af16d1e60666ec148ffc969f5b31d99b41f2699a74042ab13bd99401c7735acc96f39d70f738e87fdeea87a22ff5c8f3b6ab0c37618fabb34de945018b3b959a SHA512 f5ce12cf1abe9a3ae7d54633a7da3fedb7b9c52f6b8e0ef9eb7126ffbdcc50ae4f25bda62d0658bb5620ecc09f88bce9a77c768c228c35010a0520f06029d244
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-user/dovenull/dovenull-0-r2.ebuild b/acct-user/dovenull/dovenull-0-r2.ebuild
deleted file mode 100644
index b1fd15df1755..000000000000
--- a/acct-user/dovenull/dovenull-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/dovenull/dovenull-0-r3.ebuild b/acct-user/dovenull/dovenull-0-r3.ebuild
new file mode 100644
index 000000000000..6aa6fc1668c2
--- /dev/null
+++ b/acct-user/dovenull/dovenull-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f8ae5302921d..185e87622090 100644
--- a/acct-user/drone/Manifest
+++ b/acct-user/drone/Manifest
@@ -1,2 +1,2 @@
-EBUILD drone-0-r1.ebuild 267 BLAKE2B b857fbc2488d021a7cf8a155e60827c8ca584ca6af03a60def4d65859b97d9c4cbba067f4cec812b90bee73fed89d98e3608fe34a50140c856161a31f9c17102 SHA512 4ba2bb4bdc47a80b6880a7eb2601fa4b6ea31845e22efba187ee210d405c4838f4085a2aaf2bf55d176968014604838a719d0168af04bc2a704815edceb221dd
+EBUILD drone-0-r2.ebuild 267 BLAKE2B 356c7e72143f1398866eb912bcd58057638b2246cb2970f2869fa4623478dca05f6282ebf4754f108ecc845cef151d2b60c4937aa6e02d1e00eb4ccb2484ca15 SHA512 022e856ac734c7b3a4280d682dd1bbdb3fba8b09b1e90c633111db8309fe258b1f886c967caf195df7f3212d70a4554ea47712ff45b708bb5ddadd9b3c13787e
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
deleted file mode 100644
index 9cd5b314e13e..000000000000
--- a/acct-user/drone/drone-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/drone/drone-0-r2.ebuild
new file mode 100644
index 000000000000..dfad3ff14c81
--- /dev/null
+++ b/acct-user/drone/drone-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c687e2b5b9fa..4eae61a29a1e 100644
--- a/acct-user/duende/Manifest
+++ b/acct-user/duende/Manifest
@@ -1,2 +1,2 @@
-EBUILD duende-0-r2.ebuild 263 BLAKE2B ad79ed0ac020b629823d211ae748cf8873aafe97366627582f57d053751f1a28030b780883baf0ecb259ceacd9b687bac9d3b5005939b943538d883c8c4458b7 SHA512 468d2d47d3894979651a09be49423eab9773a63648d20011e44672ffc008ea39e85d5af2251776f718c9d00694a479bd22a6f188f21cd5a82a619157cb40206e
+EBUILD duende-0-r3.ebuild 263 BLAKE2B ae1f34bca437b500a6d0998802a53bd279097c1dad9be8ffb0775d3e821506dbcf10f53b8528b02f7b43bf77d0fe9a261bfb4d97105f4c5e81a6294efa815b8b SHA512 64fbda81d342067d04beea0cca5adf5d44175c02784520705aac7c0d0155861be24ea8a08d8ad4cae8917e009f34945757b3d1ecbc07b21042b5ee9ed0a0fb28
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/duende/duende-0-r2.ebuild b/acct-user/duende/duende-0-r2.ebuild
deleted file mode 100644
index 9606fcf3d80c..000000000000
--- a/acct-user/duende/duende-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/duende/duende-0-r3.ebuild b/acct-user/duende/duende-0-r3.ebuild
new file mode 100644
index 000000000000..68d5b8c3c0de
--- /dev/null
+++ b/acct-user/duende/duende-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/elasticsearch/Manifest b/acct-user/elasticsearch/Manifest
index 8bac0f13e2b2..59c231bffd8f 100644
--- a/acct-user/elasticsearch/Manifest
+++ b/acct-user/elasticsearch/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch-0-r2.ebuild 310 BLAKE2B cd8ec5ce55bfb0aee467d9355049cb8472def58521ea670dc13964ad9707bc67cad791e4b7b5a1cb30cd34a5c83457648eff8acfbfc458b994c12222518bdd64 SHA512 f7666742a579a3bd3fea3df5bbc599f41ba2d85cfa985af856977e64d5c83872cc1ddb472e17e7fd261ac89447e29b329061c34b6eb3fdc18146571e66a4eaaf
+EBUILD elasticsearch-0-r3.ebuild 310 BLAKE2B c158422ee64a4565ceefe7ab544d6400c3d3495c2d35ded382d479d5046afc315fe67a32fbe89db456d7eed2b5e8052b3ed4c42bbc793a0213f710d7eb669fb0 SHA512 0a73598df5e2bf13ddd3a1b6c67a423ab979a7ca92773b1cf2424c82456d4d2e019b73c7c4641e356a6001f8d8dea60c29ea08e796bc4786547fd72a12b69d80
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-user/elasticsearch/elasticsearch-0-r2.ebuild b/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
deleted file mode 100644
index e1b91dea15cb..000000000000
--- a/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/elasticsearch-0-r3.ebuild b/acct-user/elasticsearch/elasticsearch-0-r3.ebuild
new file mode 100644
index 000000000000..6986bdcd0afb
--- /dev/null
+++ b/acct-user/elasticsearch/elasticsearch-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8cedd0239ae6..ad487fda35f3 100644
--- a/acct-user/elasticsearch_exporter/Manifest
+++ b/acct-user/elasticsearch_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch_exporter-0-r2.ebuild 273 BLAKE2B c3b9c17d2a93a3ac41e16a37d5ea749e657b3c79b63e418cb8e6f0f7577bbe9ae28c5568314c7bac727b15645ffb456664b9c8eac2cb9a52d66ba7d5e9f458e4 SHA512 d0603e09e0722b95f1240f4ec0fd198007cffb46b9cc81ba399b8035de4be2b3c46e6819d8c80cf8571b4abb11dd38c0b205aa72d9695a14f26eede1df08b720
+EBUILD elasticsearch_exporter-0-r3.ebuild 273 BLAKE2B be23098b8fa8d0e95a261904f3cbbf8352958f6596225a5d73b53c4a4a39c971b978a4c3a42d546cb23816ab91e23a434ac317108a6a9918e0d46491fd60bb43 SHA512 bf276e28791802e2acf5e3e81d51826470a1ffc63efc7c9eab66551144562bda4e75e214ae54819d1a4e0a422998d6669cf69c3363a78c690312c6e43f45c59d
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
deleted file mode 100644
index 4d8aef4a88c1..000000000000
--- a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..be6260e5a5bc
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 80b5a1806626..f498ab6d62b0 100644
--- a/acct-user/energi3/Manifest
+++ b/acct-user/energi3/Manifest
@@ -1,2 +1,2 @@
-EBUILD energi3-0-r1.ebuild 237 BLAKE2B a7e50f3ca84a9dcf30ed94ded8aaba7d8bbb90a6e3c65bb5b219c1e7b618b0729858d9e64af889b47e6c99336c1fac8eac8220673601308f669cb83e3014572b SHA512 7cc39038c9a152a609e1aafd961804f7e839e3bf5fac34955e891e55b1c6cf095045d49fcd9406515296f7efcc646dc63ad303d5e30a4e3c7e854f54b56156fd
+EBUILD energi3-0-r2.ebuild 237 BLAKE2B b3d74e1ab64d363ece5e64d44b604f56b81ef053955d883d7827c765c807add32c9df0eca23385413efa434553194ab14d21502dc1e9d4267c13ff30445fb4b7 SHA512 5303b187bb6094b0fddf60ed59c0b5b16c34c0f9e2bf45c39a23099bf14145df237e688317b7d9b866a66db0f51016596b2752e08d35d8d0175ef14639d9a654
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
deleted file mode 100644
index c4c06a942c1a..000000000000
--- a/acct-user/energi3/energi3-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/energi3/energi3-0-r2.ebuild
new file mode 100644
index 000000000000..790e4fa03102
--- /dev/null
+++ b/acct-user/energi3/energi3-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 567be239803e..8c8009137a48 100644
--- a/acct-user/epmd/Manifest
+++ b/acct-user/epmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD epmd-0-r2.ebuild 243 BLAKE2B ff1a954f6472fd9490ab0b6d0b75c69f10e57480085bb2d1097758fc5eec72a7f30e87b4744192dfdc4ae9e9e8d8c53ea966f0ea0c4f14496aa457898309bbfa SHA512 dc35bfe19233ecc5f7226e9a3631597756725079356c21bcfc072a22852b480a13e46d148ae2e5695a97734f5116fdb452d5bf2d70e37ecb9d3d9ffdca42fd70
+EBUILD epmd-0-r3.ebuild 243 BLAKE2B 8ba69cdc10e1fa8590136a7c1eee9b803a1a15a19d570cfce5dc257c329092c79cc87e5f8877cc887b28759e1e1e49d46e9577fc15628b10198c4243a3e4dca2 SHA512 54731ce122af4147d87247b8717edbaba62099676b1612c5aaa43dd7c6cc1fc4bcca4333f0fefab7035d097b8261fe41ae9edc09d3db2f652a171241b4c85050
MISC metadata.xml 246 BLAKE2B 10aefa483b0d2464cc54717a1e00c5474059fb01c51ef76d09d2618a3f22d0bcf12d67d0bc625757697d7cc07ac6516718fa254e67163410241794b2417d7417 SHA512 e05bd4e45e37c5246d1a8d144d348aae094aa7ffb63651222eb91c47f6e08bc84d6cff93d3622a218cb9184fa64dee598a1a9041853321e417afc293b6135f04
diff --git a/acct-user/epmd/epmd-0-r2.ebuild b/acct-user/epmd/epmd-0-r2.ebuild
deleted file mode 100644
index 093ecbc957b1..000000000000
--- a/acct-user/epmd/epmd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/epmd/epmd-0-r3.ebuild b/acct-user/epmd/epmd-0-r3.ebuild
new file mode 100644
index 000000000000..aeacc7e3b8f9
--- /dev/null
+++ b/acct-user/epmd/epmd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3303c8594a12..0755af4bf198 100644
--- a/acct-user/err/Manifest
+++ b/acct-user/err/Manifest
@@ -1,2 +1,2 @@
-EBUILD err-0-r1.ebuild 198 BLAKE2B cd7e4399f27cd3a5641fd60ac0f75642dd03bb09179fba744548faad10b5454dfcbdac4676e17219cd1e79533eaec2b53f73c5d69330a1174a065669650d36e5 SHA512 0d85c55be681249f9da06e95a9493627c460c6d429d232150ba558f33899c1ac5499e13ace3cfe6cff710325879047c313027a1e3dae728575a0443f14aa5176
+EBUILD err-0-r2.ebuild 198 BLAKE2B 730738e2c773241e8594d9e2beceb71cf10728ffcccc14815bb3e8a56928b19f9db73717c115394691b4a1aa5361573ce7f9a3066fc98f26208632db3ae46f79 SHA512 3d456fdf4bc420a8033708f633eaf15dabadece0ba66ae55e8af001730855422326b4a28ad217dda628cd0abc080d7155e0351bd8ed900c3bbd35fc6ef22bb70
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
deleted file mode 100644
index 0def72aa8a34..000000000000
--- a/acct-user/err/err-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/err/err-0-r2.ebuild
new file mode 100644
index 000000000000..2d4075676038
--- /dev/null
+++ b/acct-user/err/err-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f0262a174b38..749e77379707 100644
--- a/acct-user/etcd/Manifest
+++ b/acct-user/etcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD etcd-0-r2.ebuild 277 BLAKE2B eb14a0a73393f11fc52c4c7231e858356888fc8c51be93237a8b62f907d34882d288148ee0cb4c1016901475ccf38b35f73a3ea1733623f335df05a4b9b20389 SHA512 bb8997ad41e81cfad423db4af6bb81d35289a7a39e03cad33ab39966e7797ed7b7d7a3c8bc17ff9e3118cdb062f65d959b93ad5710a7bad4c703966d2eb6fa60
+EBUILD etcd-0-r3.ebuild 277 BLAKE2B b0e91858251992a19688ef9e7e5f80a8c91cd42f82fdf7751f969ba444385578dd4cdf285124a12f85fea2b7c16bd5f223d7493a64c8e9f132f675cb35bb3d77 SHA512 5e31fee246a1a33b86404d25868f9775aef89f861dff2f705210f82b0dc1cf970060571e4a6e80f3a8042d496a1d57052b5a0a87e01687882493f7f96401997a
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/etcd/etcd-0-r2.ebuild b/acct-user/etcd/etcd-0-r2.ebuild
deleted file mode 100644
index 0af97deddaa8..000000000000
--- a/acct-user/etcd/etcd-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/etcd/etcd-0-r3.ebuild b/acct-user/etcd/etcd-0-r3.ebuild
new file mode 100644
index 000000000000..3e4df0653988
--- /dev/null
+++ b/acct-user/etcd/etcd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8dfbe9b5e7d0..d6f1ddf2d861 100644
--- a/acct-user/exabgp/Manifest
+++ b/acct-user/exabgp/Manifest
@@ -1,2 +1,2 @@
-EBUILD exabgp-0-r2.ebuild 237 BLAKE2B 7e0c06afad541f11b485215cd02ceddabe6a243df82942ba82d549fc3c1fe314d8c9fb67d69df09f9d56a267ace8e596375c611974b8e331df64d65b0fdda901 SHA512 b3ed485ed36dec4dc7b9c459738d56bdf40503f3e1c265a9a059f60b01c3562da00af21df6d1619d22aec36dba32535d4fc4dbbb30a5f634f79650c6349984c4
+EBUILD exabgp-0-r3.ebuild 237 BLAKE2B f69ce419524b6120637d640225d17f88f5f4e15667b06412b42813d83fd4ccbbae6a0a74a4becacaf768e2c8dc255e4b48f7667f1bd0a7ba6a7aaf2433e5bb2b SHA512 ee1e10e2832ed3fee9de5216380390c8d792afedec85ece489ebf323626737fedccc410d49d6b3265460ba75bb3c25e543c0336e3d0dc36d86334b489fc943ed
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/exabgp/exabgp-0-r2.ebuild b/acct-user/exabgp/exabgp-0-r2.ebuild
deleted file mode 100644
index 06853b063cb3..000000000000
--- a/acct-user/exabgp/exabgp-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/exabgp/exabgp-0-r3.ebuild b/acct-user/exabgp/exabgp-0-r3.ebuild
new file mode 100644
index 000000000000..e012e9133b45
--- /dev/null
+++ b/acct-user/exabgp/exabgp-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 cf68b96e4a60..9ba4f0b2684b 100644
--- a/acct-user/ez-ipupd/Manifest
+++ b/acct-user/ez-ipupd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ez-ipupd-0-r1.ebuild 287 BLAKE2B 95910e63e3becdc1870c4665dc69cc92ec6d02100af7f46e76762803fd44fc4cacf6276a0d55601df501f8be6ccadd07deb5c4d225e3592fef8b3e82b6a42779 SHA512 ce5e2540e61a88ab6c642b90efbebde9a35388b818d22525c619ca5b2fdb5a5199f020f939d165019a165931dc79bc623f96d5c1e5aabdaf4d0a13850d328d37
+EBUILD ez-ipupd-0-r2.ebuild 287 BLAKE2B 33235aca4e4657e221d4169cae4d271eaa8fecd4650ce3190fae7fecb5ae3f5e353822406baad86a820f783a2c481ea0325d9e8def5b33b5684d3682f93af17e SHA512 26b47da0d4ff1e7626d1828c1e6a50fcbd576c8bbf7f597f480496f5ec50fc8c9537154e0e30a3c5f0e98becbacfd026928d7d301599958cec482d8cb68b87da
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
deleted file mode 100644
index 92be78693837..000000000000
--- a/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/ez-ipupd/ez-ipupd-0-r2.ebuild
new file mode 100644
index 000000000000..239fc66b5784
--- /dev/null
+++ b/acct-user/ez-ipupd/ez-ipupd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a3342575c7e9..1d6253b4a7a8 100644
--- a/acct-user/fax/Manifest
+++ b/acct-user/fax/Manifest
@@ -1,2 +1,2 @@
-EBUILD fax-0-r1.ebuild 242 BLAKE2B 75827baf0ad342023b79bacad655c2748a17a6f59d83ab0db09c37d13f51b98f97225f49ea3466610fc771ecdd89b2eb02a94c838a94dbffea29a1575b549b03 SHA512 a9aa64c7e6794447e75e0af18176778ada37786e3571ac548dfb67e1ce67f552256d838a80aaa24635edfd8f3ef435985864bbdc18a2f40293663ce2f4875904
+EBUILD fax-0-r2.ebuild 242 BLAKE2B ed1f21a478f3b97bb729261ff359da07b3ffe4e781f8f362ea7e9cc777f287df76809fd4f8919ed9a15517f4131134fd50c73d8d727fc91494477d9a180808fd SHA512 da9e790c748f0185259c1911cf6173fa6bcca860469b910bef1312215bb83be5c7b15bab3e44e44ba2f104c5bbc17983c33d382f6f3668dfdad495e7aecdccbc
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
deleted file mode 100644
index 3ced3405070d..000000000000
--- a/acct-user/fax/fax-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/fax/fax-0-r2.ebuild
new file mode 100644
index 000000000000..b43d81fa245f
--- /dev/null
+++ b/acct-user/fax/fax-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4371b6e05c36..0a52a420ff88 100644
--- a/acct-user/fcron/Manifest
+++ b/acct-user/fcron/Manifest
@@ -1,2 +1,2 @@
-EBUILD fcron-0-r1.ebuild 244 BLAKE2B 7701edcedf9255e3331d5d71bee4d073a1f3fb0ca736ce276ed8fc7d7d8847bb1bea35870f96f8881b00af1b620450cacad8444d941c396085ee8a7a5fd39aa8 SHA512 ff834080ad8f10b88c6601eaf2942cd8c2a9b62b99ac16dbdf1adbf3f94c86d6d2e8f9aba0822ad83eaf14b62d2d50019ba4cdffa638e6661d847496cae0c345
+EBUILD fcron-0-r2.ebuild 244 BLAKE2B 81384d673d88cbae393b1cfae8d0277b105aafdeea4cc95c9431c932858c572ffd29e05d5b56e13ec3444ba4c6ea961047176e4e411a12f25e46b6a57c69b6e6 SHA512 37311246dcf2e7f341810c0de5c5f8a40baa7b3ec38cc12da06e3d9dd2c072e390a9506841ef32a42ea928b5bc95ee5dd8828f36b728169f388f69c2bf6348ca
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
deleted file mode 100644
index ca25b3a170af..000000000000
--- a/acct-user/fcron/fcron-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/fcron/fcron-0-r2.ebuild
new file mode 100644
index 000000000000..32dc97d81148
--- /dev/null
+++ b/acct-user/fcron/fcron-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9a9a4c1ea962..170ecd8775f9 100644
--- a/acct-user/fdm/Manifest
+++ b/acct-user/fdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD fdm-0-r1.ebuild 235 BLAKE2B 55c3afdbe9526a8f25ad191d641b221040c2890c76acc54412aa617b43e8381c3c219a76076751711eca8c530948dcb921118a93502ac12722d3f451a127f1b8 SHA512 28595f193f3b05778eca8edd4bd8d12e2659dbb48e50fe839dcc69d06d09281761e95de7b96afbe415717e1dc0f97765db8ada5465422007a21afa57ec50ec09
+EBUILD fdm-0-r2.ebuild 235 BLAKE2B be0b777669ea15c80d5fc47d86fe1cafcc9d4e7484d5a3a0edd96303917124b06b1bef8d9da30ce96c44a839e2df1f151fccc95476db62a3e7e0d5fdff287d45 SHA512 52ad9fdc538b2da37539aeef082ef78bd2b06c708ee9a32c776bf5a64359140545eac35026f9f6a5cf02b042b96dddca8aa5a85f2a4acb3b19af247dbe986d99
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
deleted file mode 100644
index 646dc4cf50fd..000000000000
--- a/acct-user/fdm/fdm-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/fdm/fdm-0-r2.ebuild
new file mode 100644
index 000000000000..e3aa7386e119
--- /dev/null
+++ b/acct-user/fdm/fdm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 418edddb55ae..4dadf7ad1d59 100644
--- a/acct-user/fetchmail/Manifest
+++ b/acct-user/fetchmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetchmail-0-r2.ebuild 304 BLAKE2B dc6eefb048b6111d98c9363b9840c1eb7d5d0f45cc4f7150c41ce0cedfd53a57ef4707bad908f07f99416926cdb6ee62aee17419b2d00b810c6fd6e8bcecbbed SHA512 d3d8fccae985d60001b4223196e88d94b98ceb818dae2e30768953154e755c39703f645637940e58c591b7a58cea305f66ba1f790646f915b88a659510c39ee6
+EBUILD fetchmail-0-r3.ebuild 304 BLAKE2B 777641b890a166dbf26944a9c14a8d21e792325abe346bbca4b7027f3d7246fa25ca78177bb69c652b46f88ee49d7b01f91603c6d6ddfa1c56e6961b5bd4e5e9 SHA512 451dc7a140987a4808a524298cc32803049290a16b97bc6b04fae43e5bc252fdff10f6c52cebdd7148a9d711bb4cf2e985c9d47dd7b61ed74b3c41ead9dce362
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-user/fetchmail/fetchmail-0-r2.ebuild b/acct-user/fetchmail/fetchmail-0-r2.ebuild
deleted file mode 100644
index 4101dcfa26b4..000000000000
--- a/acct-user/fetchmail/fetchmail-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/fetchmail/fetchmail-0-r3.ebuild b/acct-user/fetchmail/fetchmail-0-r3.ebuild
new file mode 100644
index 000000000000..92a4b3b27741
--- /dev/null
+++ b/acct-user/fetchmail/fetchmail-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0a1efb4ec7ce..e173fe570769 100644
--- a/acct-user/fhem/Manifest
+++ b/acct-user/fhem/Manifest
@@ -1,2 +1,2 @@
-EBUILD fhem-0-r2.ebuild 294 BLAKE2B 618bafd26638dd2078ba703334f34758648f74d3b60ab7b211d2cd06833f216e40c554a15ee21f375736097b6392c84155ae7a77c938ce004f0f1a0bb29e8ea9 SHA512 a7f9eb5e69dd44b6e61c55be87b7843d0de483482cf9c05730cba7d49e72fbbe99132340361c51580cda63835f11e337824ab7d141bf158b8c0f315d6dccab00
+EBUILD fhem-0-r3.ebuild 294 BLAKE2B 651bbe0b7240109a679aa60b1999392068537d316db37dba6088c56cbabe7cf0472789c0e06689583de82299eea5c6267545383be5a257cd90cdd0837172fd41 SHA512 405f170c4c655d3cbfa5b1c2957f2a4a88a39ab55d654235a5f32f8290c93be6d30ddf4d4deef3e38a9a4994cfc34eedae27a757aa58504437b477b8d18c606f
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/fhem/fhem-0-r2.ebuild b/acct-user/fhem/fhem-0-r2.ebuild
deleted file mode 100644
index 51c17069a9a7..000000000000
--- a/acct-user/fhem/fhem-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/fhem/fhem-0-r3.ebuild b/acct-user/fhem/fhem-0-r3.ebuild
new file mode 100644
index 000000000000..39ac723bd210
--- /dev/null
+++ b/acct-user/fhem/fhem-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/flatpak/Manifest b/acct-user/flatpak/Manifest
index 4541e9197bda..1605b74ce65f 100644
--- a/acct-user/flatpak/Manifest
+++ b/acct-user/flatpak/Manifest
@@ -1,2 +1,2 @@
-EBUILD flatpak-0-r1.ebuild 197 BLAKE2B 4db4bdee6d5f58efa61c8959ee1be612dead8a0f9bb4154c3f61ecf5b540e4fbca06a39b032cc67a3999e8c3512e03792cb1b79b1715a6ee2be919fc926eda8a SHA512 70d5fc3c92c30ab0825327e86d3985357c0cb44fcd1cb8434ae518f94c249512533c0f1d7560b1acf70aa6c060afb6fa213329fec8e68c392f6790aa62675796
+EBUILD flatpak-0-r2.ebuild 197 BLAKE2B d9d717d9711a886befaf6858d77615f2ca04508d55138c6189db96db7c0cdf3bf9cb36d03bf55d1600862554cdad9d5005fc10310e32c2f6dd338f050a53c541 SHA512 d71b6ccb1ef2d536682e5e6a068a2785a70a6bb84942da48c0c2e24ef7e0c06620f76b46e12afa6f48d94c133c420c104a6a8dc631112baf08377ebc5a516ae2
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
deleted file mode 100644
index aaead0d36975..000000000000
--- a/acct-user/flatpak/flatpak-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-r2.ebuild b/acct-user/flatpak/flatpak-0-r2.ebuild
new file mode 100644
index 000000000000..5fb77d230830
--- /dev/null
+++ b/acct-user/flatpak/flatpak-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a31513598115..0db003390421 100644
--- a/acct-user/flows/Manifest
+++ b/acct-user/flows/Manifest
@@ -1,2 +1,2 @@
-EBUILD flows-0-r1.ebuild 272 BLAKE2B acb02ee35915e0b39222014445c41cd7ecde81836d41f5642e2b903eaef1f40cdd48ef4e62d59b896ceb62a205c4bebbedc29b9aeb3b73c6657abd1902555db5 SHA512 9db41c46dd1628b6e59a605fe5d7374af043216a222398c707924dfe229c25501490c90fb88923323d94a0e121d0e491e2ef032f1c71199c94e267f5a8867e71
+EBUILD flows-0-r2.ebuild 272 BLAKE2B 0d7be5d068e4dd871b228d9d6c801b264749eade3b631f91b949ecc8f6fdc724310c816791ce136ae930c62c50c563ff394e2733f0ceaf0067e17aa1545da859 SHA512 1ea0ed1a56fe4999c301a3c87729ad447a92b8a3effede8f7463324d1578a0d7d1cae516feff2c3a72e73318681beaa5193354674e6d074009e118dca67a7600
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
deleted file mode 100644
index 2d265636ba43..000000000000
--- a/acct-user/flows/flows-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/flows/flows-0-r2.ebuild
new file mode 100644
index 000000000000..18d21e541731
--- /dev/null
+++ b/acct-user/flows/flows-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 22e121e52c6a..08e1a5f98233 100644
--- a/acct-user/fluentd/Manifest
+++ b/acct-user/fluentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD fluentd-0-r2.ebuild 241 BLAKE2B 64c5abc3407434ad0794f744afc7bafdae0aa0c47c300e621bb7470011e4817f50735427a7909713a3499b96a41bce5ff5ef6be5e9158cf95ff9b796060a4b58 SHA512 d3bc7e0f2402bf8c5b3d7712a26f817923969fa2fa98ea0c999e6b63a42901301d621660a80502dddee02d0cd53fb4aa52d66a9b30637cc2c6f5e1a7b48cda42
+EBUILD fluentd-0-r3.ebuild 241 BLAKE2B b379885c21864e98be2562b963b262950ee4a7d03ae4a0ee7a23ccde71f0b89022e41964f850b3b1e034f71df97976fac95436faf9a301f50b7ef63594db85c4 SHA512 53031d9d94e1cd224b6456d4020d003d9be459679218926321e8256c7c06ff5ba07de373dd37812da1f5b802449bd9afb8519df0a823061dd6fae79e4f1fdae3
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/acct-user/fluentd/fluentd-0-r2.ebuild b/acct-user/fluentd/fluentd-0-r2.ebuild
deleted file mode 100644
index 15b390b4f36b..000000000000
--- a/acct-user/fluentd/fluentd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/fluentd/fluentd-0-r3.ebuild b/acct-user/fluentd/fluentd-0-r3.ebuild
new file mode 100644
index 000000000000..a6318f9e389e
--- /dev/null
+++ b/acct-user/fluentd/fluentd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 3951c596ff08..e36482c471f1 100644
--- a/acct-user/fnord/Manifest
+++ b/acct-user/fnord/Manifest
@@ -1,2 +1,2 @@
-EBUILD fnord-0-r1.ebuild 272 BLAKE2B 8d8635a4a76be67613817666f51b17bedc6260dad3e827f49c90cf2a349a68d8ffc4160f6a78d69540fb31ef53e6f9e9e0d062e379b59ff6cbb654a87c5e8bab SHA512 1476ee402764162012eae0c42dfc335cd8d9d37b336560466a23fa74bea48138f53783ce533ca201e55f681707b219673713509a4745d40de59d8b4edbead720
+EBUILD fnord-0-r2.ebuild 272 BLAKE2B 1159a9fe467f4400d11827efffe7794f77f916a584ee55af99fd8111f67e27c0397fe0c80bc87953a9ae6d36e28af7a85b43e26b37b261bc17c3cc915d27ac03 SHA512 c883c2b07d6d8d35cbdae2eebb307d87f2a2faf52f4b61040fb7d6f30d481e278d8446e0525c2f9f6bac5aa3df68dd0d202c2d858346f71233df43970d1ad16f
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
deleted file mode 100644
index 2a104f9cbaeb..000000000000
--- a/acct-user/fnord/fnord-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/fnord/fnord-0-r2.ebuild
new file mode 100644
index 000000000000..b36098e11719
--- /dev/null
+++ b/acct-user/fnord/fnord-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4ed65d890ac7..e1fde5d0bc8e 100644
--- a/acct-user/fnordlog/Manifest
+++ b/acct-user/fnordlog/Manifest
@@ -1,2 +1,2 @@
-EBUILD fnordlog-0-r1.ebuild 272 BLAKE2B 5ed8504dbcde289594c65c7b30cb1e31d4658c18c3eb981afd44afcd3ce4e0b41ce111baa7d86089a02c666b6fede8adff936f88ee1de4da830cb8acdfc89741 SHA512 b58ecc34548f5bf7532e567b7a368a720527df8f091cc1fd084818a83f99f9c93f1d3346706442cf4e762b35553ca917b0b69d12ac01ac9f15c2b7588584d034
+EBUILD fnordlog-0-r2.ebuild 272 BLAKE2B 199a2457c8250fcc4eeb60f83e6cccd4acef65580ec3f631de75d386830ced8da5b9226c9c38f1d7c8a44468d3aa18c6b69c9ca9ed7b3a3f205d212d928f0373 SHA512 0c2f3e62f051cda248a4ed7f4347e247eb617be1545b94868767538470d3446c410600b8d207cdadae334441835404d6e499b83d5e1db8cb7b3471cf5ed8b62a
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
deleted file mode 100644
index 9fb95c7fbad1..000000000000
--- a/acct-user/fnordlog/fnordlog-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/fnordlog/fnordlog-0-r2.ebuild
new file mode 100644
index 000000000000..4a3b0b591b46
--- /dev/null
+++ b/acct-user/fnordlog/fnordlog-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9e3537997395..e69fef7174ff 100644
--- a/acct-user/foldingathome/Manifest
+++ b/acct-user/foldingathome/Manifest
@@ -1,2 +1,2 @@
-EBUILD foldingathome-0-r1.ebuild 304 BLAKE2B 38d165e7431f516909d5fa1447834a53d22449c544a5dd0378bbe942bf8d81057c001f85abe94849247f3cf4e83a451a41d9bd0a63bdf4051b616c53622de3d6 SHA512 f51dc00042088355adb4df709d5435cec37cc6d024425e581d6f177c5922480f6083ae53fadbf999b2a3b125184567e74774727a75d744866f6dcae99b1c8956
+EBUILD foldingathome-0-r2.ebuild 304 BLAKE2B 93bbab0b91c199622f7b2f6893fe5fa1fa306c293792774beaf1870c8fdce686e34c50d1a21a6b38ee963d4f46363fcf2cecd2899766c5841c7ae38c03d56834 SHA512 e48b39e3b8de6a0c21a375e750511424f981642326ea9c929c45b11025020695ed0c74712385b38a1380e5f15ae2c5b0d18b618c1965e310bb286290519f9f6f
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
deleted file mode 100644
index 4f01d42def53..000000000000
--- a/acct-user/foldingathome/foldingathome-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/foldingathome/foldingathome-0-r2.ebuild
new file mode 100644
index 000000000000..3922c168f6d5
--- /dev/null
+++ b/acct-user/foldingathome/foldingathome-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b3c662631c52..19e8b05a238b 100644
--- a/acct-user/fp-multiuser/Manifest
+++ b/acct-user/fp-multiuser/Manifest
@@ -1,2 +1,2 @@
-EBUILD fp-multiuser-0-r1.ebuild 291 BLAKE2B 77cbe28c47bf11e00a8baf4477ff589fa8aea6f74a08aa8dd6a3879b24cc3f8e0d68507540dce6b50b6e5e55cda9a4077fb7f466e8f691adf774169730ffe7c4 SHA512 3c4f4c281cc4575fd6c28bffb4b7ba68b7d58f4c167302aa8924f07aa3fc54479d17ffe873db981ef1e91a8a183d44874f7030e8a0ba8e0250b1d2f42e09e4a9
+EBUILD fp-multiuser-0-r2.ebuild 291 BLAKE2B d525ebffa20c482b3d28931be4e8d51cc108579297121190559ad59262fa9092d34a9938e17ebc06058bf2f6134a9822ae6b2e78558144b1a5d1aa36e42c2953 SHA512 fa0b64bdb79b687115b1e05c352b9021a84d175761ba52d2ebb698f47883bf9f58edec6145095286b215cfaa1ee03137430ffe7ce4001240285eea059d74b9f6
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
deleted file mode 100644
index 0397363b2c62..000000000000
--- a/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/fp-multiuser/fp-multiuser-0-r2.ebuild
new file mode 100644
index 000000000000..5c6587b6dc08
--- /dev/null
+++ b/acct-user/fp-multiuser/fp-multiuser-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0324dd36f093..45dff7b95921 100644
--- a/acct-user/freenet/Manifest
+++ b/acct-user/freenet/Manifest
@@ -1,2 +1,2 @@
-EBUILD freenet-0-r1.ebuild 289 BLAKE2B 713cd8e27080a409e3a1f0b8e9f8dd0326970d9a40c89b559149c1f78c8afa794da6c05b35062e78a8959bd6eefb8acda7142e49102f9d965ed6424705f07810 SHA512 500eb41f676ac17ca23f7c292d2bf7326c3f01eb982d11c98469d3df7d50f50feaddc43418bad7a977d965372fcbc8b78ab8bbf653c82ee33d4599f44e5a6bba
+EBUILD freenet-0-r2.ebuild 289 BLAKE2B 1e2f9fa59472d2df994c96e45d795ba5370e4166fb70aee2c8b26734375b86c7ff93dccea8511bad2e241cf0ab009eff4ec1064a2f50bbd412030b6bca2826cc SHA512 a942146151ee3e2eb20c03ed86a978fdb4e4167430c1f37d560b95d1a715b92bbe4c771d850d541c6d1479649d9fc9a4459b6c2cfa9699150653cbe022a31ca2
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
deleted file mode 100644
index c03cfb616ecc..000000000000
--- a/acct-user/freenet/freenet-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/freenet/freenet-0-r2.ebuild
new file mode 100644
index 000000000000..1426c35cd9fb
--- /dev/null
+++ b/acct-user/freenet/freenet-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1109a74bbbf5..d419a73137a8 100644
--- a/acct-user/fritzbox_smarthome_exporter/Manifest
+++ b/acct-user/fritzbox_smarthome_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD fritzbox_smarthome_exporter-0-r1.ebuild 246 BLAKE2B 6df6d768581d9d9ccaaa8dd72b99ef768b1b87ce478162a2cb432f75a9d53f3b7e8e4f8e33cc2e34ec6ec16640219068baee1ec76b60a08114bd3af9db7d9919 SHA512 f8aefa4857d5668f716190b05e54347e355ca579e8869dcc2a7fd22a2f3318c804e4d0207afda7e14def533a7146a02c01753cbd7bf5761f39bc642bd36c3358
+EBUILD fritzbox_smarthome_exporter-0-r2.ebuild 246 BLAKE2B 719f1346b560030b6d1db12b7e0057401945d6cc0f9d0975ebf1fbb4534dc138b47ab8c938ec3dbaa64355fc5b4687ee73b86b378dff86a0c691a770c7ba032a SHA512 8433a76b0ef80f471f924fe756be2b63b7d3a2fc4d6369a44ee72401fa27b2054992ffa4f07f2b184d12ca7162e96be6277cf32788758852f999646c00c3b9b2
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
deleted file mode 100644
index 8cc42b2fe072..000000000000
--- a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..68f6d6b909c4
--- /dev/null
+++ b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3edc3f50c18c..f0c448c4e4e0 100644
--- a/acct-user/frr/Manifest
+++ b/acct-user/frr/Manifest
@@ -1,2 +1,2 @@
-EBUILD frr-0-r1.ebuild 194 BLAKE2B 5b78e17f9726254ccc8b474e7ebe8f24441e126bf9b053a7225804f32773be98a7bb58c1beacd13c604fe236ac011069d041ae476d0dcc560c110490a99713d6 SHA512 39dece8db644a270633251a4fddf6d6d27cfbb9d712447afac15ccb1f3f98a219a0839c5dc86d8964fbb70aebddd8583280d9e6b4547f17276798ede5c6302c9
+EBUILD frr-0-r2.ebuild 194 BLAKE2B 9a375cf838df2fb96571a4d53aa08eb3e3402f7881c4239ea47e13d4b002f127bedb8833d7b83312f87aff25cd05cd19a0f1c2bc3cd8493af9cb324a76e218d0 SHA512 4fc60467853139402ff623b8055dc4ebccd14fcbb97d6dae9e1b91e9dd6975ff93393695b4cb5c16ce9f8f36cc54f5de2c4d819368a14b6d141f4c7b2f17f79d
MISC metadata.xml 512 BLAKE2B 82b76e030726d436238e9b6253108b3690d767d249b107a6598e485309d8260c647bf9d956eba2a240cec7a515c73945d731fb8d92fce8a160b5092d8fce457f SHA512 b982967d0899b446f183ca3ed5769b04364ad50cd7e39b3a804eb0569b4affd14fbbbb8521b0e87dd6f293351513518b722a65558510686aad04fdb8e29918cf
diff --git a/acct-user/frr/frr-0-r1.ebuild b/acct-user/frr/frr-0-r1.ebuild
deleted file mode 100644
index 8a2f7caed68f..000000000000
--- a/acct-user/frr/frr-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/frr/frr-0-r2.ebuild
new file mode 100644
index 000000000000..cfcf3155a6e7
--- /dev/null
+++ b/acct-user/frr/frr-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d254eb81f615..03b08f798c6f 100644
--- a/acct-user/ftp/Manifest
+++ b/acct-user/ftp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftp-0-r4.ebuild 315 BLAKE2B ad82d67af9687a340d4044167055a57c877c0fb1f1f33b9c0fc35d76ea0c9822ebe1b92217e78600ba79c12acf214b7529ee1f9afaa70079e16b0b43dc1e5a80 SHA512 db91412e294738fd4b1ff63d27625b46fa9d2ba7c9be66c0ef3f802f28df88078137d802b998d95cfd823a7fe274487748386af88093579e0d51079222a7dddf
+EBUILD ftp-0-r5.ebuild 315 BLAKE2B fc4e848a6ec514a69013abf970caecf65e54eedae40522a7300c9f5a4c867c18ba8e2b58ee1a69e72d928d95d83148cefe39229fb3734ee3d18ed8780255f8a3 SHA512 1535fecd2535948dafab0cc2b2a3938bbd22a29fb6778dec18f01e592962138709cee3b1e20dcda613776dde0a0636356099c6603da37a576113b782c556cd69
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/acct-user/ftp/ftp-0-r4.ebuild b/acct-user/ftp/ftp-0-r4.ebuild
deleted file mode 100644
index 9d7d85fa77b3..000000000000
--- a/acct-user/ftp/ftp-0-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/ftp/ftp-0-r5.ebuild b/acct-user/ftp/ftp-0-r5.ebuild
new file mode 100644
index 000000000000..050aadd621c6
--- /dev/null
+++ b/acct-user/ftp/ftp-0-r5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3c95fd977769..9cd04cec84db 100644
--- a/acct-user/ftpproxy/Manifest
+++ b/acct-user/ftpproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftpproxy-0-r1.ebuild 302 BLAKE2B 1ff209461f587cce5987ede99268e2d8c80ecd953bf6323d660c45c5088251ee2901a83128959513cb27ac0584ffb779b5fc92b8179f2071b7bad4da5e7ba1e8 SHA512 dfc0b1afaff6ba07a84bb0a15a81c72e87a0093cf84c634205ef438d1c7d1f1cb6c6fe62e6e100a0740b3c5100b6159161988555d6e812e306480985d84a315d
+EBUILD ftpproxy-0-r2.ebuild 302 BLAKE2B 0a07c712a13135d40639b744084798afe853f7887dc2c502aa8b004cb64c918d9298b1afa985aa5a41a78a0cc65a6a2f43ceb5dd5a01d4792ef5ed6e3a535ceb SHA512 850800dd60b3ebb4170e583d87b86dd97d9e34c112e22f98635c5a645055c38c86f76f376ac0075d2d895b848e4369e07b3968bd9aabb4bdaad2d3a59e9598c0
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
deleted file mode 100644
index 4a50399145da..000000000000
--- a/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/ftpproxy/ftpproxy-0-r2.ebuild
new file mode 100644
index 000000000000..7c956f17ab2f
--- /dev/null
+++ b/acct-user/ftpproxy/ftpproxy-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4ad7cb6f50e9..7936fd63946d 100644
--- a/acct-user/gatling/Manifest
+++ b/acct-user/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0-r2.ebuild 262 BLAKE2B 96c021408b29d1b462f664c9dd2ae8222238ef84e1d5805b78a15803537ad6858656aa7dc346fcd148a1d935e8ab912fb86970cc4abefa74cf9aa4335b0ee5c2 SHA512 65ed1a94fe49ed7d14f0d14b9d9162d6be2e553d550c7b17ea495c6a30a6d8728f99b750e5c8ba27d95bf3f71d0cced7f9fb6b6af4fa2577e0af5ec6126160d7
+EBUILD gatling-0-r3.ebuild 262 BLAKE2B bc14ad00a2c02fed04373b07be1ac712a4ba8b8d4a0dd066308316516ae1d5f3275814b2de1238aaa35c2b7f64652c5fbbb0d17cd6b749f6b4e8a438586ab168 SHA512 236b4a5b39e67e92f03c1ad5783724c515007d6df4d04c9ace7a62b436d1bdf6b4166d3b421c08ad4795e18c9e868d30771f6e0af4b11cd4afe4c62ec97e441a
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/acct-user/gatling/gatling-0-r2.ebuild b/acct-user/gatling/gatling-0-r2.ebuild
deleted file mode 100644
index 9c2708333635..000000000000
--- a/acct-user/gatling/gatling-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/gatling/gatling-0-r3.ebuild b/acct-user/gatling/gatling-0-r3.ebuild
new file mode 100644
index 000000000000..64c9d1c7e62e
--- /dev/null
+++ b/acct-user/gatling/gatling-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e9d6f438ede0..f0776fd29a85 100644
--- a/acct-user/gauth/Manifest
+++ b/acct-user/gauth/Manifest
@@ -1,2 +1,2 @@
-EBUILD gauth-0-r1.ebuild 265 BLAKE2B 13f86fa4301cd432e8491841a030e173054569a274ba4dc1e03ef579087273b48122853aafe9657a5d451621dae372754032b42a8ea223ae43228d661dd1c78c SHA512 c85df099c2da8e81d6aa1d3ef2cd8af5e874e5d2960374382aab7e5815ab5d0950691bfc8295aba39789a6beff6477d5d2344ddf2dbdaeab609324755f9a4de4
+EBUILD gauth-0-r2.ebuild 265 BLAKE2B d1007f7a7b9bd987fb2e85077d14efdcd14730c727e1b3af3c691fd56ccc976587009f338cdac29f6cbc604562b5088edf7efc2f63452f94dc94bc7cc86feef7 SHA512 0f87bd27225532db47e80b2c4e5b896fbea4e28809e87ccb04bec891802da860f7cb82941966dba594ec77d2efc9a2bc57246c33f6d50e6cebd276c59d885564
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
deleted file mode 100644
index 4ba3f3f025b3..000000000000
--- a/acct-user/gauth/gauth-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/gauth/gauth-0-r2.ebuild
new file mode 100644
index 000000000000..d35e66cb1dab
--- /dev/null
+++ b/acct-user/gauth/gauth-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2dbd217b9606..c73883a9a586 100644
--- a/acct-user/gdm/Manifest
+++ b/acct-user/gdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gdm-0-r1.ebuild 262 BLAKE2B e0bf23660cfacd667d3e14006984d37f5d550adfea1b45bcd5a64cbf0737cab69f65c91f372b4cb55c34ff286fbbe1e04047d43e5fa7eb856e8b6bb757ac0b84 SHA512 3732fd204b5e6ad008426c90bbd1b544e9b7b35072eedb834dcd60c581dfa929161a557268b78d0f252d548aaad48f36a35c8298f158091b2d788c5024c1dd68
+EBUILD gdm-0-r2.ebuild 262 BLAKE2B 9f5c0ae00a264a7fda33e36291e1966ef918e381c857ef2fef4375d916ff102c0e0825a75138c6355b1840c525306ea9233ef5953982200061f53bdda5995083 SHA512 ad5fc0c4d7d78960c05dff6e689fbf84a18131c7c42124f215bd05c5ea4fa932aaea2d07a7da123107165f0484d2505f70f6325b43bd1baec53b6e5e89bad6d5
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
deleted file mode 100644
index 9d57eb6782f5..000000000000
--- a/acct-user/gdm/gdm-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/gdm/gdm-0-r2.ebuild
new file mode 100644
index 000000000000..eb47a8e5ba25
--- /dev/null
+++ b/acct-user/gdm/gdm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 fc10b38dc3ca..60b5a1b8e2d9 100644
--- a/acct-user/geneweb/Manifest
+++ b/acct-user/geneweb/Manifest
@@ -1,2 +1,2 @@
-EBUILD geneweb-0-r2.ebuild 272 BLAKE2B 908f2bd98262d1e24d8e7c51dbb4c9cfa40c71fff5a9cd4e95a6c57ef98604af70f6a60d4bbbdeb1d89c07c23777cb702928d1bce9423c0858dccc745596fb7c SHA512 955613c775cdcf1dd05bd4c28217b16c628c89939a07c5a3a38fe854c6e3b5feb4690a90ca8de252bd1f1ee16e8787d511c2db0093b91b1325f97428ea39942e
+EBUILD geneweb-0-r3.ebuild 272 BLAKE2B e6625667a0a413bd74f5bd7a24123bba2acbe619e89a6bcf92e66907c79913000b1db5cda42734805e807eee3e76ebc14ac3d4771aec9aba89695effaf97332a SHA512 e5d771401898604d0d720ff139bab4823e0e58c07f636f672e54c1fe27988e502425e8e2110f838f8380c249ef01a82a33b22406e54ab974cc9ec4e72be24dcb
MISC metadata.xml 254 BLAKE2B ff7f6eeb2a166b29a60b0a13ded8c4f0ab8bc5413b0fc42062bf6550b0fa637426c491a01ff118c9d7d58cc5f0566a6112ced6a24a2d0b2be28ab5c027829b7a SHA512 1d9910e0013ab41b3e5511242b90fa8fcf444bba4623074cd75fd09f8ac0be98635a1d38cfd96974fc830c17c73db9e7f23d105a811fe629032cf3762ce197bf
diff --git a/acct-user/geneweb/geneweb-0-r2.ebuild b/acct-user/geneweb/geneweb-0-r2.ebuild
deleted file mode 100644
index c63d14d893c0..000000000000
--- a/acct-user/geneweb/geneweb-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/geneweb/geneweb-0-r3.ebuild b/acct-user/geneweb/geneweb-0-r3.ebuild
new file mode 100644
index 000000000000..f34e829bdffd
--- /dev/null
+++ b/acct-user/geneweb/geneweb-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d412fe68d049..508721aff0e9 100644
--- a/acct-user/geoclue/Manifest
+++ b/acct-user/geoclue/Manifest
@@ -1,2 +1,2 @@
-EBUILD geoclue-0-r1.ebuild 299 BLAKE2B fcb7793a069de4ea9528068b18fae8e003763856f6c3fc7de47070489f0e1f6dcec391e372f1a4d9de5cc2576d6cde089241ced5db87b220366f8d88992c3393 SHA512 14091c5be40cb17a2aa073e54b0eaf36b131c15a00e291490bd4a67ecdbfd1a6154147b6e81b6c53b37af70581d674533a276f2f23342db53f5d768e80bb90fe
+EBUILD geoclue-0-r2.ebuild 299 BLAKE2B b057531e97b6af7aa74d016dfd4928b5450e052476945bb94e9af0ffc61bdc2d5e47adad33b068dae695202fcfd9604a91fa28bac8826cf546871a762e5c33b0 SHA512 52d8eb7b9b4edb909b4379e4ea1dfc330dc37c0e218ccc0f8b953b76a3c55784e71bf61d2728321acc1617f5fe9a8f3278ad07090a1920feb10cf09688cb8ae0
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
deleted file mode 100644
index e679be2efdf6..000000000000
--- a/acct-user/geoclue/geoclue-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/geoclue/geoclue-0-r2.ebuild
new file mode 100644
index 000000000000..4d754cf15dec
--- /dev/null
+++ b/acct-user/geoclue/geoclue-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 45b0f0cf93e0..3cc0a7e3e554 100644
--- a/acct-user/gerbera/Manifest
+++ b/acct-user/gerbera/Manifest
@@ -1,2 +1,2 @@
-EBUILD gerbera-0-r2.ebuild 281 BLAKE2B 6ca1046e4a02d8a51a54a987bf6416d02dff81d9f02c41e39254ff9676a48e1d6ca7541d9241c017169d98de4ff251e743d80c8a4b2aa7c82deeca3748fcd91f SHA512 520c3192761f448f0d7c1d3e01db6aa468b8721a07c19b24d7d60b0c44a4bd2e922eec35f577ed56402e389028314ba533f9a4cf6eac4e3cdbb465a4767977ca
+EBUILD gerbera-0-r3.ebuild 281 BLAKE2B 217ad32c2037b476901e2fc6f45bb29572ccbcef9a1e166524c1aca301e662c0c01700583f84e15d63e34cdc6eecf7acbef92afb12f2d259517b2e62e03f2465 SHA512 2a1a510ea0087a99dd23e456abc80a3ef86b0fc8a5fbae6ce0087e366f4e649545c51aba2c567e6f64075f63d1286db8411d7b0ded3a7cf036eb93c37f8a4ae1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/gerbera/gerbera-0-r2.ebuild b/acct-user/gerbera/gerbera-0-r2.ebuild
deleted file mode 100644
index 6d7dd80afe5c..000000000000
--- a/acct-user/gerbera/gerbera-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/gerbera/gerbera-0-r3.ebuild b/acct-user/gerbera/gerbera-0-r3.ebuild
new file mode 100644
index 000000000000..6ffbfb29e98e
--- /dev/null
+++ b/acct-user/gerbera/gerbera-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/github-exporter/Manifest b/acct-user/github-exporter/Manifest
index 705c889fa00b..0995bb7ed44b 100644
--- a/acct-user/github-exporter/Manifest
+++ b/acct-user/github-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD github-exporter-0-r1.ebuild 245 BLAKE2B 68e69bbd3000bb6826232beef064756a0f52b3aa9b28e612b005001c8f55dc323a3674692e9c81940fb83e1c5f50259f152d24f1966a566360a002b30a89695d SHA512 a60a5efd84ddb032344697125bbf4aa15af72b7f478388f47631cc264f585b8697cf5e11ee7b7e850c9c9ff61c48c3d82effcc5e7d8c9d8fb8c7f03f3277b817
+EBUILD github-exporter-0-r2.ebuild 245 BLAKE2B 0ef87eebef0493863089144d404816945bbf3c88a89c1dca1c4363eb158803ccdbed08c8e14bd0b08f6ccaee3fda8c750b806d6ba5884039c9a0676d8d4b1e11 SHA512 391a0bbb547e6e24c47720b170a2501d2db66abecc0abb829e30d32d670d47b8822d302d691a4688df7be2382dcd829fd331a19ad6870c76625574bdcda231b6
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
deleted file mode 100644
index 26444dd97aef..000000000000
--- a/acct-user/github-exporter/github-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/github-exporter/github-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..1643706a8fdb
--- /dev/null
+++ b/acct-user/github-exporter/github-exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b229ee4500f3..e5e5b751823a 100644
--- a/acct-user/gitlab-runner/Manifest
+++ b/acct-user/gitlab-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD gitlab-runner-1-r1.ebuild 317 BLAKE2B 55ea0596213160a5621b9c1d65a4b25b56119303b23fa7c36f10a6ffd3104f3ba3254194f73e1bb96cfbbaa07151df180e79115b34337dd4238f40aa3779dad0 SHA512 5027a6a4668c311e63b051da4439b51f6842fc0403e4aee25a9e9fdc7d4716ee14f6d49877d6850e66c4db1f1ab61b6b7101165528bce4c781acbfaeda826fbd
+EBUILD gitlab-runner-1-r2.ebuild 317 BLAKE2B 4cc6f3480337896abff18f3ea4046b288256dde616629dd8bd47e38604e47c1461af84c14579ac4ec516baa0ecfb0fed55e17d4034509d35cb38fc2f3e39572f SHA512 eb966b18b276ddb5495fe811e8535a5004a1c16d553b25cfc51f163a4e10ca969f06d88f23c425d9ed9cfcd13275757d704934eeb52df94ad37c0d0defc14f9d
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
deleted file mode 100644
index 0dcd40188c58..000000000000
--- a/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-r2.ebuild b/acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild
new file mode 100644
index 000000000000..1ef6553cff04
--- /dev/null
+++ b/acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7d452b8348e7..eb844e0342e1 100644
--- a/acct-user/gkrellmd/Manifest
+++ b/acct-user/gkrellmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellmd-0-r2.ebuild 237 BLAKE2B 3be6ead806de42d4104f0ffbc686cdec3eba96acf6075e92bced1aeb2f77dc98cf4ef5d22f67f4d42ea65eed312e215efc6d8eec39cb790e32fb95501245f4f4 SHA512 df0c74d3705df0e84cb18ba9ce2fdfb4ba2735457ee80e4467a5d8e0cefa02a011ea491c3949c50d012203eba708b67d5402a1ca393f7f8b2a23616eaf0c317a
+EBUILD gkrellmd-0-r3.ebuild 237 BLAKE2B b0b9f36aae947cd635fa305b32abde15f64f7df807e5f6f5518502e3ed969ed314ce9f765d2756f45b25fc8d208576d528dd1e01e9016c905c3a1dc9dcbf8c4e SHA512 388b2c26dc67526efaff9ad053935f62eb5f4c45344d03600e1abade541c92f7b4813d4e94a922d73962ae6a8f9b8ffd2fd0726cfa962e0454722cffc8728697
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-user/gkrellmd/gkrellmd-0-r2.ebuild b/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
deleted file mode 100644
index a174866f976a..000000000000
--- a/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/gkrellmd/gkrellmd-0-r3.ebuild b/acct-user/gkrellmd/gkrellmd-0-r3.ebuild
new file mode 100644
index 000000000000..7e3816411c9c
--- /dev/null
+++ b/acct-user/gkrellmd/gkrellmd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/gluster/Manifest b/acct-user/gluster/Manifest
index 23b4d74cd834..71afe3fd1ea7 100644
--- a/acct-user/gluster/Manifest
+++ b/acct-user/gluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD gluster-0-r2.ebuild 310 BLAKE2B 5fb526131f206e11647ff4ee45d36be6f74291ca7ecd4eee00486bf47c2a8471c383a4c207da73863cf493adb080f224f1cbb101318875650b540339ba644d9d SHA512 1e73469fcdc7709b35464c2104e826e505b6131cd8642c4604a871afdea7efbb0035ecd3a8aed664128df8befda7e5d01ca660f9a31f81b1258352c7d92b18cd
+EBUILD gluster-0-r3.ebuild 310 BLAKE2B 1a9b9ac567e01139951aa6aa4e8883464fc0d1011a55d172d7ba3c28e9eaaef669eae825627e0cae74b750e94c268bd69e0e992251f1e6a4d64661f32acf225a SHA512 5eeee703ada4ee2e386895f2f3ba8c4d244145708916e1c8c0772f3f3404b4f564e50dc24de59d533d515b9d5f5554401eaa13190ef887ab0084cfec7fe457d8
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-user/gluster/gluster-0-r2.ebuild b/acct-user/gluster/gluster-0-r2.ebuild
deleted file mode 100644
index f76614e4e886..000000000000
--- a/acct-user/gluster/gluster-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/gluster/gluster-0-r3.ebuild b/acct-user/gluster/gluster-0-r3.ebuild
new file mode 100644
index 000000000000..b925c41686db
--- /dev/null
+++ b/acct-user/gluster/gluster-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/gnump3d/Manifest b/acct-user/gnump3d/Manifest
index 8ac18483ded4..6d4a23942117 100644
--- a/acct-user/gnump3d/Manifest
+++ b/acct-user/gnump3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnump3d-0-r1.ebuild 248 BLAKE2B d6221bd60e314001cc6be01c7f031c2428d1b3a92eb2b475346238669329748e5739c8585a817644e01d7bee6ca4691a1510c14ee4b8d3e086aa88784b2fd06c SHA512 51548e6202576b4e871337d13c73a6f84fc0ac30cb6793dcb31659401fa3c4bc9e9cfd12b3e2f455b08512c34b108d21a84f89d3927a3c23120bb6f6373dd4a0
+EBUILD gnump3d-0-r2.ebuild 248 BLAKE2B 9d8a7d2825a9916b15539cda10e6935cb88a899e019cb306679abb609e171815aa180c679098e80ecda84e5bf6238912897fc33736a5533ac51cd0e1d362f088 SHA512 a3f44afe084f2868361a9f7e6e9ec613a888bdadb3c445b055d8e1ac60114a02ebdb7b662ffabc4fea16365b2c3cae0ebedc6ad609562290944a2956409b4598
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
deleted file mode 100644
index 19f4d5e4fb9b..000000000000
--- a/acct-user/gnump3d/gnump3d-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/gnump3d/gnump3d-0-r2.ebuild
new file mode 100644
index 000000000000..39468ab0ea95
--- /dev/null
+++ b/acct-user/gnump3d/gnump3d-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1da6ba5a7c78..956e55d0dd50 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-r1.ebuild 283 BLAKE2B 9f07949f925ff4e0c6cf5c1624e0db36f536211d36fdf3b43410cf43b2894603f599b511a7bb7bcc3fd3aa0387c4ad2d823839e1d6b51c59d53656cb6ea07a29 SHA512 4210da65d43a8f27373939d2b164a412f0eb23f5310f1516a29fb452c3cf8620a03081a916f534994602ba2a669de3094476c30684853361ff1e67765ae3b68b
+EBUILD gnupg-pkcs11-scd-proxy-0-r2.ebuild 283 BLAKE2B bec48df28aa8048098cb067868a413cdd01c778fead0a3aa989aaa48d76444d603bce5c406f83baa71c828b120e0df48edf587c1ba445ef4166fa6b855536fac SHA512 95484f5c2a27f9090da5bf77a96746dcccd55841126acef5e2c5372c088d7b07b288308a3bc9b87e83f155b121d004b1dcb6f3b59b870d08c53cdff0b4d262b0
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
deleted file mode 100644
index dfbbe919c7ce..000000000000
--- a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..a78fd256b45b
--- /dev/null
+++ b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/gopher/Manifest b/acct-user/gopher/Manifest
index 7cb27d4ead13..f5fc8b122946 100644
--- a/acct-user/gopher/Manifest
+++ b/acct-user/gopher/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopher-0-r1.ebuild 227 BLAKE2B 9f16a9c8949369dc2c513dd8af9040cde37d5a73a4f5c0a64395dcb7904b852c3b6215e3f249295773398553a6fed5b66dda845446120372306f7b50d4e1cc7c SHA512 0c702b7a503107d042d54d9087959a0c0f7af63f0d3951e371463cfa7bd94f1cbb752c12a1923ce91a8d19057800e566ab77e7ffcfd2ceeb391a889ad38ab09d
+EBUILD gopher-0-r2.ebuild 227 BLAKE2B b17daccdc9d72cd720c8623713a6a17b4f57b992bd9c1084543fd757baa932c324862b040ca49324ab45316a097b5a162baa8e16167bf09828255306075f7926 SHA512 cc0c2a607ce88c9ed302880d4a4f970df926e9c09d24d0b6205133cce2578f0a2cee14e878cde6ea727a66e3840b205b2ca2b518831414bdf86de1db358cba1c
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
deleted file mode 100644
index 4edc807d798c..000000000000
--- a/acct-user/gopher/gopher-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/gopher/gopher-0-r2.ebuild
new file mode 100644
index 000000000000..cec3aeb7b9ec
--- /dev/null
+++ b/acct-user/gopher/gopher-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 99ff813e3f22..756c17896b43 100644
--- a/acct-user/gopherd/Manifest
+++ b/acct-user/gopherd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopherd-0-r1.ebuild 276 BLAKE2B 948f40b6fccb2807b79f82e5a76c9d4cb5426f0886a0ffa027a18f27637942c5fa0336b9fec5c8dc93447fd5f3c166ce0a160dfc874779a3a18f927be66849db SHA512 9d3ad91b6429fedb289ef135c1aaa08f3e497c83dc8a7bb4f8b2596422230bea3e4a7eb9aac069caa13039eadb19480a2c1c3419f7eb48c1176c9e2fb1fc9521
+EBUILD gopherd-0-r2.ebuild 276 BLAKE2B 12c9251ddd56bf158a7b52fbac7f744d4a1240f3da929cf3150a34c3c19595eae1811670a0ed6e8c15ad4b5bd1ecb0559fe1f5106dca425b736232e6bd9851a6 SHA512 82c0690331519d65f839e6f4752c5073c76f69e4e32bd597627502e7ef1617827df966c182a13fc031a069b36a6c98a509e291671b631b548894be7a57b94281
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
deleted file mode 100644
index 8b8b389b9eef..000000000000
--- a/acct-user/gopherd/gopherd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/gopherd/gopherd-0-r2.ebuild
new file mode 100644
index 000000000000..017df3787704
--- /dev/null
+++ b/acct-user/gopherd/gopherd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4bda56d2a4fc..ab829059152b 100644
--- a/acct-user/gpsd/Manifest
+++ b/acct-user/gpsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpsd-0-r3.ebuild 245 BLAKE2B baeca11f2c5eb7decbe326d582902dff30602ecb4ee967837e3bf2953ba014f0295e4e43e21c9f39675c15bf4ad53a71cb1850ce5b0b8bcc73dca7d26b4cc8a3 SHA512 889ab72d1d8d65a439218993bb753a2f783ce08c12e36bbc89466db05efe24ac2532dedfc616085eae411e28aee69fc393acf2f7a702d0a0f657dc07a6332cab
+EBUILD gpsd-0-r4.ebuild 245 BLAKE2B 945fe5287ea3e5c2e8e4198320dff1867265e08c4ee0d9b45faabc4d75ca46ded214f3fbffa799df6d7e5d98390aedeb59128bd88829da21002b9467aece9ade SHA512 60485f1f7822b3fcb4ff5b0c1aba015adf6d51212378ccf58457f9323ac1bddecf0883c60ae84d634b0cce28e82f67dab893d96935b44dbce5ef42f8c3f5ed3c
MISC metadata.xml 276 BLAKE2B 51ed91dbe57f48aa4af2c9fa6fc16fa70996a95e31096505ec3e9288f04182aaf09feb0cd3e2e1c45e37dcffc528c788995ee4c89ea73b3c736dd9ec6172788c SHA512 b0a243998a4962647e6e5bbf04f9d92837c969c5a2f44d1c752a032cf3f0308d0ad82dcab968781b8edb88aa49748e27da617e7c3587647d4637db0912a4cb95
diff --git a/acct-user/gpsd/gpsd-0-r3.ebuild b/acct-user/gpsd/gpsd-0-r3.ebuild
deleted file mode 100644
index 02e5bd60b85a..000000000000
--- a/acct-user/gpsd/gpsd-0-r3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/gpsd/gpsd-0-r4.ebuild b/acct-user/gpsd/gpsd-0-r4.ebuild
new file mode 100644
index 000000000000..1b0b328aeadc
--- /dev/null
+++ b/acct-user/gpsd/gpsd-0-r4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 85ca34c8f43e..c354c3232c58 100644
--- a/acct-user/grafana/Manifest
+++ b/acct-user/grafana/Manifest
@@ -1,2 +1,2 @@
-EBUILD grafana-0-r2.ebuild 232 BLAKE2B e1fd7a330a3ccc103e0544c649a28c7cc20b9e4916a975c8574c12ed45c7a41f234a3e80f588a1921c6e894f82ff75078200ab856a4d282dddedfc57db77b30d SHA512 fe42757173c135bde8d3d117eaae184f6c914013ed7542bde0d7ec0313a4d95edac51aa30f40f2e3727a63c15ac37a82f6b156e374f016300bcd426092eb8306
+EBUILD grafana-0-r3.ebuild 232 BLAKE2B 05ac2e09324ff721b227a2aae12776ba5c108bfb27ef69782033820d88096f4471820708d50bb6e1783ec62d53a0fc081f7375e83cd9fdadeccc2636e8be6a21 SHA512 2a4f96e6b9b2940155d467f45e613fdb597c2b7155d4c323931fb6f51e3173d17fdb04f2ae22b015fb9bea9c42049cee17ddf863838a3ea60760472d0e9b2df8
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/acct-user/grafana/grafana-0-r2.ebuild b/acct-user/grafana/grafana-0-r2.ebuild
deleted file mode 100644
index b990bfa8bda8..000000000000
--- a/acct-user/grafana/grafana-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/grafana/grafana-0-r3.ebuild b/acct-user/grafana/grafana-0-r3.ebuild
new file mode 100644
index 000000000000..2023cd307d5e
--- /dev/null
+++ b/acct-user/grafana/grafana-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2e2f748133f6..c81dbd8371f2 100644
--- a/acct-user/graylog/Manifest
+++ b/acct-user/graylog/Manifest
@@ -1,2 +1,2 @@
-EBUILD graylog-0-r2.ebuild 232 BLAKE2B 209a0f58d773326cab999819ba5bc867f980e0e03c6f866fe8f6d45d75b95bbd026f55a81beacbb826ea023f12bd84531152278ce079b33b60a7b9a12cee8b88 SHA512 44d76c7c58eeae248a95cb65263ade93b809ba301edd2e4a821932d67c5d4a940cbcca520d5eb37d9c7829f98133898d60b725de90371275a5eb51c113cf299e
+EBUILD graylog-0-r3.ebuild 232 BLAKE2B 2da27732a9ad6325704de38e151a01652633febc99404c17394b0ccd863c688d0bd27c42b7e1cd52859c77d2d1505bad59d8204ec81550e2bc8523abf627b6cc SHA512 33e8eecba5b430b305fc10ff2a1673d9fe5a1b3c95742297b522866b7436280f9420d81b6debb09b53a247b525b87a33e21771a5232a4f9d64ea5fc3bb92bac1
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/acct-user/graylog/graylog-0-r2.ebuild b/acct-user/graylog/graylog-0-r2.ebuild
deleted file mode 100644
index eb3ad26ddeb4..000000000000
--- a/acct-user/graylog/graylog-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/graylog/graylog-0-r3.ebuild b/acct-user/graylog/graylog-0-r3.ebuild
new file mode 100644
index 000000000000..ee37cc6423ab
--- /dev/null
+++ b/acct-user/graylog/graylog-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5713b85ed5ce..a6c0d7f7a933 100644
--- a/acct-user/greetd/Manifest
+++ b/acct-user/greetd/Manifest
@@ -1,2 +1,2 @@
-EBUILD greetd-0-r2.ebuild 242 BLAKE2B b32701199e49f2b69084e26baf48d643c55b9ebd8dacdbec62b5434b1b34b4b6ea6228af2617c036d6b24a06c38b7b2d20e2f475de0a90f37cdf6076c764d685 SHA512 ebcff12be5d323c1c08a63ea596c35deaa07a0df60757ccd587540ab0098cd20e7276cd667ecddbc655be460e62f13a02f25c52604c2ba388a21041da876f0de
+EBUILD greetd-0-r3.ebuild 242 BLAKE2B b9a02b0f46a47e2c8188492ae60538999b22c1ba4566e27945f3a95b81b54872d357ec24fa4577eba55977348ade2bd6374080fe3ab138aae296cd81460e41c7 SHA512 96f5cee0826f17d871525d92cac0d1327012bb8b0d8540259fb8ab36b1d1b4fd7cb4feae160284f51bb19dda479eb4057e48695c12e2cb457b88c86b2efe3ae3
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
diff --git a/acct-user/greetd/greetd-0-r2.ebuild b/acct-user/greetd/greetd-0-r2.ebuild
deleted file mode 100644
index 48f4b6d94f38..000000000000
--- a/acct-user/greetd/greetd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/greetd/greetd-0-r3.ebuild b/acct-user/greetd/greetd-0-r3.ebuild
new file mode 100644
index 000000000000..80bf0cf756d8
--- /dev/null
+++ b/acct-user/greetd/greetd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b86ddeebdece..ec11f0c9f200 100644
--- a/acct-user/grok_exporter/Manifest
+++ b/acct-user/grok_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD grok_exporter-0-r1.ebuild 255 BLAKE2B 5e464c5e40c650fd4e678dd7bec051c68273c6b28ec5a4fe31d9861622422896b2e2f4ebc66ab497a623ab6056d1b50c535ec5c5400edf174bd972ac354555ab SHA512 75907cef380ec3aae1f8193bae3f34b505d95ccc9f319169e0fb3f07fb1aa94f1e3177dc34cc5d5873fe67a1b4b1f0a05efb0b0067702fd82b9f10eff7c667b4
+EBUILD grok_exporter-0-r2.ebuild 255 BLAKE2B 2ed966006c69fd641d0370787c152ab4bcdede1c3b75c0d95e7ba9fb14e1f68beff0ba3edc3448704c39ba47bb868ee09f749acbe7aeab07dbc53d3447f29d7b SHA512 33bc623f6c15a521bb565a44ea67dd8be350af5b83eb70c8e5ec54108f261f2725d2c2014858c47eadee39b1327877fb5f1ea5ac6744f8e3f3f4cb9522168d9e
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
deleted file mode 100644
index 87a17187d7ed..000000000000
--- a/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/grok_exporter/grok_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..505ecbad8ee0
--- /dev/null
+++ b/acct-user/grok_exporter/grok_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 982cf7c1f549..a301d7b8ebe0 100644
--- a/acct-user/groonga/Manifest
+++ b/acct-user/groonga/Manifest
@@ -1,2 +1,2 @@
-EBUILD groonga-0-r1.ebuild 243 BLAKE2B 42be96b0b4a6cfb70a6e84e865c36f1255282f32d10f61e0ff783b5e412f3abd51250c667e0892d3203a942955188ae52a48c7adc6907bda6a73f66937f76aac SHA512 e125df0750783041ad297e9e1d6926beddde03c03be6560952c7559c10cd364e450b425c756b2db8c42f71bf98ee0635c1f77c2416d4c9f0058b0cd562d86a60
+EBUILD groonga-0-r2.ebuild 243 BLAKE2B fa24bb7f60d9fbeb0b8d63f3d0aae64f5248a7e2e53949ec04087cc16e12c47beff3e75c5044222cc5e1e3122793d48fffd561d57e8db3101275401d3d720368 SHA512 60db5b4b33089b9dd6bb650364815e597a52de22279452d777871c817c6f62c88f06807f326501cbb00a0e9b60b33dbb5c00257a0f839c53390c425f812ed7a8
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
deleted file mode 100644
index 6647b44bb496..000000000000
--- a/acct-user/groonga/groonga-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/groonga/groonga-0-r2.ebuild
new file mode 100644
index 000000000000..620035cc1d0b
--- /dev/null
+++ b/acct-user/groonga/groonga-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bc21805086bf..05683544b1ca 100644
--- a/acct-user/gvm/Manifest
+++ b/acct-user/gvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gvm-0-r2.ebuild 284 BLAKE2B 7856856a55994f90efef0080dfc64bcc68c18b0ad11f31bce4875e7abb23d29319076a8b86c9c5cf5cb7be78ca41cac67cbd4e56ee15eb2c884d7cfb4deba6a6 SHA512 7c6d8820449075a854ea216aab76af47787416fd18165b63337d1ed8d605784f76a50cb94396a383fb93fc48db21068912a263ae020611232a661f437712dba3
+EBUILD gvm-0-r3.ebuild 284 BLAKE2B 2d8ec91c9a1c73ebb6eb6605d913306b76d031ab727dc6dd0abe019a6bc3815fb54e950af19ed776d8809a553ca4d9669d0c33728bb3f743a8f33cf5f19e91d8 SHA512 a166b952ad79e55de532e38f1ab2cf5d140d1570caae53c76e925dfa5d5b91b851da0f5a4d2436a8e8a22dc1099bea59f445b976dc62411f100d94ff28f3fe5c
MISC metadata.xml 480 BLAKE2B f044167fa448b019fb56009a38d0d1d84d7ec1df0281d65e4e5719458e154a7def87ac71decbf0cdc3843bcd8b56e44e89a896db2fc62d951ed102f7908897be SHA512 4ff3c81f201beff84473ebf82a9820b761bf30dad40e7702bf72d9053b64291300f98c0b45c50d5970ea1ab407e717dd6c1172df99cdb2636dd09100d630546d
diff --git a/acct-user/gvm/gvm-0-r2.ebuild b/acct-user/gvm/gvm-0-r2.ebuild
deleted file mode 100644
index bafded17a742..000000000000
--- a/acct-user/gvm/gvm-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/gvm/gvm-0-r3.ebuild b/acct-user/gvm/gvm-0-r3.ebuild
new file mode 100644
index 000000000000..298e6ffcb7ac
--- /dev/null
+++ b/acct-user/gvm/gvm-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e88fc1d928c0..82315c8ec852 100644
--- a/acct-user/h2o/Manifest
+++ b/acct-user/h2o/Manifest
@@ -1,2 +1,2 @@
-EBUILD h2o-0-r1.ebuild 240 BLAKE2B 84a1fb19cd03aa52b363c92f9584689aaeb96917d4fc261ebabc59466c6f4137910a8030ae0c78a7c8d872c2ff3a0a456e6c115426c4c74ad8471ebada52ac36 SHA512 0b42ad953a294bed5ed34051faa0c6f5055dbb100cc2c2cc96839452289ac2f71d96303004bd2905dc6a58ef585005263013e2b9e8eaed2341285e947107a115
+EBUILD h2o-0-r2.ebuild 240 BLAKE2B 3bfd634dfe8e44292c1c1e7908b956546ccafeb8d2610199eb58bc28c9f64a22626928ec5c26a228192e0f08b927332d391c890fcc1b41c2d279a6a1d39cee5a SHA512 5f7fa8cf6f9af14bb0e550720e5a2e292a98b10fb3bd49891f9f8a8889f98be5cc60fedfa329eb9029adf5825e9647c29c4d15bb1a05b8b948231f2c04f849c5
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
deleted file mode 100644
index d01ee4c8ca23..000000000000
--- a/acct-user/h2o/h2o-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/h2o/h2o-0-r2.ebuild
new file mode 100644
index 000000000000..942bc85ccd53
--- /dev/null
+++ b/acct-user/h2o/h2o-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a52b33307dad..e00145764d2a 100644
--- a/acct-user/hacluster/Manifest
+++ b/acct-user/hacluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD hacluster-0-r1.ebuild 290 BLAKE2B f30238430a6f808a2e247ceda7637ce5e531dcd197ae04a1e2863d0a321f7eeab3b0b7609c8fea37ba278759c032d74fc6b71d765cf8088dd8d1ba2b0e632449 SHA512 0f4497b2a07b4f62af4a08fe4546a1c9ac0366a5ebdd4753cb158ba2c4be1ae6410b88188d44e10f05610098113f15dc6dacd174b888e477db1747909e151e3f
+EBUILD hacluster-0-r2.ebuild 290 BLAKE2B cc36479575ca53ec932f99119a5ae28f039802612cadfe38481f3f7d277f822d916b39d741648b8ab18e26a56bb5de77432451412ab3c09deef816f1ec918181 SHA512 af38e4336f0b0fa8ba3292004796d3cd5a87c31838dc7ed67acc5884ca6b44b5a5cd362c82df2a2255c874b10fb07f0b684e4fd3cad8e8b9dba62ef2ab2e0020
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
deleted file mode 100644
index becc65512d90..000000000000
--- a/acct-user/hacluster/hacluster-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/hacluster/hacluster-0-r2.ebuild
new file mode 100644
index 000000000000..8be9a92fa693
--- /dev/null
+++ b/acct-user/hacluster/hacluster-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0400f76bc5c7..a5a2ed834fa2 100644
--- a/acct-user/haproxy/Manifest
+++ b/acct-user/haproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD haproxy-0-r2.ebuild 198 BLAKE2B 461005f8d344ef6b9ea0c2225fd2bda39bf788791b9753715fc800bb394c8b111e2d74cf2725e2ff20a1dbbed3d9742eb98bcdf29a310ad1283d3607c782deac SHA512 5882f16e82fac763fb9af542388ff9e8e2cb60e7f1ce18d2da5a81e30bb492e118abdb95b15de3a0074a8bd5b9f891224f0b35feccaf47910d84cd4b9c9f5edd
+EBUILD haproxy-0-r3.ebuild 198 BLAKE2B 306a4a5f6e867a722c30845558c1de90352b0e6337d0f9c7f037dcfc20a8ce223209e6d578ea6474302edc2dc6844a671f4e8bbc081494b263a1a9bfe514b2c6 SHA512 edf470808243733a852cb3762bf10f3828f1f8aca767844ae3a56447321c759553c9b3570a769f2e1dc39f0ad4629391f02cd64b5d26c7fc49ff6493be686fbe
MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5
diff --git a/acct-user/haproxy/haproxy-0-r2.ebuild b/acct-user/haproxy/haproxy-0-r2.ebuild
deleted file mode 100644
index 03c81ce79b9b..000000000000
--- a/acct-user/haproxy/haproxy-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/haproxy/haproxy-0-r3.ebuild b/acct-user/haproxy/haproxy-0-r3.ebuild
new file mode 100644
index 000000000000..54760e7f59b4
--- /dev/null
+++ b/acct-user/haproxy/haproxy-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=188
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/hsqldb/Manifest b/acct-user/hsqldb/Manifest
index 77c46d685002..07db18b3f67c 100644
--- a/acct-user/hsqldb/Manifest
+++ b/acct-user/hsqldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD hsqldb-0-r1.ebuild 227 BLAKE2B af9bec82b5f401384086e38005ff91a6067c4c7e30508d08e496b64788f14672703238228ecd3f1107801da34e96d492c71ea284488efca4af5a30c6ead9f328 SHA512 b87302c714b5471a86366c1cbf99968b6acc548ed808b2083df886890a3f825f4c2bd5d9da685f3a5566b79aa06a3bff68ece1d4218003b9aa5e4dd51970770b
+EBUILD hsqldb-0-r2.ebuild 227 BLAKE2B 9278553739a4d1319d70c15dac54d56d81a69237ae80b32cc046af47ab441abf26638adfbe59b45bee353a4097f6114c19d73c75ea56658f304f5788192638fa SHA512 b59ea6109ac8da70f08d5d2187539be32d56dd2a860a751b2f341bcd9ab95108c02d13ffeb11a8e673bae9a6e6db37e28dc8f9dca1b832689ed3114157b4c5bd
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
deleted file mode 100644
index 18eddffbea04..000000000000
--- a/acct-user/hsqldb/hsqldb-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/hsqldb/hsqldb-0-r2.ebuild
new file mode 100644
index 000000000000..de8b7609349c
--- /dev/null
+++ b/acct-user/hsqldb/hsqldb-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c7777603fdd1..f3d38590ffb1 100644
--- a/acct-user/http/Manifest
+++ b/acct-user/http/Manifest
@@ -1,2 +1,2 @@
-EBUILD http-0-r1.ebuild 272 BLAKE2B 19b22801fc209cd04116c20182a84bfe11cac0c186d0545cd9953e49a83febb73a5371ced5172e26e11600f38d7bc8c995eaf9ac545ec29acff7b11b88de9912 SHA512 05e7ce63753212abceae3faed2b49d2bc2edafe1173527d6196e5f6a51aab649ba2d0713df085f377e7e4adbbb8cce4d712f8891ed896f22eee8e6ce1a1bca0a
+EBUILD http-0-r2.ebuild 272 BLAKE2B be5c651c6f1661b7c22f163d6148223c9185d13e8d962cc4743e7a6bd4cb3c4f5eb4635885efd9c3ae8ed5470ee7ba61a0b15efb2a12e30dd062c1079444c383 SHA512 ea8aa9a2bb133d31a65e8eb3b5c0ed4650e15ba115c506f963da9278e4f6969a08b27494604ddaab0b43b09580c29020684de890625475629e391f57b6066f3d
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
deleted file mode 100644
index 01da8bc68a00..000000000000
--- a/acct-user/http/http-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/http/http-0-r2.ebuild
new file mode 100644
index 000000000000..fba2e5256ed2
--- /dev/null
+++ b/acct-user/http/http-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2f5763560b5a..11bc4d392ede 100644
--- a/acct-user/i2p/Manifest
+++ b/acct-user/i2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2p-0-r2.ebuild 269 BLAKE2B 64ed9cb226f5aabb45661065f730b54a3ac6b76ac13f1596a7ebdee0797133e67a29f78ecdc0813744e8d4ebede566c42dc3a6c10cf20a40365940a12b613de3 SHA512 316ddbc8494aacb70e19f2cc7f4d6e8d52d7973ac7d6e5be83d0ab58dd67c13a27f847a76abe69ac1cf3d4860a37f0d73b42cdfc9871353fe953674fc1c99ee5
+EBUILD i2p-0-r3.ebuild 269 BLAKE2B db222ac938bc3e093be3eade05441ab1b94b3ce224131ae0d478c41f66e3a8228e0c2f2fba5ca851e5bd9992a349d2280ba6db11ad742774d5e001095cffd850 SHA512 f9d5be686dfe995b7c78f9af3c0376f48906ee42253e103113e043c80876b542155ffe437591afce64d0ea79f8f03cf39adb6af72a23db8e23ef091eeb336a00
MISC metadata.xml 483 BLAKE2B 6e2651a8813c1dd7ac7feef36431a6e08809d57b66381ded08d142088ee4f71d3fd2fed3e441cca0d87b1c22075acac5576528b84997743ad2b2b05144d66b98 SHA512 354e27f466ce32837109c395204282426ff5ca47f7f5e6c50679add744daf3b6507ed9f6e1e954db4ddebb98b9c9e556d8a0de0f58b9a0882905f83b46f69aef
diff --git a/acct-user/i2p/i2p-0-r2.ebuild b/acct-user/i2p/i2p-0-r2.ebuild
deleted file mode 100644
index 03e1a11909f6..000000000000
--- a/acct-user/i2p/i2p-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/i2p/i2p-0-r3.ebuild b/acct-user/i2p/i2p-0-r3.ebuild
new file mode 100644
index 000000000000..a9c926408e91
--- /dev/null
+++ b/acct-user/i2p/i2p-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7596d336bbfc..4631bf077097 100644
--- a/acct-user/i2pd/Manifest
+++ b/acct-user/i2pd/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2pd-0-r2.ebuild 309 BLAKE2B 65ab685340e587acfbfe0e5c1b3fa03a9cb96170872b56461ae4ea078fb5973eff29afb46e610c6685789f47edd56bd2579c0c8b399763db17c62a08b98fdbee SHA512 138c84f14e0159807e8ad0b99897777f08f41869f1179eed2a45b6c023e40930da18d980fb1b09932a839e88cba078dd7af15108b3a89d0acb898d38e1f74084
+EBUILD i2pd-0-r3.ebuild 309 BLAKE2B cd22cc0b4712ea2ae08634aa56d1a91bd6be4eed308b16b39f89529c16c97a43debd224d7e06549d3baa65730d2481b4fa03949ac882e4ecdd43977e042ff90c SHA512 5a3a993bf32f71956c8e812e9f04a63284e77e4db1f96a8e7b9ec4fa2c350c4da55eb91f283df0783e289b4d3b22cfd10c2cf96201bcfe1b4443628eb1d57a5f
MISC metadata.xml 399 BLAKE2B 85166ccc3c029d08bd993b4040ba89b287a14fe22bac1a96834686f074766a5545c64e6062766d0fe4162cf21e41772b8fedfac25c0d3f6f23bc38fc6feb1b6b SHA512 5add7dc4ce04ba1d51cc81d277ed0b7d50e16b678847aa00061fb7df1588f7080a911f54904ef36a3577dc199051189400cbcbb76b2c632cbbad72c2b8876da7
diff --git a/acct-user/i2pd/i2pd-0-r2.ebuild b/acct-user/i2pd/i2pd-0-r2.ebuild
deleted file mode 100644
index 5260bcec21a1..000000000000
--- a/acct-user/i2pd/i2pd-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/i2pd/i2pd-0-r3.ebuild b/acct-user/i2pd/i2pd-0-r3.ebuild
new file mode 100644
index 000000000000..73bcd00a2fd7
--- /dev/null
+++ b/acct-user/i2pd/i2pd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 23c3c40769a7..3e154f122b02 100644
--- a/acct-user/icecast/Manifest
+++ b/acct-user/icecast/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecast-0-r1.ebuild 245 BLAKE2B dcab43abc77f4943762b5da7754a4daf61d15734dd47487cd6128605c2d671759ac923a10cef776055fdd61c86d29cbf24d19ecb41512890a7974215e61cddf8 SHA512 801c18cf2e12144c2bdd2ac82b3f61bb0724d30beeb13447f8e553f37b4356a2aa800118aac463f67e5000756121ade2be86bab15d68085ceb9ed50399b35590
+EBUILD icecast-0-r2.ebuild 245 BLAKE2B 8da7e83e2b38c0cb0c5a02b9aea341777bb7c71797c253e2bfc4a324fd01a0a5e25f063c179067c7073e166b5f12408fa2f467642eacc75bfb9cc9ee7ba6ba9e SHA512 9827e70156587fa982e75f80d53ade194ef01585c0fcca813c031890112e3b13e4631efb4458ad633c6bbf0c4040ee28d4b4efa4f4e492ccb25415d997c68cdf
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
deleted file mode 100644
index b303a86666d0..000000000000
--- a/acct-user/icecast/icecast-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/icecast/icecast-0-r2.ebuild
new file mode 100644
index 000000000000..816c394728ac
--- /dev/null
+++ b/acct-user/icecast/icecast-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b81e055a6b76..8b20e922eb6a 100644
--- a/acct-user/icecream/Manifest
+++ b/acct-user/icecream/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecream-0-r1.ebuild 285 BLAKE2B 177a2df3049ae3a155a4bc1dcc4142ace9943225430a6f3f4e934dd6826a36bf2d4d0e1b9224e8d1fd779d580dd5f6a561fa599b69c11fe9c9950df75297c55a SHA512 a8c32e6750aeea9fe3158f7dbd63d324c43fa4cf0dd248b772ae513466dff68cf3c9abee5b29056f5a0934dbf3da97f472c1c741f807ed8dc71bc8b5bfd28a23
+EBUILD icecream-0-r2.ebuild 285 BLAKE2B 0caf97b9536abdc05528e026ff1c44a4c792b89a8ea14e555ad1265fe67de075e98ce235314052e0ae23330ba3184c7db54053ee3f7473e9a50bc70c3881121b SHA512 93078bb683cae59f0aa2e678d8e28d9d6b6a76efa1462624f7f5dccad0cb2e3832e71d9cff83bdc284a97c2d4144ca17da7493090f1c0a47056eddb99d1f65d2
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
deleted file mode 100644
index 955f96208772..000000000000
--- a/acct-user/icecream/icecream-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/icecream/icecream-0-r2.ebuild
new file mode 100644
index 000000000000..6fdff4a02d44
--- /dev/null
+++ b/acct-user/icecream/icecream-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 01f7dc9c2c32..b4413e632278 100644
--- a/acct-user/ices/Manifest
+++ b/acct-user/ices/Manifest
@@ -1,2 +1,2 @@
-EBUILD ices-0-r1.ebuild 239 BLAKE2B a982b747f13a7ec66377cd1bf86956b8a38b4795ce759d5b723a9658b922cfe79ebcfc007f9c9c1996bda202d05ba061b82cb0dafc6ddd949303026634c7953e SHA512 1ff3b080963f74f70e0263a13478945d25ffb9f548415d17a7991683a02ef04d6f34fa1391e19388b69a968fe407f64391b069034ec03c3680c48653aad6adb4
+EBUILD ices-0-r2.ebuild 239 BLAKE2B 1cedffc5e34e08bd6340479f37fc9a120d4218b63a7cab03fc0e43ad9fa266b1533cdec4d092e43b4b7b9344ec020fe17acc91dca0aadb290db00c68512faceb SHA512 4b1d22b743f15e55e38a45d3fe2bd4b54e864b545eff126bedb16962f9b15ba8ce8a9ce42a7922f535acf4ea7fd3eb14c63c369d0c22f590b2854565974230a0
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
deleted file mode 100644
index 0cc042ce665d..000000000000
--- a/acct-user/ices/ices-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/ices/ices-0-r2.ebuild
new file mode 100644
index 000000000000..7407267a28dc
--- /dev/null
+++ b/acct-user/ices/ices-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 44d82fc684cb..534579d4d217 100644
--- a/acct-user/icinga/Manifest
+++ b/acct-user/icinga/Manifest
@@ -1,2 +1,2 @@
-EBUILD icinga-0-r2.ebuild 272 BLAKE2B 349c36f74f7eb14f62567c50b9bfecef9bcd3e45fd52a0b69d6df5db0c6764d25d46f5396dc3551112ae9fe7e9c92a54d3d2383af2b65efd267b3b7b097ce643 SHA512 2b8efea203805e7cc972e6e8a80e9f0b4742daf42c06fc66d2478b852b7a9b941c4802b5f4b91174cfe42b9ba4783eefdab75a2c315d89e0361ffb9efce483db
+EBUILD icinga-0-r3.ebuild 272 BLAKE2B 2e3f949bc8a141caaea3b9a4430c13c0f8427752eeef31d6e7252095e18e562fd7a68f92feedfd817a65d87daa4fb6c99760e6c5fdcc56e65c001ce17a11ee23 SHA512 1437af15522769a4fd3fcada44142b6a1920e4704646e663bbe2b10600ede85899611cf3a8083c1d624db769299f32ac08cdcf8770bf54dfdaabe891c8de4323
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/icinga/icinga-0-r2.ebuild b/acct-user/icinga/icinga-0-r2.ebuild
deleted file mode 100644
index 8d2976baab64..000000000000
--- a/acct-user/icinga/icinga-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/icinga/icinga-0-r3.ebuild b/acct-user/icinga/icinga-0-r3.ebuild
new file mode 100644
index 000000000000..1fbed9938997
--- /dev/null
+++ b/acct-user/icinga/icinga-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/influxdb/Manifest b/acct-user/influxdb/Manifest
index 1fe12cc95345..d2ad68984d01 100644
--- a/acct-user/influxdb/Manifest
+++ b/acct-user/influxdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD influxdb-0-r2.ebuild 264 BLAKE2B 040c213b779762e4e479b4f17e6a6f7ce389014becf5ffcc42d55ebbe15bc87e530fd9c171b2b17b88ea35131ad908cd9f8a4bd05e1bfb52f46a1ed037653d7e SHA512 6903fae59e6482b75d2ad23de83b33858e5de3a727f82361f233c3e05f1a2bd582434793d357eeda0b8fa8801ea09833e89ac16e9c3b0c945d2702ac4ba0553c
+EBUILD influxdb-0-r3.ebuild 264 BLAKE2B b4cb7fa23bf68227d21291aa25d9b3cf2cd2f4efad0f9d631fbf3978ef9de19642b525b5ae7195493cffc5cee72886a29bfa40627fe6337313cf423a67764d1a SHA512 6698112eee9f215499a3b8245f4fc4b35534973b1e2e5ae2f882b3760a8c339154a5a118dd3f204efa86f35e9e25cb80f6601a69a43b03f3bf7022a75f803b35
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/influxdb/influxdb-0-r2.ebuild b/acct-user/influxdb/influxdb-0-r2.ebuild
deleted file mode 100644
index 21d7eb55e107..000000000000
--- a/acct-user/influxdb/influxdb-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/influxdb/influxdb-0-r3.ebuild b/acct-user/influxdb/influxdb-0-r3.ebuild
new file mode 100644
index 000000000000..b065f54ceed1
--- /dev/null
+++ b/acct-user/influxdb/influxdb-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b4ab3cdca209..9d7d62ef0a79 100644
--- a/acct-user/inspircd/Manifest
+++ b/acct-user/inspircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD inspircd-0-r2.ebuild 245 BLAKE2B a59a620e629286b6cff4aa0d7bcc74be89c7cb4ba1808555c5f811355c2ca72d8b5e0ce328ac5c44777f114f4c68502e64b3f8e8f67b3bfba841c477a6d92a51 SHA512 694ad1474befa2d8ae628b71a570df7ae381aa3d4e3c201ecf911faad87ad207552c27585c1ebac94babed7661e65d146f82ff5ab6dd364f2d4a5d2870e9e1d8
+EBUILD inspircd-0-r3.ebuild 245 BLAKE2B ecfed8def6e84155a30e64f2607c314359565762b6297f33701861d2576bf211238c9ad9a4449313247e5afe4617ff2486ed557940a71e5ddcb08eaa5c9b9c51 SHA512 285f71fd88c3a65f1f4e64ad8f195cc295d718190559ea2ce24c43ef9e541a03cd1dd5e7a0b4100cc4f213d83221d46c90406dd57f4f249a82e22f200fb5d653
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/acct-user/inspircd/inspircd-0-r2.ebuild b/acct-user/inspircd/inspircd-0-r2.ebuild
deleted file mode 100644
index 387ce15f89bd..000000000000
--- a/acct-user/inspircd/inspircd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/inspircd/inspircd-0-r3.ebuild b/acct-user/inspircd/inspircd-0-r3.ebuild
new file mode 100644
index 000000000000..0af4ef72d8c7
--- /dev/null
+++ b/acct-user/inspircd/inspircd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 34e6e656df33..492d0af7868d 100644
--- a/acct-user/ipfs/Manifest
+++ b/acct-user/ipfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipfs-0-r2.ebuild 316 BLAKE2B 782202662bc8266d6ffa7ad5c0d107e45385e1b76b55bcb59ffde6b886834c1d7a6fa2b9715c39d9b358154862262a126041d6c3f9c86083b7801783c51e27ad SHA512 d9cba7581a34e2703782f7c6cfbadb298f0ffadfbd243e604de6bcd1a2627883d3f48f1e6c1df3f3a92f21fe1565a6b0a1d3567fffc14509b77d676cccd16975
+EBUILD ipfs-0-r3.ebuild 316 BLAKE2B 72d7c00a88ab8ffb0ac66e3da33e6f65e4e39ff00a1f9808b87b342aca96dce02241b8f9e1de5f2e5dc381a51e67ed1ec0910d4620137ef7ec56f141fdc996cf SHA512 75e6625f8a5e06e62cf54567c5ba965219a7091a38e4e89a480413d8cbb0176006764bf7552ff2f60a67d8a8b08ed55b31dc7155add89b5bbeaf684f1a900c53
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
diff --git a/acct-user/ipfs/ipfs-0-r2.ebuild b/acct-user/ipfs/ipfs-0-r2.ebuild
deleted file mode 100644
index b9df15adae9e..000000000000
--- a/acct-user/ipfs/ipfs-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/ipfs/ipfs-0-r3.ebuild b/acct-user/ipfs/ipfs-0-r3.ebuild
new file mode 100644
index 000000000000..dd1dd159b8a3
--- /dev/null
+++ b/acct-user/ipfs/ipfs-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c22cfa358af8..1273813950f6 100644
--- a/acct-user/ippl/Manifest
+++ b/acct-user/ippl/Manifest
@@ -1,2 +1,2 @@
-EBUILD ippl-0-r2.ebuild 239 BLAKE2B b7f032f1538850a81129f812d074bec943ad39fb04c1ead5079131302147e2715788a7a8dfd2d1a539a9632d587fe8291a7f6e12c22949a2bd36476a5a8d1b26 SHA512 fd70091a981e52278864b2ad403d6684e7706490e765547631045bc3ba59f1a2e5162005dac344549af53ba87f2f87e1062c767cfaa9a11d13b941931fe6eded
+EBUILD ippl-0-r3.ebuild 239 BLAKE2B d6180874c92d1a2b981dc80a1034c09f447b1cec641f05ea9bea96d7c47fbb620628fe9f18a0831325f2e933be5f863c1cfc56bef2c3a83cf7f8f548b40b1105 SHA512 55b490393f9a888ddbcb9284e86775d0cb8434f1e4b1c13833463618ae6fc8b57450f306efdef707d5129c6dbbb22400ecd5f2fa10dd85ca8256f78661917811
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/ippl/ippl-0-r2.ebuild b/acct-user/ippl/ippl-0-r2.ebuild
deleted file mode 100644
index 151c567ab853..000000000000
--- a/acct-user/ippl/ippl-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/ippl/ippl-0-r3.ebuild b/acct-user/ippl/ippl-0-r3.ebuild
new file mode 100644
index 000000000000..9db6acf88ab6
--- /dev/null
+++ b/acct-user/ippl/ippl-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2f12b286edd5..7eddb13c01a8 100644
--- a/acct-user/ipsec/Manifest
+++ b/acct-user/ipsec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsec-0-r1.ebuild 243 BLAKE2B 6c3abe29e851a820a92f665527e38a053b0fcc2d86e576b610a7592c65a8d6ecbdaa82a1cb9953b0c08bce86e1271b3c23ef91d0195a48751a4984ddc546d1f2 SHA512 f2ef7d9e421ff8708e27df96d90a3ff7d37e8821164fe0b8832f9361e123b589970eb2d737fc2e7de79f6220352bf4a3fd8b3fa8a1f8bcb7bd0076ad943a5ccd
+EBUILD ipsec-0-r2.ebuild 243 BLAKE2B ea2b1785b115eee7c1305303eee98f5e347db2653aa0c070b272c1d66c3b49b681f5a57fdaf55398db7b0e410acb3696a414ad1489b248951ffc5411b5d754ef SHA512 1289694919204be15689adfbf1f03016f87a1a3d30992fb09819e30adcb5d971e6aaaf5f932cefc281e58599855f4ed60d2216b4f5dfd4ca0d2b95c54a798b3c
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
deleted file mode 100644
index a5697b99a67a..000000000000
--- a/acct-user/ipsec/ipsec-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/ipsec/ipsec-0-r2.ebuild
new file mode 100644
index 000000000000..6cc2ffd24bcf
--- /dev/null
+++ b/acct-user/ipsec/ipsec-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 09488ad19056..78500c143e63 100644
--- a/acct-user/ipsentinel/Manifest
+++ b/acct-user/ipsentinel/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsentinel-0-r1.ebuild 252 BLAKE2B b60265a87b07fd9959b9107dabd04e81570b6c71d2c369401fdb9d60e39f19ca2966b67839555d2c80f27c6d18611aa6ce0d770f60bf2d8874f4a441eeeafac2 SHA512 c22f5876dcf7a0029939fdf44349dae51ac3ce92549e1b199155512f6713f619d028fa2ca7db3584f3d9f11194f2a5734930da353e72d89645fa26d383902c78
+EBUILD ipsentinel-0-r2.ebuild 252 BLAKE2B 088827f453453cd50ed1c68d753e8229e81c315a011ebc7b08a007dbc0610837f30d47798c110b7f9d11104ddad22af335bc3687ade0c876ebcc4eecad2bea57 SHA512 0cc285206c59a2d4520c3741ef0afa9186231cf105ff9b5eae1afcaed62bcfe8967fd55e4caf22b53c1b184460c7095e723bd66dc34b9251e0979e06ce1b74d9
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
deleted file mode 100644
index 8c7be37bbd69..000000000000
--- a/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/ipsentinel/ipsentinel-0-r2.ebuild
new file mode 100644
index 000000000000..1ad78a15817a
--- /dev/null
+++ b/acct-user/ipsentinel/ipsentinel-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6b5f9f660014..3b2176e6fbfa 100644
--- a/acct-user/iroffer/Manifest
+++ b/acct-user/iroffer/Manifest
@@ -1,2 +1,2 @@
-EBUILD iroffer-0-r1.ebuild 198 BLAKE2B a2598dc6e89122c9c68cf3ea6c3f986a77d376201bdf96256fea30d04e260413b125a4e08b28e0a7ded8132fa9752f4a6532f1b801697a4948920dcd2667f871 SHA512 deaf723abf2f0262838f9b1e6da21f2ea2068e18736f7295fd598af0eaedb44d0f96fc575495c0ba6295ccf4ca793d13821752292b2177d0b4d8fca852922d3e
+EBUILD iroffer-0-r2.ebuild 198 BLAKE2B 0bb916d0e95d6e80ff140204b66bd1e1f2240be054761956764f3caf5e94cbba08324ee636ca49a08196cd17db8855668461006aba094faa38d48ab31ff0bf19 SHA512 193ab69e2f18536cee2758f83d74a79dc1939a250f4f13d86cc84a914ef1455e35340d16d630601fa3e19877488b67d8be846e9e9b454ffe9e52354d9ec4d07d
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
deleted file mode 100644
index a44bed6da0d0..000000000000
--- a/acct-user/iroffer/iroffer-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/iroffer/iroffer-0-r2.ebuild
new file mode 100644
index 000000000000..c165de141f25
--- /dev/null
+++ b/acct-user/iroffer/iroffer-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=187
+ACCT_USER_GROUPS=( iroffer )
+
+acct-user_add_deps
diff --git a/acct-user/jenkins/Manifest b/acct-user/jenkins/Manifest
index a13d892dbe9c..55afe0d142fb 100644
--- a/acct-user/jenkins/Manifest
+++ b/acct-user/jenkins/Manifest
@@ -1,2 +1,2 @@
-EBUILD jenkins-0-r1.ebuild 264 BLAKE2B 86746d5ee458e47c03b7366c53589cfc616ffd9c5376325a02ae0d30830caec5b57865d063afba508e21f7008c69b4c187481e4edf4ae2c95b5280a3a5f24de9 SHA512 433cf3c0a1a3840b144206156020353c97d4e0ac37019bf28a5a219ec35d8fab0a68b0d49c214f8f5de9aad4f348daeb3cf9be34bb3e0af79551bcfbe859bdc1
+EBUILD jenkins-0-r2.ebuild 264 BLAKE2B 466fe67a49f60321c776c459613a3320187de38bd21d1074b0ed961cc74ed60742e0b6ee145e0ede8dd3dff61c20c02df9293bbb3262a477f70539ad45b4593e SHA512 f123b7e18c0fa285cae7953b873c2c65d9faf32f55a36a40d30286930792325979acd9dccaf9f3974eafd7aba1a4c6b8ba615607db562ae1981d93b104f50319
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
deleted file mode 100644
index fe4befe0583b..000000000000
--- a/acct-user/jenkins/jenkins-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/jenkins/jenkins-0-r2.ebuild
new file mode 100644
index 000000000000..e63fa5bd077b
--- /dev/null
+++ b/acct-user/jenkins/jenkins-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0a9d70ea3eab..eb1e613314d9 100644
--- a/acct-user/kafka/Manifest
+++ b/acct-user/kafka/Manifest
@@ -1,2 +1,2 @@
-EBUILD kafka-0-r2.ebuild 280 BLAKE2B 4cab6d8ae48f2f761d588f59e569cc5f9105c64c484bc18fd8ed743459882ffd60b402ebe0426464e26a31f536a507c598892a41e98253ad47aef53d40ae257b SHA512 3d3f1b039032ae547af211da1326a8bc21b07bb0e4f85c27926fb30872e480857b0dcb99d67df3d1d4cd2072e0e6e7f27a5c62760052f260ea1ee2b51db38893
+EBUILD kafka-0-r3.ebuild 280 BLAKE2B 7797da6d3fb1e36ce8f5380b7e3a56fd8af1b01bf1bf5ac914884d1e64b25ba411e8b568971f21b8b3101014ea925b23d29926d9305c5f723262dcf4ea0b4640 SHA512 13abf6c1b3eadf85a2d67c1c69ba994b580308b4516488fed54318fed7768e72185dc3092f703682631cb14e59583e3b84b77a0fcc21782c8c8a0679ffba0b9f
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/kafka/kafka-0-r2.ebuild b/acct-user/kafka/kafka-0-r2.ebuild
deleted file mode 100644
index 2b3793a80e93..000000000000
--- a/acct-user/kafka/kafka-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/kafka/kafka-0-r3.ebuild b/acct-user/kafka/kafka-0-r3.ebuild
new file mode 100644
index 000000000000..655cc76352b6
--- /dev/null
+++ b/acct-user/kafka/kafka-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6326195c7d33..7d58d8658e80 100644
--- a/acct-user/kapacitor/Manifest
+++ b/acct-user/kapacitor/Manifest
@@ -1,2 +1,2 @@
-EBUILD kapacitor-0-r2.ebuild 267 BLAKE2B 213ef3b1dda302d3b6ac6a4bf9655edc3b06c8e333642c59f76c95d185de0deb211b8e4c8d37cb626a8f0ab70ef7d7de179c8d7532c4e1dd276d94fb70c513d0 SHA512 3695fde0017d1f89fbcee3faf1dfa505756ea9787fada53d2e100657720c673eb6c3261dda7996e66088c72f07066ff2607d1d039f16e47fce2ded52191429bf
+EBUILD kapacitor-0-r3.ebuild 267 BLAKE2B 0df0e06209be0baf0a738719722d61ac0e1d4b1f7c58290bb5612be26ba5226318499976920ca610addcce253ac7816f3d676461dea1ee1b9cfd2582a9b2f337 SHA512 59314e3560b7452638962ac61069b64e85b90fae961a4ed5dd67e71bab441dcd2cdc575d14f22a0a0ae55b87f43eb65e6771eea3847d992bb3b4b20f4d94e0f9
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/kapacitor/kapacitor-0-r2.ebuild b/acct-user/kapacitor/kapacitor-0-r2.ebuild
deleted file mode 100644
index b61f9fbd2c9a..000000000000
--- a/acct-user/kapacitor/kapacitor-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/kapacitor/kapacitor-0-r3.ebuild b/acct-user/kapacitor/kapacitor-0-r3.ebuild
new file mode 100644
index 000000000000..344014683fe8
--- /dev/null
+++ b/acct-user/kapacitor/kapacitor-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e605b5612408..ca423d4229fc 100644
--- a/acct-user/karma/Manifest
+++ b/acct-user/karma/Manifest
@@ -1,2 +1,2 @@
-EBUILD karma-0-r1.ebuild 241 BLAKE2B 8bf7dfd7870d3b8d3128200c3e1d09ae92e87dc6903e11833936a8168c0b9397b847ddee014059d134f4ad55973c237a69a9a5fbf2edcc251a590248f1036e0d SHA512 470ef27e8901b3c228ccc615fe4fa46d33205859f37456eeaefacef775ae9bfdd8d99442600fb26879ffe97f9a401d3320a419741ed41e82428e8faa042fcbe5
+EBUILD karma-0-r2.ebuild 241 BLAKE2B 7cf0f482669d52238e110eff4b1f94015dc3de8b481e62b13893d407eb783a56614e00d8a54c72cd75b5625c09291d687860a1aaf1081f4aef5add0a176873cb SHA512 510699d3404ba88400b33beeb7fd5a377eb7487da1d833759f8c0da9007df0db2f4a00f91295bd27a980391466840ff96ade18a59c440a15a7067fd3fe254352
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
deleted file mode 100644
index 420c7da0121f..000000000000
--- a/acct-user/karma/karma-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/karma/karma-0-r2.ebuild
new file mode 100644
index 000000000000..dec282098992
--- /dev/null
+++ b/acct-user/karma/karma-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/kibana/Manifest b/acct-user/kibana/Manifest
index d0676e764a03..4c49ac02a4b4 100644
--- a/acct-user/kibana/Manifest
+++ b/acct-user/kibana/Manifest
@@ -1,2 +1,2 @@
-EBUILD kibana-0-r2.ebuild 287 BLAKE2B a1dfda4ffd757f31f616066b870507e32976086abc63f41a3832e7fc2ef7409798c4446a680c7ff0a5a6a343582e0b1a2abed6feaef25bb4c975af0574844446 SHA512 b273d3dfaba39e8f1295529379adb4fa9b1056ba431dac275c7fadaae12b5afc8b1a617aacbffa3b39a3849186e87f7ada7e37e47041e6476dabb96dd733b30c
+EBUILD kibana-0-r3.ebuild 287 BLAKE2B 18c4c04c80ea4c914f3ed2153d5a4cf99fb8109ac27caf010eb32628d73be9e9b036692490e1f43afd6dd146a683fbf62276bfa0499ae136e7c28d24297a6e18 SHA512 d1f665d87140e779cd50a31c3a9cd8c5356a56fae348fb36a9014f63089c42491706c1c4029011aed55793a07e9f9510e003dbc25f72c70eda8270007cd85d25
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-user/kibana/kibana-0-r2.ebuild b/acct-user/kibana/kibana-0-r2.ebuild
deleted file mode 100644
index 4a188fc20953..000000000000
--- a/acct-user/kibana/kibana-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/kibana/kibana-0-r3.ebuild b/acct-user/kibana/kibana-0-r3.ebuild
new file mode 100644
index 000000000000..74667c4eb958
--- /dev/null
+++ b/acct-user/kibana/kibana-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 952a5d86b942..e0f2ec0934d8 100644
--- a/acct-user/kismet/Manifest
+++ b/acct-user/kismet/Manifest
@@ -1,2 +1,2 @@
-EBUILD kismet-0-r2.ebuild 295 BLAKE2B 5a3c672e88359b47956d9f622a4a4160d3ada260bbc1a4a0d0671eb839d94c8668baaddef0bcf3d25e9cac680bb003c14a3d889569d55e89bda60c32b13cf629 SHA512 385470a9605534aced01016db503b9b27837110ccc39697c56d2ac30fbff1b111e92c3e22679606f9e37a74126b9966cd23b9fbdf8957bd7048f7200ce4be71a
+EBUILD kismet-0-r3.ebuild 295 BLAKE2B f65281ed5d065abd9cc9eef580882e2a77bd05fdcff3e14af4b197402eaa9d6e2ef0a54cecd2172c6527565a637056c038c24cd29c09eed0bdfe7ce93a0beba1 SHA512 329b335617c52baea138a5764fcbfe7cc5fed97fbf6ae98cd3a7b87fe8f530f3f30a436b223a00c0b38af1dacc732af2e971310b876fe350405f1ad081641a21
MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
diff --git a/acct-user/kismet/kismet-0-r2.ebuild b/acct-user/kismet/kismet-0-r2.ebuild
deleted file mode 100644
index 7d3a4b49839d..000000000000
--- a/acct-user/kismet/kismet-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/kismet/kismet-0-r3.ebuild b/acct-user/kismet/kismet-0-r3.ebuild
new file mode 100644
index 000000000000..c725ddcc3986
--- /dev/null
+++ b/acct-user/kismet/kismet-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/Manifest b/acct-user/knot/Manifest
index 8175768976bb..4a04b5bc9b13 100644
--- a/acct-user/knot/Manifest
+++ b/acct-user/knot/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-0-r2.ebuild 262 BLAKE2B 54638cee234e5c3373f485bd75eed56bbaf5c3a0fce9f1c25c987cb44ddc76fe64b0900f0b6a9c6216070a8baa4a57f4e61696b86c7ff0010e24b964d7f5593b SHA512 6d4641003e5dbd67939b5246b3269972e4f9e7e192c7b224f056de63bebffe43edf75206b211814fe20a6750abda47f01fe3b42c7ddc963bd32d4df5af3c12a7
+EBUILD knot-0-r3.ebuild 262 BLAKE2B 019943eaab9b3787c46ab5e20277a6d0996022bf2a41792a398fa8ee7cc899518923e2dc66e24fc8e3b3d5f7967d8008b78292a8d98c8ee354d27c5e02f0325c SHA512 a90604d7a4b64c034ea8790f27cb3c29de154e58a1b5eb6dba272e926ef566641c8fde22a79217c67916c24a7298de31dea363cb5f71598c35852f7a6f6a8977
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
diff --git a/acct-user/knot/knot-0-r2.ebuild b/acct-user/knot/knot-0-r2.ebuild
deleted file mode 100644
index e1589d0acc7f..000000000000
--- a/acct-user/knot/knot-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/knot/knot-0-r3.ebuild b/acct-user/knot/knot-0-r3.ebuild
new file mode 100644
index 000000000000..cbcc3df30192
--- /dev/null
+++ b/acct-user/knot/knot-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0715bf149bc6..75482857001f 100644
--- a/acct-user/kube-apiserver/Manifest
+++ b/acct-user/kube-apiserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-apiserver-0-r2.ebuild 243 BLAKE2B 4471dbc459a725549ca311a5de9f89760b0b0322048be1e74881db8fc0671f470680d8ebec7f43f1df934011e04fb383184c1827dc0383b8f888fa99c7e82230 SHA512 17e04bc22ca54a1e5ad9041e65c31937571d723ee321df1c310a875c283b0d2138907849ac58d8d9e2a1638654002dcd5f365edf73852e84e5f2e0f3c2b156a5
+EBUILD kube-apiserver-0-r3.ebuild 243 BLAKE2B 4821805be2cfcb94bd30dff491ecfe0e47e82ddb4e84172fcd7c099b940021f2d13a32602f0371545eb0d6d444ab4f0a1a4762737ab38d3459b45e6df85f8093 SHA512 c6348248105f3b32481193901279b32e609be0a42c983b778cb16aa50571990fe896c95553616672e3ce13f351f1f99870487bf2667bc8819ce4babcc9dc27f5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
deleted file mode 100644
index 0ca7505f290c..000000000000
--- a/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-apiserver/kube-apiserver-0-r3.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r3.ebuild
new file mode 100644
index 000000000000..2c79be72b9e5
--- /dev/null
+++ b/acct-user/kube-apiserver/kube-apiserver-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e473c61af6f0..8106e2d7ca5c 100644
--- a/acct-user/kube-controller-manager/Manifest
+++ b/acct-user/kube-controller-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-controller-manager-0-r2.ebuild 261 BLAKE2B 5c325219285889ac6f9b680fa8547fcdaddbdf059dcce2e128808bf1958fb5b13e90822a2fdabebb651d5e42430004cd225f03ed902e1433011afeacce1fa5f6 SHA512 5d8d502f15bea54bc34739a68164fe3a9bcb434d0caeeb24761d304f67f31692ec61c0bac1f5cea33ade73900536c5d897d88424ca260f46be90d2a56f3bd72f
+EBUILD kube-controller-manager-0-r3.ebuild 261 BLAKE2B 757f94020fde49611508e6b1ac34152a77178cdcffa09a26117dd51bd349fd1411e1d00b70ad07b3f6c4cec65514a03164b98ff491a56309f86d8446c1966eeb SHA512 fd159007ffa2968625f5a2ca888d59e7c7535f636ed591b7e333d09b8df0d8a334aae30f4e36acceaa34214bee188b69e65f355fce7689768b6fd3da7e46f88d
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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
deleted file mode 100644
index 472ccc1d16f7..000000000000
--- a/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-controller-manager/kube-controller-manager-0-r3.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r3.ebuild
new file mode 100644
index 000000000000..4e2d9da65d99
--- /dev/null
+++ b/acct-user/kube-controller-manager/kube-controller-manager-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4d5fa1e52a8b..fd9bb77d8c6d 100644
--- a/acct-user/kube-scheduler/Manifest
+++ b/acct-user/kube-scheduler/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-scheduler-0-r2.ebuild 243 BLAKE2B 9ee1738b6a4a364f44c802a4ab719ea58810eea7475993fb8e7ea26304414e84ed16dff9f51f9eb9fdc0224d8bc726d1c57dcda7b6d7e4636b591e440beaa6ea SHA512 53269a79abb0a22717222fc1732995015ea7e974ec4fa55b933a85ca44fc88ea9bf75b5e7c935142b5b47d171a3974c6cfd2f1a494ce0128385a9ac575b8889e
+EBUILD kube-scheduler-0-r3.ebuild 243 BLAKE2B 8d7291d960cb1e3ec6e34db7e2aa3297c92e22f089db3e26cabf429a7cd50b1e016984fef4d1c63fc2e2e97a1d94fbeb8073bb25f9d7aec6709e3aa25aab5d89 SHA512 548e9bd6b2b0198fb1529ce1246100d200d2b5b416369dfd2a8768a48863c74a6140d2760e0435ca901b2840df47a6eff69cfbd3dab72c575ca357f1d018c7c9
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
deleted file mode 100644
index a6fcaaa54979..000000000000
--- a/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/kube-scheduler/kube-scheduler-0-r3.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r3.ebuild
new file mode 100644
index 000000000000..0ac3bc1cb38c
--- /dev/null
+++ b/acct-user/kube-scheduler/kube-scheduler-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c4b500ae00d3..e02630f41593 100644
--- a/acct-user/ldap/Manifest
+++ b/acct-user/ldap/Manifest
@@ -1,2 +1,2 @@
-EBUILD ldap-0-r1.ebuild 286 BLAKE2B a4891b3e24467f61415c0eec7261ac977909b02e92bc2b22c42b2c09346ab1264f37b799a0674ed63036c6a451cf4d3a99d41ddfc7ca5fa1d24f45785e13ad0c SHA512 98fdfa767a7ed9256ee629bffce944864dae89fa7ba71f1964f1eab2ce53e0aa8c672c66544f88e9b00c602880a96f60194485ad7808c3606a8980177e51210c
+EBUILD ldap-0-r2.ebuild 286 BLAKE2B c0e56320bc8581e5e182594e2ac430e044b0e52725f12744bc9c3e301a6cf5fa17a4d0fbe21df81277c28966f0939e2a4ad225c765ce4b492ed57133c7de7a24 SHA512 18a7363ef0cbef223b7ddf97ef7862a6c3468e457489343e946e8c8475d501bdd67151357086e21a7ce258c4569e217fb7b6eb2cfd1e0b06b139733bf8b4732d
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
deleted file mode 100644
index 46d4c83ae93e..000000000000
--- a/acct-user/ldap/ldap-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-r2.ebuild b/acct-user/ldap/ldap-0-r2.ebuild
new file mode 100644
index 000000000000..7006040493f9
--- /dev/null
+++ b/acct-user/ldap/ldap-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/lighttpd/Manifest b/acct-user/lighttpd/Manifest
index c492b392c082..f1ff181043af 100644
--- a/acct-user/lighttpd/Manifest
+++ b/acct-user/lighttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lighttpd-0-r2.ebuild 233 BLAKE2B f62af6f5ac51738b7b4e499bf4795e1be4619a80519d6d9acb545201a912ce0d3db44c3e77a6e223478e74832f7a78e0f65833f18f3207a55c472bc408755201 SHA512 87fdddbfae5d49d7a362794b297bbb870e51919d64a51e25b11bb77a6491caa566be34083d9430e36e40523b5770fa28c085006e2d83672fc245459ef4f46268
+EBUILD lighttpd-0-r3.ebuild 233 BLAKE2B cf87c9235e69f49222eb731c498c45f41772f32b13f5020c79b1742b988789697ec5a8af8e25a5532f79addb7a084a4e95d7cc891736ec5204b5983d3934d146 SHA512 dede7c649eb2d147813a744c5893598b21d50b78cafd87c34fe20083fec88df3da24780328a888edb607f1d08948938c4334901b31be35bd6b4dac2556696050
MISC metadata.xml 369 BLAKE2B 6cc19ae6c320ce326a51aa83486490be1cfd4219c79b926da9afa9cddc28d1cd793abd7ad6a334b482a1cffde812ebc44ea869c7ae024c2365a5bb55448fd890 SHA512 db84772cf1584b166aa81c3238a8bb312ab781f9c8285df37d5a7fb9e84af602b9ea9075d582bd1b350610f8502d6d03e4c91f5378d61924c2350591f632e65b
diff --git a/acct-user/lighttpd/lighttpd-0-r2.ebuild b/acct-user/lighttpd/lighttpd-0-r2.ebuild
deleted file mode 100644
index 155cf8661c81..000000000000
--- a/acct-user/lighttpd/lighttpd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/lighttpd/lighttpd-0-r3.ebuild b/acct-user/lighttpd/lighttpd-0-r3.ebuild
new file mode 100644
index 000000000000..eece138b765a
--- /dev/null
+++ b/acct-user/lighttpd/lighttpd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/lldpd/Manifest b/acct-user/lldpd/Manifest
index b5784f581181..33231342a64a 100644
--- a/acct-user/lldpd/Manifest
+++ b/acct-user/lldpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lldpd-0-r2.ebuild 235 BLAKE2B 88be1fa5594479f70424210ed629f72c84092d5f3124b576eb38e7634ab634d8339c732d30169f442a97fb71b595f495aa0fc145ee2af3c4223bce9483b5fcd1 SHA512 2f8e188f5e9f97f74f42b53a4b7ed896c1af605c65e17d9e026174d76e97e984ea301462ec58854e4875979d65a2e9570832c398a17df703aa4fc4c1290f364b
+EBUILD lldpd-0-r3.ebuild 235 BLAKE2B 8fcc6213e6ec80c2f1164bcbcb4963469564a3ab4d71ce18045fb4426fb6e03bd4308ab19eb4b2f6bba9dd333a79f6c24a216c0e16056a1adda1658cd7a08e32 SHA512 bf671679ed3a8eac55c56f7a3b7a3b3eb0cfcf933bf555b8c3a36d07f3a89e8832208d274f3700f25eb214d75fe9e16a29b739e0e765ef521d7d8e7902937414
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/lldpd/lldpd-0-r2.ebuild b/acct-user/lldpd/lldpd-0-r2.ebuild
deleted file mode 100644
index e8ac77195bf3..000000000000
--- a/acct-user/lldpd/lldpd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/lldpd/lldpd-0-r3.ebuild b/acct-user/lldpd/lldpd-0-r3.ebuild
new file mode 100644
index 000000000000..5c6a40dd3908
--- /dev/null
+++ b/acct-user/lldpd/lldpd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/logstash/Manifest b/acct-user/logstash/Manifest
index 455b1683ecf7..720c2ac8536c 100644
--- a/acct-user/logstash/Manifest
+++ b/acct-user/logstash/Manifest
@@ -1,2 +1,2 @@
-EBUILD logstash-0-r2.ebuild 293 BLAKE2B d98b5240c549a808fc3e4bee7d8e67e056e6cbec0d38b23cfefb04bf886cacd1932690f27e50d60250512cad3ef24d3f730ba60e4dfbe6bb8ff9fefa9d0b14f2 SHA512 62b3b19461ad7d45b5f79be5793676670d74f8adc5f4920b6a86a85224c8506677b9f8e44aef4042324f2d12c394c7a459d1d5bf6720138e63b07f53deef0ed6
+EBUILD logstash-0-r3.ebuild 293 BLAKE2B d6f7f209a44f62594d3dfd8b122b350a375aa2e4aaa53c907a402c6c8e927b735fd223873594427ca90643668bcbf07c6b5b34a0968234b57f05605a4d550642 SHA512 374a42607b110cdc85113bdd8c47ac26213b6da2dc8bd8f0b2cf4f43573c83d59be438c6d0df3c2b49cb58d0e9dd24e2699f6709f6c9e7ad9dd33c11143d406b
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-user/logstash/logstash-0-r2.ebuild b/acct-user/logstash/logstash-0-r2.ebuild
deleted file mode 100644
index 44658d2d4261..000000000000
--- a/acct-user/logstash/logstash-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/logstash/logstash-0-r3.ebuild b/acct-user/logstash/logstash-0-r3.ebuild
new file mode 100644
index 000000000000..957d187e0b6b
--- /dev/null
+++ b/acct-user/logstash/logstash-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 eec98871be61..13378240922e 100644
--- a/acct-user/logsurfer/Manifest
+++ b/acct-user/logsurfer/Manifest
@@ -1,2 +1,2 @@
-EBUILD logsurfer-0-r1.ebuild 248 BLAKE2B 1fd5264778d20f13e41927655f7fb3df7da082edb9955bf29a29a2ad63f1b0303aa0559521d61c91130746007030901d412dbe2d18e970d0aa9ae17cacab640a SHA512 89590c55c98e6b2f86ec771374c587517ce42b2dadc5b4cb47384946b43d69376c27523e114f8d4bcb9cc77ac2cc11ca6ad8f6487b2524f1d9db9f535d69246c
+EBUILD logsurfer-0-r2.ebuild 248 BLAKE2B 31fa0cf8a72e7cd4779c3372fa0e4ee7a97e47222dfc4dd0d7f50639b76d91796775b01a9fb2ed7d87675ed9ba493c128ddbe82683139c5857cd5a5e68f825dc SHA512 9602c60223f74475ede3b364dba107889c9db262e17a3eb0ff3a4311eea00700b8d0736d0e6f7865bef6a4e050c2de6f8a38dc31f820cd5f4293128debd84c44
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
deleted file mode 100644
index f55cf8a7802d..000000000000
--- a/acct-user/logsurfer/logsurfer-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/logsurfer/logsurfer-0-r2.ebuild
new file mode 100644
index 000000000000..45cdf886cff4
--- /dev/null
+++ b/acct-user/logsurfer/logsurfer-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 71d634514feb..4d0b8130d89b 100644
--- a/acct-user/lxc/Manifest
+++ b/acct-user/lxc/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxc-0-r1.ebuild 236 BLAKE2B a61f8a9ba72524fe5b2b6c3e50040053668d554e7ec5765eaad42def8a9ceec2dcaf40240e41accb698dce66d5d5b9edf804931e2dc5d2d4d0d6f3d248ee3a1b SHA512 5cfb4bf28f4a20bd0868234d87cec1769bfcdf2f811255a1d08b9f33ff392f8c0e87a6e360ad4ec8aa93495e8f90451555df4582680a681ec4ac4a7a591dc9d6
+EBUILD lxc-0-r2.ebuild 236 BLAKE2B 2be2db0a40090ff103f8e78481e852a57547e4c8912eb246e60a4a5cbfcb95e99b0a3cb622ffc3787bee6483ab6da1400d9a130492264703dfc8135ce3a44455 SHA512 134dd4ba42c3480bd21564e3e1066246055673244726f09f09f7e027dff2943abfa35553d9f9b5f842c6d4a143116fd7ecfaad1ee05a355ae611de53992d86bd
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
deleted file mode 100644
index 503091786bb5..000000000000
--- a/acct-user/lxc/lxc-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/lxc/lxc-0-r2.ebuild
new file mode 100644
index 000000000000..7449e8ee3799
--- /dev/null
+++ b/acct-user/lxc/lxc-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d10a7725bb86..4b9c20779612 100644
--- a/acct-user/mail/Manifest
+++ b/acct-user/mail/Manifest
@@ -1,2 +1,2 @@
-EBUILD mail-0-r2.ebuild 314 BLAKE2B 1d76d95ac1d8c4c9a0f46918c16a118c7504acb96fe9cef5c2caff7515995f8462e34288c0c426c5e953fead231d6670473b5dc63ac1c73a7df014a97ac18a78 SHA512 7d42a4ec0fec4ac9db1f4bed2030ce91daa79a485adb1d297f0c0a9a5f67ed63d55f4ed1e619835629f6894691a40c3dcc9f3f70e01ead3e1ccdbbcc161fe8e1
+EBUILD mail-0-r3.ebuild 314 BLAKE2B 86532c76ef67db6cf287605334c74b887ba3f7039349e8911ad8a31c3566bf5a7efe98a0faac02bd3a6faeb73e71378ce457ada1888f1a4f5386e30720f4cb37 SHA512 053f23a46dbe75c6274a28ec3f7decb5aac3750c966790ad1c3e86ca491b62073adc98ce6dc57d2c925ef1933e7ca3abcea0f7fd5538113ff15f91f2a8077083
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-user/mail/mail-0-r2.ebuild b/acct-user/mail/mail-0-r2.ebuild
deleted file mode 100644
index 7e265e0f4c6f..000000000000
--- a/acct-user/mail/mail-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/mail/mail-0-r3.ebuild b/acct-user/mail/mail-0-r3.ebuild
new file mode 100644
index 000000000000..b5cca0f3edc7
--- /dev/null
+++ b/acct-user/mail/mail-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9b436ae5cd3f..e2f2a1b949c0 100644
--- a/acct-user/man/Manifest
+++ b/acct-user/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-1-r2.ebuild 193 BLAKE2B da384074752544f3a07c7a6d9400c7eb7dcceeb665a2d6513496ba08503aed519c4b520b622795be8fc46e924df33f66d429645f490ac8edba4f235f75a24743 SHA512 7a57c7134a1d2ab1f860118fa861523a0748fd94bddf02c3e13cbd25f4ccb0a287030fc357e007b37ba1a9eb5c9cb544bef644a6ace8e329a886fa2a2d7a384d
+EBUILD man-1-r3.ebuild 193 BLAKE2B b9729cc535d325f5a0017510e42568cddcee8fd6f5c2b40f1222c536faa12d49b38d409b7315df613218bfc4001f95c6df6a7bfe803277568b79196d2dac046d SHA512 85e06a659feb8720ea3cad97dff891a852e6970c466ce986206eed7ed04b7be5f9bb284234c858345019b55fdbb4b614db747510d498392023ca8640e5fc3dc2
MISC metadata.xml 228 BLAKE2B f079847f571a8b1d3a795045c91b7c556e56a6c8ccbdb2104d4e0e5f976498fe3767a5b7d57edd46406b4e81861ad65b52de6b5d8d11d88409c91f158ceeccbf SHA512 982f1dd33d491d63e0a2f9bdf0fa9fe4778abbe7f38017387226101da3674eb242104ff57cbf5553923f35e6a8398b96b7cbd29da8033b7f70e128d67b366516
diff --git a/acct-user/man/man-1-r2.ebuild b/acct-user/man/man-1-r2.ebuild
deleted file mode 100644
index 95551cbfed4e..000000000000
--- a/acct-user/man/man-1-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/man/man-1-r3.ebuild b/acct-user/man/man-1-r3.ebuild
new file mode 100644
index 000000000000..b3ffdc07f966
--- /dev/null
+++ b/acct-user/man/man-1-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e94c0c89c8aa..6d20798f3b34 100644
--- a/acct-user/maradns/Manifest
+++ b/acct-user/maradns/Manifest
@@ -1,2 +1,2 @@
-EBUILD maradns-0-r2.ebuild 197 BLAKE2B a9064f31cf4f036a8bbbff35968b6aee6e7e968ddf5538f818e336fc3bf548163107cbd7caa6f715fe847dd48e8d38137464a24149470becf38d96aa0e945795 SHA512 943afdd7a55e0b435eaa3bc0b76b6c115a5d91d9a98ee2aac518cc1c4304293f18e1c25fd7c4a7948467805212410af7406410baf3d728f0055acbe478d7498e
+EBUILD maradns-0-r3.ebuild 197 BLAKE2B ffa4eaff73d9d21342cb3af4b8f265020977c7058639abd677b5002aece784f96a8f4173a462ace2177b33f518c6c205ec97a1b1880343a3fc867e9947abf785 SHA512 9c59554f2fb72a74bb0f9aa93b9753eb832b95898cb4b227c36e955cf32d61e60826e59d1642d02891b563b1e5a02df4ed3c356b7ad99222807e2f1418a5e912
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/maradns/maradns-0-r2.ebuild b/acct-user/maradns/maradns-0-r2.ebuild
deleted file mode 100644
index 7448e405ec94..000000000000
--- a/acct-user/maradns/maradns-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/maradns/maradns-0-r3.ebuild b/acct-user/maradns/maradns-0-r3.ebuild
new file mode 100644
index 000000000000..fdb733b10ff6
--- /dev/null
+++ b/acct-user/maradns/maradns-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 54ea868b929d..3c51b2beb48e 100644
--- a/acct-user/memcached/Manifest
+++ b/acct-user/memcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached-0-r2.ebuild 245 BLAKE2B 3272490f1470d9330df301adb0267eef0064f551c24ee5d7faa55b4e6a9d940cb8294b8b9739bceec8ab4676b5c3802d3aafe14c4a5da59959bfbb4af1319526 SHA512 67ce619fd252394c43dfb4ddd5d5c854a45d32dbceaed153b1d2bb91042d4ad8116420e17fce9019287b9066168b9f2aea1a1a400f8a03a5403d6f67b986f0a3
+EBUILD memcached-0-r3.ebuild 245 BLAKE2B 821c536dc771ae4d1c2a271f65ecdd9c164a8a9b35887287441721cff10dbcf8e73fdcfb91286df979a57bb1170e5120647437d7616f142fc7d694f0274829d6 SHA512 8429ad7df92fd4da6601cdfde2960ef21c3e34d7c0b249ab9932cfc76615840ea0cc9293b3636fdf0e77fbac18854045880d881b5a96fd938f02bfc6e62f0de1
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/memcached/memcached-0-r2.ebuild b/acct-user/memcached/memcached-0-r2.ebuild
deleted file mode 100644
index 17e00df26495..000000000000
--- a/acct-user/memcached/memcached-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/memcached-0-r3.ebuild b/acct-user/memcached/memcached-0-r3.ebuild
new file mode 100644
index 000000000000..14256ca31be4
--- /dev/null
+++ b/acct-user/memcached/memcached-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d2ed6a6b1397..14d762a88cb1 100644
--- a/acct-user/memcached_exporter/Manifest
+++ b/acct-user/memcached_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached_exporter-0-r1.ebuild 251 BLAKE2B 2337a209c4d6f1f44064b917dade5f2d2b511041e3e2a86a2c4f257ee7c6588d644e545a1ec99bbf975cec95c78f03c5fe49d9c15ba08d773c253b73a2c4b6b3 SHA512 97d67933ddcfbe41cf15fc7278e961d4cd388e51a65aabf79d7ee28c4d1a05dad689ce250fdd3d0e43d0f352b8450d92893989064f5a0c83e4aee0566d44c1bb
+EBUILD memcached_exporter-0-r2.ebuild 251 BLAKE2B ad8ab4d1e36e2637a560f1eddf623f7aa94ac43f499a7bc516bbd3c08373035860692a27131205cb10809b2bb171660e092a6f777c6b0bf9af9c185c7baa6d29 SHA512 96d1396062a6714d50dd757c8c2a9e67e509cf9c500c2ac9745f36f51b3ffce22fd7cb06de33e1da4b54d217b831f9f244762a94e450510aa068e0441dffabaa
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
deleted file mode 100644
index 78a563f0de1e..000000000000
--- a/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/memcached_exporter/memcached_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..a3aecacc5fa1
--- /dev/null
+++ b/acct-user/memcached_exporter/memcached_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 10be1f6ef3cc..6772202c1f80 100644
--- a/acct-user/messagebus/Manifest
+++ b/acct-user/messagebus/Manifest
@@ -1,2 +1,2 @@
-EBUILD messagebus-0-r2.ebuild 201 BLAKE2B e7fc8f178823a771166c5a613906e521a383c51e67ab52cc457d2a1a6e73812ada52f653082f03dbd2f901eccf1bdaa7adb352f48d9a16f12ecf1d03a4ea4a52 SHA512 a96a4062c83f9b3f33add68bc0acc07793edf1042de13af0c33520e2c76d9817cfa1431285e740dfa9b1bf0737147fcc00995378425d559183aeae512f52c775
+EBUILD messagebus-0-r3.ebuild 201 BLAKE2B e991af44b8052a1859be4192df83be227eeb51e26271d3512fe4ddfdd3954a50cb003966fa300c063460192a7851c36659ee5f0b8e642024b4e77d42e6b955f9 SHA512 b8bfb6d8b0b9dc398c0d27030679df96d17437da896efedad57a0f2cee851dc551148181fb3833fc54b9aebb96c948d957c70b23356aa8693a8951dd54995f6b
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/acct-user/messagebus/messagebus-0-r2.ebuild b/acct-user/messagebus/messagebus-0-r2.ebuild
deleted file mode 100644
index c75cc7874852..000000000000
--- a/acct-user/messagebus/messagebus-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/messagebus/messagebus-0-r3.ebuild b/acct-user/messagebus/messagebus-0-r3.ebuild
new file mode 100644
index 000000000000..f67e1f4f13a7
--- /dev/null
+++ b/acct-user/messagebus/messagebus-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3e8d05aa715a..ad33d5f4667c 100644
--- a/acct-user/mgraph/Manifest
+++ b/acct-user/mgraph/Manifest
@@ -1,2 +1,2 @@
-EBUILD mgraph-0-r1.ebuild 304 BLAKE2B b9380b35e78be0a2b6fbb45389d13893e22b532f1426fc6ce55433ead51d87c2e820dde589788023a6111a876cc74fcebcbfd695b8846f3b5ae5a18b5dfe6d98 SHA512 5b964bc862dc65584a6acd6845072e89f30ed5165dec362499ece114dffe57e72342af8c298122b3b79187ac5b4adcb046465a279db07556a1cf913a806f330e
+EBUILD mgraph-0-r2.ebuild 304 BLAKE2B 3ee703f1ac372c24b5739eeb752c8b09c6dcc34b9a625031608d13908283dc57b689b6ef0fbdd9f91a56e5d6db8cfeee6910f56557c1a564d25a803148fb30c0 SHA512 b1ee6f13ee641bd9f7b0552200ee7eaf24ee21d470d38e0c49587bd215827ccf0762a2f570e5ab5ee6419c0638551ea914c22a5d2f93c1bee9afe24f1ea1c0e5
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
deleted file mode 100644
index fd1fee37a63d..000000000000
--- a/acct-user/mgraph/mgraph-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/mgraph/mgraph-0-r2.ebuild
new file mode 100644
index 000000000000..5e67d9b11ee2
--- /dev/null
+++ b/acct-user/mgraph/mgraph-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ccd161d0415c..0deb619a4aea 100644
--- a/acct-user/milter-regex/Manifest
+++ b/acct-user/milter-regex/Manifest
@@ -1,2 +1,2 @@
-EBUILD milter-regex-0-r2.ebuild 252 BLAKE2B 33d0740883b3d1ba3cb50f8a9e562e64a81a575113c918013e79b656c72cdd980aa816441d26f9cfd7863ec69c4b6eeb657642a4fb5a83274810e928701d99cb SHA512 559ddad479360fa8d97c86da5956e9c75e1b98d859ddd634c2050451f12e7cc6b5d4a2df6ab90b4db1d2af1c9e6d24e0b40a491ee016a13cefafe66aca9b9d9e
+EBUILD milter-regex-0-r3.ebuild 252 BLAKE2B 2a0056a2f88fc362e91b8f9cdf3c3e255a61ff6de257db9f823bb9ecbd68fa501eed96c38db800998cab619bcefd98d42719ca1ad485385bc23d94a451ff4b70 SHA512 c4ffcf671ce12409b9a7e15c5db5b5773b6a575578225b0f125802c69d2adaa62210f33119eccc18b9ea09fdc153e46abcc04a3743bf53628532e527a1948740
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/milter-regex/milter-regex-0-r2.ebuild b/acct-user/milter-regex/milter-regex-0-r2.ebuild
deleted file mode 100644
index 666063185127..000000000000
--- a/acct-user/milter-regex/milter-regex-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/milter-regex/milter-regex-0-r3.ebuild b/acct-user/milter-regex/milter-regex-0-r3.ebuild
new file mode 100644
index 000000000000..388768981dbf
--- /dev/null
+++ b/acct-user/milter-regex/milter-regex-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/minecraft/Manifest b/acct-user/minecraft/Manifest
index 809b4b8bee71..af4637a08c78 100644
--- a/acct-user/minecraft/Manifest
+++ b/acct-user/minecraft/Manifest
@@ -1,2 +1,2 @@
-EBUILD minecraft-0-r2.ebuild 294 BLAKE2B 465b067d8885082466d839b30f63ac518e7d8dcba9c6b9b5e90f0267a7ee0abb83fec931b588abe27fd5007bbf6f6a15e42e23d4dfd1b2a7025b85449031e34b SHA512 850f0dd8dd92eefe229e6dcb24a74fa73a352339233d342bb3fd9f365f72dd2f8460fff8dbddc5e1792db12be716d23a9f9fe298d3c472d2718acda3f1de6eec
+EBUILD minecraft-0-r3.ebuild 294 BLAKE2B 2747a647cbd9fd9a8bb03d52ddf3c7b05880e3e527a65d545fe2c4eac04a7e2500ac85868afc9f9b1439ddea1bb650653cdc7bc164355b19b0bcd85cea479f84 SHA512 825db9b590a9c0e4ef383b35cdabd3e26417eb679dcbd947c8c2a605d07104a97147b60894af243b793e7b3d1ad2bfe0ea336739a0b8097520482e29d7be67a3
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/minecraft/minecraft-0-r2.ebuild b/acct-user/minecraft/minecraft-0-r2.ebuild
deleted file mode 100644
index b591f5313e6b..000000000000
--- a/acct-user/minecraft/minecraft-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/minecraft/minecraft-0-r3.ebuild b/acct-user/minecraft/minecraft-0-r3.ebuild
new file mode 100644
index 000000000000..450d5069a6af
--- /dev/null
+++ b/acct-user/minecraft/minecraft-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 daad2ef5b77d..511da8c0a757 100644
--- a/acct-user/minetest/Manifest
+++ b/acct-user/minetest/Manifest
@@ -1,2 +1,2 @@
-EBUILD minetest-1-r2.ebuild 284 BLAKE2B dce3bb1396d8c41cdcbf6acd866b53940ae8518b2f5c8db0c903112aefc808f882dd061ce8a442741416c1775e7c9aea8da2a8a3feba92e002140041cb4e5b64 SHA512 d7f7ee3cf4f7bec27a32cc9c6c5d12d2766eea13e1d2116c11c80b085b42ec4fdbc44bb73d5646d7cbdce827319be459b54cceb9bc6346b75a2a58519524995c
+EBUILD minetest-1-r3.ebuild 284 BLAKE2B e58bbc1d51692761a38f3e80cedf892f1e47e37296f8bbdf3f6bdca3f6f782db1ccdfd4793069f3a1fc6d38aaf6c155fdf36b08c398eda4794ed8d3b3378a3e0 SHA512 4508e5bbc04eb5226c660c6c5229393c66cb3d838e202dd718767800b9803659da1d8bd9a8392bdf72bba207b16fc6bdca62e4afa2a924215c5ce7d3293663e6
MISC metadata.xml 360 BLAKE2B 4867d8ae1f68605b01a06a446474bf19088f0cc57c5b381dd3af707e32bb7727c348b2c59b4ff654551be2ab78ac7ded05a0e258d0601740d27c058bbc08e863 SHA512 db7554cc1f206ef22ee9748d3102d40cb5b1085f5acf3f2cbd732ea11e122da26d20d2065d7184ea4a6b94105b4e53794af339c869f5432cc005e46b4b506545
diff --git a/acct-user/minetest/minetest-1-r2.ebuild b/acct-user/minetest/minetest-1-r2.ebuild
deleted file mode 100644
index 4af1d2ed9392..000000000000
--- a/acct-user/minetest/minetest-1-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/minetest/minetest-1-r3.ebuild b/acct-user/minetest/minetest-1-r3.ebuild
new file mode 100644
index 000000000000..94114295e5ba
--- /dev/null
+++ b/acct-user/minetest/minetest-1-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 eeffb7354151..8e143aeb0a6c 100644
--- a/acct-user/minidlna/Manifest
+++ b/acct-user/minidlna/Manifest
@@ -1,2 +1,2 @@
-EBUILD minidlna-0-r1.ebuild 198 BLAKE2B f5bd83f3df77a07050d4a3c2bd4ea00914b1a712a677bdc0a44050141c05332167f67c3ce9cfd73c76b117d8968a6b7e4993d14bceb7e88d41d6c861bc0e0981 SHA512 7b8b7f545fe20dfd8ff26a7c83a0088e97e7e88751ecd8170659bb4f00071e9c8e7628c6241916c0eb25a8d9aca7111dbe5a21f758424543d4eba24badefe0c9
+EBUILD minidlna-0-r2.ebuild 198 BLAKE2B 827240864af143df0fba876747164856b736da9fb22e6c029c5ad563cd19a59bfc61e030958c7b78f69aa33eab25b6683e16e49eb9dd30a2df36690990e79f98 SHA512 4b51693a513f67fa83a24b45557fe3ab17545ba2448236ec6515d94ad58672aa5a7ab8898c386275b446407d444725f8c4fba9e9719fe2311f2fe2b52e4e041f
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
deleted file mode 100644
index cbf710b89ee5..000000000000
--- a/acct-user/minidlna/minidlna-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/minidlna/minidlna-0-r2.ebuild
new file mode 100644
index 000000000000..2a7e91e616a7
--- /dev/null
+++ b/acct-user/minidlna/minidlna-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=339
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/mogile/Manifest b/acct-user/mogile/Manifest
index 50b223d8ad11..78bf5a0c0c05 100644
--- a/acct-user/mogile/Manifest
+++ b/acct-user/mogile/Manifest
@@ -1,2 +1,2 @@
-EBUILD mogile-0-r1.ebuild 248 BLAKE2B 10e86681e5c8ebdaf49d0a9db8b8a520e7abf6d4895d5d7a86a652ca0e89bcb8b6808f704180ac0c70be974f15382e0b6b890eaf7717f735f0df93a53741c762 SHA512 5b59ab186b31245c6305018c9ab3436bce4f646d7c1e2b7b793098f50af8408f31cc6eaee391841d56e3fc82d6ce22992e381a154a035728eeb469eb461bf7a0
+EBUILD mogile-0-r2.ebuild 248 BLAKE2B 310da33cc06c8ca1790804e70cc4b924ff56ccb7ab88fbc89fee0cf3dafddf07dd97f1a6258a4a2d8f75fb27fa63cab90ffcccf8cc5fbb14878040a1cfd1cb48 SHA512 bc22a2653497e15e21beeb5907b903ae45e8df8fc05b88645947d13392e6254e0a493b9846869bfcbdc93f36c353ee2f9032ff41b65a21b63e16eb71a32ff342
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
deleted file mode 100644
index 407e8ab74359..000000000000
--- a/acct-user/mogile/mogile-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/mogile/mogile-0-r2.ebuild
new file mode 100644
index 000000000000..93ec229a3193
--- /dev/null
+++ b/acct-user/mogile/mogile-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3ad98659a15a..4a33299b620c 100644
--- a/acct-user/mongodb/Manifest
+++ b/acct-user/mongodb/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb-0-r2.ebuild 290 BLAKE2B abf5cf954ef476302a3d84d9fb41336180c7ecaa6f30c31ed95323df76cfbed3684dec957670e85732cbef5a9c82202fc1b1b33f76d512111d1adee0a4d88a89 SHA512 520905f907942f0723118bd5796f4d27cecd67c9366e9b30996322173b2fbad6398f60547a910867c8f38aabeee3c3e9b18b629247f1d35ade6751d78bfe2d93
+EBUILD mongodb-0-r3.ebuild 290 BLAKE2B 8bda17c2767efb5854b247e190823474812310972a9c13c011a15999a2f1a688c66d8e8dcd10fa976e842e700c74f47c5ceb26ac6a2111f0b8d6fcc64946f5f5 SHA512 d33fb70e6face3b317d2916efd09027a9fe5d99490bf4597c4ae07763b591f9c198b276bdd2486caabff31c766d6e8a6bb7d38000ac73d8001a5f1cd051a9d07
MISC metadata.xml 506 BLAKE2B 914c508b2299ec351b57287f94ab25b016f8f6459a5de86da19b40850a9a90c364218a867589963d471becd19c93b73adb668787aa0134ffd2005b4d39fca7ee SHA512 d94bdd1e741af6d113f86aa60e837c3249ec74f11c6878a6932ecdf8c420968e2236a04bcca8e33ae77d7fd3029e7dbc78054167ef6feebfcab998ca527a677f
diff --git a/acct-user/mongodb/mongodb-0-r2.ebuild b/acct-user/mongodb/mongodb-0-r2.ebuild
deleted file mode 100644
index e1b6eeb17d80..000000000000
--- a/acct-user/mongodb/mongodb-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/mongodb-0-r3.ebuild b/acct-user/mongodb/mongodb-0-r3.ebuild
new file mode 100644
index 000000000000..f7e4288c17e8
--- /dev/null
+++ b/acct-user/mongodb/mongodb-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 42bdb626f6b1..776cd3029151 100644
--- a/acct-user/mongodb_exporter/Manifest
+++ b/acct-user/mongodb_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb_exporter-0-r1.ebuild 247 BLAKE2B 59e643c72d904de72a745c2a858512ce2365b40ae262e5d4a750e481488e1a28cdd0523b1cf1c4aed5fc8296cdc489d6634f01caa100474e01f83e7bc7cbb7f5 SHA512 d80bcbe9a96f524a89bbfc82ba0a777cf1669f81bbd294a277e2216bbcb59eaa0da93096940fb820b29ab8bc95b6488211d816ecf9b9563c966ebaeac7e51784
+EBUILD mongodb_exporter-0-r2.ebuild 247 BLAKE2B 5f8bb0af321ceee0fbaabb1489b409e6f9c1067fbf74253110f20f8931828ce45f98f5d5c3f8eb1e3bbdc3308971f5f91142fe5d50198aaf90da0eb4a3e91618 SHA512 4a077ea3619c8e0a74231eee4930434f8695ec923919a72fa053674a71eadbdc197fc43f11695cfae05e5941b3c6b7da3bc47bb2cbc09ee1999367be3275d457
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
deleted file mode 100644
index 6b855f4acfef..000000000000
--- a/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..c99e0e6bf3d4
--- /dev/null
+++ b/acct-user/mongodb_exporter/mongodb_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4f9e29842eb0..1df12316631c 100644
--- a/acct-user/monitorix/Manifest
+++ b/acct-user/monitorix/Manifest
@@ -1,2 +1,2 @@
-EBUILD monitorix-0-r2.ebuild 241 BLAKE2B 42561489bee2492e1dbd40f773805737c01d60281393887d18dcc495f051b3e4afbd8602eba18f507da000f754d02cbdd6895cccd581342e985b29ea7e806dac SHA512 503b8dd6a4411f14b0589dabffd07b612a006c959087c9fb2cef537c52f511187bcb673efbf62a558d870f700b9c5c9051d5bbc1385b31aa6c0439868a30a95c
+EBUILD monitorix-0-r3.ebuild 241 BLAKE2B 64af333858d8c0945ab6afcc9cabc35dcfd0b16e03f2b16086e232055c271763b9ea01998fef99b535d0f022d335ec4f1dd1e3c5983cc35b9d419b5442da0b76 SHA512 9d5d866f8a56ce2d78259b3a71afb96d79ce415d0ea77bec4780c9a0cf304a1877cf5cba237bf12d872c9fa64061bc656e9c72c949620138d8ca8283f400ea67
MISC metadata.xml 391 BLAKE2B 9ead41308785d3c5c7733cf997c688ae1ee8584c5eb379d8a03f14921a7597aa28951510c0bff8d5a0ec80df5b13864f34dd2b2ed962ddd870b3777187b0e09c SHA512 af160187c0209c791cfd8d497da9a9ff4b6fc3762300e309d5d75df2571fec2b52bdba990b2d13667d3fed5cf50e6d3938b70683e53d0937adb15e4897ca49d8
diff --git a/acct-user/monitorix/monitorix-0-r2.ebuild b/acct-user/monitorix/monitorix-0-r2.ebuild
deleted file mode 100644
index e9c54be3e683..000000000000
--- a/acct-user/monitorix/monitorix-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/monitorix/monitorix-0-r3.ebuild b/acct-user/monitorix/monitorix-0-r3.ebuild
new file mode 100644
index 000000000000..f4a84a4a88de
--- /dev/null
+++ b/acct-user/monitorix/monitorix-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3e55c99e0190..865cf47c2343 100644
--- a/acct-user/monkeyd/Manifest
+++ b/acct-user/monkeyd/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeyd-0-r1.ebuild 310 BLAKE2B 35942e5b491f5c2c15fd8bedf967a3d98c1acc362bed5086f42b735f655b8b4f4d82bfc23ad6bcc015cb807cc9e7452a2ba73634e64039a1bec28310cefb793a SHA512 8a6c5b1024ffeecbabbc27d5b5e8c8783970d02166d4eddeadc26997359c3f987c364278b5169741ab5633da112dedd7cc6288e12872a4c1e19bcf9aee054df1
+EBUILD monkeyd-0-r2.ebuild 310 BLAKE2B fca898ab41ac7fcb71d8df614a4dda84acd3b840b3a8eee3682b0f02a6bb2f898c02b5afafd43b4205efa0a748bfc3bd419e42fdffcfcf7804bd9fae650a3ef7 SHA512 d86fe6690fd9ba1e520abca66f33c778214ccc3002d6222995400c3cb181249b35d6d5e44131c98950d199f7c18903cbb02cdc6a1778e520eacc25272e880090
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
deleted file mode 100644
index 228bd178732e..000000000000
--- a/acct-user/monkeyd/monkeyd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/monkeyd/monkeyd-0-r2.ebuild
new file mode 100644
index 000000000000..f6b295037f36
--- /dev/null
+++ b/acct-user/monkeyd/monkeyd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f6fb0a361be2..95314876d38b 100644
--- a/acct-user/monkeysphere/Manifest
+++ b/acct-user/monkeysphere/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeysphere-0-r2.ebuild 329 BLAKE2B c3fb30a691bb0d2640cb1b066e87a0a820c37ec046dbca5c5322f244cbc929be422339afe1660204d81bd7ecfcd482387eac9f6cf1358b1a5f91929c57efc4c8 SHA512 ed34d58c9f6a852e06da1df991d164935546388dfb4fa683ca49c938576cb088c8cfa09d4f9497c4039f09babc67ce63ba43b4bcafca71c83b7d7b4d571c7499
+EBUILD monkeysphere-0-r3.ebuild 329 BLAKE2B ae2934b24586a950893b1605b74b0010d43d781be177f0e89469d09ef2bd7ebfd9c3fea2e566d69f3edb0d1d4263df1779918f1a1ad54a70247ef8b7fd073cc6 SHA512 4c23e57fb05dd03219b0c9989b64294a2f2dad7ea01ea1bc03756b3188809626d7215678fedd4dd511cad3ef6d79d0071cb41d2fe2e1367b643162fefb82d437
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/monkeysphere/monkeysphere-0-r2.ebuild b/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
deleted file mode 100644
index 5bf080cb25de..000000000000
--- a/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/monkeysphere/monkeysphere-0-r3.ebuild b/acct-user/monkeysphere/monkeysphere-0-r3.ebuild
new file mode 100644
index 000000000000..307bfa5deb06
--- /dev/null
+++ b/acct-user/monkeysphere/monkeysphere-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b865e9b74e24..5e958b474a86 100644
--- a/acct-user/mosquitto/Manifest
+++ b/acct-user/mosquitto/Manifest
@@ -1,2 +1,2 @@
-EBUILD mosquitto-0-r2.ebuild 251 BLAKE2B a892230256421020d539c235a221b54033f0b5464d112596f5a6c801cb89b7067b365528fde2079cad3a9474424805de37cb22789e3022738e9efc82950d1858 SHA512 62fca076f93f8bf149ebe2a097e8c188e78cb1a75dae22ab0f8f1efccbbfb227fff9e9761c241904c9b95c5b4b170241ec8f9709ee59b5d2933d85063aaff537
+EBUILD mosquitto-0-r3.ebuild 251 BLAKE2B 838a38f3cb563bfdfe891087e2b3b877d8ced8047125e6810042657cac2abe5071a472f22890ce2abb709d1b49b7c8ba1a1263787bd24c229e0f93fc4699cb62 SHA512 de4c0467c2fe4c93ab13ee7c487f5f968cfb2ebe72502658b0573c4d5fce5f459695add2d8e1a13e1221074435136f7e83ddde28b013be3e7f963e0d23321cec
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
diff --git a/acct-user/mosquitto/mosquitto-0-r2.ebuild b/acct-user/mosquitto/mosquitto-0-r2.ebuild
deleted file mode 100644
index 450a523203e3..000000000000
--- a/acct-user/mosquitto/mosquitto-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/mosquitto/mosquitto-0-r3.ebuild b/acct-user/mosquitto/mosquitto-0-r3.ebuild
new file mode 100644
index 000000000000..69d5fd5fbfc0
--- /dev/null
+++ b/acct-user/mosquitto/mosquitto-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 83e24af9c2ca..f82e3e8ff541 100644
--- a/acct-user/motion/Manifest
+++ b/acct-user/motion/Manifest
@@ -1,2 +1,2 @@
-EBUILD motion-0-r2.ebuild 273 BLAKE2B c73b67352db3b848d9544fbf8054a3799ef8ffd23eca291dbccf4ab7613afca4f9b10e6f0fea80999bed5b01dfdda56b18d471e720974061fe0c4f8b89a1ed3a SHA512 ed5aa548cc7c541dd9fc70b98290a0740aea74da718dffa38fcb35d02d3aa3e0e164b01eba0d73afd914e8fb7b114af59b5952003c5124bd15b52576dbad1ffa
+EBUILD motion-0-r3.ebuild 273 BLAKE2B c4588ac760d2eb8903cda94f76babf27826895638fa615759c0c3994b69118234b93754dbc9fad90363e58528ec051485251a021800969effab218b392689ee5 SHA512 48a4117f3d52525aebe6bd3e2de7a4f6e5ec454f3d69dcab4465fa48bb27a66804df3d3b403c55ccbbdb4d81967c15849ec52d78a08cf87d3f43e6e7e1a695bd
MISC metadata.xml 396 BLAKE2B c23e0428f6d197596409734471aebdc88231ccdc6abf3b132414ac1c4a2aa933017b5d6368b018e8e91ca1c01f38c49933af23888f2a6eb3b9e333eee0677d81 SHA512 c5fbc86f53d46fda14e9268883cad59049f01e2f356185af9a0d0ab8d5e76de69923768027bfd0d3fe02af6af2c008adcfeed20f3d312a8bf458fa655376d19e
diff --git a/acct-user/motion/motion-0-r2.ebuild b/acct-user/motion/motion-0-r2.ebuild
deleted file mode 100644
index 2580f7f8db61..000000000000
--- a/acct-user/motion/motion-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/motion/motion-0-r3.ebuild b/acct-user/motion/motion-0-r3.ebuild
new file mode 100644
index 000000000000..5ace75166a1c
--- /dev/null
+++ b/acct-user/motion/motion-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5f5c92317697..423eb2481a52 100644
--- a/acct-user/mpd/Manifest
+++ b/acct-user/mpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD mpd-0-r2.ebuild 274 BLAKE2B 0482e6f5c1b4cc634ae18e54695af58052500e91fc5957f3e9360c635e820f12002084a3d10e01dea3b2fa0783f282479baed28e84c7ca41ef370f85b1a39f9f SHA512 77beb3f6b29d316cb66f82dc17fa8ad6acce79a155a980b7a408c45ff6c2f3701ac43a154191e5f4a3660ce67f65ed30cb287fc12cb9180ae32f5541c17f8595
+EBUILD mpd-0-r3.ebuild 274 BLAKE2B a73437f971f3edd1a0711111555013cf5559ec0b490185abf42da49c3e297e4e73cd23de6fa914e9b82fe86d5f20dc764255a1f4b26d771a834bd4a89d884dc4 SHA512 742fa86832631de5d6ac7e82d253c7d0cc8d734596a3afaddb9e618621bbc16b23a2187f3ac4fd54c388b820e7a842617a79ea42159f6a3f8f9755c52a6d6664
MISC metadata.xml 371 BLAKE2B 1dc95f39908a3eaa277959b6434e6167edde97094d80c15895328586207abed46ab15e2aaf48751945f62888442279c9832fae1f5276c276522239afbee1c68f SHA512 79dba2ab8e6a18dbd7c10d95bdbb7a0b2bd8b639c98982e1cd325a5709b9984d713cb81c639165b4055a39d4993f44a746dba9db87f0f66acbc3b34d6f210103
diff --git a/acct-user/mpd/mpd-0-r2.ebuild b/acct-user/mpd/mpd-0-r2.ebuild
deleted file mode 100644
index 7bf030d369de..000000000000
--- a/acct-user/mpd/mpd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/mpd/mpd-0-r3.ebuild b/acct-user/mpd/mpd-0-r3.ebuild
new file mode 100644
index 000000000000..1824bc03a21e
--- /dev/null
+++ b/acct-user/mpd/mpd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 02b7db6e69a7..569487bbebb8 100644
--- a/acct-user/msmtpd/Manifest
+++ b/acct-user/msmtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD msmtpd-0-r2.ebuild 233 BLAKE2B 7004b36415ccf8c982104a4dbc66e27e6cf198d9e9dee662f134ff4405977aceae7f59739948fe14d19dca9e5158d30a287aad1e39a8049ee477565f0cc2f890 SHA512 e6e12ab2894b7baef6362b752419fa2e77ec728f9384927f98b1d84a4cc15991f7a2a41a4282d3f6959781e494d705c74d30ba50bf9aff78f53d5686edd530a5
+EBUILD msmtpd-0-r3.ebuild 233 BLAKE2B 1ffa36973ad3c7ee0b2be86ed6f0175450c4ef8efac3ce674a95bd2d8919f49694e047726b098bac0d985caf08767b36d6cbe2a28ea4d24042a172b4a15bc373 SHA512 3740a053e774a27e2d512f6ece4cecc4a91822e74b88932e614e1828bce6be05c38bf6b9d48cf4091b5e0d34098cc6626433ec3fe4e9826ad0cd5aec2b44daed
MISC metadata.xml 228 BLAKE2B f079847f571a8b1d3a795045c91b7c556e56a6c8ccbdb2104d4e0e5f976498fe3767a5b7d57edd46406b4e81861ad65b52de6b5d8d11d88409c91f158ceeccbf SHA512 982f1dd33d491d63e0a2f9bdf0fa9fe4778abbe7f38017387226101da3674eb242104ff57cbf5553923f35e6a8398b96b7cbd29da8033b7f70e128d67b366516
diff --git a/acct-user/msmtpd/msmtpd-0-r2.ebuild b/acct-user/msmtpd/msmtpd-0-r2.ebuild
deleted file mode 100644
index f635313b24c0..000000000000
--- a/acct-user/msmtpd/msmtpd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/msmtpd/msmtpd-0-r3.ebuild b/acct-user/msmtpd/msmtpd-0-r3.ebuild
new file mode 100644
index 000000000000..e57f3c2708aa
--- /dev/null
+++ b/acct-user/msmtpd/msmtpd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c291391c927a..ac8048c3781a 100644
--- a/acct-user/munge/Manifest
+++ b/acct-user/munge/Manifest
@@ -1,2 +1,2 @@
-EBUILD munge-0-r1.ebuild 273 BLAKE2B 1ad56e71b145cf784e52d8fb7ffd00cf99d05083a871b1e9f69b51912137a71b1b245b6949763f04aac1f0c67e6d0996bb328bb976f8953dd1903b819f671b24 SHA512 9ca1d68ea3922e826b6a5e594d0fc7f7ab8fad6e8f907448c074f2f14bf62566222d9b9b30cf7b18aa6044ed7eae3ac45d416fb82258c679071f275d4d74cf3e
+EBUILD munge-0-r2.ebuild 273 BLAKE2B ba16407485d1bb82939ccbb70e5b4a063de667f0eb4f4608034f00ce65b1a95c0c92f78b59b49a15c3f6c3b7103ba2a18031b15045ef3d8f9a9927d360b983ac SHA512 79dc5b0b1cfa55d4463d2ef5192ad281dcdd5750622adef7d018a2d97ad96290384049eaeb6b5c16a5d99318ab4413e02762f14102de872eb73846e246b910e9
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
deleted file mode 100644
index 51037b9634ff..000000000000
--- a/acct-user/munge/munge-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/munge/munge-0-r2.ebuild
new file mode 100644
index 000000000000..d4387c1c7655
--- /dev/null
+++ b/acct-user/munge/munge-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 57e7d6ed6fcf..2b39444ffe65 100644
--- a/acct-user/munin-async/Manifest
+++ b/acct-user/munin-async/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-async-0-r2.ebuild 307 BLAKE2B 9c9b46307d17ce85f68d63c95723bc408be957c8d060430cd54894eab474ca043ad181ab3200bb4536c49d9b8ff3e3a7d821d56119484b69804cad58f86a8129 SHA512 a7f4eefb2a2f298abae6c6920f7632c5fe44849b0d69bde38f51ea55eab4aee31e72a2b79e817f13fe6f2bcfd1607f2ca0c960e04d581a5db0dcb087cb0eea64
+EBUILD munin-async-0-r3.ebuild 307 BLAKE2B 18f29762f9de3f4cee7f9712f3d4471a001a704801e8d3853844037b02ab12be20b2b77bac539691d5f7b0e3d17d450d132f9cff1592ab290b44885d39ae7733 SHA512 40944618601479cf5d7a6d35f2a3d4159d4f36f9315675c59af5e93f65e0febdfa7c9c4740deb8dfca1b70e2d7c88578d5dfa5ab471c5e0218f2f847f51ffac2
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
diff --git a/acct-user/munin-async/munin-async-0-r2.ebuild b/acct-user/munin-async/munin-async-0-r2.ebuild
deleted file mode 100644
index a11cabd62269..000000000000
--- a/acct-user/munin-async/munin-async-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for munin async proxy node"
-
-ACCT_USER_GROUPS=( munin )
-ACCT_USER_HOME="/var/spool/munin-async"
-ACCT_USER_ID=178
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/munin-async/munin-async-0-r3.ebuild b/acct-user/munin-async/munin-async-0-r3.ebuild
new file mode 100644
index 000000000000..601e82b3518f
--- /dev/null
+++ b/acct-user/munin-async/munin-async-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="user for munin async proxy node"
+
+ACCT_USER_GROUPS=( munin )
+ACCT_USER_HOME="/var/spool/munin-async"
+ACCT_USER_ID=178
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/munin/Manifest b/acct-user/munin/Manifest
index 26ee85c9209a..5e9db8687f73 100644
--- a/acct-user/munin/Manifest
+++ b/acct-user/munin/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-0-r2.ebuild 258 BLAKE2B 1f3c980f0e5d2f817473bcabcc6c094b6defe24f14106ee487e0de1b6694be547a1d89f67f575f24b1b9f45a9f9555763778327a6709147a59c99cd38a5b51a1 SHA512 50e2f8d063058834842d70a06851e5c04416d5affd9497d6e72db3c2b9be3162d06620fcb630dc7061d4bfc656974ed86d2a7ddbcf2e19e4e62e3a86781e4245
+EBUILD munin-0-r3.ebuild 258 BLAKE2B a1f18b72838044c94408b6384de9b5b468cc6239d69c4e68add43c138711a6e762a388fb0785fb032cbae85f2812c6143e36b4e80bac4f3028632992ea4f8e1f SHA512 766cea1d262de37442cad71503bf30088921547bf9c03bb0facdf92c6d6529afdb4df8b1326b10149d4d1133310aa9e2d6926c1ece71868f478dbc9ce0712ca4
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
diff --git a/acct-user/munin/munin-0-r2.ebuild b/acct-user/munin/munin-0-r2.ebuild
deleted file mode 100644
index 08f9f00552be..000000000000
--- a/acct-user/munin/munin-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for munin"
-
-ACCT_USER_GROUPS=( munin )
-ACCT_USER_HOME="/var/lib/munin"
-ACCT_USER_ID=177
-
-acct-user_add_deps
diff --git a/acct-user/munin/munin-0-r3.ebuild b/acct-user/munin/munin-0-r3.ebuild
new file mode 100644
index 000000000000..a8735eb1d3b9
--- /dev/null
+++ b/acct-user/munin/munin-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="user for munin"
+
+ACCT_USER_GROUPS=( munin )
+ACCT_USER_HOME="/var/lib/munin"
+ACCT_USER_ID=177
+
+acct-user_add_deps
diff --git a/acct-user/murmur/Manifest b/acct-user/murmur/Manifest
index 852181fee6cc..048d7b86a114 100644
--- a/acct-user/murmur/Manifest
+++ b/acct-user/murmur/Manifest
@@ -1,2 +1,2 @@
-EBUILD murmur-0-r2.ebuild 322 BLAKE2B 82014234f093bd1b5ee878daa113a23e2df6b5251b1f6fd4ccde10b31b01c6c37ad44c79e0120b7d574ee80ff0e9b71a0cf681253b7eca60ae542dea083e7eb7 SHA512 8aa909aab348b573d146ebce6fbc3e5e5a5642e1316c0995c92996e4aaeefa23698a90fd0efef6b48c625f867c61efe5c7d19a3ce33060b5f9589a469c52e4e2
+EBUILD murmur-0-r3.ebuild 322 BLAKE2B 31144a429cacfac7f29555c2bec52c4b7b6e1d9ab21e4e870beb6681ff20a21429e3d26adc8f42abc979b9d674269f91437dc2d2d662c868d6b0a94cf6f273e2 SHA512 78b9d716f962e50e75e9af3e782567309dd01f5659b02848bdce73cae120ccdd81cac25e0b3633dab94140db8ae6cb963d85455b7535e3f26ea68e2a480cff05
MISC metadata.xml 259 BLAKE2B d393fe53508d06da051d73863657c1cf9f63ba80d8217c3c17ed754a7e652bc90be692dbb619d2a5e3e1d0dd258a6019c7b9a7aec0597bcc0f63e2f16c60774a SHA512 3292858f61d9b06b284b4cae18383cbd9cacbee726291402e1b3cd104f9498dfeb4074c6550ff64b5ef374f40d3d329b04f2f3010be782ff06e896d4c666c925
diff --git a/acct-user/murmur/murmur-0-r2.ebuild b/acct-user/murmur/murmur-0-r2.ebuild
deleted file mode 100644
index b6d3fcb6fa7c..000000000000
--- a/acct-user/murmur/murmur-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/murmur/murmur-0-r3.ebuild b/acct-user/murmur/murmur-0-r3.ebuild
new file mode 100644
index 000000000000..7932534b3969
--- /dev/null
+++ b/acct-user/murmur/murmur-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3fc3ebbb9760..9f19e251e566 100644
--- a/acct-user/mysql/Manifest
+++ b/acct-user/mysql/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysql-0-r2.ebuild 236 BLAKE2B 227a164350eb7c610faf4ed206620fe105da0ecf4a7b08d7d80d10eb57e9d4e17230931d2b53c2dc7aed86a7634dfc4466a8a631b76727b4a522a24fde25073a SHA512 7022cb81c69f1c2bc83ff8866634b692e70898c45a4efbe11d65d8049b97aaf5cce003e91acb64932d23e55b32c05a18f20b30c2e7ca3a21338b11b890f7fd16
+EBUILD mysql-0-r3.ebuild 236 BLAKE2B 27b3ddccf3f143f0285cf8cb7dc00896bfdd028d78ed964325c7947ea3310b5febe6497f3880f403d9dc37ca2a1d1ec65f3e63dcbd652e1320ac855fde5e2f19 SHA512 a11044f28b0a1572edcac1b32ed4775867f90913e042e4e7003027d238636a5c37354e2284c9d2211633d569c12984435c24b57dda030a7f0c3312e9a6aa492c
MISC metadata.xml 258 BLAKE2B d72173be6096a07ac4d2cb3e8cc161e6d817e7bf3f3b87c82c8c490403d67487ad3f4d65edb951b3a9ddfbe38a5c2a28b335436fd14f7af773d630a61d34f2e8 SHA512 25f8d8e566c979bffdcba13749feacf7d50ed10ec9099018bb18984d97dafbadb4787b4e49e618658390afa31c86531d08d27e13ff8119a39195d6dde26d9b6c
diff --git a/acct-user/mysql/mysql-0-r2.ebuild b/acct-user/mysql/mysql-0-r2.ebuild
deleted file mode 100644
index e198373af282..000000000000
--- a/acct-user/mysql/mysql-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/mysql/mysql-0-r3.ebuild b/acct-user/mysql/mysql-0-r3.ebuild
new file mode 100644
index 000000000000..b9c43eaa95fc
--- /dev/null
+++ b/acct-user/mysql/mysql-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b44a16d6f792..1f79e4dd20c9 100644
--- a/acct-user/mysqld_exporter/Manifest
+++ b/acct-user/mysqld_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysqld_exporter-0-r2.ebuild 307 BLAKE2B e02791a1e387f58c5498ee8b68b505d311c10a3b6c403b2db80916171bc8221f06db715d227091f554a0dfb8d3a83d42b90583af8b6edd74e50a38b9c33c93f9 SHA512 20e68014a5b43a3e7c2048f0634b56a2845647c032f17d5db1f4701306062efcb49fdf18aa58e460995a09bc0aa2c7466442ab95277ca465daf253e9f6788fe4
+EBUILD mysqld_exporter-0-r3.ebuild 307 BLAKE2B 96190772c63e834053202e9a08b4d11c82f2fda9d2b32ae5bdb6548767a56ec895364b3fef6f770f427db1d55074324f17640af7f2786346c59a356337b3843d SHA512 c5be375bb69d4663186976364925948738f8e76f5d90b862fc2e85bc1cd860ff446412dd81dd37881684fa3993c06337f92c5bbf09109706d1a23ac4d6767684
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
deleted file mode 100644
index 7e5666e46909..000000000000
--- a/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/mysqld_exporter/mysqld_exporter-0-r3.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..8ede0f1258f7
--- /dev/null
+++ b/acct-user/mysqld_exporter/mysqld_exporter-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 22a0e18681fa..0fa85d3124c0 100644
--- a/acct-user/mythtv/Manifest
+++ b/acct-user/mythtv/Manifest
@@ -1,2 +1,2 @@
-EBUILD mythtv-0-r2.ebuild 328 BLAKE2B ae33da77409fa8b334fd736e20a1f8cfc5bfd12e54945cbb70c3c9347c6648148ab8bb1ad088fa213b231f9989cd14d0e6338387667f6410a654d2e5e3fda118 SHA512 34749afcfa6a3833530aa030fa8f2bf304b64c546f4523887dea56a98a25bdf88032b4d6087df2344f4a7f2ed7a157eea8403ce1dbb3a76e2f376cd81e2d8540
+EBUILD mythtv-0-r3.ebuild 328 BLAKE2B ddc03acb6596a7543c71a942ad8599878539345f5d7c58ca5f09a395b4f20fef95f484085e431437533866fd9ba6c5f76b121a016fbd4e1b9555a1a6651bca83 SHA512 082ce0b574ffbb67954e4480950da113d07f6aa4791bfa92944c87b1887c044ab4e9f1ea9b2dc1601f12b920ed20db43320498d817dd2ad14323b78c3887b1ea
MISC metadata.xml 412 BLAKE2B 269dbfe3205f3520151a0d18ab4d2b8a1854a85020e0246471c4ed78dc7f57d7dab5dee7fe0fe12de2505410da9221183267ef9f09c6f903b5b1e4feaf98b4aa SHA512 093a35b0ee0dfbb9c841467bdb78c52699c712e94e8965c076a98be872f9a7cf545b75ccb8d44048488c6ec6d169c8c3ecf198c7e551f427bb9e0940102c054e
diff --git a/acct-user/mythtv/mythtv-0-r2.ebuild b/acct-user/mythtv/mythtv-0-r2.ebuild
deleted file mode 100644
index 43fc7503be63..000000000000
--- a/acct-user/mythtv/mythtv-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/mythtv/mythtv-0-r3.ebuild b/acct-user/mythtv/mythtv-0-r3.ebuild
new file mode 100644
index 000000000000..f9fcb47cdfbc
--- /dev/null
+++ b/acct-user/mythtv/mythtv-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2758da056917..d7ea5ec713a5 100644
--- a/acct-user/nagios/Manifest
+++ b/acct-user/nagios/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-0-r2.ebuild 198 BLAKE2B 695ac63b4a5be5ba88fe12d8d2f88adeef658341367c55d788a5fba43976fc7755b30402ba7a36568d4059b34f332a954b3207cfc85004b68b531efd29635cd9 SHA512 00261d93d998d70784c7648fc08cb5aba514be22626dabba8c37a3b5e1627eca04458a71e5bcef52845c40644ac399cf972ed8e1925ffbccd3f52dcdc47b7298
+EBUILD nagios-0-r3.ebuild 198 BLAKE2B dc75593178e0a97b107c8694c0c713aeff7f2cf591722594560023307e5f8e91f46b5357035ec7efa10f7470f8bd4bfec4843be761a2e82db22309668fa4e9c9 SHA512 34f005801937f38273ca9bf9274d7c76908155b8185c113e060e85683d12f616548f90afdb27c2c3b1d44fcaf726360addc53514d6c3dd985a55f618af63c9f2
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-user/nagios/nagios-0-r2.ebuild b/acct-user/nagios/nagios-0-r2.ebuild
deleted file mode 100644
index b20dbf0f431b..000000000000
--- a/acct-user/nagios/nagios-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/nagios/nagios-0-r3.ebuild b/acct-user/nagios/nagios-0-r3.ebuild
new file mode 100644
index 000000000000..8f00154576ce
--- /dev/null
+++ b/acct-user/nagios/nagios-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 46ebc6a4dd69..4af6faa8355c 100644
--- a/acct-user/named/Manifest
+++ b/acct-user/named/Manifest
@@ -1,2 +1,2 @@
-EBUILD named-0-r2.ebuild 257 BLAKE2B dba42a909f8cffee6cefe3c7857b4dd51fee0edcad28ed45471795ae0336583f03087c8e22b04c9909577a01154eb19bc3d0587ef763aafdacd8764e9d2f088d SHA512 7fde4359acfdbfd1dfff4d823ba198c127421d2e6bfe2d8b6ef14115d750d568c247e2bb874e4edaff91288da59d30411888056f46fcbf6116c362a296c35643
+EBUILD named-0-r3.ebuild 257 BLAKE2B feba110b72159f1fa754437ac170e43c25e458c82881332db57a0957386d4a983ede1f044e076d7e392ef1886e344a9629cc27858cfb15c05cb21cd2914ef57e SHA512 6e0deef9ee789de978b5066852fde55554d9703bda39755c1f88e267c9ba84968e456be0a03e9afc1abca17183fba6f9fb82cf60907c70450490c06c892ecf1f
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/named/named-0-r2.ebuild b/acct-user/named/named-0-r2.ebuild
deleted file mode 100644
index 4ca236119be0..000000000000
--- a/acct-user/named/named-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/bind"
-
-ACCT_USER_ID=40
-ACCT_USER_HOME=/etc/bind
-ACCT_USER_GROUPS=( named )
-
-acct-user_add_deps
diff --git a/acct-user/named/named-0-r3.ebuild b/acct-user/named/named-0-r3.ebuild
new file mode 100644
index 000000000000..471b7d103410
--- /dev/null
+++ b/acct-user/named/named-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/bind"
+
+ACCT_USER_ID=40
+ACCT_USER_HOME=/etc/bind
+ACCT_USER_GROUPS=( named )
+
+acct-user_add_deps
diff --git a/acct-user/netdata/Manifest b/acct-user/netdata/Manifest
index b8d3c155fe95..45ce776b37d7 100644
--- a/acct-user/netdata/Manifest
+++ b/acct-user/netdata/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdata-1-r1.ebuild 255 BLAKE2B 4a07c13d959c8d7a9c03492967c3cf733330fe7f31a28573674c2d4461e470b4b6f1ab691089380ac1a2e78edcc6ac5cfc96a87fe0a2dcd7ee010177c27ca4d7 SHA512 5415d1a83fd00265afa78d545c3603813192f410f977b5edc00d63c23edea0b9c75b094f8c16b1ca298ca6036e5afcb3b4f616466957c292e47dd6d7fb33298f
+EBUILD netdata-1-r2.ebuild 255 BLAKE2B 4f2ddb44ab08bdf33345a7fa8231763e6b4a86d9b6fb05ec809948dcfc19493b71c39739615205ca4b7949135255561884a84efcb39820d95b6cb85a7c38d879 SHA512 d052e6ff2864684648254c8440c874029659d2e5e032dd08f0e545370c4437e073e7443e3169c3a8635eeaf692bb3877eeb7de2f64bd5e7d64e8d90c3b43c8d7
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
deleted file mode 100644
index 6b571b269430..000000000000
--- a/acct-user/netdata/netdata-1-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/netdata/netdata-1-r2.ebuild
new file mode 100644
index 000000000000..ab8815313e02
--- /dev/null
+++ b/acct-user/netdata/netdata-1-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5468da3043aa..ff4b7e18fb0e 100644
--- a/acct-user/netperf/Manifest
+++ b/acct-user/netperf/Manifest
@@ -1,2 +1,2 @@
-EBUILD netperf-0-r1.ebuild 249 BLAKE2B 1d85d8990e96688d01d993d75339921f6fac129cd58db136c76612b734bdf62b4daf706504b2ff57190381c874b2707e07adf3941f5b346a1054717e69e213d7 SHA512 11632e4abae8008080b1fbeb5a24f3b20e00f96e86fcbaba5a722244eba20a11a778adcf8dbe403b17494d707966c4314af60e7234c58c0d37fdf7f9808024d6
+EBUILD netperf-0-r2.ebuild 249 BLAKE2B 9799eb6e2ec0bcc4dbe12157986cfe42e805a586ea2dfe6f8342dd0485009222b58b15164186f63520980db86a01a64a1aa99904cbd1676688d2c337a362b606 SHA512 820d9e0640228b7906617876207d04d4e1b4fcf5eeab92410c08b0a149ba4996f5f14b2e4dec311ce322be1eadc6cf6bd5c98be0570c18119a6dfb7596f36609
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
deleted file mode 100644
index b255ae4a2f28..000000000000
--- a/acct-user/netperf/netperf-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/netperf/netperf-0-r2.ebuild
new file mode 100644
index 000000000000..f80b0bb908b5
--- /dev/null
+++ b/acct-user/netperf/netperf-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/nginx-vts-exporter/Manifest b/acct-user/nginx-vts-exporter/Manifest
index b9e1f44a5dbb..90608bc6f00d 100644
--- a/acct-user/nginx-vts-exporter/Manifest
+++ b/acct-user/nginx-vts-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-vts-exporter-0-r2.ebuild 251 BLAKE2B ccc58f6173787595784353794d055c3e241c454863d21f1bc368bd74a3c17dfffc51bd2868da897788ff31ea36abc9e825fa254c2978c952d499decb2250e047 SHA512 1f16dc75844e7f4505c1921e31a7835b4dd93b3afb507c0a8afe80d6babdf71ec9e3d16fa47a71f6c6852e8effcac1c8ff42746f02128690e2b72aabc12e7d34
+EBUILD nginx-vts-exporter-0-r3.ebuild 251 BLAKE2B 8ae953d9f047b71d16ec8718a691641f9ee1e92ea6e6fc3827e930a0d09097b463777f3ce9ab71c47942d228dc07a5aa7613e65415406bb37f3e1bb3bd6db1c7 SHA512 da76b6d7a0559326a7ed847520908b860310f4698e80fe4b9f215ec879f1d35c07f7619ccb04a65e6eee3c1bc2a6aa771d2877d5a8b32067b82e69694f5eb900
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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
deleted file mode 100644
index ede97d226773..000000000000
--- a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-vts-exporter/nginx-vts-exporter-0-r3.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
new file mode 100644
index 000000000000..403832d29bc1
--- /dev/null
+++ b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/ngrep/Manifest b/acct-user/ngrep/Manifest
index 4582dc7237f8..1cb9fe994cab 100644
--- a/acct-user/ngrep/Manifest
+++ b/acct-user/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0-r2.ebuild 245 BLAKE2B 6f62e551d7d7e2b8bde63f2e39914cfab40cb5d8f80d0d50fe1462ed069b63aa44b785d63392aac5d534b771be440fe82244abf940c117e8745b6723e25cf8a6 SHA512 34f15c43da49de9ecb24e41d67bb5e5bc6ddbda5a8fcec99c479ada812ce87e103cbc8c1a48828e4e447f193ba908c4e56c5bb34a7e4c546c7dbbe2c8eefad85
+EBUILD ngrep-0-r3.ebuild 245 BLAKE2B df2a10e07efc0f22c0644df97c1f13259ca0269b954e757c6749162514b440759bebb63873d9308925da575c9541bb07b1870ae30544e20e17d94a56c518fe52 SHA512 b831b7e41758887347ebe0f9347122265427ff41da0e47cc9ba42b8772b9735ed5c04760e438dc0cd5418e2970b190666e71223455ba002657db663aa06ddf33
MISC metadata.xml 625 BLAKE2B dccaf7134c266c36cbb22380e96e5dba09a7b9ce70285cc21c10168b236c7b17e7dd52e3c84dfe4a311ab600263159f7acf04243edefdfa00937bc43d54b71dd SHA512 3f7d9d8ee4647bded5bf3b73b7fe5489b19b82e27a8e0150f08a6f3cb1a2dfe9292591ab4d378f897e09d98d77b276960aa756d22af7affb4ef2e40b90737003
diff --git a/acct-user/ngrep/ngrep-0-r2.ebuild b/acct-user/ngrep/ngrep-0-r2.ebuild
deleted file mode 100644
index 810bddcee9f5..000000000000
--- a/acct-user/ngrep/ngrep-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/ngrep/ngrep-0-r3.ebuild b/acct-user/ngrep/ngrep-0-r3.ebuild
new file mode 100644
index 000000000000..ec84445e6833
--- /dev/null
+++ b/acct-user/ngrep/ngrep-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6176ab15ec80..2856c6b56b24 100644
--- a/acct-user/nm-openconnect/Manifest
+++ b/acct-user/nm-openconnect/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openconnect-0-r1.ebuild 270 BLAKE2B d10812aa8def630db0f0d95244e494978877913080b7c88f8360feed76166f98c38e48e262ec298fb9c67c0ab298d6ea66931fd6574b2914b6ad50e9991b28f3 SHA512 4e97bf7f6fe4b91503775a01749879033336dec7d7d40e2494928fcbb4c663f82e0c96b0bc882759f8447a3e3a560351a96283f99abddce0b31a73c18b8943aa
+EBUILD nm-openconnect-0-r2.ebuild 270 BLAKE2B 6a9de79efe64cdc74afb1e5658912e7634ed089c9ffcdf1d4815acdc325907342bb4140883161a7a57250d2b483d65af07cdbd1cdfffa3fccf62b98943d3f3b7 SHA512 a9327776a701cb400f29c713f0b26d9a378036406b076d2b45e1e691deff6066a511cfa17c7213c511c032cfc40ebe127c11a7f388b8cb00e817e370aa2f6ef9
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
deleted file mode 100644
index 5f0a81f394f3..000000000000
--- a/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/nm-openconnect/nm-openconnect-0-r2.ebuild
new file mode 100644
index 000000000000..3f52391f879b
--- /dev/null
+++ b/acct-user/nm-openconnect/nm-openconnect-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 dbc1b92f5dd0..4d2edd303fbe 100644
--- a/acct-user/nm-openvpn/Manifest
+++ b/acct-user/nm-openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openvpn-0-r1.ebuild 262 BLAKE2B f03e570cc10f73244f7d05c152c7e9c279641c2ab1be37752b3a7fa0e7c35f12202245f6c814bc2bacf4ecd19dbd44efa2401af41450bee9454643228fe906ad SHA512 d8de94f64d20b9120fd107280a47abd56d60900febfe8688d4dbd8e0fa70575c600fd8bd45a9a6fa70069fd30a501dd7d3535eb88a8156209326498f79302cfb
+EBUILD nm-openvpn-0-r2.ebuild 262 BLAKE2B c750fc869fd4d7b70a4da2c1e4dd0d8f2edeb59a98771fdd86aa0540aa712261c0feb166800871bb70c052e8dfb3b761e049d0ddb3bf14143ff60d97bda10f69 SHA512 598fa5bc2422c00116551d13b126519b59835aab9a53943f40f05f44f4bf9d824f00b92eaf6d70a71492646878e4ab19f3e89867349fd106745fd26b91e73cc8
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
deleted file mode 100644
index 24e46f7d19a1..000000000000
--- a/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/nm-openvpn/nm-openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..be88f15aa7a3
--- /dev/null
+++ b/acct-user/nm-openvpn/nm-openvpn-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7f43518e4958..5835cd2f8cef 100644
--- a/acct-user/nobody/Manifest
+++ b/acct-user/nobody/Manifest
@@ -1,2 +1,2 @@
-EBUILD nobody-0-r1.ebuild 339 BLAKE2B 310baf04ae6cae681a79ec57cfdde5d3071e2b02ca6e72a323f2eba9516f8331e16a52b70319b163d8cf66d9acecb40336d39a9a82472a86c9d358e77d3bd74e SHA512 68edaf3b19a2e9fb77f95eeea1d7324ee72c5b0de163081384e615fd7b862fd1374997d16a76bb0b6a96665ee72ddbc2b97579418664d1aba956967482fb19cc
+EBUILD nobody-0-r2.ebuild 339 BLAKE2B eba76a4dc01c3154bb5de75e9ee12eae561c65ab1e2317d078f51e3da531dc7b8d0aa444cfbd220ee84e66e1b90766328aa7435e5696c6996a48eb6bd3ba7b2e SHA512 1a8e0334700c14af088b6cb05d931d3404340d7dfe0d7feb6767a1610a28c058fc1489495005b92417fc5d522e4a374716f2b58740e081bfd75f7256e6b1939f
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
deleted file mode 100644
index 8ee787fc00b2..000000000000
--- a/acct-user/nobody/nobody-0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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-r2.ebuild b/acct-user/nobody/nobody-0-r2.ebuild
new file mode 100644
index 000000000000..7b8132b4d816
--- /dev/null
+++ b/acct-user/nobody/nobody-0-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b177d678da3c..c156bcd3a763 100644
--- a/acct-user/node_exporter/Manifest
+++ b/acct-user/node_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD node_exporter-0-r2.ebuild 237 BLAKE2B 5b671846cc179a98c877164d765c3c7b487f71520af4c5d3fb30090fdc2ae2c6c657cbe97e20f93e70b1ea48617748e40daf01e49615acdd67f8e53321770f35 SHA512 5241b39d01465b91b8d15764f237e905ad3d37c2cbfa4e9b922fb5f68cf6a58e48d464233902caa572def7c315e1e06940005402c8bdd942bb5780b979816586
+EBUILD node_exporter-0-r3.ebuild 237 BLAKE2B de67eadf66f4d68edffc3953c515b5a2ac094df3a440985893e650fb1d43e3694ba6442fe592ad2541070356853d8350d469b733f5d08f67bab37908c1cff243 SHA512 eb4eaeae19c68448f10a0791210bb266617028ae6dda88e6e7a034ba334e28fa6cb795cc2f7eeb2db65f95682ede8a4cf55750f356d84bfa1da01d3312eab8c5
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/node_exporter/node_exporter-0-r2.ebuild b/acct-user/node_exporter/node_exporter-0-r2.ebuild
deleted file mode 100644
index 2ca85112dfde..000000000000
--- a/acct-user/node_exporter/node_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/node_exporter/node_exporter-0-r3.ebuild b/acct-user/node_exporter/node_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..44d8f56e24fe
--- /dev/null
+++ b/acct-user/node_exporter/node_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f67959fcaddb..b8e85a3bd169 100644
--- a/acct-user/notary/Manifest
+++ b/acct-user/notary/Manifest
@@ -1,2 +1,2 @@
-EBUILD notary-0-r1.ebuild 241 BLAKE2B 373cb77b6d6a847b26233377b7361e83606f1f5df737dce22bd8659925f168f176166f3497dee6e4a303ea9f17d9bf10227a7c202226c4517d719bb75773896d SHA512 785b1643de19ebb204d99164e56b4a29666762e0f7a56a1268b193a1b90ae0cb2dd0a827ddf4f05f6a9759ccf8548ac84e74457140181daa51f815b384cea5d8
+EBUILD notary-0-r2.ebuild 241 BLAKE2B 97db54332687e97f405a4d9325c0d0d5edd643b946168ce62cbfe98d7665b6e82a29d74b7b8db7ad97c9920130bd22af48955330fa53c7a5f7b0063c75894377 SHA512 df8bf7a5eaf161e0702c13a5005f90fc0cff4528640b6502ebe690369e2b97a77ff0f7ca356709755579c044132a8a90aa8155254c2bab878307afcaf4069ff4
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
deleted file mode 100644
index 754a4408efe1..000000000000
--- a/acct-user/notary/notary-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/notary/notary-0-r2.ebuild
new file mode 100644
index 000000000000..a5456f9528cc
--- /dev/null
+++ b/acct-user/notary/notary-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/nsd/Manifest b/acct-user/nsd/Manifest
index c0c3abda585b..10aebb5f6545 100644
--- a/acct-user/nsd/Manifest
+++ b/acct-user/nsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nsd-0-r2.ebuild 228 BLAKE2B edbbe76ae3743c60407d7cbfb081d19ca70b83e777811106b1e4e8189be7d11622a83936eac9f36ac8123fa6f3f423a63d51c1174dfc7335c62576d6b9f474ff SHA512 432590e0e9a1a319ec687ba1ea504d31b6345818641867e6a2ab2ffe05053bd020ec7117fd6927655d99c15b11eb512e6bcd2d4a759fe2b539c56a4ea4c85b59
+EBUILD nsd-0-r3.ebuild 228 BLAKE2B 1388a0bb81ecbae8a69f2af78bea7b6bd3b2941594a8290a30a441dce922c0ca3d7a2e13089d684e428ed5dce22637d5818ac10874e654be05b6b5c549307378 SHA512 b0854f4487447043ced4dbec35735451458219a18d573ccfb28c264f1e19228365a193368abb5e985cedc9ce62b675c30cf9c4a3c640f04de38e3584a0797086
MISC metadata.xml 248 BLAKE2B 2ebd3859067e8f8283e96840dcadae47ed3e87851182477e7238733e2d6333959fe8db0005033e3ca97e8bc0e9fe0ac8ec25ca7718ffbd1e7d1170b7b1124d22 SHA512 4063700d10965813ce4aaf3973b20a7209180943d53b249e55e58c9f980ecb3f64fd1e061958ad25d188ec4215a439e0639562ad3b608b6edbf58acc25e94997
diff --git a/acct-user/nsd/nsd-0-r2.ebuild b/acct-user/nsd/nsd-0-r2.ebuild
deleted file mode 100644
index be5ee197a884..000000000000
--- a/acct-user/nsd/nsd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/nsd/nsd-0-r3.ebuild b/acct-user/nsd/nsd-0-r3.ebuild
new file mode 100644
index 000000000000..502bc8784cf6
--- /dev/null
+++ b/acct-user/nsd/nsd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e18d32915ac4..095a22d4f68a 100644
--- a/acct-user/nslcd/Manifest
+++ b/acct-user/nslcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nslcd-0-r2.ebuild 234 BLAKE2B 698561d921a594a6201c4ecec2b9700a84654cee2377374a6c0eb4c9a34beb727dc35ce48ebc89391eac5e45ecb8c045a1ac070cfd95bc775d089d85e570d787 SHA512 651ddfc9f722d1c5dbb69218b8d119e85983cda5c5eae45c6e60495fc1bf8610658342a1f93f3ba5f5ec2bcd5bbf52f577308dc63bf3b03185a99d6640fb7e37
+EBUILD nslcd-0-r3.ebuild 234 BLAKE2B b6441ffa58f4e550e50c583421c120a2146e41410c5b6f11d5625a72956d85578c2f17738306d603eb1322be41598fc663819cdc2b7a4796925f8453bfc5d3cb SHA512 749a1b936b85f62df796fe18d0958144e46867b31f5878ea6d9cade9bb8d2783cb49393f024487a3b4a796220992188c20c42a1a860dd9c0087f1d1361f0bbee
MISC metadata.xml 377 BLAKE2B de37a4550f576438d2d9e50c63d53758876cb174ec6a40846b0c70f377cc1d0928d24951fe803bbb28dcbffa5a30dacf89c05a814ae7304b61ead2c115cc9b25 SHA512 29c89211671ec281f5aa38644ba64d43c90dc32251074e6c0a399b8087e3d5085f0277b1f7899ea278389b406270c0b35e18cbf30cec9fa52cbfa5e7ceb9038d
diff --git a/acct-user/nslcd/nslcd-0-r2.ebuild b/acct-user/nslcd/nslcd-0-r2.ebuild
deleted file mode 100644
index 2b6742845a63..000000000000
--- a/acct-user/nslcd/nslcd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/nslcd/nslcd-0-r3.ebuild b/acct-user/nslcd/nslcd-0-r3.ebuild
new file mode 100644
index 000000000000..5d775aca48e4
--- /dev/null
+++ b/acct-user/nslcd/nslcd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 eb5bf70944c2..81dcab02c3de 100644
--- a/acct-user/ntopng/Manifest
+++ b/acct-user/ntopng/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntopng-0-r1.ebuild 227 BLAKE2B 985a938b1721efa798225f203a35352cc77e2f8026e9e220007daa12f2e2e2efd4b037602dff04858fcc524cccbb555eb2cf96bbd621672253495af818d55b73 SHA512 5dec558dfa72eb8f845ca1eb136fdb57f9c4fb5aa9b2a33d275f68eb951ed52ab2b9e432e8eae595f07ae554ac28b607b5c7657b7a3fe5afada929e46468e4a8
+EBUILD ntopng-0-r2.ebuild 227 BLAKE2B 49730bc1ad8647e90d693fbb618a8e43151909deb0fbdea80c52f3e262fbc1209190028689b5c2df5df516fb724544bb579662c3638d3947d76023661409788f SHA512 6fa5168ce5689481d643cf94b4eff99cd0cfaed71aae140828e7a23e7873d9f73cca0b7911b154925095e98b2d1eaa3850a83c1b82a28d76a16564e7bab73b07
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
deleted file mode 100644
index 4697c8d589a8..000000000000
--- a/acct-user/ntopng/ntopng-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/ntopng/ntopng-0-r2.ebuild
new file mode 100644
index 000000000000..7f9ee48fed7e
--- /dev/null
+++ b/acct-user/ntopng/ntopng-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e2a73c4f0ca5..be6913873a74 100644
--- a/acct-user/ntp/Manifest
+++ b/acct-user/ntp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntp-0-r2.ebuild 228 BLAKE2B 65a18c31686864449b009ba6a38a22ea853185bc82e0e62ec339f5c712d57de19798a08172a3bf145a8a3433231b3cc8f8b90b1828ff11eb017f274995a76747 SHA512 6cddbc1a107f68fa8e5b307e77b950d4986a6294e8de7050e41edb2243cd39a472733684b95fee8e1f68cd8bf00b31189958ac8e6e3a33f42807f7ffa2a3b87a
+EBUILD ntp-0-r3.ebuild 228 BLAKE2B 1297c7659a1e6c00ee13ce623683c82d55e7abdb36aa2b1071ea1192acfd5ff6eca22551794fd6ceda1dbc90ffbf2e1899fa7990244560e2245002ffb3ed646c SHA512 e33e642fc87f378bf9fe3f96d09b837d5753e6f1802ba1c5a89eb44351ae7bc802b3edf6f166d671ec39ff6bd9cd4cb6c9b1a4abe09a984b2b555235e84f5897
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
diff --git a/acct-user/ntp/ntp-0-r2.ebuild b/acct-user/ntp/ntp-0-r2.ebuild
deleted file mode 100644
index 0e38e0cb70d3..000000000000
--- a/acct-user/ntp/ntp-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/ntp/ntp-0-r3.ebuild b/acct-user/ntp/ntp-0-r3.ebuild
new file mode 100644
index 000000000000..bed2e5aea0ae
--- /dev/null
+++ b/acct-user/ntp/ntp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 723150100687..db62dd167af0 100644
--- a/acct-user/nullmail/Manifest
+++ b/acct-user/nullmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD nullmail-0-r1.ebuild 282 BLAKE2B a575607b061a0a15d118761ced2ec68da6453beda15c82f0c625666c5edeea9cdfcc4842f7f7570b0bd2ae4e5af0d608e1ea54aa7c0e0627e18490542292eca3 SHA512 a6f002715cf0debc5b42087069e8388e46dcd210de7094f83e20ad9a6e9b6f3713822d3526356e9e347799e2eda6bfbfbfcfdc887f1b3af7f488bc7b1d2c776a
+EBUILD nullmail-0-r2.ebuild 282 BLAKE2B b3a14cc290cf34317705520a2d2b344c120463f22e0d37d40e29bd2673768cd7d30651831f3cd1a6c4b0571c0b9b5f6b7e8c22a177940811f8fefdc37fa739c4 SHA512 01ed322f094d1e0fc15591be78ea48dc7a5bbd2af0ec30bacf982ae99282aa050fc2170dcecab317a0d13632c9bd064b654561ffa55e1d6c2fc697be86227474
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
deleted file mode 100644
index ed75e88c8a6f..000000000000
--- a/acct-user/nullmail/nullmail-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/nullmail/nullmail-0-r2.ebuild
new file mode 100644
index 000000000000..41d6b71223e1
--- /dev/null
+++ b/acct-user/nullmail/nullmail-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bc40889e1454..d6a13571ed0e 100644
--- a/acct-user/nut/Manifest
+++ b/acct-user/nut/Manifest
@@ -1,2 +1,2 @@
-EBUILD nut-0-r2.ebuild 282 BLAKE2B f4c1cd162165ba443d6189c79e6708739837213e1ffebdd950c028a4223d9d0c150e02e20d0e8e799487b5e56297092df6087e4f76bd57114129f007d73a2c7c SHA512 0aac22fd504dbde4db3e01f62a243c01c8a222a63c2235c6901c0b050a88d09e613b69de4b913e32f053c7d65d23038d9186acb8337afcf254f762c6642a2205
+EBUILD nut-0-r3.ebuild 282 BLAKE2B cda2cd38d266c3d5dd56aa8201c3dd70cb34235603e008f20f38ef7688be5f0b0c0b00fec0f0b2c058addda4fa917a2f6138be684274b2211f6b169e2c502bf0 SHA512 bb9466bd168ed2b57c7f561b5b6e0a159796fcb601a1bbffd068d15ac393294c1bbb109bae0a736d760fe453eba8c7c0383513b531a943b085df0da915d4f3e2
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-user/nut/nut-0-r2.ebuild b/acct-user/nut/nut-0-r2.ebuild
deleted file mode 100644
index d9c746f626db..000000000000
--- a/acct-user/nut/nut-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/nut/nut-0-r3.ebuild b/acct-user/nut/nut-0-r3.ebuild
new file mode 100644
index 000000000000..e5b651a468ae
--- /dev/null
+++ b/acct-user/nut/nut-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c359d0b269aa..c430a189db98 100644
--- a/acct-user/nvpd/Manifest
+++ b/acct-user/nvpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nvpd-0-r1.ebuild 239 BLAKE2B 8169b5afa1415d450a0c806aeb0f6d5e1c752051af21d4ac21f81dcfdb44ff8469d2b34aeee48b9df834a31102c2cc61644f8576e5bec70416cff68a61153b11 SHA512 a47f8ff2b039874e1610833ee4a6e38f22f58949c9582553852535ea9aaf4d43356722632b654bf5f136f36c996f0357cc7430465c33be6dbf1324c2ec9b19be
+EBUILD nvpd-0-r2.ebuild 239 BLAKE2B 4f5e01fdf2f676dd711cf7e691e3a12f2c7d3d7dbf833ce238e1e84827732c0a367ee8f4d9466c57ea44a062e542d49516efd11fb1c1a4c942fba6bee9259651 SHA512 705d0563d27e8a86d78760f815f8d36169dd5e39841e86d8d2e7598fce79d11290570aa8503338f193e9641ed8aa62012b612ec5599726a7ff2fdbcc75787cd3
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
deleted file mode 100644
index 072adc5d8abc..000000000000
--- a/acct-user/nvpd/nvpd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/nvpd/nvpd-0-r2.ebuild
new file mode 100644
index 000000000000..135ce9aee7ab
--- /dev/null
+++ b/acct-user/nvpd/nvpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 34ae7c911c80..1c266eb938c8 100644
--- a/acct-user/nzbget/Manifest
+++ b/acct-user/nzbget/Manifest
@@ -1,2 +1,2 @@
-EBUILD nzbget-0-r1.ebuild 359 BLAKE2B 975eb0b03c81cf1f31d8a5afa86bae17a1d9052cc52b4f7038ecfc338212bfb97a791c96a93ebddef581fb42e2d13b053482efc2c2380f1df8b0465683156d6d SHA512 06fdbdcec151c3432977ef833b05ecc2ef9c64a8a0907772d0d26e79f8591d6dceb7121bea5fe314fe9f443ed33de6287227531ebec586b081d8f20bbe69c093
+EBUILD nzbget-0-r2.ebuild 359 BLAKE2B 70478f297ee753337a64c99860c9ded53e7c08f259735efc1a81d09d8a0fa2f2896243bf1191224e2af0d35c1eb013f0763ad7831f816804a6a9ee4434bfa9c7 SHA512 063aa6e4e4bbbca5e5aba741494f325a2befff7c94f8dad3f8b8e32bc9ad94d652c163d37350beec0e04fe60d6105d30c5ad9ba9fb84042bcd87f47110d030d8
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
deleted file mode 100644
index 7bf7f87f0097..000000000000
--- a/acct-user/nzbget/nzbget-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-r2.ebuild b/acct-user/nzbget/nzbget-0-r2.ebuild
new file mode 100644
index 000000000000..615ea30308fd
--- /dev/null
+++ b/acct-user/nzbget/nzbget-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 806f25cfa6f0..fba18df9d575 100644
--- a/acct-user/oidentd/Manifest
+++ b/acct-user/oidentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD oidentd-0-r2.ebuild 198 BLAKE2B 80e7a6e29b56064d228eaf195697adb50e239947e7c017ff8d7eb45eaff32e18d9f1f8a3bcedc237ecf4ebaefc9d8435daec7f965821cc64e44c5b4150a1fd41 SHA512 883232784588fa1ccc7159a6b62e1ea63ee8267309b56751c68bbb72759ead9ae13dc87cc1a78ccc2d92c36c7562a00a97804a770e82ec07d655771c666d354b
+EBUILD oidentd-0-r3.ebuild 198 BLAKE2B 4b5635e82ae9af8e8ec159e8d610c1ece56a8a8025e7f9b2fd8891f8cac5fc15f5a36eecb3e387c4f8fb949303306beb7da5a2aecf795fb8a7f2161ba1ff4406 SHA512 55b31f0f70e1a04ff63147e790a7259636b622b7665c58fa283ffc405615852e948e3dc9a38a6213e478144954b47808010623220cc380e6a8fa0525540dcc53
MISC metadata.xml 393 BLAKE2B cece790dd0310b08c71dfc107e0cf9d28a86714a8d14361140f30820be5987008fbb1f0954db16c6686a8c087bc54f0935960d4ce718e2f61240d2e83e67823f SHA512 4b60a9a9e648418f7d7eb82dd3f5d4ab28caf622f9f84cd8db5a782cd5db5e6bf1b20a4dae54b65f27998db671aa1ddd64ddd3e9ef26ffb1d786bcae82760cb7
diff --git a/acct-user/oidentd/oidentd-0-r2.ebuild b/acct-user/oidentd/oidentd-0-r2.ebuild
deleted file mode 100644
index e750efb495d8..000000000000
--- a/acct-user/oidentd/oidentd-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/oidentd/oidentd-0-r3.ebuild b/acct-user/oidentd/oidentd-0-r3.ebuild
new file mode 100644
index 000000000000..37f3868f6f4f
--- /dev/null
+++ b/acct-user/oidentd/oidentd-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 39f2896f7810..9fb7dd951505 100644
--- a/acct-user/openctd/Manifest
+++ b/acct-user/openctd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openctd-0-r1.ebuild 240 BLAKE2B 5cb5b5d6fd61a760931309987d88d50f3d14f004eea5d831d7293f102b204396f249992c871c77fbc1a25fcfa9a97878e5a6992cf3595724abc4b7be48845730 SHA512 1394b54aa22142f0aead250e72adc493c618acf19d86ae6adaa0b3897b4a154a150aa17d4f5a989ce00860058b08470d551ed53ed336ee050d727710255437ce
+EBUILD openctd-0-r2.ebuild 240 BLAKE2B 600031c6922e5e8900cfe327225d70e99a096f87fd604a60428149743c6838cb0599436de9cdf95684fc76420f4242112fd264eb6935154daa72ab52d041af34 SHA512 ce0377b845635dd34fd6eaac465365e4074e5cebf8b90931ef092a0aed25fd03a1a1aa559100381d50bea0cd8758652f092c868169c35241a6434279d9983aff
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
deleted file mode 100644
index e5943719af29..000000000000
--- a/acct-user/openctd/openctd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/openctd/openctd-0-r2.ebuild
new file mode 100644
index 000000000000..fc19cbedf9a9
--- /dev/null
+++ b/acct-user/openctd/openctd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 32e483797d47..c99ce4a0ecda 100644
--- a/acct-user/opendkim/Manifest
+++ b/acct-user/opendkim/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendkim-0-r2.ebuild 232 BLAKE2B 44cd2629fdc7a53bffb3cfc9a351fbc3aab63c6bc9563e118e78e10a9a576068a18b13c4b8a35912ec851c0a8f78d8c92ad4a1dda098972cdc8a292cb33d07a9 SHA512 bbf39b9461b96f5e8daf83e283c2027ab001d8460c0c8809eb4af4d8e3010c847182d31454c65fd2c13159313126eed9a17541bf4f5a0f694f80efa306fad427
+EBUILD opendkim-0-r3.ebuild 232 BLAKE2B 690f9a2617617d331ebf975d98f2e3423f11e7783dc2437c244620a264d8458e9eed9f801dfc2d13a6cbcb8846514751b81dd507b2a187a79e1d7f8dd9332646 SHA512 593cee16cefaad78b0672b54e83cc5d298ef5d17e7737e58577b4ab332b6a54de15be1d56457969c192736a384c3a74ca5d46b5956b8080cfb413c824ab158fe
MISC metadata.xml 247 BLAKE2B 4846dc5414f3478596a37af6a99c490ce9ac8dc341903d8fff794c05354b7a73309f70aac92faa801fff9f8a6aed87860af87e5d227fb2c6425b907038bf0052 SHA512 7a189fd4e7c0f67664c0788b4769a1c038374eb224c259fc206dd1d2448eaa1deab71c612186cff31cd380fb445fa4ba066a0cf881028191e8adb0aae9d862c9
diff --git a/acct-user/opendkim/opendkim-0-r2.ebuild b/acct-user/opendkim/opendkim-0-r2.ebuild
deleted file mode 100644
index 45820b9fe19e..000000000000
--- a/acct-user/opendkim/opendkim-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/opendkim/opendkim-0-r3.ebuild b/acct-user/opendkim/opendkim-0-r3.ebuild
new file mode 100644
index 000000000000..beba1adb3184
--- /dev/null
+++ b/acct-user/opendkim/opendkim-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a6d87389ded8..f04e2f44754f 100644
--- a/acct-user/opendmarc/Manifest
+++ b/acct-user/opendmarc/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendmarc-0-r1.ebuild 309 BLAKE2B 78ace2c37405320a08e2e7a463463d7fe06d80de2d25c014fecd07e51b067028e4799465c3fef5a9d94fa0e8642a04ad9bd7a7faafe90d5f609feeea1a1e59a7 SHA512 c5baa0cbb57ee8bb7406b50db08027192d9d0afd7cc10023b030f7c3e9345357c1564652f4681de98f11f56d58d642d0593ef787595d78dae297c4279aacb549
+EBUILD opendmarc-0-r2.ebuild 309 BLAKE2B fb535d04f27af5a91bcf9874238de9403319d23d6db6c565b46974168aae0b02dd5dec6fa35b2c727a2a8291caf496be0f78811daf6629d50ca38b9e02d25089 SHA512 3be6cac208664aba93d712dae015def0117da8858e6216d629dc10a76a759477bacb1245b8a835fcfce3a36321aabbb969c386fd431d2486e3cae87b3638cc42
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
deleted file mode 100644
index f7defc95688f..000000000000
--- a/acct-user/opendmarc/opendmarc-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-r2.ebuild b/acct-user/opendmarc/opendmarc-0-r2.ebuild
new file mode 100644
index 000000000000..af70fe1240a5
--- /dev/null
+++ b/acct-user/opendmarc/opendmarc-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 be085c69b9e7..c1fdb8e835b4 100644
--- a/acct-user/opendnssec/Manifest
+++ b/acct-user/opendnssec/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendnssec-0-r1.ebuild 250 BLAKE2B e6d4cf60bb9c4dac75243cc93b6f6894e4c5f7bbd40b9206330c99f86065914b52553d53b93b77f520f2f643c63faef742be87ed34384ce1e55f5d358222ddb7 SHA512 9d6bec5e712dd0e6cc3c852570a42fd6db630e06e9f8a087f406a6e482360b3b129730e52824368fef278fb4517d43f332c1de327cbe28bd866c1a3eb55e340f
+EBUILD opendnssec-0-r2.ebuild 250 BLAKE2B 54b2669c942208bafc8936658ab8e99c8d1ce1c6e63488a5a50e5294dddae4184d9d20fd3cacd67a7d00ca2143f15e1e5b4c38f25544558b2820903f71dd8868 SHA512 c7686590f44bb4b610f6e8e6e09e079e02d237ae2d358ccce0fd362a5de4d3a449b7d5da6822bfe6e83a7e9302b5acb8bb4f4a4024529ab349e9a3d6dd52d733
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
deleted file mode 100644
index 3684c42cbf0e..000000000000
--- a/acct-user/opendnssec/opendnssec-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/opendnssec/opendnssec-0-r2.ebuild
new file mode 100644
index 000000000000..9471919f6432
--- /dev/null
+++ b/acct-user/opendnssec/opendnssec-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7952eee1d318..53d9b9d9aca5 100644
--- a/acct-user/openntpd/Manifest
+++ b/acct-user/openntpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openntpd-0-r2.ebuild 309 BLAKE2B 35853c3f18ffa365ec666a8403ffa05ec3d991ce95ed1f4641c653770a4d230ed4cf8d877fee96d16a193b6092e83431fe672010ae9079f5f742ab2d650cbb5d SHA512 6fc356308b8503692a4d0acbdd4d04fde7c12d94a4f13bde5a5f4c7c3f28a1d3f52c7989678addc0d0a8be662302f2c2a6ef220048bcf19f6be10169fbe8bbec
+EBUILD openntpd-0-r3.ebuild 309 BLAKE2B 3d2c792e1b7d80332929c469f9a382a0fff4a3c8a4b83021746c3fb307e7501697c2daa744fdeb90700a55951262c5156aa1f0eb229051e6da5338a5599aaa25 SHA512 78a69333b0649599affd6a3537ee0a5c106fe534881ee30e5dad46c034bf929bc098b4d3c8342bc80219e4790a7b36de870ccfeee77a7ffd284d33591960e541
MISC metadata.xml 392 BLAKE2B a875ac61061b518231ca2dc61e92dec80b9a647942ba08b241bd897a2232a6b3ab804f875de8a64a1d323f4b289193571998d867279ca135dda95ab1f056abad SHA512 4418af84fefa90044cb549d2195537df74dcfe7a8c02011b8e0a975f660e0226c942da080b20529fc5752fe0e87928479ac433de3d7ae2947182672e3508a030
diff --git a/acct-user/openntpd/openntpd-0-r2.ebuild b/acct-user/openntpd/openntpd-0-r2.ebuild
deleted file mode 100644
index 64e9497fe4be..000000000000
--- a/acct-user/openntpd/openntpd-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/openntpd/openntpd-0-r3.ebuild b/acct-user/openntpd/openntpd-0-r3.ebuild
new file mode 100644
index 000000000000..edcb8a40ea37
--- /dev/null
+++ b/acct-user/openntpd/openntpd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c4547584ce25..e7adde8ca2fd 100644
--- a/acct-user/openrct2/Manifest
+++ b/acct-user/openrct2/Manifest
@@ -1,2 +1,2 @@
-EBUILD openrct2-0-r2.ebuild 259 BLAKE2B 6f9902a1571200bd2031f74709f3776146f9fbb5e66c7c7d61ee279c2c0cebc274d9eaf5a6f1afe3422cd26836e70934dc8b9d033e92ee699f1ebf10f79ebff6 SHA512 2c3d2669661009c84f125593240a95e5daea9a4abc980271d0536be77117ab3576ecff7c49488ff2593435463e99d876010a79bb126d8b22fdb11c2f9d52dc91
+EBUILD openrct2-0-r3.ebuild 259 BLAKE2B ec83f0a142b11d9b407df7e7336f484d706cc7b1fd2a4f43abb9e9deab8f45ca943dc13773ed9f080e4b6a010ea0e41fe3e3470ea8c0c4d867d18aad45b67135 SHA512 77a4d26581aac099c882f531c676e0d1d10c6fcf48da2b7344ccc1c8ed19d5bd6f11191f9bd83a9f07b11b61375f1986e1a6ffcadb625be6877968fce8a6c5a3
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/openrct2/openrct2-0-r2.ebuild b/acct-user/openrct2/openrct2-0-r2.ebuild
deleted file mode 100644
index bd994570f3e6..000000000000
--- a/acct-user/openrct2/openrct2-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/openrct2/openrct2-0-r3.ebuild b/acct-user/openrct2/openrct2-0-r3.ebuild
new file mode 100644
index 000000000000..8d1be68c87f7
--- /dev/null
+++ b/acct-user/openrct2/openrct2-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/openvpn/Manifest b/acct-user/openvpn/Manifest
index 21b0baee1f5b..df4e83e928e1 100644
--- a/acct-user/openvpn/Manifest
+++ b/acct-user/openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn-0-r2.ebuild 238 BLAKE2B 28d82b0d6005b6845e3b052d2cf20997aa5406be682b95627859a2044a71a06c35fb6553bfab336e473dd1945685c25b6513ac46b467bf363bbcb4953bfd9146 SHA512 059a90ceb27930e2200b15167a6d9a719d525f87213b1b87e5a39f42416c903f034a646f818af6c9f085bffd50ead4c8854120496d5cc6855f0c6e2553e6a98f
+EBUILD openvpn-0-r3.ebuild 238 BLAKE2B 7f130bf7d495e503fac7520de00b6e9c2e5d9ecbee4d319f5d76e30b4257cf95487ea82c606139109e014a4fda5668decca18fdab081baa045a75b2570c9fe5a SHA512 731e7b987bc3d21fe64bdb89a5bddfaf9c3f933494aeff9cc6689d79d6345e882d8196a0727168dc4c9cc3215f7ad7907e2c40dd43e78b9c91827380dbee5c6f
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/openvpn/openvpn-0-r2.ebuild b/acct-user/openvpn/openvpn-0-r2.ebuild
deleted file mode 100644
index 910756a921ad..000000000000
--- a/acct-user/openvpn/openvpn-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/openvpn-0-r3.ebuild b/acct-user/openvpn/openvpn-0-r3.ebuild
new file mode 100644
index 000000000000..e9e4c06ca7ff
--- /dev/null
+++ b/acct-user/openvpn/openvpn-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b049ea758ad9..00594a766571 100644
--- a/acct-user/openvpn_exporter/Manifest
+++ b/acct-user/openvpn_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn_exporter-0-r2.ebuild 288 BLAKE2B f730246a6e21ac1dd18aa28ba33df6ca3b2b3cb27f9a66e2166356e3fca9052e96bb05e6c9726db2ebb993570b6ba78203c5a9c7decbd7786d2c6bbc4bbf0ee4 SHA512 c310e282d44b7f07fdc530205b7e4580cb255609606f68922feafc3c5b73d98feaade4b0841ffb20ba6cd4cc862d20bd6eaa61a7561441c2b2e442152c44fb92
+EBUILD openvpn_exporter-0-r3.ebuild 288 BLAKE2B d9964659ee9f9c2270698584e2e6f41f30000a3127dfa8ab1bc839017cbb77df84258aac0159fb0f8462b5c1a8c90c37b36303d876ca8b79ff90d12a6d3aebf6 SHA512 eb795990c41f7ee9cfc6e68c09f579b568190c0cf71c721b22796cce29ea285561243d4ac1d4af6a1977ddede594bc73323d9b611483e1ed62ea78f8d64db2bc
MISC metadata.xml 250 BLAKE2B 24647b7269305eaebefbb6426c3543e9ecab2b478004d4353af64dd2281fd139059d4ff4450ea7545d357c3f14583e8f9acf6485abc570ef4a8ed053cd76df67 SHA512 5b3a845086e7023834b58c81bfc93f332349e17898f3bec944fa9430e419a5cbf064de5e71cdbaf570e68dbba1d69a8313c99021f8b68a94ef07f53cd52c34fd
diff --git a/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
deleted file mode 100644
index 286c269ef79b..000000000000
--- a/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/openvpn_exporter/openvpn_exporter-0-r3.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..cf244c426e37
--- /dev/null
+++ b/acct-user/openvpn_exporter/openvpn_exporter-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/oprofile/Manifest b/acct-user/oprofile/Manifest
index f6a7e8236270..bd73dbd9f9a3 100644
--- a/acct-user/oprofile/Manifest
+++ b/acct-user/oprofile/Manifest
@@ -1,2 +1,2 @@
-EBUILD oprofile-0-r2.ebuild 259 BLAKE2B 20644b4935259e90c9469f1b37d3a8ff323a3103b8fcc666e344b8a84f0e92e7c3539fa36bb7d6e4583218a400084c55e40c20bf9b7796fb81d9075d690ac358 SHA512 69d2833ec5541264eef14bf614e9dceff32b1e73bfe28f139d0832cc58fa95174e54df508594830f170fbe3efc3ac65644ac4bef5177869e0b615831d5e5a208
+EBUILD oprofile-0-r3.ebuild 259 BLAKE2B a9b0946e9530507b156098905e3a04bde4ffb10ef677c9c199dde15cd6806923094ca0ca8f234bd43c2bbee69fd392fc8ec50456ae50bdc90eaa02d04562040e SHA512 ad48dc300afdf4fc56294199dea50ce65724d602757426c96b76e6017cfb34f20c8e51b3b8e6873ce56ad525ca7529fc5d57f49aa81657d563fa895b5f9fd70f
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-user/oprofile/oprofile-0-r2.ebuild b/acct-user/oprofile/oprofile-0-r2.ebuild
deleted file mode 100644
index 193a1f38d923..000000000000
--- a/acct-user/oprofile/oprofile-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/oprofile/oprofile-0-r3.ebuild b/acct-user/oprofile/oprofile-0-r3.ebuild
new file mode 100644
index 000000000000..f86e3a2d3220
--- /dev/null
+++ b/acct-user/oprofile/oprofile-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/ossec/Manifest b/acct-user/ossec/Manifest
index f4a869cb4210..e1f5af3d606c 100644
--- a/acct-user/ossec/Manifest
+++ b/acct-user/ossec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossec-0-r2.ebuild 294 BLAKE2B 47f6a90b9df53a66697a048c0757be29e3ecc5063791253304cd99fed7f2903397af5b63e850305f36111c0e6a09688eb532cf6a951fc531e436b3b797da5be1 SHA512 1846071fbfeaa68c19693c403b29a934767e1b8f6293289568fa79e1fb82faaea2e28459c77103ebdc669becdd7594da9ff232d7ea7516a3f73c576a0112de2e
+EBUILD ossec-0-r3.ebuild 294 BLAKE2B 8982be20b3466a442c151e8d0aa973f4c4f8ebd3c94cebe1ce87f8976d5a2b917b403b27f6b6905bd079b5051be29153faed79c2835e87a865853746df3dd06f SHA512 8148c83a5e08ce2317121c3a7432a1eb1bdd008df008116e999dd1e8daf21301b53c6e862babbfa7a826fdeb457fd5fa72c50c857d02d46108dec51f52344af7
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/ossec/ossec-0-r2.ebuild b/acct-user/ossec/ossec-0-r2.ebuild
deleted file mode 100644
index a559074b51e8..000000000000
--- a/acct-user/ossec/ossec-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/ossec/ossec-0-r3.ebuild b/acct-user/ossec/ossec-0-r3.ebuild
new file mode 100644
index 000000000000..ae956403a3ea
--- /dev/null
+++ b/acct-user/ossec/ossec-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f87e6fe4c0b8..ebe3c58df785 100644
--- a/acct-user/ossecm/Manifest
+++ b/acct-user/ossecm/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossecm-0-r2.ebuild 252 BLAKE2B 11c4b18a16b318787d7d37944360f9ee971ad5f60698225b630b58890a9ceec6abdf09a6d7779a5b3e6df372ca203ffa011e797cadfe5f983d944a51eb851f50 SHA512 c5621c45e783c44c5f4e9c76fd14b235efdc4efa76ab172525964550bfed57548ead1d7b31bec50d4c57513444d5c8c874ab8c3e6952243a7cb58759a4ae9b94
+EBUILD ossecm-0-r3.ebuild 252 BLAKE2B 0ed79308e0038e0a856a332372577a5850796afb415ff88cb02717a59a83d200e82f6b4cca90642aa6aeaae1342d1b9a904d12590f2bfe19385932fc8f88b292 SHA512 6fb0cd94755d654b319ee68cacaabdf74ec899cdbf18737b982b6318086b0d65243f81b420467fec3c59bf930b8784d7f953d063c15d4705f49e3ff1c2e9ae5f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/ossecm/ossecm-0-r2.ebuild b/acct-user/ossecm/ossecm-0-r2.ebuild
deleted file mode 100644
index 6f0937bc3343..000000000000
--- a/acct-user/ossecm/ossecm-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/ossecm/ossecm-0-r3.ebuild b/acct-user/ossecm/ossecm-0-r3.ebuild
new file mode 100644
index 000000000000..dc59d33382bf
--- /dev/null
+++ b/acct-user/ossecm/ossecm-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 62557ec1f2ac..d3b64b594724 100644
--- a/acct-user/ossecr/Manifest
+++ b/acct-user/ossecr/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossecr-0-r2.ebuild 244 BLAKE2B e4f29f47c1d406d3c96d5dd0a5d6cdd103c66d2ca3221294e3a3007700dcbba87e30c8bbe6da5b43628b0ae28123a978159dda55e4535fe866a809f126006dc5 SHA512 bea423590213b2125e7b6469878a72732247d6a61c174f7cb549171916ac5491040db57421fd81189933013d0fcb0c86ace9b1b31b7da7fc8be8d282237e6b7b
+EBUILD ossecr-0-r3.ebuild 244 BLAKE2B 8081cd9c3e16807a71f5bebfb67919ef8c064e88b2789f1a9344b652ab71820a19fb864e1b373ada562d4a2e27f43bd42b664e38868be188df7c8b100ef637a2 SHA512 2bc31e6ef19b7a049d926d9793a7774caa355ba33e1ed27d170e766238387b75f37d53990b6ab06e46b879545431c84f8a51eec0147cc4cbb965f21b8218087d
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/ossecr/ossecr-0-r2.ebuild b/acct-user/ossecr/ossecr-0-r2.ebuild
deleted file mode 100644
index 4ad2a76704e8..000000000000
--- a/acct-user/ossecr/ossecr-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/ossecr/ossecr-0-r3.ebuild b/acct-user/ossecr/ossecr-0-r3.ebuild
new file mode 100644
index 000000000000..4d4a6a2c5447
--- /dev/null
+++ b/acct-user/ossecr/ossecr-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/p2p/Manifest b/acct-user/p2p/Manifest
index 5e23d868ba56..44e18586c590 100644
--- a/acct-user/p2p/Manifest
+++ b/acct-user/p2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD p2p-0-r1.ebuild 226 BLAKE2B bdb6503646ec6af5f7a455aac48962a6f1a0ad1330a39e44d5aea21252116b767e65974e3f2f1941ef3299ffff84d67d7d4bcf053efe5f3d9001b8e55966d792 SHA512 802bb19adbe81ed4dd7e5b33634e2a9839b21bb8d8d6db89f1940eac2625baa34b6ddaf2dd4349ce80c72c2a542319ba7911793fa3f9813c3b9c7da2161b27d9
+EBUILD p2p-0-r2.ebuild 226 BLAKE2B 0fe1b5e5c538a372636e9a7bfd82a70c9348adcc75daf916d2d4bcafe3e7c8cd66261f2fdb876a722075c738b789e7fd441f781ae82c35869a523735214a386e SHA512 86b3cd9e3bfb6a8585cdfce53d53713a1b18413ccb3c7f4a11c43ecf7451c7bf7a176e07ed9226983e43e3cb6b82dd64f09319616a956c6a438cf5f9b0aae0dc
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
deleted file mode 100644
index c01f9700cdee..000000000000
--- a/acct-user/p2p/p2p-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/p2p/p2p-0-r2.ebuild
new file mode 100644
index 000000000000..4d9159dcd4ae
--- /dev/null
+++ b/acct-user/p2p/p2p-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for mldonkey"
+ACCT_USER_ID=378
+ACCT_USER_GROUPS=( p2p )
+
+acct-user_add_deps
diff --git a/acct-user/pcscd/Manifest b/acct-user/pcscd/Manifest
index 575e2c5b4f32..7a07e6ab1806 100644
--- a/acct-user/pcscd/Manifest
+++ b/acct-user/pcscd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcscd-0-r2.ebuild 241 BLAKE2B d56175a6d8da3a2161ae67fbd0662c156b14b76d91d5e171201495241d4b9aa9b3828ac4b444563441c26cd835f33234b2f70810dbd90c9304bb217c9f76b2ff SHA512 263629a43a1b877c9dbf692c74b7948374455be9c13f18966c65c1b5840693350172a1c97d07b3a02e1c58fed728a8b5955f855bfe12ab12f2c6e827c4e0471b
+EBUILD pcscd-0-r3.ebuild 241 BLAKE2B 4900ff50638098e362f7ed662cdd9160dd6b469dd232b73ca113e896c963573e54da0dbc1b84c324e01989275d4960c9929ce88708c6f0c39d56900611184e31 SHA512 f4baa8b71e10ba6e8b6099d0c6bbf91e2a308b87515d5829a50d8ed9cea4438438ec041b95dc8447c9ab4b329ce5645b2f40cfd4810e3d47eb3c4cabffa002ce
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/pcscd/pcscd-0-r2.ebuild b/acct-user/pcscd/pcscd-0-r2.ebuild
deleted file mode 100644
index 7da6a318dccb..000000000000
--- a/acct-user/pcscd/pcscd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/pcscd/pcscd-0-r3.ebuild b/acct-user/pcscd/pcscd-0-r3.ebuild
new file mode 100644
index 000000000000..b3c8c9c43629
--- /dev/null
+++ b/acct-user/pcscd/pcscd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2f9093c1ec50..a12597d124b8 100644
--- a/acct-user/pdns/Manifest
+++ b/acct-user/pdns/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdns-0-r2.ebuild 195 BLAKE2B 1a772053909946e436386e466852584291381addd2b3ec2fc44dba128f0a703cd5e4de836b5ed7bd4f3a4b3ac3df1ee6dc77a23bf950d6d548e89adb1f29dbad SHA512 aaac826ad14fde1c8d9ef677bd2f8532fb8b7ca5303ea2bc036d1fbb77586983d06279e582c473f265c0be92b1d6b68cfa558a0d3cdce1482fc2b3fd8eb08f82
+EBUILD pdns-0-r3.ebuild 195 BLAKE2B 31eccff8388b30f21fc68ca4bae2a4f25628842b90a272fdb71da35f779f6477dc9b2a5a13ecf58f233069b8679f33fff1025f252703cce8208ed709d3c653cb SHA512 b678923f8c403e9b7a28eb90ed80b72e1e0d0b036aa50a170ba8c3abd7a6b4eef6903b293a47fe4708bb908e678e2e8f2ce41c0d702b7d762c94ac184839f6fd
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
diff --git a/acct-user/pdns/pdns-0-r2.ebuild b/acct-user/pdns/pdns-0-r2.ebuild
deleted file mode 100644
index 08cc83f39d72..000000000000
--- a/acct-user/pdns/pdns-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/pdns/pdns-0-r3.ebuild b/acct-user/pdns/pdns-0-r3.ebuild
new file mode 100644
index 000000000000..fe2c17f1345a
--- /dev/null
+++ b/acct-user/pdns/pdns-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e82f12dbb516..ac002d51f6e5 100644
--- a/acct-user/pdnsd/Manifest
+++ b/acct-user/pdnsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdnsd-0-r2.ebuild 293 BLAKE2B 66fada3ae2ad904b97b784fc59010a8a659b19c1a9dc3dc8a2e8193fe104a9fd0296c99d2ec3bc46892fede092bef68f494edc193124bd360b5994da0c38dc07 SHA512 71b0f2047608e4244533134f092b0baffba80b2a7553c328d43cc43c68001ea30df451d70012fbc0d8190e874cde194784cc9d5806e543800534757ca076e61d
+EBUILD pdnsd-0-r3.ebuild 293 BLAKE2B a820e66aa0bdb69c17b3cc6a6c1b8ae0d70231d5941d16e5492bbd538d33a601dd4312d1562d1dc7d4a3bb5c3b69d0fa68a2b3ab8d6b362767042e817fb5e85d SHA512 c16df6f173c45c62e7fca251b17b703f4335be278c5aa9a886ad9fd8145b9d9ad4932b72bf69a6cccdd30c5d260eecba5999b487c81021c3e79e4c586e364bcc
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/pdnsd/pdnsd-0-r2.ebuild b/acct-user/pdnsd/pdnsd-0-r2.ebuild
deleted file mode 100644
index 3b3ff7fe51f7..000000000000
--- a/acct-user/pdnsd/pdnsd-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/pdnsd/pdnsd-0-r3.ebuild b/acct-user/pdnsd/pdnsd-0-r3.ebuild
new file mode 100644
index 000000000000..d03433dd884f
--- /dev/null
+++ b/acct-user/pdnsd/pdnsd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/pgbouncer/Manifest b/acct-user/pgbouncer/Manifest
index 6ab9eb8697b9..0725f848ba42 100644
--- a/acct-user/pgbouncer/Manifest
+++ b/acct-user/pgbouncer/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgbouncer-0-r1.ebuild 244 BLAKE2B 2699bb182f62ce9136412fb6bb2b795dee05c5ccdee60e571eeb5eb3fa9e91bbc93af56a54a709d29cd0baa0ca4ef8d381677119a0615246a76ebf0439098cc5 SHA512 0b1d775c990e6072b4a92603951021ee189a6c9c6f1630f777e76fbca9f1b5521ebf93b7b4b540430071de867b7a857c00b1b2b4f54400e342a1b524ecef59b0
+EBUILD pgbouncer-0-r2.ebuild 244 BLAKE2B dc1cef5b14ff27d1f56c857bce129c2046bde4f4647274b9ea5fce43d47a71bcb90c413af5541392ec649d16c7f435494be30435bab1a465fcfc6994cf6b1503 SHA512 f22b4ce505aa6d372dd412d659e7f8fce16fecaed845013ce97acfa83132f7be4b660b5180a52abeab458741c61c2b2d0a02b4cc23cd69b4989d00e36ebcd1a6
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
deleted file mode 100644
index 5903c2bb5c40..000000000000
--- a/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/pgbouncer/pgbouncer-0-r2.ebuild
new file mode 100644
index 000000000000..2458dfcf0653
--- /dev/null
+++ b/acct-user/pgbouncer/pgbouncer-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/pipewire/Manifest b/acct-user/pipewire/Manifest
index a50e3f93750b..15528ec70bf4 100644
--- a/acct-user/pipewire/Manifest
+++ b/acct-user/pipewire/Manifest
@@ -1,3 +1,2 @@
-EBUILD pipewire-0-r1.ebuild 304 BLAKE2B 521e82b7a4dbd6b5e4d87504ee3cd60ee3e4b7db786fc2deb8fc1a586019eccde801d5b849739a8176d46fd79b5ef4482682c8ba1bd7ef4cd662126cb12b4cb3 SHA512 09aad60a9899b8069b864b26dcd4d0b8b11f6a5e111d4a5750da3a5b0d1312743e7b4b9518bc9ed3982a96ddec55567d95a35374049f14477630977916103c76
-EBUILD pipewire-1-r1.ebuild 296 BLAKE2B e1d875f4ef1e567f006fef2c1d62892024a7861f83ed205bba7cdf40cf0fe1e248cf2531a0677dac4a4af1c29ef45bf461451b6819db2eceaceab1795a829bc3 SHA512 6bfb6cea55816f5cd03f4d6d9e422fa2aaea53c0102266f5009a76ab815ef8f3144b03f6fcb6c635253e5f69f278781d75fde68c39853e042dea20840be751ac
+EBUILD pipewire-1-r2.ebuild 296 BLAKE2B b1c168a1218e093ab4e76da9edf0cbdf58cc1d01d6aa002ea518a942e27ce7fc7526a90e2b2fee570aa1344d566886afb7637868be02d77452e5f7451a305116 SHA512 71bb78d076d25b612f5c933103818324125ee2af211537a002c58a92671a6729a0ea571281cb96abd7f4b886ec71b5cceafcdb36718746a923f81aeaece0e945
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
deleted file mode 100644
index 75bfc8650b44..000000000000
--- a/acct-user/pipewire/pipewire-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-1-r1.ebuild b/acct-user/pipewire/pipewire-1-r1.ebuild
deleted file mode 100644
index 0492f9ffcc2e..000000000000
--- a/acct-user/pipewire/pipewire-1-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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=/dev/null
-
-acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-1-r2.ebuild b/acct-user/pipewire/pipewire-1-r2.ebuild
new file mode 100644
index 000000000000..2825e42284c8
--- /dev/null
+++ b/acct-user/pipewire/pipewire-1-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=/dev/null
+
+acct-user_add_deps
diff --git a/acct-user/plex/Manifest b/acct-user/plex/Manifest
index dc16101d289c..e84a338278d5 100644
--- a/acct-user/plex/Manifest
+++ b/acct-user/plex/Manifest
@@ -1,2 +1,2 @@
-EBUILD plex-0-r2.ebuild 278 BLAKE2B 8b02274ba5bf22ad416e785d36aefdc526b338df04f6068c2d660fbcbd54f23d50dec1a0ed07caa49f7fd2ceeb45342f6ef0c433cdefe65e98746270d252e5cf SHA512 aaed3b187eb78550c6ce909e1dcfb68744cf13a3205266e315e66c26abe71f794b1dcb3d22850fa604cabb7035999cfe3e504af390e7bf6896240e323b72f5ce
+EBUILD plex-0-r3.ebuild 278 BLAKE2B 0ed4cfee4fc06ab3d502920d5897f85b8073d2c358bc8e9ec4008514fe4539fc3ea5733b05e803d38fc2dfc84fadde10a3e9d11a342dc1277f72ba31aac4964a SHA512 f6db695e07da70f6853adacc773c61f25a8c8131ba3486349ed39ae53aea2428c7e603d2f4188c062ee27be02ccf16a9b83bc748f88fd93c89f36e8bad85ee36
MISC metadata.xml 398 BLAKE2B b0364533e5e51af3ff46cce6e364786496e4a93a365d7566da1fad2f1a7a262cb18a2afb43d3e3f02d9a7e6a6f76148ae49c40653b63b3d11f242c99f113cd90 SHA512 c05d31ba64239181f746b0d3c66dbca84895f310378b754431ff3b8e27127a02ae3372c538fb21c23f94d4ad7331c9a9aa90b001a1fe581aeab2ccd913495a8a
diff --git a/acct-user/plex/plex-0-r2.ebuild b/acct-user/plex/plex-0-r2.ebuild
deleted file mode 100644
index 10782ef24f9b..000000000000
--- a/acct-user/plex/plex-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/plex/plex-0-r3.ebuild b/acct-user/plex/plex-0-r3.ebuild
new file mode 100644
index 000000000000..86ed08940429
--- /dev/null
+++ b/acct-user/plex/plex-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d2169a8b912e..ccf02fd42d4b 100644
--- a/acct-user/polkitd/Manifest
+++ b/acct-user/polkitd/Manifest
@@ -1,2 +1,2 @@
-EBUILD polkitd-0-r2.ebuild 231 BLAKE2B b01b4c3c5040b23f25568b0e3055685272ddfe17aa86f08d1ba9db32fa031cd288e1dc4aab7e74cc2a7c6b3278f2497e4e5ca18f6b9de55a58fc95ce78bdbaab SHA512 62fadcafb059b3b91da695c8b8a1fa14855dd2742389c9f37650d81699a0781028d36514b279a83b36cf7da717672dbd9980244ab9a9bc694ec0e600ebf11392
+EBUILD polkitd-0-r3.ebuild 231 BLAKE2B 39eed8acebba3103be4acb0c691450b310a87a48724743edc3bf8b0cfb7b4c116ac68f56535fa9850a88a729ca58b1f6dcc9ed26833e71b4645469548643564c SHA512 fbb4848be0ea567cd0b271fa0d398f8f2f5c8dfa7362b81b368a3fb67f931d00483924e0c8a9e2a693eea75c2c57cd9f16b6074f1cdb1faab9f93c61c948777d
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/acct-user/polkitd/polkitd-0-r2.ebuild b/acct-user/polkitd/polkitd-0-r2.ebuild
deleted file mode 100644
index 2546ca918d7b..000000000000
--- a/acct-user/polkitd/polkitd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/polkitd/polkitd-0-r3.ebuild b/acct-user/polkitd/polkitd-0-r3.ebuild
new file mode 100644
index 000000000000..d81d207f7309
--- /dev/null
+++ b/acct-user/polkitd/polkitd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ab25d542a764..61c22fe154ee 100644
--- a/acct-user/polw/Manifest
+++ b/acct-user/polw/Manifest
@@ -1,2 +1,2 @@
-EBUILD polw-0-r1.ebuild 250 BLAKE2B 668f88d1f360a470e81b5e9af6cd6e77addb064dea00aa2ddaf8a1cd0a09016bcee8a3a6e37e4da3b3e4c04d56063eb397e0c795474e87adaf16f2d5b7b56b05 SHA512 23dd32ea9e8d391f3fefc0fafd89fb01523b397a18e4837224f115e51e0d6f7e346ed517a50798932e1d9d7a8960d050cf5eb723c51b99557285ea65c8e54b33
+EBUILD polw-0-r2.ebuild 250 BLAKE2B b05e147bad07bd9317247abf07cce256a3ff9d8e416a641c24262373b042cc26b5145fc3e9bf98465c868429352c069358555f28c4ded555f296a55cf39c1acd SHA512 84911fb925ce6c6f431bd182a7e18b52dc08ffe483b8b85b46b27f953a85600ccb535343ff58a01bca85e3b798f9c19951cda04694bfb933ac882fb36b9981cb
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
deleted file mode 100644
index 7d25130c691c..000000000000
--- a/acct-user/polw/polw-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/polw/polw-0-r2.ebuild
new file mode 100644
index 000000000000..5d8e2298dceb
--- /dev/null
+++ b/acct-user/polw/polw-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 779be76a3152..f805cbc6e21b 100644
--- a/acct-user/popa3d/Manifest
+++ b/acct-user/popa3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD popa3d-0-r1.ebuild 236 BLAKE2B f1826a104a205a1c622f6dc939f48617dc13a4f9b3bfd9b2c0205a0dbd17410442fb100091380ff54401656d868e91e558392d7b51359a424c763a2a068e4569 SHA512 522de732511dd13a45a434095a7dda0600723f0216ff775bba186e8f8d8cc537c8a4611a233aebe18c7bd60c0f7399a6c6353b52e2b3bdf9abb7b3200fb3af16
+EBUILD popa3d-0-r2.ebuild 236 BLAKE2B 3b142e73f01f780efe80227deeff0956af1df58efb7e5d35ea4d279478376ce52dd6e5f2be8c357401ed3a958a9fb638899ab1c7c48315900b62826af660eda2 SHA512 08ae2deb102b381af38ccf74f7ef9943ffaf052e889d21f54758134459711ff8401c8fc3e38b86da9cd6975acd8c3ca43c14070ee03f98e6a6098cb2590b05f7
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
deleted file mode 100644
index dc83868e0236..000000000000
--- a/acct-user/popa3d/popa3d-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/popa3d/popa3d-0-r2.ebuild
new file mode 100644
index 000000000000..31e95c449a25
--- /dev/null
+++ b/acct-user/popa3d/popa3d-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5ba99c356be0..ed58558bd168 100644
--- a/acct-user/portage/Manifest
+++ b/acct-user/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-0-r2.ebuild 237 BLAKE2B 50da337688798807174d65cdcbba8c5a19ec25ee9eee41a5a23127e48005a281d41a54281575d7afd7cf943fab6b258ddbc58c4fede601739a1d8d96e53f6ad8 SHA512 eababbb04a4d3887accc2aa003f5e099cd37f7580535e481829a36ce10dbed887d95b78d9fdba651daac10f19bb4e71866853bc1e60601eccb0126585df348f2
+EBUILD portage-0-r3.ebuild 237 BLAKE2B d77c07082d01fe93753330cd50bf42e9f4eefcb5c21141d62747e78f9d6a916268844202abe67afb1177e1c9a62783f31a7f70db002f916cf17fb877f7b71c11 SHA512 8381be3add80d81ce6bb00eb6a5e499a7be7266d709aad3a76d0e24a169ffb1781a23e006a12edf9d043b1b239da39be0b4cca3a0c96a040bfe385c31624213b
MISC metadata.xml 224 BLAKE2B b8b01962c2bc1d5abaad41f5f9c1af011244a3a3c73ca8544a532a151b5afd90cd1a423ff4d796bd9dc76ac7504a385a850c5f6ceb4c8a5d76e44aa52452d24e SHA512 fa9628394e8600bac8ce6f6f75926875f02d5469f9f5e33f4ab3180504d1a4f614a72973fffb21513b73bf93e22e97d03a4b3fa5360c52e322a0d2919e1f47ae
diff --git a/acct-user/portage/portage-0-r2.ebuild b/acct-user/portage/portage-0-r2.ebuild
deleted file mode 100644
index 5d8cc4b82ab3..000000000000
--- a/acct-user/portage/portage-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=250
-ACCT_USER_HOME="/var/lib/portage/home"
-ACCT_USER_GROUPS=( portage )
-
-acct-user_add_deps
diff --git a/acct-user/portage/portage-0-r3.ebuild b/acct-user/portage/portage-0-r3.ebuild
new file mode 100644
index 000000000000..678713be633b
--- /dev/null
+++ b/acct-user/portage/portage-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=250
+ACCT_USER_HOME="/var/lib/portage/home"
+ACCT_USER_GROUPS=( portage )
+
+acct-user_add_deps
diff --git a/acct-user/postfix/Manifest b/acct-user/postfix/Manifest
index 154b908a358a..8ec76d0a49af 100644
--- a/acct-user/postfix/Manifest
+++ b/acct-user/postfix/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix-0-r2.ebuild 241 BLAKE2B 0fb050f06980890ac98f64002a5903473ca13b7b56849136e89c9101bcd1caded942e2b21486819afabbb819c762df53674e5557143f0ad125973b4e83049900 SHA512 f590f8dcfe05db3e360cd9cc40c5a0bc089453061c5407d75122751e6f0e65956a73ee5e88841f57dbc5f7309f24580dd1d1e7c4e0f91152c6ae34bd8d9eb1d8
+EBUILD postfix-0-r3.ebuild 241 BLAKE2B 6dcaf907e5abedfd6c7e879e7f5ecbb0197239390db98cb3edeba9aa0931312cb08fd417dc91d65770e00d3ad54132f37707aa0f1c55bde581ce53ff63b4f96a SHA512 ca41c164410f9a8653b768de46607e3bf1ecb267b0f9fb9f64a7eae6295511c43652689fa490ddd3785b312337049e7e0d96346b709ee3d1ff95e9a77f3df71b
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-user/postfix/postfix-0-r2.ebuild b/acct-user/postfix/postfix-0-r2.ebuild
deleted file mode 100644
index 7543f3afb66e..000000000000
--- a/acct-user/postfix/postfix-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/postfix-0-r3.ebuild b/acct-user/postfix/postfix-0-r3.ebuild
new file mode 100644
index 000000000000..5670bc050558
--- /dev/null
+++ b/acct-user/postfix/postfix-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 048ee2e91d11..99cba270de54 100644
--- a/acct-user/postfix_exporter/Manifest
+++ b/acct-user/postfix_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix_exporter-0-r2.ebuild 288 BLAKE2B cfd3f7559f4ad3e0883211d751539992141f1e3f7f1faa324f5dc6bff8edfe8798d29ae7f1377ef1ff854c6c93922e63e7864f7ac0e5b334769d67a686e0583b SHA512 7f56e61084701490ff700462916c09a8c54b536e0c4da3e07c9181773bfd84c51b10d75c7b83db79501c2930dbb7fd6a806530be492598e1eb75efec7c74c00a
+EBUILD postfix_exporter-0-r3.ebuild 288 BLAKE2B ee9db6539d9d7940984f05fe8eff42f0854e13b2dbfd3dc490881e725494157f47251b351695ffac55942b2d1a2b4bf356fc5f4400b0fcc50360e575bdf8c9ff SHA512 9fefbbb07c8ed0d5dabcd0176bed65f74823630b4aee5f007481004de2c070eec080af6055d4c48c56f54939a84a474158ae3b451a349f38c3855de6ce16fa41
MISC metadata.xml 250 BLAKE2B 24647b7269305eaebefbb6426c3543e9ecab2b478004d4353af64dd2281fd139059d4ff4450ea7545d357c3f14583e8f9acf6485abc570ef4a8ed053cd76df67 SHA512 5b3a845086e7023834b58c81bfc93f332349e17898f3bec944fa9430e419a5cbf064de5e71cdbaf570e68dbba1d69a8313c99021f8b68a94ef07f53cd52c34fd
diff --git a/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
deleted file mode 100644
index eec25c5cbfa1..000000000000
--- a/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/postfix_exporter/postfix_exporter-0-r3.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..662a6bfe57df
--- /dev/null
+++ b/acct-user/postfix_exporter/postfix_exporter-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 746bf607ef28..ab328785c827 100644
--- a/acct-user/postfwd/Manifest
+++ b/acct-user/postfwd/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfwd-0-r1.ebuild 248 BLAKE2B 0b769d0ca58ac82bed9a87763fea720d59feb78f6f11c6ff0ade529bdf0730e654bf77f454f8ad7f953fdbe14780ce057aa39aeb3aa672f4b500dcc9bf51ad54 SHA512 f644cc754ac46225f0aabaa7a27f650b90bef7f580fce4b991ec1f64a415763aeb1b4ea53798faeba18a528fdecf34883900d89491369a203b6019a0b3835455
+EBUILD postfwd-0-r2.ebuild 248 BLAKE2B eb0fd512ccefee10fcf58057db9e6c1536f191d240dcca272f3f08f4d132ce4396f8c7876b440ca4d224e3cc9bc1b7c47f035508bb3a54aad030f8c6842fb6c4 SHA512 64dad00478fc5004ecb522ee6b48eb70f842282a29c995b4d9d25ee23c4e18b9b699090edd2c04815325e5b986d61a79649372f8089daab90760df323011fac4
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
deleted file mode 100644
index a9f9bb00ff8d..000000000000
--- a/acct-user/postfwd/postfwd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/postfwd/postfwd-0-r2.ebuild
new file mode 100644
index 000000000000..9bf5a7e27252
--- /dev/null
+++ b/acct-user/postfwd/postfwd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 52c3f3ed4b3a..11318be1137e 100644
--- a/acct-user/postgres/Manifest
+++ b/acct-user/postgres/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres-0-r2.ebuild 329 BLAKE2B b0f8eebff1de8f254d23effda8f6b5e6638937ca71e740b87137ddf48ec86b5ece1b4d0cee0e5d9db2b673054319cb1acd2964af44c01962080b5db2f5d79cd4 SHA512 71231f9291e6275af67b193f2178af90463c7b9a2542fbdbc77b827f6bac78c085d6761ecb8f66a24eb02edb140ae8c936656794c42eff6f6fe69ca817dd85fa
+EBUILD postgres-0-r3.ebuild 329 BLAKE2B 9665c7f21acf83195704e5d0e81e64810ef4bd8590466c389c9604f58fe7fab5e442631196b1c41e88194b212df3f6370851fc02f693033ef2413c997fa5a049 SHA512 15dc42be01673c42d90129d0e3ff8f04d6ae794a81c31195f71cf86048b1973e31bee337363909be0b04ea62473e4a209f343997798d5a58526083e57e7d9b84
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
diff --git a/acct-user/postgres/postgres-0-r2.ebuild b/acct-user/postgres/postgres-0-r2.ebuild
deleted file mode 100644
index 4bc70595c4de..000000000000
--- a/acct-user/postgres/postgres-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/postgres-0-r3.ebuild b/acct-user/postgres/postgres-0-r3.ebuild
new file mode 100644
index 000000000000..26a32fa3af3c
--- /dev/null
+++ b/acct-user/postgres/postgres-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 dfc9b4a1b604..c2320b057620 100644
--- a/acct-user/postgres_exporter/Manifest
+++ b/acct-user/postgres_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres_exporter-0-r1.ebuild 249 BLAKE2B 70d77b3c155a7e39cfb448488a6262d8f12de029576f55e6710c0faa99df006ac99c978ae39c6abf623da9269016f11e705ae705cfc4670c66549cb468ab7ed6 SHA512 ce7969910c53c6d9a369f6d4bea4bf5e8e9f34ec6c25556a5d053151b548ccb72ceb63a9f318ee21b0296e3c03fe09850ecdb1c81af2e00c3f05d081a1b29996
+EBUILD postgres_exporter-0-r2.ebuild 249 BLAKE2B 8bc58767325c131125edb1180fa1d0e46828f5a9040ad10fdb2cdf110a41466a7937e885b06f4bbc105deed36820b1add0dabf093ef78288252e531fa2054f25 SHA512 1f722e7063dbc19d244221d9356408b443ba5093fb02428b981ba773d2cfd613e9d9430ed9de5977f2550132d63a58aac7ca1c95ab8193c5e2597561d31dd30b
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
deleted file mode 100644
index f451c6f3ed15..000000000000
--- a/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/postgres_exporter/postgres_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..b2878b604a0c
--- /dev/null
+++ b/acct-user/postgres_exporter/postgres_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/postmaster/Manifest b/acct-user/postmaster/Manifest
index 9effd5143c36..bbd1ad743e6e 100644
--- a/acct-user/postmaster/Manifest
+++ b/acct-user/postmaster/Manifest
@@ -1,2 +1,2 @@
-EBUILD postmaster-0-r2.ebuild 313 BLAKE2B 6d32e82a9a63166f740f00bf0eba03f5496b3ede61e03059aa68ea1eb8f8c8cf89cedc6b2718d77e73c5df95cdef572b649f49b3fa9d0e7a29bbc5f2082526e2 SHA512 6bb9c9523b48d9a3cc3c77a40c6fd7911167b47cc476d1640532b7472bc5dbb8836b12e244ddd5477ddaff74c8a04dd61a534fdcd7205c78da091ad495567eb1
+EBUILD postmaster-0-r3.ebuild 313 BLAKE2B 3a43fd28e7ed355f512644408af8fb970bc0eec364127ad3812a505d52ec94267d755caebe68dbf35b5a2305e845f2e032bb99aa04f87eeabcfbb049cb12f997 SHA512 3f40ec44b93f632d66b171dfc71a7c66c3c2db0560a93349c976e4942ceacd532419fd8402cbcefa91827ccd7844e4486aa7df326f84b703e5a14366d4a63d49
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-user/postmaster/postmaster-0-r2.ebuild b/acct-user/postmaster/postmaster-0-r2.ebuild
deleted file mode 100644
index f2ec25973733..000000000000
--- a/acct-user/postmaster/postmaster-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/postmaster/postmaster-0-r3.ebuild b/acct-user/postmaster/postmaster-0-r3.ebuild
new file mode 100644
index 000000000000..30de8b34596e
--- /dev/null
+++ b/acct-user/postmaster/postmaster-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0dc796cbde52..9d9d9eca8b51 100644
--- a/acct-user/privoxy/Manifest
+++ b/acct-user/privoxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD privoxy-0-r2.ebuild 253 BLAKE2B f7f6b1a3345b22d385f03374a8a715e20f1b4a5b86cffa8de8144e0efbac0638aca73e8719eb4555019443058b31bf299b15fe070cf37a8203ea0abf00fa502b SHA512 0fd1908bb7e003d171688cc71364ced53543b1a183199dd481c5f3fd0ed9e26265aa24ab2564cbb6f324b1c10a91c94b81adf3ea51b5f58e62a0cb8c3999e5da
+EBUILD privoxy-0-r3.ebuild 253 BLAKE2B 3e74cbee9ba9fcc82fe3fae936f893221a5eceaf58cb05cc123f636173ba1c487bbdc74fe5fe2069c8b587003ba5e068c8cec89c8e9069a43f4d38c6615d75f8 SHA512 94f71eb5fc73e6f230d71561b9f567c7538cf57d3e3794eae55a85b58805e4b5c8042010c1ed61c084f13a27b771f700be468369df60550b11333fa8bcca78ef
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-user/privoxy/privoxy-0-r2.ebuild b/acct-user/privoxy/privoxy-0-r2.ebuild
deleted file mode 100644
index 2afb11613a43..000000000000
--- a/acct-user/privoxy/privoxy-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/privoxy/privoxy-0-r3.ebuild b/acct-user/privoxy/privoxy-0-r3.ebuild
new file mode 100644
index 000000000000..dd53ad4ee679
--- /dev/null
+++ b/acct-user/privoxy/privoxy-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 886a03c638df..549d88c8d800 100644
--- a/acct-user/prometheus/Manifest
+++ b/acct-user/prometheus/Manifest
@@ -1,2 +1,2 @@
-EBUILD prometheus-0-r2.ebuild 270 BLAKE2B 0c92917e66542262229d538744457d41118ba0be91fac441c48b265e81a23541cf14f1274cfb2d8f212407df8d91fcc157817823325a8574304f06961316fce0 SHA512 9a0a4af3d1e4f909fc22fbdaa85f296834d038d8b665024b75ad597ba1ebe96242f94115bf590091039052027ef98a425871c14b31ab5f34eef8b4f4f79355ad
+EBUILD prometheus-0-r3.ebuild 270 BLAKE2B d67ca581f056f80150d6ade6277b419b0e786ca190964a50709de0ef410acacba5d366b65a400b22652768b8c3da0d16a3413ba417acf5efc5d830b7a203ee8e SHA512 d315e423882b080dc8d2742d171ea389f9dfb29b78996bc6befe6c8f86f855591fc26109fcd48ceed5ad41a90b062854b73389f6e84824fd807b6312f29a6a6b
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/prometheus/prometheus-0-r2.ebuild b/acct-user/prometheus/prometheus-0-r2.ebuild
deleted file mode 100644
index 048869dfe9b9..000000000000
--- a/acct-user/prometheus/prometheus-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/prometheus/prometheus-0-r3.ebuild b/acct-user/prometheus/prometheus-0-r3.ebuild
new file mode 100644
index 000000000000..e185fd357c45
--- /dev/null
+++ b/acct-user/prometheus/prometheus-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/psybnc/Manifest b/acct-user/psybnc/Manifest
index 405b46a515ad..efc50454a538 100644
--- a/acct-user/psybnc/Manifest
+++ b/acct-user/psybnc/Manifest
@@ -1,2 +1,2 @@
-EBUILD psybnc-0-r1.ebuild 273 BLAKE2B 86e8cba3538b2f74b9ea552ee1a952bcd7c4be3ee55854970e967ab64097e52d7956dedbe04d4ff59337bb2eaddc9ac3f42274946798ee83c610e948d0e5af20 SHA512 f7365659d85db38ca7f42d96bdfb5a4bc352afdd220f5387aaae080c5c22bb7e2d9f3abc4f23470a334cde4ac50a14b6640bad4991060329a5cc3d58e5992b4c
+EBUILD psybnc-0-r2.ebuild 273 BLAKE2B cbc9da54e7539c6df4598ac061c423d2ab4006c20a6640a80fa643226bef1a5f8682b5173ba7d1ad248e732bfd859b209ff4d7d2a33e2f839e0167e2b5576814 SHA512 bd296449b41dd1d4f85eb7850ff9cb882a1461cac225e9e7d00870159d0136eedfc41a9a118f6960c272cfb6984f9b8fdd245de45ad3f8490532ad4ae7c8edf0
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
deleted file mode 100644
index 5d2635b896c5..000000000000
--- a/acct-user/psybnc/psybnc-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/psybnc/psybnc-0-r2.ebuild
new file mode 100644
index 000000000000..bf51cc9ab04b
--- /dev/null
+++ b/acct-user/psybnc/psybnc-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 582ce611cd9a..3d18193855a7 100644
--- a/acct-user/pulse/Manifest
+++ b/acct-user/pulse/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-0-r1.ebuild 311 BLAKE2B 1253db627e39ca574b2d430db04093f861a73e6fd44c8d17f95469b0d19bcf4c62c10eb203ce7a5dc999ce380f29898b379a9d308de60c35ce3979c492159abd SHA512 8d24118920f8992ca31cb3309ccc1fe0a4648b7bd2a6a0f797f4f9e824e80b38031cad5c26e739859fef4fbd7c7947842b46551dc7310d2ebf1b7aacc22a0361
+EBUILD pulse-0-r2.ebuild 311 BLAKE2B 4f79976314f0e103f494ad50cd95bf8b41993bc8bf1e11a1542578bd34ca4c938bd341c9f4e699b92eff08f039beba50157e1ecad1d7146129db6fc77c754e9a SHA512 8ed66b729e903f35bf3138fbcf620e3dc06674579dad1fc115d17ff2935a7c76915b7a12ed0c7065c227c5087a477cbc530e45194b2244d47a1de1fd7994635b
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
deleted file mode 100644
index 88465175512a..000000000000
--- a/acct-user/pulse/pulse-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/pulse/pulse-0-r2.ebuild
new file mode 100644
index 000000000000..964bff103ad7
--- /dev/null
+++ b/acct-user/pulse/pulse-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 f0f4f6fae401..41ac0a647bf9 100644
--- a/acct-user/puppet/Manifest
+++ b/acct-user/puppet/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppet-0-r2.ebuild 293 BLAKE2B 399d924d4a31aa70fce85d37407b1f4d946bff4db37cdc1e166d82672afda20c263cc649033fbfc0440af43d8b42627f5dfce2071b3d61be7d730f5f22a67a40 SHA512 1c0f83ea36dde9009661d656278f3a6cdc86ace870469f95b23ba367a8b91b32971f05e9657dfaa0c6e4ecf3eb3f637c9be433af5a1017a33957f237a5eb254b
+EBUILD puppet-0-r3.ebuild 293 BLAKE2B 58f8cf1da5251dd2228da2f06326f36d8ff0aca089cbf019193c12997362288d32aaa6a62f7453e69d6a3aaadca30199004fdfcdbd8a9d60ffef99b8411d3fe3 SHA512 81654afc4f8e86cc00dbafd7706c1c483e5673ae054f4c0b6931812c49f502d78ee69ce0b55d63bfd854d300e461b80577826e37add45f614dfb08935d9690be
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/puppet/puppet-0-r2.ebuild b/acct-user/puppet/puppet-0-r2.ebuild
deleted file mode 100644
index 4e634ff27bf3..000000000000
--- a/acct-user/puppet/puppet-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/puppet/puppet-0-r3.ebuild b/acct-user/puppet/puppet-0-r3.ebuild
new file mode 100644
index 000000000000..b1e1138f13f2
--- /dev/null
+++ b/acct-user/puppet/puppet-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e066c861033b..a0a9f7536d90 100644
--- a/acct-user/puppetdb/Manifest
+++ b/acct-user/puppetdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppetdb-0-r2.ebuild 325 BLAKE2B f0417caaffa8899df8ecc55c25379ed274f8261e97bf24d12c81dd698431559ae3d7b31f5f3429f96ad1e45c61c7ca6e0f48bfb3660f0d1f5925818f6e8fb2df SHA512 c504c82f423afa444c80052f44a95b7851b5f33ce4e9974fe8201d1d7b2acc3b362e8352724ed9cfb780029006708a775836e54921a318b7c2fe5df69ca64ef3
+EBUILD puppetdb-0-r3.ebuild 325 BLAKE2B e2e7f02949a58c5f3ca42dcb3b2adc615e258d79f0f84b991aee1405c0c5103bdb7219c9f07b634059b3c2a88a43674d7b826f533e69d3faede697bb9c9d9640 SHA512 482210a9cd083f0188eadb80d09c61d5c2177f2c654123731e62bf31951f99aefc70354075f0e2b05db98633245cf30401fdc4275cde0a4d91f68a16ca6e24df
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/puppetdb/puppetdb-0-r2.ebuild b/acct-user/puppetdb/puppetdb-0-r2.ebuild
deleted file mode 100644
index c509fa9a158c..000000000000
--- a/acct-user/puppetdb/puppetdb-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/puppetdb/puppetdb-0-r3.ebuild b/acct-user/puppetdb/puppetdb-0-r3.ebuild
new file mode 100644
index 000000000000..3f77d7bdafcb
--- /dev/null
+++ b/acct-user/puppetdb/puppetdb-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 527ce12b9aa1..ff9de4d5f141 100644
--- a/acct-user/pushgateway/Manifest
+++ b/acct-user/pushgateway/Manifest
@@ -1,2 +1,2 @@
-EBUILD pushgateway-0-r1.ebuild 256 BLAKE2B d2b66b812a9678f4234622631b6d85ef661916d37dd766c385a56e1dcbea8bf22b7acd01b445f97ebe6e7bcc73f4db0c4c3daf6cc182e0ca22c927ce542bb278 SHA512 af60d89b59a530b9ee6910cf7b30f4752a13089606e4207fef374ef03e04b9dcf4c46ec569da12a2aafc67f8f91fd7c40d18804cfc8abe2eae4664880bfb55e0
+EBUILD pushgateway-0-r2.ebuild 256 BLAKE2B 418ce6c5c93d6e676a3996f2c23db26d21c981f682e20bb3e98b1562e9ad843aaa368b975744a41575d65501898120851e13515688760d7f21b3655c8f3b570f SHA512 d60c065b9d16dd078c646c728f6823f999b60bf374b7f72c5f1cedd6c7435e45bc6ff8684cf019d03c234e0955abc7ace5b89a88fe94950df1c749090bc2f891
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
deleted file mode 100644
index a7a92c4456f9..000000000000
--- a/acct-user/pushgateway/pushgateway-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/pushgateway/pushgateway-0-r2.ebuild
new file mode 100644
index 000000000000..63861a8c87db
--- /dev/null
+++ b/acct-user/pushgateway/pushgateway-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 cafb1775b300..540ad22c0fd6 100644
--- a/acct-user/pvpgn/Manifest
+++ b/acct-user/pvpgn/Manifest
@@ -1,2 +1,2 @@
-EBUILD pvpgn-0-r1.ebuild 275 BLAKE2B c9191b4b984c2108cfbe7bbbaa93cf9d822740e6d4f0ad00a9de62f0512630590ed952ed04fa0a8dadb3f6b0516558f992162b76cee0ba140e822703b85a6739 SHA512 5992576fe68e3360ad67ef7f834893198291db2950b9067b0d1cbc4f4e9c9af6fe6cfbfbcf21c83c86553b3a1ffda5901951123377de9a939f46f3332211b784
+EBUILD pvpgn-0-r2.ebuild 275 BLAKE2B 91c185aba93e8747e8e90501a4d12b89f041e1ea6b83cdcd086ee58baa8588d9c86aefcc060c3dd1bf8dd4dde09a714a6a5a2ba6820ec89a7b8a67d04f38fa33 SHA512 c71f9f3966efbab9168acb3a6a527caa2a22d1ebd2b7c9772d3712b8c688ecad835cbcd2e019f3627335f836486c41a7032cdaf3ef7101983df4b0b515600fb7
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
deleted file mode 100644
index ddabd61a188e..000000000000
--- a/acct-user/pvpgn/pvpgn-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/pvpgn/pvpgn-0-r2.ebuild
new file mode 100644
index 000000000000..acb989253b23
--- /dev/null
+++ b/acct-user/pvpgn/pvpgn-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 55f4e2a36a82..fd81aca0ac83 100644
--- a/acct-user/qemu/Manifest
+++ b/acct-user/qemu/Manifest
@@ -1,2 +1,2 @@
-EBUILD qemu-0-r2.ebuild 198 BLAKE2B 01e2e45a3a86887f0c1809c4f5b9c5cee3226afe81c4ac4637b049fd37086cdd69d56c87db755d70c25e18acd500cdf8dc5715f9467c1c148efb7bb969ea946d SHA512 015f383b96f744b4fc5ee4ddbe2cc77570d4881161e4ed13b6a0d00369443fdb454baa35432cb703e54246a840b11f0d1798dff0a97fff9a131a25b5598f2e09
+EBUILD qemu-0-r3.ebuild 198 BLAKE2B 1749a174ab3c1faabe61a1611bcadd7d0952d7d04f39f002477ac1b3ed15cf9531d50cfadd7744253db39277e39a0b4c624e5bca4cd0ff510307876d2d5603d2 SHA512 ffaf80d5ed4c4ccd693348d4d7e6b98351f569c3bba47ce0fbeb8681f57f3bcbfcaf579183f06bade694dbc5dbbfe320fec559ff355a10e478a659d29843ef80
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
diff --git a/acct-user/qemu/qemu-0-r2.ebuild b/acct-user/qemu/qemu-0-r2.ebuild
deleted file mode 100644
index ca7ef414b25c..000000000000
--- a/acct-user/qemu/qemu-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/qemu/qemu-0-r3.ebuild b/acct-user/qemu/qemu-0-r3.ebuild
new file mode 100644
index 000000000000..74fecd50469d
--- /dev/null
+++ b/acct-user/qemu/qemu-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2970c4031747..b6c28d4efac1 100644
--- a/acct-user/qmaild/Manifest
+++ b/acct-user/qmaild/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmaild-0-r2.ebuild 233 BLAKE2B f2f0e4cd7ebc1d4463e4c2d3893be4f69bf9f65d96906315117ed24a1eef790aa84dd189e084a4859a5c4de29dfcd8546ec84a22f94088a8a0b82e5ba4f32213 SHA512 d151fdaee174785902b9d237c7d03dd578732a04b51bb729f6c1e71c2db21b37b414a5b887bfdcc29d381b3d887f692810c47f91f8e5fb3570e21daa0f433597
+EBUILD qmaild-0-r3.ebuild 233 BLAKE2B 198dfd2e2e4cdc640957cd5ec3c5bdb9c46dbd0911e38c6dbca82a1d40ee6392759149ece72424047f23cf53a1422ee7471a81f16a110c660830e707984276d5 SHA512 221b1ccbbe98aa0e2d7d464617ef968f2377b2d65d27c4cdb1056445ab45608b82c228f0659dba17528e11433283d3cbf560f76f532be4c7cd4703c0f2935073
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/qmaild/qmaild-0-r2.ebuild b/acct-user/qmaild/qmaild-0-r2.ebuild
deleted file mode 100644
index c5d19a59cf46..000000000000
--- a/acct-user/qmaild/qmaild-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/qmaild/qmaild-0-r3.ebuild b/acct-user/qmaild/qmaild-0-r3.ebuild
new file mode 100644
index 000000000000..789169827814
--- /dev/null
+++ b/acct-user/qmaild/qmaild-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c622fee3e346..1ba43c55395f 100644
--- a/acct-user/qmaill/Manifest
+++ b/acct-user/qmaill/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmaill-0-r2.ebuild 235 BLAKE2B b81459112c64532791f1dc5328fb70eaa5ad9f8e913385f073f02c148d939cada9dfabbc0a70f889b654253cff18dc47f6001dd10b2172fe5c34edbc88812d4e SHA512 6444dc7203ebe0e728584b5d1998eb9756b806669e1812cb17caa558d7934d6d04f11e8072a5c889ba0a63f65d2b43e3f90051dce1224f593f3f01a51db02c94
+EBUILD qmaill-0-r3.ebuild 235 BLAKE2B 3ba0af99b11379b687fb4f95a6ae5f8c0a843ccc2450dcfc8441c6923a0e3224cb2faeb2906b05e1ba38c1acfe6a3bf340f840a66b8089b93d35f4273cfc7582 SHA512 4a06318bd87fa3c78112b454ddc53c712dc166ba64ac40abfbd6adb3bd505d0b8d62c087aa3efc8bd569483d5cfbf0994f4d92a11f60069abaadb6b229fcfcba
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/qmaill/qmaill-0-r2.ebuild b/acct-user/qmaill/qmaill-0-r2.ebuild
deleted file mode 100644
index 58863dc7fa00..000000000000
--- a/acct-user/qmaill/qmaill-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/qmaill/qmaill-0-r3.ebuild b/acct-user/qmaill/qmaill-0-r3.ebuild
new file mode 100644
index 000000000000..ba53d9de0517
--- /dev/null
+++ b/acct-user/qmaill/qmaill-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 58e7f0f1f6e5..5fac63efcd20 100644
--- a/acct-user/qmailp/Manifest
+++ b/acct-user/qmailp/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailp-0-r2.ebuild 233 BLAKE2B 1400c916c64891b6cdc217fb3edb91691f3ad774eebed5056ea3795e4c78c66c1b8b74d46d6917355a0c44ab4ff1e7c583f69920d8b2861ece0810e2b808580d SHA512 352348f3f13bdc75fb91cfb864cd8948791ee43ea427ecbfdbe728b5de2eff62f436639a2602b5bb61bd74e74cf44e74dbc409805c9a5bb886c697ae501062fd
+EBUILD qmailp-0-r3.ebuild 233 BLAKE2B 3e709e5acd25334f94579a7eca98289f9237105e1f12376f9510db2bfe320fac9a86c876675e43089ff8dadd2067cee3de3076e2881c97e71d03fe9111f2d4bf SHA512 e20d650a73f6a2fe3e074cd6e07cce5b6684e01940d4d7fde96733f511e0f7e2d61487321ff3bb356c93a751e8bd278a7317b31004a69f39743cf0556f5a22fa
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/qmailp/qmailp-0-r2.ebuild b/acct-user/qmailp/qmailp-0-r2.ebuild
deleted file mode 100644
index cd06f3ce8ccd..000000000000
--- a/acct-user/qmailp/qmailp-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/qmailp/qmailp-0-r3.ebuild b/acct-user/qmailp/qmailp-0-r3.ebuild
new file mode 100644
index 000000000000..f5c41cdb266e
--- /dev/null
+++ b/acct-user/qmailp/qmailp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6fb15b0ae415..0a9dd85e944b 100644
--- a/acct-user/qmailq/Manifest
+++ b/acct-user/qmailq/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailq-0-r2.ebuild 231 BLAKE2B 5d5d333c0b28f5b8acd3c4e753642052d16a35521415fd6ff95d8f1e0e5aa5d655775cbb5d7099f4ea4f2b157141410750a828932de2e8628260e4ea7b4bdf20 SHA512 c6dea88197fb89fdfc16435d4b867e492c19f6176244b1bc57c97bf5eb31eb5648ec56405e1947ab74b74096bd59d67b47702cdcca7b41d1cf98f92ee2517cc1
+EBUILD qmailq-0-r3.ebuild 231 BLAKE2B 5e26e64bf4ea48e38c92e86ba1659905d62e4729effde760b6197f084c09f39fc9584589eb6b60090d2d4d6f1f24bf18b3ce9d123e0f43aaa11397b5b3c1130f SHA512 66c1b22ae8f532e26eb49aaf9ec1e2154bb6dc80b8b18b02c52ac29df5c9495c86555cbda12904f3f2096e0225be1b3428fa24c0ae7b3b2570232bb61ab3f34a
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/qmailq/qmailq-0-r2.ebuild b/acct-user/qmailq/qmailq-0-r2.ebuild
deleted file mode 100644
index 3f48c735c70c..000000000000
--- a/acct-user/qmailq/qmailq-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/qmailq/qmailq-0-r3.ebuild b/acct-user/qmailq/qmailq-0-r3.ebuild
new file mode 100644
index 000000000000..f5899c7e262b
--- /dev/null
+++ b/acct-user/qmailq/qmailq-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 20df193e8c6f..a21dafe93af1 100644
--- a/acct-user/qmailr/Manifest
+++ b/acct-user/qmailr/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailr-0-r2.ebuild 249 BLAKE2B 337cc1df1911592bf54e4d0c4cb329d554884b355a16d8fa8c6e8065426caf5c48780425a32d67979be1c0135ed904cf58e8216a152ffd615e675ca0cdbb573e SHA512 1bc49f3540759f26836ae97a6b30b6e57b1db562b9eb76196164f7ca71627cd1d68c0a0fd3cf118089628c80e84f92c07f766b8887f7b6dba7b10f21a8af1fd2
+EBUILD qmailr-0-r3.ebuild 249 BLAKE2B 28ced4bd84c94c7fdf77dcd82e4c45503deb963b4de293a76f20f845c37ab2a6b4a25d7de8b2558080ae4eefb8d0ee7fd5b1e999bf0f36f0defc077289a6edc7 SHA512 bd44dad8d0af093b8bf5b0e07ece642f3522529ef0b8471fb173db14e9cfe8f5d2b833cddd6d0d068b3e81dee70b9b6088fdfedc76118d425bce46421b178ca6
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/qmailr/qmailr-0-r2.ebuild b/acct-user/qmailr/qmailr-0-r2.ebuild
deleted file mode 100644
index dabc73bfed6c..000000000000
--- a/acct-user/qmailr/qmailr-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/qmailr/qmailr-0-r3.ebuild b/acct-user/qmailr/qmailr-0-r3.ebuild
new file mode 100644
index 000000000000..d90e4c178718
--- /dev/null
+++ b/acct-user/qmailr/qmailr-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 674db3adf86e..4279ac37ea94 100644
--- a/acct-user/qmails/Manifest
+++ b/acct-user/qmails/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmails-0-r2.ebuild 231 BLAKE2B bfc936515840995a2c4643fe3eb584f0cd76309cc89dce8c5a3871473c43709cefdbc60cc04086bcf5b69784ec48c28b518d3fc196f74d3a18a696524c672a56 SHA512 102c66e127215835fb18aae3d83326d0381f1ff3005460eb964581ce12942a66f5f035cad85c752cdb0952aca4883bcf0e139260bb08553486dcbcd01655807e
+EBUILD qmails-0-r3.ebuild 231 BLAKE2B f89cc8a13202c987daae289328861421f85d1690c533045e08090d06a35db22f762d7d4cf65dc127688dd6e20278bc03897ef442c37e11be78ec6b1bfdc40d5e SHA512 973b827ea20791065bbb0f9b436225cbe30d9c1d0fcb94abe5f1143b40e994e438461479c8d55082f15680f37a82566d5fb12d1025c1717e4802c0aca689a3ff
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/qmails/qmails-0-r2.ebuild b/acct-user/qmails/qmails-0-r2.ebuild
deleted file mode 100644
index 7f26ec2f89b3..000000000000
--- a/acct-user/qmails/qmails-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/qmails/qmails-0-r3.ebuild b/acct-user/qmails/qmails-0-r3.ebuild
new file mode 100644
index 000000000000..9ef8ed0506ce
--- /dev/null
+++ b/acct-user/qmails/qmails-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/rabbitmq/Manifest b/acct-user/rabbitmq/Manifest
index 3fbb96f5eed5..93f9d13c71f8 100644
--- a/acct-user/rabbitmq/Manifest
+++ b/acct-user/rabbitmq/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq-0-r1.ebuild 317 BLAKE2B 36666ca0e5dc21fae4e6f2146843cb92ae2e7f25da88ebd78e76232f96963488ca0713e37b6b04a6aa2c28cde61bf2bf65cb9b355de8cbdb361b7e3a965c818e SHA512 686d90d8129db3968f9e3e21413747f4c6666158ca36b0f5a0c06bb9f434e4cb25dede39ce76db742bb5a7859c617971b165bb96e62d39493d3eb0ea6f1aac0e
+EBUILD rabbitmq-0-r2.ebuild 317 BLAKE2B 3e56e24d0ece5d70ca0c1ccfe82da5b1009d4d617ef64b6c92e39587b07dd380afe7a876f9c68593caca4565c621c4b51f94c99a5d71f8652bd963c01f6def1b SHA512 01217689d6476284acd39ee6e359d3a626b046a501c81181a9383945a07673c4d74b2eee699551bb90fa0af1113151c91b67c32ce3d9948ecdf4d4906451625f
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
deleted file mode 100644
index ec27b7545b5b..000000000000
--- a/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/rabbitmq/rabbitmq-0-r2.ebuild
new file mode 100644
index 000000000000..f5fce0c26e29
--- /dev/null
+++ b/acct-user/rabbitmq/rabbitmq-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2aa984d64da5..1b9f29553ca9 100644
--- a/acct-user/rabbitmq_exporter/Manifest
+++ b/acct-user/rabbitmq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq_exporter-0-r1.ebuild 263 BLAKE2B 909cbeb33e86f1ed31067602b0dfd13e583cb7960fec3c4ea61e72ed93a77e0294e1b18a17863b6d6d8e8bf183cdbb330bd5a37077e53bd7edd6bc3e1915637f SHA512 3e7203e92e392cfc888f3cac8c6b1e845cbe0e6e697bfe31b8a2570a08d3c2ba0beeb7f4b2768b8ea222e496cbf13d09ee35a44cb20b24c31516780f3d1acf55
+EBUILD rabbitmq_exporter-0-r2.ebuild 263 BLAKE2B 88ac16e1a88465acbcc1d45461cbc8d53c44b5dfc6bacccb3877265f21ea6731c0680a9dcc14381bd30b9c2a4e959fbda9a549fc2f536a3401346be298f0567e SHA512 917d2028bfe9fab909c698ae989f51ffff5ee6cd7e533b03b96dc43b9cb1ff7fe856a9dc2a02ddb7a42ba27a0cbd7d07daf4aa11021b41d242f9088618a1dd16
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
deleted file mode 100644
index 78248a6b75ff..000000000000
--- a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..c980a0356c8f
--- /dev/null
+++ b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/radicale/Manifest b/acct-user/radicale/Manifest
index 06bf71f8ee5d..1e555e911314 100644
--- a/acct-user/radicale/Manifest
+++ b/acct-user/radicale/Manifest
@@ -1,2 +1,2 @@
-EBUILD radicale-0-r3.ebuild 273 BLAKE2B ba3bc772ba745c24bc4bd050fdf19a275c8822d7fafcc71efb61b2232e152a123874adf757e54df2e88b4b29a66add019f912690d907964c9ef6468e72739ad2 SHA512 ba01d4fac250f9eda6b8ba4b9856023680df862ef96fd00cd5cd7f63e86af076b87b3ba208dac8e21144dbcaa7565e23c5172b41264a2024c72aa0c4d62a7f99
+EBUILD radicale-0-r4.ebuild 273 BLAKE2B 0fcdcd58b8fc7398c88041979ebce5d97e3d41c8e520026fac868350dbbd215805f39bc64044ba744df0a0773781558cecc7787f5a63091015ce99aa0a352dcb SHA512 51fddc755ac220bf0946e4217faff2556a08af86053dcc18d88364934e406aaf789f3f5818552c0f5204715c1d48652429c59308481bcf257ce50b57e982fd24
MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
diff --git a/acct-user/radicale/radicale-0-r3.ebuild b/acct-user/radicale/radicale-0-r3.ebuild
deleted file mode 100644
index 75d00441a126..000000000000
--- a/acct-user/radicale/radicale-0-r3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/radicale/radicale-0-r4.ebuild b/acct-user/radicale/radicale-0-r4.ebuild
new file mode 100644
index 000000000000..1e29e79f762d
--- /dev/null
+++ b/acct-user/radicale/radicale-0-r4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 52d1ed74f4e9..6d51778ccbee 100644
--- a/acct-user/radius/Manifest
+++ b/acct-user/radius/Manifest
@@ -1,2 +1,2 @@
-EBUILD radius-0-r2.ebuild 233 BLAKE2B 6e8d66eed9911a3387356d7780de05efb7eef4e68462963b51124d16d6876f57ea25bc01ca266b39865a0c3d428238d6c25571667e5fbfbaaf6979ed67cdc00c SHA512 f14c9e9f3c9354d3408b1fda80cb2421066b8ed81134abaec8096cc8529beb0b11a25595257aa2fd55d92d18c71f51afeb11d071f5ce4cbe112a9ad964eaa508
+EBUILD radius-0-r3.ebuild 233 BLAKE2B 401f95c2a6792160a1545017ba0a31de1578b8a1b67de377a109c95c414eb515871a289399b82478bc146269fad363d0edb81ab7a32e06315f87cfc312d8bac0 SHA512 45b9e0b7619cf7dc000adc471401123628f0d3f6e258aa2d005188dc1dabe9ca83f4c34199ee84bdb6dd5559e453c21337eae9c228035b4f1cb28fe9f080223b
MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
diff --git a/acct-user/radius/radius-0-r2.ebuild b/acct-user/radius/radius-0-r2.ebuild
deleted file mode 100644
index 2611f8b3352a..000000000000
--- a/acct-user/radius/radius-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/radius/radius-0-r3.ebuild b/acct-user/radius/radius-0-r3.ebuild
new file mode 100644
index 000000000000..a9384d65b967
--- /dev/null
+++ b/acct-user/radius/radius-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 21209c932a08..defc4e9083da 100644
--- a/acct-user/radvd/Manifest
+++ b/acct-user/radvd/Manifest
@@ -1,2 +1,2 @@
-EBUILD radvd-0-r1.ebuild 258 BLAKE2B 288198478b32c2705ecadc482cad4bb2b4731fca9e5c19a9dbc9884112d0e7cb143a90ca2e513b7a08eceb76989fd5b609a07a822a2fc998f73bcf609c257926 SHA512 ac2102e7037cc11f954480c82d3a1c9f423fcb63c0cba9d0fddf3c451925dd1539610e393e29edbd29d0aff7e0b40de221ad3d40e713acb20a1b94f0310892a1
+EBUILD radvd-0-r2.ebuild 258 BLAKE2B dc2d6abc0459ecd9440c36a0b37bf4f7caa2dcc7dbbdd1e5b33c6746a960da59f8c32bc3aa8fcd9154d13de7a41bc0aaf29b0d147158c3155479bf164a24600c SHA512 41cb32127ad7e9ac9bc3ab6931825d91bb82e57a8971e41536d4fcea3896e26ce679ac03fad5c23cc1595504c0deb0996f37bbe211e4a5099d9c1a15724e423b
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
deleted file mode 100644
index d74fe7916643..000000000000
--- a/acct-user/radvd/radvd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/radvd/radvd-0-r2.ebuild
new file mode 100644
index 000000000000..781a0f7284de
--- /dev/null
+++ b/acct-user/radvd/radvd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c45aa0b95fbd..00b86ea12264 100644
--- a/acct-user/rbldns/Manifest
+++ b/acct-user/rbldns/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbldns-0-r2.ebuild 198 BLAKE2B 3ae83dfb49cef5a21662cb464237554c17a688b336173ea528bcad5f3b61967fcc2fb5b5fa2ba9a6761694c8192c2c3f0fa53acc5c6fd0deb560940431aacdff SHA512 ea9d166bd9287e43862fa6c747b7c90510a15d70e22fad2609042e430dce7c020cd020c7781b81533ceb1a47bd10bfc7e9db7747ca1a9fa9538aa7382a14dff4
+EBUILD rbldns-0-r3.ebuild 198 BLAKE2B b99cf95986b92683137f4d137fd6d31ebdfa2c9077e000dbf556ac3d2e1e47a381bc06e6ea3abf049a4fc9e58d427996a3476a8f1eb25c1980e2812ae8a3da7f SHA512 abdb41935f5beb68bd8ae9e3cc64a8137ca244373f43e325997313e6d78e02802d42f8794b4e4b774fcd5ef159b1edf27245b874b2585e3ab21c9d65c38823eb
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-user/rbldns/rbldns-0-r2.ebuild b/acct-user/rbldns/rbldns-0-r2.ebuild
deleted file mode 100644
index 43929c1fad55..000000000000
--- a/acct-user/rbldns/rbldns-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/rbldns/rbldns-0-r3.ebuild b/acct-user/rbldns/rbldns-0-r3.ebuild
new file mode 100644
index 000000000000..5f05e9ec9685
--- /dev/null
+++ b/acct-user/rbldns/rbldns-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b7bb51ccea6b..1ec65ae6b5dd 100644
--- a/acct-user/rbot/Manifest
+++ b/acct-user/rbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbot-0-r1.ebuild 269 BLAKE2B beb60d2ed630b9fc0b8209993e1eaea34e969d6d25775e70fe064f2c66fe99e729a928b7230285dd3e6c8b07f08e676052eb8475133ac577beae0bb478325bce SHA512 d7d330135c2ac00e564a35084ee65f6c600f3cf90f903f9ce0b09c9e44ef724d3ee3b3e17cbb969a5234f958ca3077440545c06fcd64ba45e60350e067974154
+EBUILD rbot-0-r2.ebuild 269 BLAKE2B b232177acf23af83c6985c291408e2a8286dc657e6a8c41c44d54a5026e3c84263997cba0e46a129e744fa76aabf6019692b28a095be2a7f5a41ebe40ed77d71 SHA512 5191bd586b685e79870bad890a530ca7d014b60b84d16bff0720c6fbcd6bf643f6f3772964a4a3e3b7991787c8fc2d100b6b58c62ea2df6ef967196a844456f4
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
deleted file mode 100644
index bf0c7c145e88..000000000000
--- a/acct-user/rbot/rbot-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/rbot/rbot-0-r2.ebuild
new file mode 100644
index 000000000000..a35ca0cb73fa
--- /dev/null
+++ b/acct-user/rbot/rbot-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/redis_exporter/Manifest b/acct-user/redis_exporter/Manifest
index 2e5b93c1602e..a18b7fe91190 100644
--- a/acct-user/redis_exporter/Manifest
+++ b/acct-user/redis_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis_exporter-0-r1.ebuild 301 BLAKE2B 38a15039eb8554a248a3dbbde5b0fa2567a713271834eb9111de844b048523be33d99e839958ca93dea14cf17869a87d33c5c06e40146cafe2e1720aad818b20 SHA512 62003cfe128d2e62eb891583a433680ca721c12d80797bb0f0e72e90a32654cfcd94168ce7146d1e85d01986077aee0feabc787ebd205203e2e27fe6a6f37aaa
+EBUILD redis_exporter-0-r2.ebuild 301 BLAKE2B 4a6d0065e5ba10a539f9d19c0a7cbff37590c76f2d3fd980b6fb0ce316beebfb9e43a27730485204c9c1796d2148ca0678142fce40945c835bbbc24b78e6b899 SHA512 107fdee4bb1f0e1c58358854cabecbec12c6bf3c399d453703a1d0cd1b4ad915bf52105cef1d913de4c033eac40b1cab01893b8a2856335692d2f50586575d98
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
deleted file mode 100644
index 9dc7b65510f4..000000000000
--- a/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/redis_exporter/redis_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..55d815b208c1
--- /dev/null
+++ b/acct-user/redis_exporter/redis_exporter-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 acac48f52423..5ec0349eb68e 100644
--- a/acct-user/redmine/Manifest
+++ b/acct-user/redmine/Manifest
@@ -1,2 +1,2 @@
-EBUILD redmine-0-r2.ebuild 236 BLAKE2B 4bfebe80927891a8e9000c9c474236a996f800e6bd2380b4603549048773b738e7461b79d5ac95f4d32562da2bfa31791e89127441d3bf29bcd5a160a90c48fb SHA512 c369d1a0a4804c1208a0407f1c85a954a6a8c0785269f6b632310a977988e81eb3c660d73b78622d578412b2881d352932c9f219e83c5231c7cae315b316b35f
+EBUILD redmine-0-r3.ebuild 236 BLAKE2B 441c26eca67dd6f8d26da22addf5c7cc0e8230f34fdf0e119f2fd20e8cbd1590c595e1fa9f1effb0b9baefdce0837a96e5c4dba3491e37e53d11862ad1722283 SHA512 a81f0fa20950d1f9648397f7c041cd75333f37e1cdb069211a024a0bba9cc1ce1333f6f806af497e0adb6f4dfef74f23487704e3cadb347a9a47abc552f03561
MISC metadata.xml 439 BLAKE2B b2e195109d27e64d38fa965e29a1759e01d7bd4377b9b239ebaadd35023bff49e2981d0df3102d395f368ac970188dc81d31d021dfc48bc4f17d486bd7bf339f SHA512 b82761ab3e617b9e1edce602ad937850ee801633fe478a91f16320f6000394ce4b5653c86ab227fc0b00bcf35331fe0b059f6b101942e22ad7673f6e7b54080e
diff --git a/acct-user/redmine/redmine-0-r2.ebuild b/acct-user/redmine/redmine-0-r2.ebuild
deleted file mode 100644
index c46f454cb5c8..000000000000
--- a/acct-user/redmine/redmine-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/redmine/redmine-0-r3.ebuild b/acct-user/redmine/redmine-0-r3.ebuild
new file mode 100644
index 000000000000..ad0a6f0c8c5a
--- /dev/null
+++ b/acct-user/redmine/redmine-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 04d77913ca66..a859f21bad6b 100644
--- a/acct-user/redsocks/Manifest
+++ b/acct-user/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0-r2.ebuild 248 BLAKE2B e6d339ae0e36dccb354b3dd6fd3e5390b5fdb55bc8e77fb44a4a6b27b394c30918dd11eb241be54d7bbe7595f831cc7639e1d624024d381e8791f29647e1fe72 SHA512 a98e66cdc73520ceb23a7cb2222b724a323d0b2d44e6da832f5ccd0de4affba6bdf4636912ed51dd15a19d6e4a9ba4322dbbe8c617eaea738ea5007413749f2a
+EBUILD redsocks-0-r3.ebuild 248 BLAKE2B 23faa7292a21197d9569b097f879c1f789b210f1997d49588bc66cf149f1bf9db837cc923541b2f20e614cfc50b7eeef6a9b112b33920bfb165b38200bf168b8 SHA512 2bc06a771cf98b1bb553cd1483fb98483729efd27790828954da66a5930384c4f3da5e762224cc6a480cdb4a532c37d82f2c45ad092fa89cdcb88b2f5ab21036
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
diff --git a/acct-user/redsocks/redsocks-0-r2.ebuild b/acct-user/redsocks/redsocks-0-r2.ebuild
deleted file mode 100644
index bcaa7b06c23d..000000000000
--- a/acct-user/redsocks/redsocks-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/redsocks/redsocks-0-r3.ebuild b/acct-user/redsocks/redsocks-0-r3.ebuild
new file mode 100644
index 000000000000..84742190bea1
--- /dev/null
+++ b/acct-user/redsocks/redsocks-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bf015204180e..44093924d1c8 100644
--- a/acct-user/reg/Manifest
+++ b/acct-user/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0-r2.ebuild 266 BLAKE2B 2dcc4d93cb84287b9c83bde19fc4a7f0299edff7816dfb37d0dcb1a1723be578fb1313e9cfebbed1d72ec2d2d7ee4ef3b6d17551625c317f5ad98a932ea3e4fd SHA512 0bff441471447e110d3433e401902027481a04d00aaa64a9d688cff551bb085acbcd2fb911f18f590132d31f5d4e339b3f578f77a4be4ada5bb10b0db188ef44
+EBUILD reg-0-r3.ebuild 266 BLAKE2B b34d6d27ddbf2b3fbb62c43eb9aff6b171ce2b063f5e80665e3297af01aaebc1b0ad3fa2c1eb36adc2240dff9e3046de2d4e70b7f6e6ba16895b1753ea9d7a53 SHA512 446b359ef56b90131d30c0546402a0174d6f249f549a3435b9fd0c539b462e11e8a8d64ad1468ee1826a384162669e10a1dc3e466de8dbec509f3e0a8e933093
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/reg/reg-0-r2.ebuild b/acct-user/reg/reg-0-r2.ebuild
deleted file mode 100644
index 908843687070..000000000000
--- a/acct-user/reg/reg-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/reg/reg-0-r3.ebuild b/acct-user/reg/reg-0-r3.ebuild
new file mode 100644
index 000000000000..56e0376f00d7
--- /dev/null
+++ b/acct-user/reg/reg-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 dac5449dcbcb..8c12746d819d 100644
--- a/acct-user/registry/Manifest
+++ b/acct-user/registry/Manifest
@@ -1,2 +1,2 @@
-EBUILD registry-0-r1.ebuild 260 BLAKE2B e78e293d142e191898c01bbbd65f0ba6a4f6d0088b048ac08fa45efa8d91a7726116e7138d61f793e50d9a7d722025bb6f6cce1feb691d5732d303732dc46174 SHA512 21ff211bb91a27732b847c1a757734dbbec30161c4582482bfd34d5cd283b623b1add069dd8ae99859e8147bf3e9bec7bfca490fd28fc32b06c02d5e136f5d30
+EBUILD registry-0-r2.ebuild 260 BLAKE2B ebf2903cebaf4303d4c97bd47ccdce2100aa572ac690a38f84495b73c2685ee22a2029194541618a7864789d17bff3f79eae93139f929f631c54194144b4a986 SHA512 e15a9659cf2ee20cde4180a9d29e269661be51de93ca8909e3c3cf8122f1c50eef88cb8f96808f6b7bd34f0e207209bea1d54dd845df56d6273e3a798a7b5c32
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
deleted file mode 100644
index 0542f5c6e243..000000000000
--- a/acct-user/registry/registry-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/registry/registry-0-r2.ebuild
new file mode 100644
index 000000000000..72ade46a4622
--- /dev/null
+++ b/acct-user/registry/registry-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 049d5fd972a3..f80f07702027 100644
--- a/acct-user/root/Manifest
+++ b/acct-user/root/Manifest
@@ -1,2 +1,2 @@
-EBUILD root-0-r2.ebuild 446 BLAKE2B 5293473378883e209b8dd42fa7c6c2d2f2658565ff34baa236530a5c4f92937c9837fc5ade1515f179d90b6112a8ed8463801fc5fb080ac5216230a518158087 SHA512 711f329a03412064cb6e220c6295fd0e40254779f9e9e91753d08979c1f9210893230d70d2fd59d1d8076141f7502156edc4f09ab7d04002733791ab6ef6c83e
+EBUILD root-0-r3.ebuild 446 BLAKE2B 3d824428873515222d9753d2cac1182941394c71649642ce3c5b7719d16758b82af6ffe664b4fdd0f619c96c6b414fe0a181a16646285171d151cbff1345dd7b SHA512 732a8aa9cb28218cc02c5115796ec9e06fda684a44e8e140df567e30bac4a9982ce6e0f720c8c313a73e56ff30ffeedccb09c8a59955dd2b877ce500b0e182b3
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-user/root/root-0-r2.ebuild b/acct-user/root/root-0-r2.ebuild
deleted file mode 100644
index 886f46d01e36..000000000000
--- a/acct-user/root/root-0-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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/root/root-0-r3.ebuild b/acct-user/root/root-0-r3.ebuild
new file mode 100644
index 000000000000..dcb37bf77d3e
--- /dev/null
+++ b/acct-user/root/root-0-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/rslsync/Manifest b/acct-user/rslsync/Manifest
index b580f366ce9e..a29492b0e45b 100644
--- a/acct-user/rslsync/Manifest
+++ b/acct-user/rslsync/Manifest
@@ -1,2 +1,2 @@
-EBUILD rslsync-0-r1.ebuild 316 BLAKE2B a4be5f2d215b95ca41d77f0ff7c938dac48af0177a54736a9c8ddf7bd503f2a32c270847c68047af2fc05ac5fb9af99fadc1c9c72b1b602782c2bc9457e638f4 SHA512 6826229a77fbefa0aa188b28665666804f41405da9ef1dd18fe0e0477a866cd580e143010b2f4d7b57713a3f294dc83f7b6fbbdf3cd138f9629a9a942ed06901
+EBUILD rslsync-0-r2.ebuild 316 BLAKE2B 4cf2d3bbdf90b4416cb21eacb7e91708efcf8fd44195be3b2396911811d48d84d38582b7b73f48b8ffa8daf55fbe98430783818672123ba81c549aa954a7ca97 SHA512 9f5594119d7266e7b017a9be9ab5d6e0df21c104ef5d31c62c2813f4ae000c2bb866efc01509e9ae993d198af90e0a9a70ccf010e868e42e2780cb0ec1effd03
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
deleted file mode 100644
index 58907429b95f..000000000000
--- a/acct-user/rslsync/rslsync-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/rslsync/rslsync-0-r2.ebuild
new file mode 100644
index 000000000000..81f285e81384
--- /dev/null
+++ b/acct-user/rslsync/rslsync-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 95e7106d6011..0eb8d5b430cb 100644
--- a/acct-user/rspamd/Manifest
+++ b/acct-user/rspamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rspamd-0-r2.ebuild 257 BLAKE2B 0c2c31f2d984760091c171f5b5bc583d4c2c072e7078cbb3ca6f6110a6b9c4f9dac58190f3c281187476be7520fc5fb5335b0ef1d1b0b3fda5154547cca14634 SHA512 4415adcd7594b1fe4bae205fe484bb2d3c2e362bfe46cdb61c5838d291c2dcefbdbc8ceeb763628d862a235ea4c8dde25b6a1fe368d5a165dd93a95e8b087add
+EBUILD rspamd-0-r3.ebuild 257 BLAKE2B b448b334ee1d8ba57f60d41604ed1b2140c6e19a57c259988a76d59a8b9f99499005ac07a2d3e734df057a4adefa762c2bd38512efc515e92fc71af9395890ec SHA512 f1ccb831337aa949d5e59f9f473fcdf17b9748ce69f4714f37889aef24c10a94692da0242633d34cabeac75a34ec9d24e058990d44af929f0d40e240a09514ba
MISC metadata.xml 252 BLAKE2B 7b4c6db66de4b1687e1efaacfff0a834b50c02d942b84c7513ce5b5f973e3afea36df6f7dd9170c3d37b44e10ff9bbc1081c20ffb2f9d403fcb78b114e3ce5ce SHA512 d040336c81e6e41b84af753049156cac544a9675591cb9ee03231065be9edf7005764e5e8d1d3f6a6217fa4155571ce56dd2edef6dcadb90e8ccd9b538130ac5
diff --git a/acct-user/rspamd/rspamd-0-r2.ebuild b/acct-user/rspamd/rspamd-0-r2.ebuild
deleted file mode 100644
index 445b38c43475..000000000000
--- a/acct-user/rspamd/rspamd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/rspamd/rspamd-0-r3.ebuild b/acct-user/rspamd/rspamd-0-r3.ebuild
new file mode 100644
index 000000000000..eb74bab3440f
--- /dev/null
+++ b/acct-user/rspamd/rspamd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/rtkit/Manifest b/acct-user/rtkit/Manifest
index 1d4804a75505..0b02d7b763d5 100644
--- a/acct-user/rtkit/Manifest
+++ b/acct-user/rtkit/Manifest
@@ -1,2 +1,2 @@
-EBUILD rtkit-0-r2.ebuild 259 BLAKE2B 0ed6aa9b8670d967abfe1adc9670f53f3adfed67947f20afeb0b5aafe048c80bf9a14b6dade7d83cf10a8c6e81b4b29f66db47b83610e8f70fb2e246e9678d25 SHA512 7dc969cc30abfa2f6cb97bbc7e25e11fb505be6f1cf214d9e57e23fa7c5856842b82007f29b7a3c1844cc9c86fb2217c0fb332548a6b2cc23116cda51578a9a9
+EBUILD rtkit-0-r3.ebuild 259 BLAKE2B 5e16bbc6ebdc918d47cc2ec269ec6058fb109a00eb10ca1fdf2fd20d642d056ec52cdf95e85eb44e8921b6752f3ae980e4d4c7ac0fa0f7d4033e768a26d80964 SHA512 f256c4e6e469d2cfd1f211c6a986fda0573b23a0eaa7b384b27491ce1f65ba7cd7b9706bb1b8e029815f4cac278765ddcb33c1c77c85c71f058eaa585511021c
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/rtkit/rtkit-0-r2.ebuild b/acct-user/rtkit/rtkit-0-r2.ebuild
deleted file mode 100644
index e37c9fff14f8..000000000000
--- a/acct-user/rtkit/rtkit-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/rtkit/rtkit-0-r3.ebuild b/acct-user/rtkit/rtkit-0-r3.ebuild
new file mode 100644
index 000000000000..c4c3f12bf9cf
--- /dev/null
+++ b/acct-user/rtkit/rtkit-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/rwhoisd/Manifest b/acct-user/rwhoisd/Manifest
index 16c4f91ff91b..f1f5566bf0db 100644
--- a/acct-user/rwhoisd/Manifest
+++ b/acct-user/rwhoisd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rwhoisd-0-r1.ebuild 273 BLAKE2B 19e17561a1b07fbe3bb38510cf44d8f1c46bb06ef6f47475dc33ad0d895eea68cc1be343df415494b83feb33b408920ead23f651a8b0f1957d7c09a5033ded9b SHA512 645aa4c85f69676ca63e445229c52c1442fba492f951cf23df4b45b3a113d36ff2ecee33d5a47cf3559893b2055eb7796aea83f6cfef7cb3e1559dd8fb86c181
+EBUILD rwhoisd-0-r2.ebuild 273 BLAKE2B 6f1362058291f07fcb576fae3933e24b403cdb08bd85c2576cf9b1eefe170bc5488c01fe1e502dda7993ccee078ce79046c7945eb11bf23c616a1685b67226ed SHA512 b29c659163d43de0042a2e7ce13be2a39ba04570b37fd8419120c13236266b298616fd53a0de90bfd9c8bb39295ff56f918accdee994725e825954a80a81d396
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
deleted file mode 100644
index 7bb46f1728e4..000000000000
--- a/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/rwhoisd/rwhoisd-0-r2.ebuild
new file mode 100644
index 000000000000..5adab886c587
--- /dev/null
+++ b/acct-user/rwhoisd/rwhoisd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5f3bc2809b84..71e6ec6877aa 100644
--- a/acct-user/sabnzbd/Manifest
+++ b/acct-user/sabnzbd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sabnzbd-0-r2.ebuild 292 BLAKE2B 76b594342fbddfa015167330b2ee20d28d2bef3c51609bfa839225f33e71029b243e8e1d2c71aecda8a80692e0b090a897a01ab58841ece899ed861d594ac3f9 SHA512 d630fe74df513c07bdec2fbafc82550921002afbc59b33caf5646d6cabaf7e200fa80f8a73e49b6d7054b7ef17caf1cd1845bb12ec2717ce2e389443f0cd76e5
+EBUILD sabnzbd-0-r3.ebuild 292 BLAKE2B c4d3c5e924b6b2355f18b830bc510b203c13489d8fd55e702d91db448d46b1b422a26058c54f8a3f48a2e05eb7142dac537caa99cf0f7d6a45c9a2fcb56954e8 SHA512 c91e8c528ba647a42b344827566a930c81e380c4ae6dcc1f2fdf3c8a8fda9d4d9c825f0b604526e5a5b39666933dce08ce7d17fbadafc9e9677ad3e1949e722e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/sabnzbd/sabnzbd-0-r2.ebuild b/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
deleted file mode 100644
index 271ae1c22ae7..000000000000
--- a/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/sabnzbd/sabnzbd-0-r3.ebuild b/acct-user/sabnzbd/sabnzbd-0-r3.ebuild
new file mode 100644
index 000000000000..e7ad08ee4b8e
--- /dev/null
+++ b/acct-user/sabnzbd/sabnzbd-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d4d8292be145..4ccfb3a60a1f 100644
--- a/acct-user/sagan/Manifest
+++ b/acct-user/sagan/Manifest
@@ -1,2 +1,2 @@
-EBUILD sagan-0-r2.ebuild 251 BLAKE2B ec2faa5471df7a0bdd4739bfcdd864ad20d5f11af05567182bb871198549337e47cb0f67838cf798b676722670a95dc9e87eda4825a0944299459f3c46e8f263 SHA512 999a4f0a5682dc2aa535b6c05b7adc9e59b160654bb39901522bf6691f8251d5bb8519a0686ed75db33375c437381182d8d162e2b1e61151de31ddb09b24b507
+EBUILD sagan-0-r3.ebuild 251 BLAKE2B e140c1b17c167218d8a716f1101ab6ff83539282d1153e3bca1406c82d8c8c1b49ff85cac8b42be979b36a57dc6b89d049bc76ef0dd866ab82d8682db5c44e36 SHA512 c685b604064afd2f283c1b9a70f75dd595f6c72f764961524d2d31ef0cfd2c7efe0cf3f422673ef82752dadaab7c8012271c08ad90f2db5e08474afae85d9248
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/sagan/sagan-0-r2.ebuild b/acct-user/sagan/sagan-0-r2.ebuild
deleted file mode 100644
index 4f81071a3b94..000000000000
--- a/acct-user/sagan/sagan-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/sagan/sagan-0-r3.ebuild b/acct-user/sagan/sagan-0-r3.ebuild
new file mode 100644
index 000000000000..09f2c269789b
--- /dev/null
+++ b/acct-user/sagan/sagan-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e1138e37ff6b..fab45535848f 100644
--- a/acct-user/samplicator/Manifest
+++ b/acct-user/samplicator/Manifest
@@ -1,2 +1,2 @@
-EBUILD samplicator-0-r1.ebuild 287 BLAKE2B ae8aafeff05febb6277e7abc5e27fb10695507a75df2db2b4ac831bfc683d3a3a6acf5b9a732c4bb9c669a46d186218003bd8114d97bc4b51786f7c22fd56b3c SHA512 1a5b28e0e74206aea2ea92fbb2de4bf70709b711e103b91b5077a34f33661e46bbe4f647a56e46fb517fd00bf530292d13c0f73aea145f012ff14fbaae442c1c
+EBUILD samplicator-0-r2.ebuild 287 BLAKE2B c9ade1e6608c29b76cea3999c5ffea2fd930c0c5304d3190f5573520d4ac4f94dc5b969cb8f0b7129b02499059353df43e6924452713a985968f153cbe886ccd SHA512 3722b2dac4cf20ebb827ee3af2b678e0ab661f0a77e24042579c5357f479c9b642493575a8d28ff8c67f8b963a271c5fc3a052099fb299981730a24c3864b82b
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
deleted file mode 100644
index 7b60d91482a0..000000000000
--- a/acct-user/samplicator/samplicator-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/samplicator/samplicator-0-r2.ebuild
new file mode 100644
index 000000000000..004ba3fb1960
--- /dev/null
+++ b/acct-user/samplicator/samplicator-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9cc5d71b6c51..2552240dd248 100644
--- a/acct-user/sancp/Manifest
+++ b/acct-user/sancp/Manifest
@@ -1,2 +1,2 @@
-EBUILD sancp-0-r1.ebuild 237 BLAKE2B 08ec3659efdfd9a144556dd9551aafc70eae541b309d8075ea464ee5c3e1fc5c221ff13973e187a45cb76d0972157de3e9115f386d0b9b8ed4d7bbc5bec6a3da SHA512 f8f583d488ca539e6aa7c4ad17155d770273673ae00a075ac58fd875d2423a47b8c7fcd17504d9630a4cc923cd2fefec3e927a0cccaaeaa38295a23a8ef239a4
+EBUILD sancp-0-r2.ebuild 237 BLAKE2B 9dc7a3515f3db742e913ea86a787db82a6e1b14fb13a90abe3ef01dca9c791bc2d03922e6ed014a076529af5439f1cb526fbc875ac1281528e0a0f0cede362eb SHA512 ea5f74711ebb43ac82aefdeb2f672a03337f5cb3ebb37995e60227f928a6c9f7b580d816ba39fa1d9e81803d6ddc4b78cca329802e8e636f5a5e9f1e7de37794
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
deleted file mode 100644
index 012908badf47..000000000000
--- a/acct-user/sancp/sancp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/sancp/sancp-0-r2.ebuild
new file mode 100644
index 000000000000..a5fcea1cff4e
--- /dev/null
+++ b/acct-user/sancp/sancp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 834fda6ed2bd..7fb88b2cad4e 100644
--- a/acct-user/saned/Manifest
+++ b/acct-user/saned/Manifest
@@ -1,2 +1,2 @@
-EBUILD saned-0-r1.ebuild 250 BLAKE2B 77991e40ca6e5890d36a9059974ab000c7f69dc462508df15391137d597b265730869f2b978aa66bfae931c95d7467612b975317b727a93f8b56f70f63768d90 SHA512 bf3090c6a81ec2cb58b9457d5515ce4b44f8d2b7211eea83c2c0b55d88eb22a74577b518801f3ab6b546b1be5ab6f112564a05584b85cdc61e8099f4b024c7d6
+EBUILD saned-0-r2.ebuild 250 BLAKE2B fe31d349d481513036f1eb8c72e2f0fdefc6e6231d044bb2735424790ecd0268163b36cd23ba346db354f67367de5bf76abe453663c30384e418198068d056a8 SHA512 3a0aaa3d414bbfd8d1204d60d70f7964d5a65858b4eaf34439618cab692d934e0b2a3d771c73cc0e4c1a4a1b806101e11834e060e50fa645db933dd88a766281
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
deleted file mode 100644
index 43a593335a48..000000000000
--- a/acct-user/saned/saned-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/saned/saned-0-r2.ebuild
new file mode 100644
index 000000000000..4afc7dc0d809
--- /dev/null
+++ b/acct-user/saned/saned-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 48f42c974a1b..6323a7ffa765 100644
--- a/acct-user/sanlock/Manifest
+++ b/acct-user/sanlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD sanlock-0-r2.ebuild 268 BLAKE2B f14dc4a02dbb0814e424ea188f1867d0711babb6d4f2e1b6e72c06861038a07ddb152d48a49729314d022bebbfc4f434ef459b74cf80c73e49a2702e7e8af303 SHA512 20ad7ab294544b6a7fb2895e8cf08ae1d6f9836424967794b81a715a878268bd6f1de688a21714a781bf5062b061eabc62f89019c42c8eeb7d9bd0c614ee3066
+EBUILD sanlock-0-r3.ebuild 268 BLAKE2B 3e98c405146b884df498805e13adf15f0261b4da30c3dafeaf5d658f5b970aac57c2d5e017fa8f416bc7df7a2f6498b0bc07e03d9452220d811449fdff032796 SHA512 e7343ea8e7a2706c293e5913ed7cf031b43a35e4c9987d5cd77a155da7bbbef34c0b01ba5292568459f2546f6d373d839034058e5213a4ee071c1ec050651780
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-user/sanlock/sanlock-0-r2.ebuild b/acct-user/sanlock/sanlock-0-r2.ebuild
deleted file mode 100644
index 8a98a7cacb31..000000000000
--- a/acct-user/sanlock/sanlock-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/sanlock/sanlock-0-r3.ebuild b/acct-user/sanlock/sanlock-0-r3.ebuild
new file mode 100644
index 000000000000..a40a0b8437c5
--- /dev/null
+++ b/acct-user/sanlock/sanlock-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ff25947f6ce6..0947a509e4d0 100644
--- a/acct-user/sauerbraten/Manifest
+++ b/acct-user/sauerbraten/Manifest
@@ -1,2 +1,2 @@
-EBUILD sauerbraten-0-r2.ebuild 266 BLAKE2B df70a10ffea87c53a7384d890d1fe2d957323d3f82660bb1a4cc3cf642b9e0f00f8cc294b7b31cb79c437c9a44819028212d32b353a5c5adc68d772b1ca9e5aa SHA512 0d5aa521e1f44fcc1d8b7840ebd0abbe6d8552987a0f2f48a03f413846ac168b567bcc1211ecd87bb820b2b66ff32f67975cdbbc158a25e19c6940f1256a0638
+EBUILD sauerbraten-0-r3.ebuild 266 BLAKE2B 779082cc26ec855cdaf0a7c74d313288ab0a4e0e29c894902c49a123784e482fa956d6212563651f61bd4e6739f0cc8637260f6cca5527f73764eda90b299065 SHA512 80529e74c891842a73ef776aaf34df6006fc927c3b0f07dafc14fd4e2504feca1ab7a5f058eec25fb478179b52abe4e9616fbd73e0274dfebeccfd13336a16d5
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-user/sauerbraten/sauerbraten-0-r2.ebuild b/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
deleted file mode 100644
index 657f44fd672f..000000000000
--- a/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/sauerbraten/sauerbraten-0-r3.ebuild b/acct-user/sauerbraten/sauerbraten-0-r3.ebuild
new file mode 100644
index 000000000000..3e1f90773129
--- /dev/null
+++ b/acct-user/sauerbraten/sauerbraten-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e26c0f2f97df..c2ab190126bb 100644
--- a/acct-user/scanlogd/Manifest
+++ b/acct-user/scanlogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanlogd-0-r1.ebuild 251 BLAKE2B d5af47ca62ca9059279251042ff265cbc9f3afea0249066533ffa70195d27b5387038319768129dc056556cd545dc34c1ed06f9467e8e9adf4bfb97cc3f3804a SHA512 c20c14856286e9c687a5a599775acc93d528106c4f471e91ae4d3246f3b10901d4a95549e0df1ec108cf316eaf3b9b56b47ade10123c1c3609e782d7e92e0053
+EBUILD scanlogd-0-r2.ebuild 251 BLAKE2B 4bb005a0e6669464ce3491975b5cb2618a25df09a82e99ab4d799f4602fc938113aa87cd33a22b5be71da6f7d2bcfeb482562e5ede41663fd295d6f693e364b1 SHA512 023fb934e72553b41e8ec4bc60afa91d0792ed72395148515520c0d12fa08221c60025a17579c9d6fcae2ed53971c1ce9c6865d5a12399ac1ecbd261b559238c
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
deleted file mode 100644
index 9e823b440fbc..000000000000
--- a/acct-user/scanlogd/scanlogd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/scanlogd/scanlogd-0-r2.ebuild
new file mode 100644
index 000000000000..068258cbd803
--- /dev/null
+++ b/acct-user/scanlogd/scanlogd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 febc66c4fdac..87a2183415d6 100644
--- a/acct-user/scponly/Manifest
+++ b/acct-user/scponly/Manifest
@@ -1,2 +1,2 @@
-EBUILD scponly-0-r2.ebuild 378 BLAKE2B 6770c852e390cb9e6fceb95c5052fdaafc1383824e760cdbbe8ba1dcc4dce1521e1aada601a572e90b28df00605e0e8bd0cfe5fba18e3df6cb14b585ef1eee96 SHA512 9a17767b63487799003bdb731aff82700f08f7010044d19ee85b9ab2d962c4ecf814b0b095d00c5e25d4e44383a31e9104226326b64509527507c208040e66f3
+EBUILD scponly-0-r3.ebuild 378 BLAKE2B 7f9c58ba1e74e6e9ff2a721e8c80d433566f84fb6145edfb032d3a84d5e2acec8f3fbc585a01e2ffdafbce68e5d41d3261ba56f9ead978042d6b231f93772e5d SHA512 b01c0c577ffaa7c50f8df4f5d7a7cdf4e45e8c40f0813de625936fc4131294b7a534470301444a86413f05c7ae4459d9314fd215c343abee48f52ca2dff52a6d
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-user/scponly/scponly-0-r2.ebuild b/acct-user/scponly/scponly-0-r2.ebuild
deleted file mode 100644
index ed12f0b4e2c6..000000000000
--- a/acct-user/scponly/scponly-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/scponly/scponly-0-r3.ebuild b/acct-user/scponly/scponly-0-r3.ebuild
new file mode 100644
index 000000000000..df7eac437e47
--- /dev/null
+++ b/acct-user/scponly/scponly-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/sendpage/Manifest b/acct-user/sendpage/Manifest
index d04c762f1660..d0d831214e4b 100644
--- a/acct-user/sendpage/Manifest
+++ b/acct-user/sendpage/Manifest
@@ -1,2 +1,2 @@
-EBUILD sendpage-0-r1.ebuild 242 BLAKE2B ff88e0e1644aecde3bae1d00249ff0944f59a2ac45ffd1af78a147723571d953991d850c378dfd3779e6c48043e56220adedac595060a7ef7810669e306aa4d3 SHA512 2bb9d4cd6cc05bec6ad47d6543f92eeca83375e8891c8dc506cb99d36a3475c44bf1b12c35b78696975e1e86f20bf9fd91ce44f277872decd4381ad7a445bba4
+EBUILD sendpage-0-r2.ebuild 242 BLAKE2B c4622205c2547d8fc02bcaba1d02cc4aebee65acd95f2e0a7ea2494de2ad08c773d74d2a70c5ce6e331871fe3aad1b7d8f2ad9bf5443c806b21a0d5374b72129 SHA512 88574ae87c83c405d4e6570c0400283a354a4249e227aa205e91512786e7e9922b7746798319660ce94ca321237ae824994f47070349c637611ba802c8850822
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
deleted file mode 100644
index b0fc5897e520..000000000000
--- a/acct-user/sendpage/sendpage-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/sendpage/sendpage-0-r2.ebuild
new file mode 100644
index 000000000000..e39039ff5286
--- /dev/null
+++ b/acct-user/sendpage/sendpage-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b4dd23a017f6..b9d66beb9fce 100644
--- a/acct-user/serf/Manifest
+++ b/acct-user/serf/Manifest
@@ -1,2 +1,2 @@
-EBUILD serf-0-r1.ebuild 269 BLAKE2B 37444007f4c8558fb7b48aa70e3bb8c965c0c1fecfd64dbe013d6b8e2aa2b7776134e23c68087a496a682246c1c9c957673d33582d5afb2ac3172755dfc9cc95 SHA512 93425c15e76425853d9da48655630234c70b6827c2957877fd3ef28ebed65e2daf6fa35cd0a07bb52e005a6bc6c7b670901a69592538ac7c020a1a37fd4233b4
+EBUILD serf-0-r2.ebuild 269 BLAKE2B 295f4035e08c3466eaef9896e5ff4af3d983f7b29f2bb4ef7a36ecc25d755c4b726087a2f3bef663f91a914f272b5cd2465a799b37de157847e778a04620f514 SHA512 28b149515db86074a5a098018b4b533b573d4cc775ec8b81025cd3b32c9a53cd85863b14bcb8f5d2fee6fb50046d266da094da95fa74a2feb2b4d97010a4a897
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
deleted file mode 100644
index 08b4db34860a..000000000000
--- a/acct-user/serf/serf-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/serf/serf-0-r2.ebuild
new file mode 100644
index 000000000000..05c10e1eef2d
--- /dev/null
+++ b/acct-user/serf/serf-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/sks/Manifest b/acct-user/sks/Manifest
index a762968799f2..9bd5dfb8968c 100644
--- a/acct-user/sks/Manifest
+++ b/acct-user/sks/Manifest
@@ -1,2 +1,2 @@
-EBUILD sks-0-r1.ebuild 243 BLAKE2B 70431e0342874178f6b045df9763d51d67903bd2a28f019c9f1decce9bea415eb9c663119249cb7fbea93490444bfba6b0ce082e80b279db38314cd10225f88a SHA512 04b1f8733e3c1929795721a6da4e690d07a50729f591d0436a85aa113f870a80119e161550bad81a513129fbcb389dd72c3e6cf4bb76fcd69e056b285c5629ac
+EBUILD sks-0-r2.ebuild 243 BLAKE2B b8d486afc77100b58c01dcae7e23ed14b6c3021e6fb91f4761afd7109e433c8c0106fc39d68dbd62ae08e65b0c0d98e319d3e6aab7c1ae90c495e3f1b5d55646 SHA512 de6a558cec852e04d92797de811a2129dbb36cb6964d8db637aa811f5dd575d7a8db204a0287db3033155d18daab1e0a20d0ce010daebb3cb61d7d61fdf349b6
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
deleted file mode 100644
index 5844d199183a..000000000000
--- a/acct-user/sks/sks-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/sks/sks-0-r2.ebuild
new file mode 100644
index 000000000000..ce4868c4fc2f
--- /dev/null
+++ b/acct-user/sks/sks-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 003ef0660188..7bfcabdbd478 100644
--- a/acct-user/slurm/Manifest
+++ b/acct-user/slurm/Manifest
@@ -1,2 +1,2 @@
-EBUILD slurm-0-r2.ebuild 320 BLAKE2B c32abe96d9886e3eb410ec801d6a0d1bee3566c4849aee387cf14e8f864e53e3c3893eb8fb40fb47f8e8bbe29ebf37e9c7ab928876e060f270ec4cb5afa583fe SHA512 6fb79a3be49bed95703ad348019d6171b1f95c9166ab8f3d968c0cbae02159fef536eed19cf56105ad16e46ef550a6006972f9aa72df6dadc14d6f0c1301464a
+EBUILD slurm-0-r3.ebuild 320 BLAKE2B ca303746530db1e7d1c1b7c2062fa1c71a6776d5cf15e0a9c3b1fed3138dddada1596a4e261d30c03a2ca60b115851dab2e67a54991c9f0220ff844779defac7 SHA512 c3c662bfd6385638a96370fbc207b8875d1a0aacc698b1ae043c86ae8aec36fde6a87820e6e00fc707eb3ee5ba546678fd812ab3d60fe27cbabb23dca4c776e7
MISC metadata.xml 367 BLAKE2B f7377cc4c8ab6161736e0b676f04156059b020ebb1bce3eba0277b419458a520c595dc43dcc2ac7545bd91a93630d5809ab8194757dbdb092d06473ebbdc9bdc SHA512 07ecc9173013e5b0d47c90f5c5fda05bbb127e4401ccc2bc2c92ca04c4e300f1b6fef8f40f12ea58db212e3f66f7f9085af42ca8e0c6fb1e7be5d193a8a09831
diff --git a/acct-user/slurm/slurm-0-r2.ebuild b/acct-user/slurm/slurm-0-r2.ebuild
deleted file mode 100644
index 2a2d155f5fec..000000000000
--- a/acct-user/slurm/slurm-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/slurm/slurm-0-r3.ebuild b/acct-user/slurm/slurm-0-r3.ebuild
new file mode 100644
index 000000000000..679f13ecd665
--- /dev/null
+++ b/acct-user/slurm/slurm-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6e1c75cf93bf..81276bf19cf4 100644
--- a/acct-user/smmsp/Manifest
+++ b/acct-user/smmsp/Manifest
@@ -1,2 +1,2 @@
-EBUILD smmsp-0-r3.ebuild 235 BLAKE2B 36a6753e052aa48998d095c443c7c11438964b172223452edb055e95769f09615e6524cde5ad55a821b352d9c7397e91a551ab6d27a4dfd2e61f107c1407012b SHA512 66f18a5a81c071536dd4e9c1835f19e1103596e8e692c34431b79b9ddd26d6769a3523a41da943d11c8480e0275562cad1f1d13a2f97a2f3679f35a256a2a90f
+EBUILD smmsp-0-r4.ebuild 235 BLAKE2B 2c15b3b8754863319f4fb3b803cc698481c962a3a71ec6b12bff0ef4b088c6273767f9f1a149c3bc01027b376a264945c37af462c106cf5d15658bb7a7f199a4 SHA512 0d6db4ff983ef892f4ca38d5957128a96d9d233392ea8bea1d6ac4e9e212189d7209f6c567e1c810461d99a424f58b127fad91549aeae953d40632010d696f39
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/smmsp/smmsp-0-r3.ebuild b/acct-user/smmsp/smmsp-0-r3.ebuild
deleted file mode 100644
index 8a12ba2c6cc4..000000000000
--- a/acct-user/smmsp/smmsp-0-r3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/smmsp/smmsp-0-r4.ebuild b/acct-user/smmsp/smmsp-0-r4.ebuild
new file mode 100644
index 000000000000..45d1ee94c798
--- /dev/null
+++ b/acct-user/smmsp/smmsp-0-r4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/smsd/Manifest b/acct-user/smsd/Manifest
index 8eecf08cc5e7..c59b09e49530 100644
--- a/acct-user/smsd/Manifest
+++ b/acct-user/smsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smsd-0-r1.ebuild 224 BLAKE2B c6e7499b197c7b5e13eeb798f705a26bb94b31e2217c3157d022508c96b15ecc930c504b741867a1fd70a7bded8d2ad15ab6d7995655eefbaaa4e67aa18066ab SHA512 bbfb1206aa3832fb9facd2b087553440d8680a94a6ac8402ac9148cdc000660e4b18f8f4cc7ddacc8a70765806c07ac63c2214b6e8045e989803f26e4545b217
+EBUILD smsd-0-r2.ebuild 224 BLAKE2B 3682cb61f4add638e5ec463613c9d64083077a94be0343ec50d7c83d6df9e7e80b8bc3a19f69c21fb2e6b94587cfec23ed303aef5aa857376789e3b9e4c8cb01 SHA512 062522991730552475d3dbe39b00875a535d18b298a17c0b9ae3735338611b3860236abaec60c6701191e7957d9ebb89821f419384d3e145c7d5ca39bf07ff9f
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
deleted file mode 100644
index 69987ac6919d..000000000000
--- a/acct-user/smsd/smsd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/smsd/smsd-0-r2.ebuild
new file mode 100644
index 000000000000..fb12d4adb212
--- /dev/null
+++ b/acct-user/smsd/smsd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e8e82aea9c36..95097673aca4 100644
--- a/acct-user/smtpd/Manifest
+++ b/acct-user/smtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpd-0-r2.ebuild 257 BLAKE2B bde7c5fa697e039fa2826efd9d3a9a0b39abcf7376a1deec50f991a88affe5bb630b8a951cf9031d6193af7e08471ad541f0884992afecb25eae55ab97f8590b SHA512 8cee99bb245640d0fc6cd736c554a2c510402bd0a8f49e8787c94e070052e079896bdafb2c98090165fbe1c8be7d66a0094829ced4835b190fff95a60aeb0983
+EBUILD smtpd-0-r3.ebuild 257 BLAKE2B da1628b1dfa476fd02ed76391012e39efa0a095492d919d0d1835baffabddf7a14c16260aa1c3de2c818d2fdca6e3be2c6a1fe7669fb96160d9067e0dd2ea74f SHA512 38e6079174abe03f74c3942484063b683f6cbed8cd3c53ba109d4381f3673f821ad098983180575dbdc00bbb2cd64db949688c981a810023034f1de994acea82
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-user/smtpd/smtpd-0-r2.ebuild b/acct-user/smtpd/smtpd-0-r2.ebuild
deleted file mode 100644
index 58eb0dfaa32e..000000000000
--- a/acct-user/smtpd/smtpd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/smtpd/smtpd-0-r3.ebuild b/acct-user/smtpd/smtpd-0-r3.ebuild
new file mode 100644
index 000000000000..a6c80409e86c
--- /dev/null
+++ b/acct-user/smtpd/smtpd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 57705b8a8776..149cd4ee82e6 100644
--- a/acct-user/smtpq/Manifest
+++ b/acct-user/smtpq/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpq-0-r2.ebuild 257 BLAKE2B a31fc2340a062968b59b3f2162848739b918c0aff071b1a90c20b359454c72a0572361ae966bd3dfac516b2f44ae2a6e384ca4056fcfd2eb3805ba4ad5f638dc SHA512 9730d9f3a864e4f2121445bd1f43cdf29d0e6d4294454947200c875641be58cf3c47dc45821a6cce8b9ad977bf4ff32214c62611d8595e0fe3f14f707eeb9e0b
+EBUILD smtpq-0-r3.ebuild 257 BLAKE2B 18ba17e69a423d31818773b3772ec4bc65add79bee5477cd45cced9ec258f30c63ec844af69f0715e9859ac755a6b71c94ed647b0eebd2fb9d499f992618c7aa SHA512 32e25af13fc141e82a4e7ef6ec19428961e7e4291f12db5f54cec43d1ff1d6434b9c6568bf27cb81c48273df998f6aca1708cc7eff8d5b2b3ee04e4edc184f48
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-user/smtpq/smtpq-0-r2.ebuild b/acct-user/smtpq/smtpq-0-r2.ebuild
deleted file mode 100644
index fcf4136aa1eb..000000000000
--- a/acct-user/smtpq/smtpq-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/smtpq/smtpq-0-r3.ebuild b/acct-user/smtpq/smtpq-0-r3.ebuild
new file mode 100644
index 000000000000..cc0e0d6979ce
--- /dev/null
+++ b/acct-user/smtpq/smtpq-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ba50bd339436..05c4503af529 100644
--- a/acct-user/snapclient/Manifest
+++ b/acct-user/snapclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapclient-0-r1.ebuild 310 BLAKE2B 48f69b28ef45059d0b3f48a7537889aaf732c3fd0a8fb294acaa9adbb4b411735a32ac68be923b256125d17c4983a15b313de2e2bdc6acd59dde85acdfb8479a SHA512 1949e4dff585d09b28bf6618c93b112c1e5e3a2e6e65806d1e4544807f862a7ad9483ba0d66e7272e1f94f7f01a100ac132233c466784bd4fc79682c1f6a5943
+EBUILD snapclient-0-r2.ebuild 310 BLAKE2B 2c7ca98a9e38516ef99d4037bcca8e02a175d12ae628eb9751d70f19764cb2c0a926e6f3560d82a5258374e147a6e7232a130b643f666a96566ac4851db1799b SHA512 0fa99373feee308a6a847fff104b1a17d52b483a73e7e3f00644641be1cf40e7723d40bf2daf42eea9051bfa9202b9ced503e3b3eba22fe3651b0126ac774b99
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
deleted file mode 100644
index 8d1da6fe79b3..000000000000
--- a/acct-user/snapclient/snapclient-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/snapclient/snapclient-0-r2.ebuild
new file mode 100644
index 000000000000..34064469ea22
--- /dev/null
+++ b/acct-user/snapclient/snapclient-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2bcb63485f34..c764a2647626 100644
--- a/acct-user/snapserver/Manifest
+++ b/acct-user/snapserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapserver-0-r1.ebuild 281 BLAKE2B b40d5f29e5209ece908fd6fd3c5b8061da43faddf4e286f7b31e89642bb8131ee43038f58e7dec0acd0dbb859ae22fff47cec6c6e6e9003813c9e8ddfd0cd888 SHA512 560d4134c77e1272b58a66203f6ee90ef0a4a30e55f19fdb90cb28fc4a57687e49512ef2cbded81a7c39cb4f6c72c66eb8f23ad5cfa1b2910df930b89d44b328
+EBUILD snapserver-0-r2.ebuild 281 BLAKE2B bfd40da5a868cfac29a571ea62f68c6ecbb3ae2d294e044028ae456453e4320cf06a98e851c5ebf70e1408d5144f2acda136e4d9d701ec8ff5bcd1c8138b6c4f SHA512 4b079b09fc5c8772e8958d5d5ffb14662586ef154b6df2a00e28ce30026bd61852b4f2b226a221e17424e07440c54fb36a3b101259c4a9a58170a6076241a31c
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/acct-user/snapserver/snapserver-0-r1.ebuild b/acct-user/snapserver/snapserver-0-r1.ebuild
deleted file mode 100644
index b4b8bbda6968..000000000000
--- a/acct-user/snapserver/snapserver-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Server user for media-sound/snapcast"
-
-ACCT_USER_GROUPS=( "snapserver" )
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_ID=374
-
-acct-user_add_deps
diff --git a/acct-user/snapserver/snapserver-0-r2.ebuild b/acct-user/snapserver/snapserver-0-r2.ebuild
new file mode 100644
index 000000000000..0cb87f8ddbbb
--- /dev/null
+++ b/acct-user/snapserver/snapserver-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Server user for media-sound/snapcast"
+
+ACCT_USER_GROUPS=( "snapserver" )
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_ID=374
+
+acct-user_add_deps
diff --git a/acct-user/sndiod/Manifest b/acct-user/sndiod/Manifest
index 85788b39508c..7d96c01ad595 100644
--- a/acct-user/sndiod/Manifest
+++ b/acct-user/sndiod/Manifest
@@ -1,2 +1,2 @@
-EBUILD sndiod-0-r1.ebuild 232 BLAKE2B 2d502c3f9afc2fd1e3ba14a5aed1a0650d9d6723b9f346c8af59a124831fd54687885ecdf9e63e911bb7212ad7e4c56cca21b0581e1279881d8f8763b946dcd7 SHA512 d28781d33d781e4dce8d23fa78e3bb88de95087e33913b91d576d75510d49bd16b60dc050290907d72c38688484341286a35bf8f6b0c0574b037974fee577d44
+EBUILD sndiod-0-r2.ebuild 232 BLAKE2B 3d7b5af336ff18c13711673f5201ad514d4fd5a29f9608da9c6278649a7b1e550e23cdd8e4970ee3a3471b2f4638ed156babfe801724fbaa213537a1e39ad9ff SHA512 253d9b9c937523b163a5ac0f942fc59c50bb105188202c8fbbcf15ab2185802a8bf5866b42a322686ddada9cc01d831fda59a12159fe7e46a03f5441b739a35d
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
deleted file mode 100644
index 5e796716760b..000000000000
--- a/acct-user/sndiod/sndiod-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/sndiod/sndiod-0-r2.ebuild
new file mode 100644
index 000000000000..17f9c991600e
--- /dev/null
+++ b/acct-user/sndiod/sndiod-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2ac43d1e7732..aaa696640eae 100644
--- a/acct-user/sniproxy/Manifest
+++ b/acct-user/sniproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD sniproxy-0-r1.ebuild 198 BLAKE2B 1c03b7a628e2b1b68d3b0c6a05b40541d68fc7c90afef9eecd35193d2e00624270e61d46be3c7bccd8855ed5f0d0bbd7bfad4b9ae92c824d531f41389ba83fc3 SHA512 2782ff5a9257c2d4a7aaf0b12db95a6955225d292d9920c2e1b60cec30da152a2f8b951d03a6c15c75c82c72fd9e93f4a5de6cf2ae9cfbe14f32c751629ec400
+EBUILD sniproxy-0-r2.ebuild 198 BLAKE2B 6020c9c6e71335b7e074c3f2a29449bc53a0f056a2bfddeebfcfc01446f158bfa1f7e8f090ac05f181e378e1b2116cfa245c65df4281c3eb23028fec0da2948d SHA512 e3fe0965e897d8ed2337ee6fdeeb7802fb3d60d575c5f16086fa07b61261dc56e3ba2b30864a9c7c7506616a6816f6bdbc3fb79bd53effa84b7eb854a707de3d
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
deleted file mode 100644
index 5bda56cd6a17..000000000000
--- a/acct-user/sniproxy/sniproxy-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/sniproxy/sniproxy-0-r2.ebuild
new file mode 100644
index 000000000000..6498ec6e4ac0
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 46d4584a87d7..cec72085837d 100644
--- a/acct-user/snmp_exporter/Manifest
+++ b/acct-user/snmp_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD snmp_exporter-0-r1.ebuild 255 BLAKE2B 2a008b1d6e9a49aa882566c9019d51ce1db74f6b172b95e645ddd4f350c9e3b65e5c1b326cf6a13bba64ae305c07b947b3d210947b4a3cfe41eb81d2515dd8c2 SHA512 ede8abedc4211d81650ddcaa26a651b49e41b7893d121ff17b6db201ae6a6c9b491b59fecff3848479a14f96a46f7420e0475e177f44517293eb4d5d163def36
+EBUILD snmp_exporter-0-r2.ebuild 255 BLAKE2B 56a355f12a71585dbf0eb2f3617c2e41eb8f41404f84a6a95f0dc79291c38d6066238d615c2244c7aeacf0c41faee6b6ee2575d3872c31002aa1d0f8c824bf83 SHA512 9f0082c80d197626f47929d1b82924571399d3147c35e75621625f9220a40325d59d2ba257a58cb8d881ee80868f2856337f00b04e37e97433b170ab155dd5f8
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
deleted file mode 100644
index f1b3d5a78eab..000000000000
--- a/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/snmp_exporter/snmp_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..e43643a993f0
--- /dev/null
+++ b/acct-user/snmp_exporter/snmp_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 f82402208527..6f3a3ffacc83 100644
--- a/acct-user/snort/Manifest
+++ b/acct-user/snort/Manifest
@@ -1,2 +1,2 @@
-EBUILD snort-0-r1.ebuild 225 BLAKE2B c287337bfe81463b4f839b02ce4630c8ba796ac7fafda3767e0bc18e30994ae6df395eefc4eff2486a09ff57d4d0e7ee70c17b0ebf99e92a1df2ab7db7641873 SHA512 1a510cc129719a099253e29efb9ea7c1ef2a3e274f1d689d137408561ee53655700d01d16fe969b100b7646be1b4eadbf711f1ce662ddc93eb77a7a8b7053e34
+EBUILD snort-0-r2.ebuild 225 BLAKE2B d6bdb2d1c56d1e60f55c46d23d90917c231bb2e9c94ac4c6972eb5a8b236fe0dec264f4c52a9161fe3a86bc04794fd7ea109cbc6b13eda444d2c4226fb96d851 SHA512 a03310abbefac04240ceeb081e4c1a5464deff8ed311ff0cf57102f1900dcc93c0e92b4d9851980de9fd4c71bacd578480f8409db034a97459c298b396ab5318
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
deleted file mode 100644
index 6b52f5bbce84..000000000000
--- a/acct-user/snort/snort-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/snort/snort-0-r2.ebuild
new file mode 100644
index 000000000000..8e3865298c46
--- /dev/null
+++ b/acct-user/snort/snort-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for snort"
+ACCT_USER_ID=328
+ACCT_USER_GROUPS=( snort )
+
+acct-user_add_deps
diff --git a/acct-user/sobexsrv/Manifest b/acct-user/sobexsrv/Manifest
index 7568f0608bc3..c355637b76a8 100644
--- a/acct-user/sobexsrv/Manifest
+++ b/acct-user/sobexsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobexsrv-0-r1.ebuild 289 BLAKE2B 2bd7a6f4bfb12b5c382046c86dfbe951717b91b01c58ce4ccc453a69795c92198e950847db6404dabb42750a99c1a4359446ea43fc4ed4416e0ce9040ae35fc2 SHA512 45c8946515a0cdd887444f716ae7baf8a57da275ed3fbc6094de914bbb408bd9c7a46ebdd2276dfccb3ec752e12c53c98c9f3a94af5e1088edc307070890d333
+EBUILD sobexsrv-0-r2.ebuild 289 BLAKE2B 24da5d6eaf98508571c4693cca3f7fa757a7542beb4e2a4915fefdcfc9a9187349fc3d8814b679a69f8d05577b5d8bb2d56ff2a85aa1636171d820c93f4218bb SHA512 9e929f51fe1e045f0a12dfa35aa1e5b3ab6a5de4aa52de29a97ddebede005a9a206af56d87487c7c332f26c45a56ab91265ddd0313a0588c0be018bc6609adf0
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
deleted file mode 100644
index fab5653ea299..000000000000
--- a/acct-user/sobexsrv/sobexsrv-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/sobexsrv/sobexsrv-0-r2.ebuild
new file mode 100644
index 000000000000..7ef23092dd50
--- /dev/null
+++ b/acct-user/sobexsrv/sobexsrv-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1fc9b8953d28..39c2510365e2 100644
--- a/acct-user/sockd/Manifest
+++ b/acct-user/sockd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sockd-0-r2.ebuild 242 BLAKE2B 0e5fe92aff767a7991f89796d03762289e5b5e7c951f02570ecce89a121e91a7cf8c4f423ccc776f32a0e975b8a81c5088c03c2dc658f3277b22c4bee29bd0ea SHA512 daef1e8a35e3603c7455df11586d7f910817e12c96b47f5c2f32f534d117f2f0d7a0649b1f5ed3a82dfe4f4b11855c0e0abfe992af424c8e828fcdbc394abdad
+EBUILD sockd-0-r3.ebuild 242 BLAKE2B 164d4597d9a4aa3a912ff2886275f40a2664d80fdadfa9f63de7f64f5ccd0ddff78c7ca9d042c56cda8ce5c8f184de15d318cbb4349ca8621970bbb72a62b342 SHA512 3ff6c0f42e3719ee749404d98de746e1986186488651d95c70b17788aee8856159f19607ca663ed49be6ff80e6cde1c9240376356e3dc91fda6df33b3b271273
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-user/sockd/sockd-0-r2.ebuild b/acct-user/sockd/sockd-0-r2.ebuild
deleted file mode 100644
index 582e473c1667..000000000000
--- a/acct-user/sockd/sockd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/sockd/sockd-0-r3.ebuild b/acct-user/sockd/sockd-0-r3.ebuild
new file mode 100644
index 000000000000..401ead808e3b
--- /dev/null
+++ b/acct-user/sockd/sockd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0a54f6b95615..b0f35b354422 100644
--- a/acct-user/sogo/Manifest
+++ b/acct-user/sogo/Manifest
@@ -1,2 +1,2 @@
-EBUILD sogo-0-r2.ebuild 293 BLAKE2B edcb55a1e4a644d58d4d862759c3a774359c7ecb8d43ca42eec73e761c54e2729325f9b19e48ecc709d82029ea357227a10e4bb3f8838c0a12fc0ec7a479d559 SHA512 a6db807bd21801c1936fff0ff0ee9061cdbc85ffc53cc9dade7f52c9f1baa86f4dae979b4e56da537047782c7b0f43bd753374106d16d8c81ad15c53f762a76a
+EBUILD sogo-0-r3.ebuild 293 BLAKE2B e922e97b696c0162b152d8df95b0c97a2c56c5be0a0f7cfc01b6b025f4477bda435cf154429299e4b849d223aa22248464838584aef9f5c1e0e4e61a6ceba70d SHA512 0680faeefbedc592ad91fe710fe60bdae530d7c693a26baf1ac3b609a9609585d38a4f3747bcacfdd3b58e656d8ddb8026d363653fa7fc35a54b5802ff465913
MISC metadata.xml 254 BLAKE2B e0f44b5b45dfaee5d78327c0a786de9629c29eb26b6ef1e06e499f8ebc1c72c0d0cee20d68992fe79df2498d1664a49f2bae19b5a115b97896300d741cb4a0d1 SHA512 48119cf18eaf9e217ca2203ccbfcd28aa8c6d2f7de7b21e347ba3c4d5f23147908620d158fab2bf0b0211670d091949b5ee3bed0044d4c86656703d20bdc6ee1
diff --git a/acct-user/sogo/sogo-0-r2.ebuild b/acct-user/sogo/sogo-0-r2.ebuild
deleted file mode 100644
index 47590bc2fc6d..000000000000
--- a/acct-user/sogo/sogo-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/sogo/sogo-0-r3.ebuild b/acct-user/sogo/sogo-0-r3.ebuild
new file mode 100644
index 000000000000..10c451fd3333
--- /dev/null
+++ b/acct-user/sogo/sogo-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/spamd/Manifest b/acct-user/spamd/Manifest
index 24044cbd0ee9..bedd08e72501 100644
--- a/acct-user/spamd/Manifest
+++ b/acct-user/spamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD spamd-0-r2.ebuild 731 BLAKE2B ae140b5b2183c44573f00d4900a767553e331c4db1a375656f075cb022f571f5fe576eaf74c47c4dde81e28d3e58e74ade618e1c15f27c1022eb2e34707bcb4e SHA512 6fbc200082bf4684eb432465b1409db64f1e0881862cdcd08652375daa01063801f05935a9f9cf30be1e18f904286bc354b4d69ed35f3864cb8d26b7e8b019ab
+EBUILD spamd-0-r3.ebuild 731 BLAKE2B 8400d1694482d562c2b4d6fb3c4ffb68b01431d5f50999e2fc801945e3b8c00a9a05c166dcca9adb5d2d5c3bbe59d9173dda6de7f110252b9f0350aa7bea9681 SHA512 bc3bf311a9a5152c6da04f6e32b07f39765e9f33475dc54a1693ca1b3ff93e6c5015f5c03185ca53b0e53ab845effc4bdb2f07190ca309059aaeb18c1981f66c
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-user/spamd/spamd-0-r2.ebuild b/acct-user/spamd/spamd-0-r2.ebuild
deleted file mode 100644
index 0b184739667c..000000000000
--- a/acct-user/spamd/spamd-0-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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/spamd/spamd-0-r3.ebuild b/acct-user/spamd/spamd-0-r3.ebuild
new file mode 100644
index 000000000000..ae49dd16b61f
--- /dev/null
+++ b/acct-user/spamd/spamd-0-r3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 435f588e7770..f0cb18e06ea3 100644
--- a/acct-user/spectrum/Manifest
+++ b/acct-user/spectrum/Manifest
@@ -1,2 +1,2 @@
-EBUILD spectrum-0-r2.ebuild 298 BLAKE2B c87157f715c19e52c4f0c650b8859a96911c893d470ea6a29722061e9c426219862b6a2c3e4bc9691bd16ae9192d1afa58bf1e3bd26d38f04e61f464e1f2ac99 SHA512 17705e6715ed813a74479d3984dee77a02f5b95230dd5e5ecd47b4d81cb28c3b84b49d7dad932d50f9e2c3237a02165a4e2cfdd7c358c72ae7ab52f943810f6a
+EBUILD spectrum-0-r3.ebuild 298 BLAKE2B d4d8b2f417b8011be16d7478cc99a055547fbeed5910f2b811b702d50fb2e334345627c96de9e1f014330e6d0e70d4d659a0cee4fe720ceabea34997e37cf481 SHA512 996930d3fe60039dbec3b5b356d9e07bb351486229f31f358959ebd42fdb345c7d07d52610a7d7445ed45b363493635663f1c57a99c5a9d5621fddafd22d65cd
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/spectrum/spectrum-0-r2.ebuild b/acct-user/spectrum/spectrum-0-r2.ebuild
deleted file mode 100644
index 54a2098366ef..000000000000
--- a/acct-user/spectrum/spectrum-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/spectrum/spectrum-0-r3.ebuild b/acct-user/spectrum/spectrum-0-r3.ebuild
new file mode 100644
index 000000000000..781029a8ebfd
--- /dev/null
+++ b/acct-user/spectrum/spectrum-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 7657834538c2..5054269bbc05 100644
--- a/acct-user/spire/Manifest
+++ b/acct-user/spire/Manifest
@@ -1,2 +1,2 @@
-EBUILD spire-0-r2.ebuild 246 BLAKE2B f5225e883f4abbe59e9ba1323b12a4a44e077b116df191339fd8656cf21bdeffcc33431b3619da3cf9e7551a2aadfbb8da27119e07361dccf1b58733a534eea4 SHA512 d1b677c7efb251cf5af0ac5f5327db246ca798ec0bbb89e0d33adc1475b3878583c464c68f9b6318db2e6872bb035d246e9b16d1901cdf9c3be9119baf3620a9
+EBUILD spire-0-r3.ebuild 246 BLAKE2B a2d485158f9d4b50cf5b609c335a76981c4ff4461973c1fc6caa62ffc49ffd2852156b5fb43b31846bc3547dad1392fec2600f8501a56cb8760b99e3febfe57b SHA512 c555432f590cc18a08bcd6107620f4a4515b363b15dd338b91c963e806a46a99f965af45923848ff8e656d3d40199c0ff0888e1af026fd0c8ca30fc77c5b57ac
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
diff --git a/acct-user/spire/spire-0-r2.ebuild b/acct-user/spire/spire-0-r2.ebuild
deleted file mode 100644
index 18e15e27892e..000000000000
--- a/acct-user/spire/spire-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/spire/spire-0-r3.ebuild b/acct-user/spire/spire-0-r3.ebuild
new file mode 100644
index 000000000000..ec05ca13f1d9
--- /dev/null
+++ b/acct-user/spire/spire-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/sqlgrey/Manifest b/acct-user/sqlgrey/Manifest
index 357b3606bce9..3ac6066091e6 100644
--- a/acct-user/sqlgrey/Manifest
+++ b/acct-user/sqlgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD sqlgrey-0-r2.ebuild 266 BLAKE2B b538665a15206f3459888078ad15fb06b65305ec6855f89ccf5dd66d80751b660cae47bc9c5eb4812b227bd6098364b929432721d041d4ce94a3ba54b5ff3c83 SHA512 8eef292307571eb4adc1211b2ed6cf185dd56d0be23bb22b1e10c524d2f7a861ee59c96687963ec1bdbb01ad40a9773f23715842245a14a6289981d920d4898b
+EBUILD sqlgrey-0-r3.ebuild 266 BLAKE2B 5f65b7e0d6c2064b002a9901dee40193cf4dbc515dd6df88fa2ecb39fd86de65a5a383f20adf68b805b50a8f3ef2bbfdb685492bf68d3ab67071599a823f251b SHA512 03b80c045377cbb5042d622500120bd0cb0af1ea7cc66f41f73f4c062a187762e9fe30c755077581bd7ef550dc7c3e828b90e0a2eda81925097abe722847ea64
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-user/sqlgrey/sqlgrey-0-r2.ebuild b/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
deleted file mode 100644
index 097a202f2595..000000000000
--- a/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/sqlgrey/sqlgrey-0-r3.ebuild b/acct-user/sqlgrey/sqlgrey-0-r3.ebuild
new file mode 100644
index 000000000000..d44c86908115
--- /dev/null
+++ b/acct-user/sqlgrey/sqlgrey-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 80e4d6ca4bad..301d28185967 100644
--- a/acct-user/squid/Manifest
+++ b/acct-user/squid/Manifest
@@ -1,2 +1,2 @@
-EBUILD squid-0-r2.ebuild 275 BLAKE2B 7bc15115d27837bed3d4cef0ad23f57d947c4d3d21f9943651454e3d994ed27ec90e2a763ae47c9c1b54db7e2684c5612ad870d99df5e557fae6d387c5b0c31c SHA512 10c251cde8a214ae16977043be38b81ec32c8e0aebb19bdb74ff60a93cae255d5d3a3cb968e3f4338fe22425a042195c77b30fc1e1b1add4703d68cac1c4033c
+EBUILD squid-0-r3.ebuild 275 BLAKE2B 75770d17d7f8c0110ed76a788e13125c86783dfdb92697d8c4bf1d7293eb694e18dce1c9b459f6a33d8fbe6122bf56c6e742a773dc07be231ff77409d3bc2feb SHA512 6606101d46ecc2ba42fd631fcbaacf614890f0f425c03961368726be0aed62281c9f28bfa33acb8c4d105eef4a60327f342e9a1d80c500dc1d1d6262c0bff326
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-user/squid/squid-0-r2.ebuild b/acct-user/squid/squid-0-r2.ebuild
deleted file mode 100644
index e009bd51a92d..000000000000
--- a/acct-user/squid/squid-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/squid/squid-0-r3.ebuild b/acct-user/squid/squid-0-r3.ebuild
new file mode 100644
index 000000000000..6035229a46b6
--- /dev/null
+++ b/acct-user/squid/squid-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9f8aeb904718..5e8b8b4aa82f 100644
--- a/acct-user/sshd/Manifest
+++ b/acct-user/sshd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sshd-0-r2.ebuild 279 BLAKE2B e4efa829ebf6cb1221ea975c1ae062db53c1db7a3f874977eb59bea414ff74981abbe4066c8d2d4d2f3fb007521b9f630e83b56c5d52d7b09aa40428bdab8077 SHA512 2a3bcb79baa0a7df4bb83753d19e01fd40fed90364c93fdc469d8432bdc3275ba0708994357a7b0690b00ea5767bc4537b439b57632c8f095650f561404d7f11
+EBUILD sshd-0-r3.ebuild 279 BLAKE2B eef2e294033b09300536e80a613f5a7a6bd2228db808bef83c447b42aa88311fbacc060e5b297f4c9dfbc5eee4236c1d7fd187739ad7fd2dc04aa696fa2f2ae6 SHA512 4b9b720b30b9b49588f3bb096c41d416bcdb3b42acb42b944273d4920a4fc14a1534f79b25ab6d6eae211d92e5ec09c4b3dd0a3cc9afb850875a17b07b636507
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
diff --git a/acct-user/sshd/sshd-0-r2.ebuild b/acct-user/sshd/sshd-0-r2.ebuild
deleted file mode 100644
index 1f398feda6db..000000000000
--- a/acct-user/sshd/sshd-0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/sshd/sshd-0-r3.ebuild b/acct-user/sshd/sshd-0-r3.ebuild
new file mode 100644
index 000000000000..530fc5008994
--- /dev/null
+++ b/acct-user/sshd/sshd-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5670cb5e6c05..47da864c8815 100644
--- a/acct-user/sstpc/Manifest
+++ b/acct-user/sstpc/Manifest
@@ -1,2 +1,2 @@
-EBUILD sstpc-0-r1.ebuild 245 BLAKE2B bf997794850030a5c7b5cc76c3137e204276ade2ebc07870252c387ba63d9ea487161ee5964b604bcae7ff485f293f319112cc27c63cf3a4e0af4f440f8deec8 SHA512 1209fe3e9b061bcc1cc549f5828e21b2957113fbf031ac33daa158e3f5555e4cec4bf5c59d300fc737b3eac6a587885d4565a58eb85d8ebe778c464d1ae1d7d6
+EBUILD sstpc-0-r2.ebuild 245 BLAKE2B bc3f60d8be9d600ef5ad2a9a8bdb9da07a78fa4a9efcd427f99f0cc002ec3d82f259e33f250b4b5580a2db27ae9106be08533056992abf6dc9464415aa27c8a0 SHA512 05b5bcf47b1df0315393d5d797de4f2433c659554de7f6b271b1cd556016c32c125e675930085fc9c05e5b00a0ff02e3830cbce26d43e5811ecc1a7d0a84a17d
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
deleted file mode 100644
index 177d09eeb1f7..000000000000
--- a/acct-user/sstpc/sstpc-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/sstpc/sstpc-0-r2.ebuild
new file mode 100644
index 000000000000..0404d22ec3f8
--- /dev/null
+++ b/acct-user/sstpc/sstpc-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/steamcmd/Manifest b/acct-user/steamcmd/Manifest
index 4dd82d3beddd..8961a4238d13 100644
--- a/acct-user/steamcmd/Manifest
+++ b/acct-user/steamcmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD steamcmd-0-r2.ebuild 280 BLAKE2B 8b6c0231de46c079cf984f93d77b83d1c0411d7c6215155b908669713109e98bb39a016379e3d4ba456e4113b924b4564dd109ac9b8147ed26ee5c69e4613a01 SHA512 aea3d431b858da1efea415a04f0444ead4a20709853c5c6ab652d9eb65959d4be9d648ac953102d84f5a3463a510d07af485f009f73e6fb06602dbc44c38bf01
+EBUILD steamcmd-0-r3.ebuild 280 BLAKE2B 6cd63abb78ce8856a351f0c6d0e0b81e3f5a26244072c8575d87d46527b5ad6d6efdfbd408c748426052d17d73deeba7296ea2f1095bf6ec6d375b2de0f80736 SHA512 99885cf91786208e3e96225362ae0db71708b22a39981ead9be0e02a68f506a1340e3d207e070d707eb40762388408396b2f01dfe2b6a03d80ae25358b036bff
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/steamcmd/steamcmd-0-r2.ebuild b/acct-user/steamcmd/steamcmd-0-r2.ebuild
deleted file mode 100644
index c587360a5303..000000000000
--- a/acct-user/steamcmd/steamcmd-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/steamcmd/steamcmd-0-r3.ebuild b/acct-user/steamcmd/steamcmd-0-r3.ebuild
new file mode 100644
index 000000000000..69c2c4175c08
--- /dev/null
+++ b/acct-user/steamcmd/steamcmd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/stubby/Manifest b/acct-user/stubby/Manifest
index ccb6758256de..3a69af2159ac 100644
--- a/acct-user/stubby/Manifest
+++ b/acct-user/stubby/Manifest
@@ -1,2 +1,2 @@
-EBUILD stubby-0-r2.ebuild 253 BLAKE2B 85a950e6b5b4147a52711efc7726080fbc55829fd551d58c77c869667a7353c93ab032e679ce6bad80bdbb941c6b9e677b9f4cc7095980059e092f21fae4b91d SHA512 39b669edaff2c179c7b3df69b7c039709f8baa2954746a3cfb441bbe349bfa70d3678cf2d0a3d234baba80de3d32808c8306662943a93eb2dcbd8e5b28085c24
+EBUILD stubby-0-r3.ebuild 253 BLAKE2B 3090b3d530c6c2d6e54fe811d023083c062cd9c57f9fc308d88dd7881db1447582a8a356c435b0d648bcfafaf8f14e30ee8de0e3e8f6ed64a228e9a6ea4a43fc SHA512 eca103cd943afb16e9501ec3d44f765cdeb7eb20f35dd783f8df68f514484398b83295c01b38a8fc9ae6122b0e7709f5a24d9adb76bda175641d85ffc5eeef30
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/stubby/stubby-0-r2.ebuild b/acct-user/stubby/stubby-0-r2.ebuild
deleted file mode 100644
index c2edde79f5ef..000000000000
--- a/acct-user/stubby/stubby-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/stubby/stubby-0-r3.ebuild b/acct-user/stubby/stubby-0-r3.ebuild
new file mode 100644
index 000000000000..594820538ed5
--- /dev/null
+++ b/acct-user/stubby/stubby-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 417633e471f9..e70d78251e16 100644
--- a/acct-user/stunnel/Manifest
+++ b/acct-user/stunnel/Manifest
@@ -1,2 +1,2 @@
-EBUILD stunnel-0-r2.ebuild 229 BLAKE2B c34ada120d208ad791b21c97e7d01f65f281684e908173bff11a9e7b5f66042f28e9a620e3fd82b23ab184af05daa226531732ea6a5528fa15d5b5fc7a6b83a6 SHA512 da56ffc4e2f3589cbc6d10f843eaeda1ceb4854477e8f3fc28233f1306376679ab17a60f056ca6ec9e983a84361c9b041a264485429fdf46c6641460cba60791
+EBUILD stunnel-0-r3.ebuild 229 BLAKE2B fc9a1f151fe532e8edc4a8ba1cf5ab311ac4859f9753bc386d1a776db2f9ac3914ab0cfe8ef0884812ec949375050f8ba658e445092c7f1efa6a06c7a7b97179 SHA512 266d6de9f7a18cc5ac2e1e6213be6ed676f5d9ecf0d1914e421d3bf7b77a7a12c2412e2caf2ed32e952bcc3ef04a7b589a2b50133c460503b85c5f341847b952
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/stunnel/stunnel-0-r2.ebuild b/acct-user/stunnel/stunnel-0-r2.ebuild
deleted file mode 100644
index 06aa05483ac0..000000000000
--- a/acct-user/stunnel/stunnel-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/stunnel/stunnel-0-r3.ebuild b/acct-user/stunnel/stunnel-0-r3.ebuild
new file mode 100644
index 000000000000..fbf8406047bc
--- /dev/null
+++ b/acct-user/stunnel/stunnel-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 80eae668089d..b9228aa939db 100644
--- a/acct-user/subsonic/Manifest
+++ b/acct-user/subsonic/Manifest
@@ -1,2 +1,2 @@
-EBUILD subsonic-0-r2.ebuild 289 BLAKE2B bd7f6ea73d100a5e994568ebbc4aa010f6cd26077c5156d2d64207795de4567d8010bb6b782c39278bdb5197d96d0027f8e6bf1136698590f64121bbb44c5aa0 SHA512 94daded5da0c5db9a00b162e4fe19dc85db4332ac5d4a908d1fce35350c21e06c7cfb4dc317f768f978212b87214ac8d0511743d100013b23b6b3159a6f87466
+EBUILD subsonic-0-r3.ebuild 289 BLAKE2B b26ab6115090587bf52c2157f0d2b2876c5b4a31cd0af41e5576e536038b02d087406d789ef5da6a7efa6e00bca9d0850342b569f90b33d7c54b6099d5f57ea6 SHA512 45549b2b59c749c4fa692ce066a2d51e8b9833bd614154f1d3b56b7e4db6fe47b48ea77c54400740baf5d25e50bf9d52256c02ee843779de50b7dcd8605a289e
MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/acct-user/subsonic/subsonic-0-r2.ebuild b/acct-user/subsonic/subsonic-0-r2.ebuild
deleted file mode 100644
index c5c61c23e2b7..000000000000
--- a/acct-user/subsonic/subsonic-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/subsonic/subsonic-0-r3.ebuild b/acct-user/subsonic/subsonic-0-r3.ebuild
new file mode 100644
index 000000000000..3a4a427a569a
--- /dev/null
+++ b/acct-user/subsonic/subsonic-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0e4d3dbc585f..1bdbd4dc4428 100644
--- a/acct-user/suricata/Manifest
+++ b/acct-user/suricata/Manifest
@@ -1,2 +1,2 @@
-EBUILD suricata-0-r2.ebuild 234 BLAKE2B dd15990ac2d36f1a0e48879e513ba1ed0fdf8b9ead0d7a7b9597ce01a8886c115d73ce3af6de2f49b6d0b6a45c474ac1049e1b6aed0ebf2ab7c969851f29f687 SHA512 d04ca9a63473d35e892f18bdfd7108a09f87d7575531f76861b98acff7d9d3ef49d6bde3033700e9c6a57e11680538cb58b76f92bb6ad52336c0b5f7e74548b5
+EBUILD suricata-0-r3.ebuild 234 BLAKE2B 96ced412ae3e97436fb79d71ff2de01a8e8ab8761c2b8f63e7de2aa37ce48832614c50e5fe85a7130e36c44606a54ea0188ce7bbec8d979dfbbcdb9f17efe3cd SHA512 fa0c84f732c61acbceed12cf6e2c2badc4156e985cf34e37dcf11e2b11a9fe3a0c9d88d3869a2179772f9aa13e470cb4a527a470a8952f3b469e2594902627df
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/suricata/suricata-0-r2.ebuild b/acct-user/suricata/suricata-0-r2.ebuild
deleted file mode 100644
index 8542433ac1cb..000000000000
--- a/acct-user/suricata/suricata-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/suricata/suricata-0-r3.ebuild b/acct-user/suricata/suricata-0-r3.ebuild
new file mode 100644
index 000000000000..e8977c57fd53
--- /dev/null
+++ b/acct-user/suricata/suricata-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c2adb564d2af..7aaf9a9d8642 100644
--- a/acct-user/svn/Manifest
+++ b/acct-user/svn/Manifest
@@ -1,2 +1,2 @@
-EBUILD svn-0-r2.ebuild 199 BLAKE2B e74e5efd57bfdfc0bdd7dc09a5a4bb7bf5486a60fd73b5cc68ad24f8817c033b23e8fb0e9ec4c40891db3de4f389c1dc9e5f16e261f5c0ca6e9652f2a9cce467 SHA512 8fce8975f4f5ba76059f0ee8efad2ff4ad37d0084a514a7bd8365dd1173b59ed4fc12fa10a02b567375046866803d0a616273706c673b96211b7d1e0a57a8e8b
+EBUILD svn-0-r3.ebuild 199 BLAKE2B 00f0398181e85159eb38174148ee946fd3e99a7fbc2086f2a14d4dfd43c81392e57c252ec8271bd277d3cfd770e3b9e15603ae8856963955c343d16b3b513181 SHA512 6b0559b79d4ac93dbfe3717d4cbc5ee8aab93049c709b39ee857893c23a465ef201882f1fb5461d3a942ad77d8c256ae20f16fae8fbe876f38d084177d793f8f
MISC metadata.xml 255 BLAKE2B 6d9704c53f3cb2feb306acb4fda9d377fd979897237080046e5e5285bdf057281bbb32309764e654c06cce3f6690196f39896508ae6c1dc937e5d3e632fa3cd3 SHA512 ec50c1a81ca10bd96a826462eaec981359cbc400462e7ba7c3d0ded5edcefda5433c21be5df7644adf567e518bd865775e298e48f7d13c92740a80e5be044be4
diff --git a/acct-user/svn/svn-0-r2.ebuild b/acct-user/svn/svn-0-r2.ebuild
deleted file mode 100644
index ccadd54c2705..000000000000
--- a/acct-user/svn/svn-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/svn/svn-0-r3.ebuild b/acct-user/svn/svn-0-r3.ebuild
new file mode 100644
index 000000000000..cee36d84dae9
--- /dev/null
+++ b/acct-user/svn/svn-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 89caa3e38ce4..aba60e12f3f6 100644
--- a/acct-user/svxlink/Manifest
+++ b/acct-user/svxlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD svxlink-0-r1.ebuild 242 BLAKE2B e805f600357d7aecf462a8f315038a54ee42b25b673a1b388bb0313a3494e4f435334e44014c5177661fd74642041fce50314aec6527a4e7b0dc407df1dc8a8f SHA512 637a4353c2f2d10439d47ea29b2747ee748ccc2b4b89a5b3afd1ff5de2272356f57936fb5cfe2210b450fee71a66885cda4a0d7298c4b39119ab29e252dbe116
+EBUILD svxlink-0-r2.ebuild 242 BLAKE2B dee68c7871f257de966ee52f51e2a77087a6d8235d78e92775f92d5810a3fdb8196289d32e942dc5a8fba8ea6fc5d17a649bba6c0924d66ca9eb1f28933b8844 SHA512 b05615b69bc561291fbd869cb751456513613928060ba5092873475e1ff6a3b114c587a67c1bffe97cd180abe67649864b08a5bf7ece57e956888b6ebae36fec
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
deleted file mode 100644
index a1db366fdc42..000000000000
--- a/acct-user/svxlink/svxlink-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/svxlink/svxlink-0-r2.ebuild
new file mode 100644
index 000000000000..f551a8149776
--- /dev/null
+++ b/acct-user/svxlink/svxlink-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/syncthing/Manifest b/acct-user/syncthing/Manifest
index fdca12c0b648..f4b90ab3f7a6 100644
--- a/acct-user/syncthing/Manifest
+++ b/acct-user/syncthing/Manifest
@@ -1,2 +1,2 @@
-EBUILD syncthing-0-r2.ebuild 324 BLAKE2B af417934b4afaa17f4cd5786126599f184f05790c8c39bfc1a2f1b29b4564d8cf4f7f149513cf503ad570fe85766e50803ff39ed6e94c32f80e444d584d0e32b SHA512 ac6ed4a8f6a811c15f89f4f7c685ae12d227ccc8db6dcff866476be885a5c06edf8ade6e827b893d0a823f5e5611427663e2c6d05eb60945d881c39e0b8df9c6
+EBUILD syncthing-0-r3.ebuild 324 BLAKE2B d2f3d1bff0fc5f7322e65c02d6b36a0d37bdd5400f3a7871906e690031e42c640766fd5a023a469abf570afa355839f74cb64269afe54130dfd33e2c9742a3ac SHA512 9088215500dfb8b7652b58d75e2ea039a6f7a04f2259cabcc66cc95384a7c539c2ac7e60dcc7e9a7b7335c2f88966c7fae2b0d7e1fd184c066c69166427d23fa
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/syncthing/syncthing-0-r2.ebuild b/acct-user/syncthing/syncthing-0-r2.ebuild
deleted file mode 100644
index bb5f5ae16039..000000000000
--- a/acct-user/syncthing/syncthing-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/syncthing/syncthing-0-r3.ebuild b/acct-user/syncthing/syncthing-0-r3.ebuild
new file mode 100644
index 000000000000..4a930fccd4ed
--- /dev/null
+++ b/acct-user/syncthing/syncthing-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 51c946e1244d..3fb173583de4 100644
--- a/acct-user/systemd-coredump/Manifest
+++ b/acct-user/systemd-coredump/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-coredump-0-r2.ebuild 207 BLAKE2B 34c74113c41bb33c7bb1e9ff01ece409e504dda9fffe6d77efb8c5aaed0ea530d4153fafc1148d264963fc9e751ab3b2fa5f5520dc9baa36ca4d7b9a62ee9c51 SHA512 35d52bab439a172248a4e8a7b1ea997f551292c9b7a348043be401ec897fa762573518ea2a31cd7f9f6af9d81c2fc13afaf6aeca37285cac0f00400bc5d787b9
+EBUILD systemd-coredump-0-r3.ebuild 207 BLAKE2B a4574ef1533c5ed01cf7bac762406353edcf67b5c27e493bf041a1286dc736f1baf216d94e5c9a5efed8c987852fe6295cafb74cccb6406f4cb5a9ec311736fb SHA512 11e1b68c9ec1cde9f8635b659c5a5b24ad1d43f0c73ca48deddf483ee4bbc6b943e6a25aebfe3f45a3e720b6c24a6398dab4fafb2a1c625adfc7e3a294dffebe
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
deleted file mode 100644
index c6a2b8a225e9..000000000000
--- a/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-coredump/systemd-coredump-0-r3.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r3.ebuild
new file mode 100644
index 000000000000..cf0dc9c2972b
--- /dev/null
+++ b/acct-user/systemd-coredump/systemd-coredump-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a7933da23bbc..ca6874e83646 100644
--- a/acct-user/systemd-journal-remote/Manifest
+++ b/acct-user/systemd-journal-remote/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-remote-0-r2.ebuild 213 BLAKE2B 36ae5af00a3c63ae23e107db0584b23b9bf4ad0672b8604f57ccb1ba790068c5a8f68c581ea47cab306ff77ec441e30e72199bc8563de4beb577fa613ef25e43 SHA512 c623b3334f8a8aec656265548a1978e93476e11575ac2e0121e83fc8150f670783a5cf41d10e3a1c71dba9538e85a62699f324961e28f7ba0131d1ad022826ba
+EBUILD systemd-journal-remote-0-r3.ebuild 213 BLAKE2B fa7187c143a52bd9047746314425e9f84d46af0ed301713ced7ef198b55f305ac23a66d35928f5494abca22f1f86254bc7fd34d2cef00389eef1d1df8345615e SHA512 a9a5470dee1a3908171752fb8ba2c340ae5f5dab9b9d29cb45d853a2d69cd9b27191e878bfb99720b7a31ec385400fdbdc7e36b3ccdc354318bfbcb8b5cea293
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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
deleted file mode 100644
index 79477b5fc172..000000000000
--- a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-journal-remote/systemd-journal-remote-0-r3.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
new file mode 100644
index 000000000000..39d3d14ebb3d
--- /dev/null
+++ b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2fa1413bf3b1..ffa75dd83c0b 100644
--- a/acct-user/systemd-network/Manifest
+++ b/acct-user/systemd-network/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-network-0-r2.ebuild 206 BLAKE2B 0b0dedea20c22b2ddc7b12831775c3833471fd245c9858c7750c8c0b8691152905026536f2ed5cc860a729421d257759ed7b51bdabdaa0571dd5e68dffafdaf7 SHA512 f1dd4835f4c810dcc5e8b633a857989a41c483840d0be1329ef82b425ed129ac2055db85b281517ea9641c3510507a866eb7d9bb3b2dd58bcdedaf61ac424dfb
+EBUILD systemd-network-0-r3.ebuild 206 BLAKE2B 06dde2cd5e8c9161badac8ef282b71b2c2268a7fead529c539027f34b1070231271fc4520e0287389a5c474462d2f0077fecf78c1a5855f3615e9c876e4eb19b SHA512 ef2fb39285c4595ec7f491157e3a70d77267b14d59c5e42dd544bd96d6565de6508a880ad3ff298a273926feeb43ec7274671f2d4a0920ea3fbd2556b73da1b0
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-network/systemd-network-0-r2.ebuild b/acct-user/systemd-network/systemd-network-0-r2.ebuild
deleted file mode 100644
index d4ed5bb35fb1..000000000000
--- a/acct-user/systemd-network/systemd-network-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-network/systemd-network-0-r3.ebuild b/acct-user/systemd-network/systemd-network-0-r3.ebuild
new file mode 100644
index 000000000000..3b105de1f14f
--- /dev/null
+++ b/acct-user/systemd-network/systemd-network-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 9d410490154e..a45d76cd7311 100644
--- a/acct-user/systemd-oom/Manifest
+++ b/acct-user/systemd-oom/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-oom-0-r1.ebuild 202 BLAKE2B 04d3746b8aee287256650e62bbba61867e56aee7d081466ba4c102faee292fa198247eb235cd968e6dede6cbbdbc8a514c354a00ebbd3be965e7d20d45d1d9f2 SHA512 e7d4688723503aa8217635f9014bebe263c9aae70db5e0e93478821a97df7b8950ef4ce4449fa1a1cb7a0e7f876c03a89994ca99360d8e2fe8b6d1e7355e10f4
+EBUILD systemd-oom-0-r2.ebuild 202 BLAKE2B 97259a738364628fa24cbe92d396796c8edc876e1725703ef0dc10d90e5e4e8d2636a0e46033a8b9992164c606033679e320f8bdeec848a14a212726bf080c55 SHA512 9878ce9eb7ad2be824fa66db269f691b397abba413dcd584254527d4f08d6441fab23ebe9511569ee3c7c26c63bd1682a65a111377d266201b1fcee2a0cef0bf
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
deleted file mode 100644
index 4cdc4a3944c7..000000000000
--- a/acct-user/systemd-oom/systemd-oom-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/systemd-oom/systemd-oom-0-r2.ebuild
new file mode 100644
index 000000000000..e4954962fbe7
--- /dev/null
+++ b/acct-user/systemd-oom/systemd-oom-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 582032828692..540b5ea5e3d2 100644
--- a/acct-user/systemd-resolve/Manifest
+++ b/acct-user/systemd-resolve/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-resolve-0-r2.ebuild 206 BLAKE2B 51ee552776b7de3fecc99e960e15a4e0f280b6b6921de92eb431a63c9ac2ca1a99469f813ff5a69486661c291acb44bb6f0f3f2a05d55744121b87546d04cd39 SHA512 032664be2e795ccbfa5096f62ecc34ce9c1477d4ed75b29e612da8f7c2aa0ae1e6ac3db70ae0cd29007330ccf380d08b416091cfaf24339fe4bab154e650e271
+EBUILD systemd-resolve-0-r3.ebuild 206 BLAKE2B e028884104240c0721bf7cd661ec63506f18bddfebd4301f6f674fea08c296b7868d7fc95c01daab844783c98e083f6c2de37c8deec11125b9045f304935c3bd SHA512 9ba0aaf4d4e1f76f08c0d3f9d6e7f1cc9519dff6bacf5ce3361a0c859a0303f8c9285ac1b08f7afdba9830d4a932a35f859e71e3a020ad998fb1c0c47ea6c89a
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
deleted file mode 100644
index c8316cff5ac1..000000000000
--- a/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-resolve/systemd-resolve-0-r3.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r3.ebuild
new file mode 100644
index 000000000000..f70a9b2d3715
--- /dev/null
+++ b/acct-user/systemd-resolve/systemd-resolve-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 5890ed34d011..29148ff95666 100644
--- a/acct-user/systemd-timesync/Manifest
+++ b/acct-user/systemd-timesync/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-timesync-0-r2.ebuild 207 BLAKE2B d0ae649650d6193feb5388d33aca6c200ade30671ae7c6e244ddcf1715c0412a3d1a2132505fce1d6a2115ff6ea6a0e3bcb41b69412e03e04f204d373ed59836 SHA512 b8f0a27ff1d6e531df0b29b19272154a9f6f83358a630dc3578ed0fc7bf8db281da17db788bb47fedb73d112afb2dae7129661276671074920b187f94cde8846
+EBUILD systemd-timesync-0-r3.ebuild 207 BLAKE2B 082b4f92afbed60575cbbc578d75aaf89bcf7bd4474fb806a59b690dfc2ca68f26cdd5955c89ceffe41889df37251ba44f14fd61d628f5d4441bf19d43094865 SHA512 14511a70ffc4ff2813d8a8959087d5ebeb922ff28eaa97604ef407ae9f524692efe186b2218f8c7b7e2d74cf43f90cd6b0f5734ca49ac3d7eb418fd32939dc8a
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
deleted file mode 100644
index 3f4554bdacbd..000000000000
--- a/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/systemd-timesync/systemd-timesync-0-r3.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r3.ebuild
new file mode 100644
index 000000000000..e2a4d84a40b1
--- /dev/null
+++ b/acct-user/systemd-timesync/systemd-timesync-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 e4fc3bd8b719..f0cb0f3c6e54 100644
--- a/acct-user/taskd/Manifest
+++ b/acct-user/taskd/Manifest
@@ -1,2 +1,2 @@
-EBUILD taskd-0-r1.ebuild 301 BLAKE2B 352fd504542dbe14d73258d5911cc02b1b810f3d9409ae5134c13e0cf5a3e0b5d878f0786445fde8c6fdf41b091564e26cda58f38a908891747944f45b3ea7eb SHA512 83bfe7539157a710bfc75d4c78715470de83a00906869a1b3855e5d61177638691331cca2aac0f889c38ecfe0b23d0873d46035ed6839efb5215c23a14e3d7cf
+EBUILD taskd-0-r2.ebuild 301 BLAKE2B ad21bc15d14a7ca72cf97abdc72d2860a81d767f10113f7eebcd7e726b0b8a10e917a0eece37880e1efecaf53c6ce8a1068d1e385d8226e838b090a7f93a0f6b SHA512 db2a5dc3ea83aee595270c4e364c0c418c26d23e92d2f54b8bd40d0f5f8f0e3434fa88f8a0dcbd730cf5ba12658d82631b11ac4ed79048a9e964cd253489fb1d
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
deleted file mode 100644
index a40214d5f105..000000000000
--- a/acct-user/taskd/taskd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/taskd/taskd-0-r2.ebuild
new file mode 100644
index 000000000000..00e4dbabc48f
--- /dev/null
+++ b/acct-user/taskd/taskd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0fe5a2598df9..832e4f060919 100644
--- a/acct-user/teamspeak/Manifest
+++ b/acct-user/teamspeak/Manifest
@@ -1,2 +1,2 @@
-EBUILD teamspeak-0-r2.ebuild 291 BLAKE2B 73b2e7e042a2110c0654294ea84130c49de25deb336114064664c6202b82610811e5a26a00b2df1450765b4b6955b5bab58d7e2273324defe586d94c1a22d12c SHA512 56062989ea1420379e55d20394c86043efa16ef79af39661818d1305e636c83ca09505f963b3aab33d75465913e4bba0432b0e2a9517728c93e2b66697fee3b1
+EBUILD teamspeak-0-r3.ebuild 291 BLAKE2B 7d0ab42a7d261d9ce3b95f7d008d21ea0b6314d7aa2b6f9099d29041b5dfb7edae76ed103ee255e88ea4e58ad9850e04a375988fee32b68e8fd07ef80535eb45 SHA512 b35b28bac2efbd32d4d491b9eccd62bcaabfaa0dc15b9d6a1f75ac4db2b365abac6bd37e15d409e26db40142973d168dd7af37fd53d542942fc732fd585ee110
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/teamspeak/teamspeak-0-r2.ebuild b/acct-user/teamspeak/teamspeak-0-r2.ebuild
deleted file mode 100644
index 4d3115689ebc..000000000000
--- a/acct-user/teamspeak/teamspeak-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/teamspeak/teamspeak-0-r3.ebuild b/acct-user/teamspeak/teamspeak-0-r3.ebuild
new file mode 100644
index 000000000000..fe43320c6ea0
--- /dev/null
+++ b/acct-user/teamspeak/teamspeak-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 244fab74fb1c..517742756e17 100644
--- a/acct-user/telegraf/Manifest
+++ b/acct-user/telegraf/Manifest
@@ -1,2 +1,2 @@
-EBUILD telegraf-0-r2.ebuild 231 BLAKE2B eeb73adc0940e50cee15d98d1900a0cd0df00af566c5501d9d8e85070e4484fcf2cb553b4ac0bb7059b176a29375121aae0e7ddaeef9e22fdd2eed15aefc76d9 SHA512 7647c718a44104f3f5c0f3836b457e418de8b9cfe9ab8d0c94312a5f72a6b246fe20d742a14a32865a2d128949e4506add3f034c8ba3b5a27f65bd380876b5a5
+EBUILD telegraf-0-r3.ebuild 231 BLAKE2B 5c2fa926c287cfcfd9be905f8fbba80db5b57eb14a80a628f19f7bab92ab35283d1ccfc320a93106113d43166ec1c0a55c36b7d7fad2308e3ce750b7168a002f SHA512 f1298affbb9918817a4bc7065eb666e0641dfff942b151f8b0a70657a0f216370fe9c52c181d19303cf2556f0ba417b55386997f1a2e32be1b72fa504b0415c9
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/telegraf/telegraf-0-r2.ebuild b/acct-user/telegraf/telegraf-0-r2.ebuild
deleted file mode 100644
index a5b9ca2670f9..000000000000
--- a/acct-user/telegraf/telegraf-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/telegraf/telegraf-0-r3.ebuild b/acct-user/telegraf/telegraf-0-r3.ebuild
new file mode 100644
index 000000000000..49fdbe3b0027
--- /dev/null
+++ b/acct-user/telegraf/telegraf-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b3a7ef2cfc38..f6a041959897 100644
--- a/acct-user/tenshi/Manifest
+++ b/acct-user/tenshi/Manifest
@@ -1,2 +1,2 @@
-EBUILD tenshi-0-r1.ebuild 275 BLAKE2B 58bd5e9cc12da21fc4e2c19d489fcf9528f216a44df2f7227837f38c3a411b6d87e302e80ec6be32ec75ea301443d56cc32f00c263ce75ecc0c8ad6af03b72d5 SHA512 afead065da14470382032cc5c80fc8eca0dada6c5cf9a65cc6e5e41d3cc64da45aa69355f48f1bc75266f08400dd70316a2610acd887552a11323501918411c2
+EBUILD tenshi-0-r2.ebuild 275 BLAKE2B 7e2cb907d0982d6dfd8a037e385c8b3e1bb5fcc513f18ca465d5a5791dcb73ed1ccebb907b727048e10c4557719a716bc2553db35e5f397a9e931882f0dee5f6 SHA512 84a312ea7e07c24a8810ac28f478d7bd383de63c3d05f7c62acc0658d4e977a00433fec34b7d7ed7b66ea98cbb076cc76d2b7039cd5a384fa5b00fd3bda62c9e
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
deleted file mode 100644
index 4b78147bf97d..000000000000
--- a/acct-user/tenshi/tenshi-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/tenshi/tenshi-0-r2.ebuild
new file mode 100644
index 000000000000..6c01b7955c9b
--- /dev/null
+++ b/acct-user/tenshi/tenshi-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/timidity/Manifest b/acct-user/timidity/Manifest
index 943cb3c4fb43..919c0f8f60bc 100644
--- a/acct-user/timidity/Manifest
+++ b/acct-user/timidity/Manifest
@@ -1,2 +1,2 @@
-EBUILD timidity-0-r1.ebuild 313 BLAKE2B 7a38a387a1cf04458ffec2f5f84083eca0275b6872976d9d4f37c602ee90d7324c8fece7d02cd154d74d1abacc40af4bb9e444ed1cc790079d4d96bc1a928fb4 SHA512 53cc528859730b593205286268b5530306a21478937df02f3ba59ef0e7a293542823fe722b37f895617b1bdd8ba5667f85dc59f7ab35418c40caaa5cf50261f1
+EBUILD timidity-0-r2.ebuild 313 BLAKE2B 930b697c93874ba64d1c6469c12a5582b4f17e31fcb9d577a71f9f7f0251ee22382e3f44c733df6d90961e6d3c8abdf558dbc22cad9c04900d402a30dc7a865e SHA512 22ed9f63e796c5bbadd6d11542fddb1f1e2212327ab0aeaab9a7f560bdaf955b3e88d091cfd0463205ed2e8c97a04105d072761f7586bdf42af7f0870e6b4f8b
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
deleted file mode 100644
index b5ce42f013a5..000000000000
--- a/acct-user/timidity/timidity-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/timidity/timidity-0-r2.ebuild
new file mode 100644
index 000000000000..1628b749bab6
--- /dev/null
+++ b/acct-user/timidity/timidity-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 80cacdcdd269..5349d0dad039 100644
--- a/acct-user/tinydns/Manifest
+++ b/acct-user/tinydns/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinydns-0-r1.ebuild 198 BLAKE2B aa47c14cb31febc727f10318a783ce78e218d3f4b9b55e979ca5957d11a6799c7474678d8260f87d3b5537cc62e87c5bc4b236ff92737d87b8093073ad6db839 SHA512 002e27a6f254feec38323c5b78b987ffe974bd10304f2b8d50b072dcff2ea9a9af812606a3f7e26f92de9f6c451e019efa6de97667f39329f9eea406fabc5020
+EBUILD tinydns-0-r2.ebuild 198 BLAKE2B 729204d85c8ddd0389e9dc8b8b85ed6bba67db90dfa2457c1041b152b562b50f3bd96bcafd79d04908ae6f3042f9acf55b66c5689a44d62c5552b949887fa7c4 SHA512 f6a74e38e88fe219e44d9496aca4ef437a329337b0f66856a2861ed0aed9cf53044f59b59a0835b079ed79977640ed5204c4a385d81fe797f9bb1c4c8143d83d
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
deleted file mode 100644
index 91a3a9c097d3..000000000000
--- a/acct-user/tinydns/tinydns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/tinydns/tinydns-0-r2.ebuild
new file mode 100644
index 000000000000..3fce8ac02c6d
--- /dev/null
+++ b/acct-user/tinydns/tinydns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2fdbbca4fdcf..e7675f990e3f 100644
--- a/acct-user/tinyproxy/Manifest
+++ b/acct-user/tinyproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinyproxy-0-r1.ebuild 242 BLAKE2B c4c625723e62b89c2dc2d20a7b844cd48ca282b75e95d04095c034ac1b6bf37e3e90319181a2f10ba0911881d6dd187b597c125d625d424d694ea158e33bf33f SHA512 41d17a787e756031ac65e2dffbb3ca9169424e96a53497835b99798f24bfceb9d4b87a3ea4259ca3d9fcbae1b860b2fd2dbc38879549ca01027128ad4615d460
+EBUILD tinyproxy-0-r2.ebuild 242 BLAKE2B 1e10c898cd818de7c593f299137d811aa6ea45eee9d2b633da46fd21a58446bcd52f22876d0b3c1a3771935de86a8b21fbbad11c27b8d15a7a2aa2bd635058f5 SHA512 0a156cc699ac4b40352734f2ae43451db3f9854f841de842d5f71e90ca9e1ec1c07d79e9d49d12666a98ff5cb56e19840eb39e76aec9a1d0bdf7ec7f7dea905a
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
deleted file mode 100644
index 20c6ba419bd0..000000000000
--- a/acct-user/tinyproxy/tinyproxy-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/tinyproxy/tinyproxy-0-r2.ebuild
new file mode 100644
index 000000000000..d8f082bbd702
--- /dev/null
+++ b/acct-user/tinyproxy/tinyproxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 29a0161438e5..dc2dbc68f173 100644
--- a/acct-user/tomcat/Manifest
+++ b/acct-user/tomcat/Manifest
@@ -1,2 +1,2 @@
-EBUILD tomcat-0-r1.ebuild 235 BLAKE2B a3a4298d83bb1e49b578d6b068091634656fcb2b8315ac36ad8f4e0ce6c6511a59589b9e0b992065107a57d47bede9b18d1da890fc3120e354a51f5aca44f9d1 SHA512 424f7edfd11e466c790c51a058437f3bbcf1469780e4ba3080bf6d7561ab024def1fbd42a6b2ee062a23872b6030ab5c5e6b367f07806d0c79dbda299aa55dfb
+EBUILD tomcat-0-r2.ebuild 235 BLAKE2B 7fb406f0dc7d3ff9834eafd1289308942c48d554753227d0971f7164841d1e2daed762d1b88536fda1c37389646a7f9c80075630f0ae249e9ed30575b627573a SHA512 994769c8f930deef562a88c92349118e3eda19619bf2bc0d083d27273b7de7868197ae159ccfd6f1b0d6df589957eaa99ab0b0b2fe0cbd1b9beea65231001e33
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
deleted file mode 100644
index ab1a33ae6172..000000000000
--- a/acct-user/tomcat/tomcat-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/tomcat/tomcat-0-r2.ebuild
new file mode 100644
index 000000000000..733fd3b41a49
--- /dev/null
+++ b/acct-user/tomcat/tomcat-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b5db64d6f382..ddfb24782201 100644
--- a/acct-user/tor/Manifest
+++ b/acct-user/tor/Manifest
@@ -1,2 +1,2 @@
-EBUILD tor-0-r2.ebuild 227 BLAKE2B 043918999ba31996165b88e31340a4e572bbfb3402c25105ebca291ff2d93532ac79d69b29bfaab3a43ce9d56b24a3ba4c969aa76b8482319c65d60ffa60bce0 SHA512 ddec4aeee20dc57688c7e9f05ea414804c2e3af746c6b028acc0c345d145bf5d91be792c425c7e21d604b853c37f48487134ad85b97993bcdde2e3e55ba0fc03
+EBUILD tor-0-r3.ebuild 227 BLAKE2B a61ff9aadf05c82566b75872436a8e5582f51deb3985c44271e0d64f626983ae84c90f721a87d4060e571d48332daa2e45035ba615796376f7cf414376cfd495 SHA512 56782094fae2f52528ce08886aa7b311fc28236dcda45cddabff8522d6c6181d4669874f0a9ccfc787f27a378bb9be7bdc6b451d41deaa742b5f9695a7cbb80c
MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/acct-user/tor/tor-0-r2.ebuild b/acct-user/tor/tor-0-r2.ebuild
deleted file mode 100644
index 9a356fc4f42d..000000000000
--- a/acct-user/tor/tor-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/tor/tor-0-r3.ebuild b/acct-user/tor/tor-0-r3.ebuild
new file mode 100644
index 000000000000..20d561a3be2a
--- /dev/null
+++ b/acct-user/tor/tor-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 4d29c98f5a99..0da98f094d3d 100644
--- a/acct-user/tox/Manifest
+++ b/acct-user/tox/Manifest
@@ -1,2 +1,2 @@
-EBUILD tox-0-r2.ebuild 270 BLAKE2B fbc78416aa6f9339a07f20249d3568129224bb3ddfe4b016071bb7fcd67e95916ec6037053aefd3a0926813f761ad735bc6d5350319585476be69ca3bad41f2e SHA512 0f7171366b6a341883617315d1479bf0693a87307d0dde2a2ee9908d1d99104d5e0b8fc395cb589e726adbbe4b1747b1e194f79148f4f70a47cb5e6f578f8591
+EBUILD tox-0-r3.ebuild 270 BLAKE2B e156d7bfffce3ff424bbb8dd01ba5201b33a49c2edf90eb24ba88cc12704b057e7ff31d92dbcc6cb74a6aa04c1716118f40d5a526a9fdd0839973add1b2219c4 SHA512 b1a1fcad69cd066800f8f0380d61257cb883b494968f550673cd56422c56e205830329fe3c6acbe50bbe5d332a0fb961e38d3314155bf5f3b5f6e70f8d3c720e
MISC metadata.xml 401 BLAKE2B 0a0d5a25868d5ad4b1b9b6212ab038e94628f9b2428fc62dcaf1e0fa672a6a4ef4b555767dd6d1ae1e58f82e31a194e6ac5f914fcb21b7a4a5f52bee97ad2eb4 SHA512 58b858736e5503593517b113c9e5417306caf20137303fc03afb43071c088ad5314495f6203e401544e48a87793a0d09d8d231d6f6740639836415c4857a22a2
diff --git a/acct-user/tox/tox-0-r2.ebuild b/acct-user/tox/tox-0-r2.ebuild
deleted file mode 100644
index f2e835541b0c..000000000000
--- a/acct-user/tox/tox-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/tox/tox-0-r3.ebuild b/acct-user/tox/tox-0-r3.ebuild
new file mode 100644
index 000000000000..7f5210837ed6
--- /dev/null
+++ b/acct-user/tox/tox-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/transmission/Manifest b/acct-user/transmission/Manifest
index 39d5dccb2934..8a19f6f9a16e 100644
--- a/acct-user/transmission/Manifest
+++ b/acct-user/transmission/Manifest
@@ -1,2 +1,2 @@
-EBUILD transmission-1-r2.ebuild 203 BLAKE2B bd83de359298a898f6e5f52e3945ff98c8820baa4513226caba8ed3565c3cd559fd4fd19f9ad048837a3ccc559ed919e771111d85885fa84a9f25df9d6f85d5c SHA512 921f3f3b0a3be04d99483f18fd05247fb23d4edb6bc3c5123bb4d46d0dc0184dfa621d1b76eb47d567f92d1eecb22c7cbc2c066e43248e8cabf4c922d9ffc811
+EBUILD transmission-1-r3.ebuild 203 BLAKE2B 1e3e11685ae10500ce3f3be09ca65f16316fcff61d685c78e76c1d7ca90269623eb4b506d6949db2e64e21a1a435f697456e87baf0bd5734f415ceaedefa4c02 SHA512 ee7a66053a81b8bd59eb7f9e70b3d8f214a1ff207613aa778bf99e3a80c8492f320cbb0cb3bd37c17339e47dd03ce28b98a743bec1dd397299de8da80167be42
MISC metadata.xml 247 BLAKE2B 9dcf90d404c84f0ce3da367274c25984b6497a2d8fb68496f497e76c7061c9c7ca7f444f7e4ccb62ba06223caaf0eea4d6aebbb2409ba1f08bb57123e72f0836 SHA512 4681b02c210bf3f869157694af1f80cb3e9b2dd619283a249aaafa85d3bc328c1306af5d61c69040fc503feb3271490bdd2e38e61479a94940fa225810b9e8cb
diff --git a/acct-user/transmission/transmission-1-r2.ebuild b/acct-user/transmission/transmission-1-r2.ebuild
deleted file mode 100644
index 1f899e09ded8..000000000000
--- a/acct-user/transmission/transmission-1-r2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/transmission/transmission-1-r3.ebuild b/acct-user/transmission/transmission-1-r3.ebuild
new file mode 100644
index 000000000000..a774ee577b5a
--- /dev/null
+++ b/acct-user/transmission/transmission-1-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c09b9ec9569a..d3d1325419fe 100644
--- a/acct-user/trickster/Manifest
+++ b/acct-user/trickster/Manifest
@@ -1,2 +1,2 @@
-EBUILD trickster-0-r1.ebuild 245 BLAKE2B d81a3835d326538b76b159a2074c55236f70501e3eedff6a5badb5aef996c28ea919ae00017836dc7d4c14a253ee88c135e9e3f5ecf3a1d63f5b0fed02aedf6f SHA512 fa80ff3c63ec63dcb76c93ad006b832e938ff3a07ca06501d6f23f5b7386290bd3bc2d3bb5477b7b758c4379afb8238c33b644f78cbe901ff33575cabb460bf3
+EBUILD trickster-0-r2.ebuild 245 BLAKE2B 5ad075763ef83cec06a3238d66e279d7df4b5d355c99ee8ff65cc35e98cd9dd01ab1fe548ff9f1531a678cd7b0beb005ba494a188ba928626aa0fcb445199aae SHA512 3ece468053e39f3f137a0cc298df0667294c465eeae0dbfd7795e62a440dc114cfc4deac0e33c0a108dbc71cd512b469c5b2206238aba2eb556a82e78904c52d
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
deleted file mode 100644
index 9be7fc094450..000000000000
--- a/acct-user/trickster/trickster-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/trickster/trickster-0-r2.ebuild
new file mode 100644
index 000000000000..0eba0d3422a0
--- /dev/null
+++ b/acct-user/trickster/trickster-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 97fb0d2bdaa9..e807f864fd5d 100644
--- a/acct-user/trojan/Manifest
+++ b/acct-user/trojan/Manifest
@@ -1,2 +1,2 @@
-EBUILD trojan-0-r1.ebuild 237 BLAKE2B f8780a02559b6c3d032b9acf0f7243fe7d24cfad96a8341ae97a5c798c7e045afc602a8eab37a7107d8d39064f5ae619ecc590b4dd5ef6b3417d26047762ab35 SHA512 992101288a8ef84291b221a81e8eedc5185b2ebbfcf67f0e653a4d31f5754b2b8007dcef24de249606419612f41cac0d2e71eea53008a169a3aa9118598d57b6
+EBUILD trojan-0-r2.ebuild 237 BLAKE2B 81b486e1d4e785c5dfd19fb075e02d829f6945eb02c48090bf31127462ce0de26cc8d3b0328d5e7bb806b6ca80087da28aa7255f2ad143aaabaea6dec2fe9e46 SHA512 87a12c56f879e944f9b011fa1118cc6a45d368ff4b29d1ce6290d27a17d76fb62717dc8425d22cdb8c6d3ca62e48f839ef2b8040b2bff41cb4af4f41c795af8d
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
deleted file mode 100644
index 233972ae9f97..000000000000
--- a/acct-user/trojan/trojan-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/trojan/trojan-0-r2.ebuild
new file mode 100644
index 000000000000..0a667e2cdc09
--- /dev/null
+++ b/acct-user/trojan/trojan-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6ce98fed27e6..b49cc5e04f5a 100644
--- a/acct-user/tss/Manifest
+++ b/acct-user/tss/Manifest
@@ -1,2 +1,2 @@
-EBUILD tss-0-r2.ebuild 244 BLAKE2B 8203fbeaa66875d1c11b5576c5dbd94e9bd4ebba4b5b0ee2fe09a4c09191f097c68111acd54cfa2ab0c7c310608c46d008af0cc8aaa4558f453c9b2367205966 SHA512 f45652e8b886be5c4a1e25b8529f50381a65262fa916dcfe1daa2de8e42eaa6a7a74bc300c6ab1ff5cf4ae32bf50274d73116b98fa6c00b485f3d3d026f74a3c
+EBUILD tss-0-r3.ebuild 244 BLAKE2B e3ac53b372c72f1d3efc22e9c7bfe6761a755b70996b5c3957b4d8e4ee83a8c9216c3d1565cf549e1d16cb24a819cb9206bc51dff835a47f0566f2741e3e6230 SHA512 237dfe9bca167961b9a4c523e6b42e839935559852541128110db9c5838618d8e29afbb40a113380d0a9c49fef92aeacec5e8681aa44ec73efc2948058067108
MISC metadata.xml 404 BLAKE2B 08ad2d09bfd3697b69bcfd85280cb3965aff26e91a49f0840c2fe81d02a5795254a283b95124bfc97a610034e668332d06abae1db1c34657d7aab8ed6963654b SHA512 9b8ca2c33c33a1f4e3f30244069486fb1dd970555c9bb719a5bb8c4e2bc979745e0511216ec70481f0c3b1e716dd631662a1986e1c89628b29b0a85d6b4b9f76
diff --git a/acct-user/tss/tss-0-r2.ebuild b/acct-user/tss/tss-0-r2.ebuild
deleted file mode 100644
index d5b5b705be41..000000000000
--- a/acct-user/tss/tss-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/tss/tss-0-r3.ebuild b/acct-user/tss/tss-0-r3.ebuild
new file mode 100644
index 000000000000..5b08fdf351eb
--- /dev/null
+++ b/acct-user/tss/tss-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d52f764165c2..968e928c45a4 100644
--- a/acct-user/ttrssd/Manifest
+++ b/acct-user/ttrssd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttrssd-0-r1.ebuild 236 BLAKE2B 4c428f50273171c8794c6489b7a8a4ea50a805e6736c9bc944fb88703ac1a46f47360bdea5ea315371a60e080fecc1747e6f4153252abfbde4285848ff93294a SHA512 828578fa7be089546bd6e2b30b8659e82813da350efa811295077cf5394ac9c1371ffc86f9d0f0e1f8b53418c1308217ad6487929acf654056081e990a10ac92
+EBUILD ttrssd-0-r2.ebuild 236 BLAKE2B c5b85dca275436e41b758485433a3cd8c4d3596719d1ef36279500bbb98db8cf5e3a2862b835b2440aee007d6bc41274dee0b5ca9141610b5e3ca5c85485bc76 SHA512 90560b4e6d5c8aa74efcd9022c269578344dfbd030b45196121e877c505ab23e64928c38e11c57b50efb5d1405e8b2ec16147fcd935fe801a3c3a404f0f840ff
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
deleted file mode 100644
index 6068ea16c406..000000000000
--- a/acct-user/ttrssd/ttrssd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/ttrssd/ttrssd-0-r2.ebuild
new file mode 100644
index 000000000000..a3340172d10d
--- /dev/null
+++ b/acct-user/ttrssd/ttrssd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 a10ae1365791..12cec4ed9c07 100644
--- a/acct-user/turnserver/Manifest
+++ b/acct-user/turnserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD turnserver-0-r2.ebuild 257 BLAKE2B 98ad7dfce5363309ab50508f6b14886dab53e6a316a95b44417220ccbb162187683303b9ceb7684483c407226634aa1a420066b19ab7b04a9b540fe41fb06c37 SHA512 fc7564536c04254461d78d20087882d1b1d86f79020a6354f4873af0e7710c5ebc43671cbcf7724b98ed253d24fa4769871656844243d25098ac2771c506888b
+EBUILD turnserver-0-r3.ebuild 257 BLAKE2B 939176fff4538b21f558ed5e992a4665ca1c847f7dad6e17b7ed7f219460c700a5f54ec438ea20866f54acf5f65b64a248e63551d157ae2da5445548c9cdf2e4 SHA512 7a66b1517494202d27bf23ad6ab4542352f7fe7302d1f6e0da931ea8588b76d9328f2a2747858d33b3798ad8d7e7c03426913d95b99a184b2824fb8e5b0aec78
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/turnserver/turnserver-0-r2.ebuild b/acct-user/turnserver/turnserver-0-r2.ebuild
deleted file mode 100644
index 7b96d5e1bdb3..000000000000
--- a/acct-user/turnserver/turnserver-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/turnserver/turnserver-0-r3.ebuild b/acct-user/turnserver/turnserver-0-r3.ebuild
new file mode 100644
index 000000000000..f7083fa752c3
--- /dev/null
+++ b/acct-user/turnserver/turnserver-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 41c4cf15ed28..afbbd58034d7 100644
--- a/acct-user/tvheadend/Manifest
+++ b/acct-user/tvheadend/Manifest
@@ -1,2 +1,2 @@
-EBUILD tvheadend-0-r2.ebuild 289 BLAKE2B 8e07c1cba79a55a013f16f73c8bd0e104684a1446242d063c7e1fb537de09436bdf60cf4b245bc28eae17a7a0d63fd49d068c7cd3efaf36c7569743eca829b16 SHA512 c6e2995742b73d336570cfbee5dbecba53fdcadcd48778826e5b323d652ae542c3716b2f63d46dbbefd85f410fac52d57de77c5988c1136c95e9fd97054b0022
+EBUILD tvheadend-0-r3.ebuild 289 BLAKE2B 5f35caa82dbe95bae3bf3847a997ae58dd0ae3c42c03f637ac773b3390766a13c71aec9e92e26c7563ecde0bb0ba71e136f08fd020aa318ac21463d70d1f99e2 SHA512 0f7342da1bcc7fd25b7d57a62a53e0fc119a6e52fe9b10d4878664e547ba22796432f6e76fe7090bd548746264e57858bc5642f5963afa44bf6d5d25cc4eeb13
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/acct-user/tvheadend/tvheadend-0-r2.ebuild b/acct-user/tvheadend/tvheadend-0-r2.ebuild
deleted file mode 100644
index 81c83454fa65..000000000000
--- a/acct-user/tvheadend/tvheadend-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/tvheadend/tvheadend-0-r3.ebuild b/acct-user/tvheadend/tvheadend-0-r3.ebuild
new file mode 100644
index 000000000000..24a4ab8d463e
--- /dev/null
+++ b/acct-user/tvheadend/tvheadend-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 bdf022d8ea29..bf56f1b0982e 100644
--- a/acct-user/ulogd/Manifest
+++ b/acct-user/ulogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ulogd-0-r1.ebuild 225 BLAKE2B 41c3abea37840071b2190ede74f3b37d493f1925ea44d05e3e4c0db8875ef8a6d7487f4d27dba598a67646c320474b7e1fe3ce84bcbc16f258a63ab199d982c7 SHA512 34a5aef6383cb73613cbed270108ea1cbf94c1f8910f010cce79746e5f2eced8547d13dab13ad4154e1bf462dc409b9c40815d0ded198f2b1221fcb407eb2bc3
+EBUILD ulogd-0-r2.ebuild 225 BLAKE2B 6e0137844f7c913203ff0475f764d64e9e50422ec944b2dbda378fe89e5d40eb21cb511470994329ed17338f91b8f173ddd7f625ef903bde9563aba9e3505e6c SHA512 587b20f6d2ced86395a66e96745aa4ca8c7b1860ba8ab8c18724276e8ce93084db42ebb6f6a7b24ce9731f53f00d5a291b4c4d0b08e185b72189572df096ca88
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
deleted file mode 100644
index b188dd0e935b..000000000000
--- a/acct-user/ulogd/ulogd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/ulogd/ulogd-0-r2.ebuild
new file mode 100644
index 000000000000..82017138e5ca
--- /dev/null
+++ b/acct-user/ulogd/ulogd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for ulogd"
+ACCT_USER_ID=311
+ACCT_USER_GROUPS=( ulogd )
+
+acct-user_add_deps
diff --git a/acct-user/unbound-telemetry/Manifest b/acct-user/unbound-telemetry/Manifest
index df812e36c013..b4cf131dcd0a 100644
--- a/acct-user/unbound-telemetry/Manifest
+++ b/acct-user/unbound-telemetry/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-telemetry-1-r1.ebuild 257 BLAKE2B 3a4d850f649ca74bb12bca66f09d9d7cd72aaf9da79b836db063438354db59dbcebff42ac3f42fbbc8430751ad0f49e9d3c1d47f20d9c8d896c2945ce70374a5 SHA512 c392b469a5e58379867c738a1024eb874ad7d3149b01a1dd93370b3f6b5e37058fdf123a76314962145e8702359272d2f921b61c52a0f6ceb456e3a8291a0fc5
+EBUILD unbound-telemetry-1-r2.ebuild 257 BLAKE2B fcb499d1182dd1bbdb8d9430060c4f67a35aa691093d2d21c4e97e710c465328a33a4bca4d5846e6578c13f64c0505bccc7ae4139532aed737ce21aa85a7bc5d SHA512 2de73af1b4a9886439d416ee050cf632ec9d8dc27e0858dec3d753c3ae1c44315fee6822071377257202784ef05fcb9fcc33057f64a3cfc06c2ca26e48f94648
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
deleted file mode 100644
index 2ea65c1a449e..000000000000
--- a/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1-r2.ebuild
new file mode 100644
index 000000000000..c2ff7fef89a4
--- /dev/null
+++ b/acct-user/unbound-telemetry/unbound-telemetry-1-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2947466e3529..65c9ec43059f 100644
--- a/acct-user/unbound/Manifest
+++ b/acct-user/unbound/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-0-r2.ebuild 320 BLAKE2B 289392878f28f84f1ccb17c10d2c55a3682eb4a28b92493476894d51d064edc4bffa44184ad204c85328e05e7d74e7c39a7e088f494c3a9c542a7d269a1fb038 SHA512 26b118e823256a847438e9922c729b00ca5019787d1a323e9ec6f7a12af9fd000609c54db5137d1083d1010ce8c233eceb5e3682a37a98741e21a87af4bf713c
+EBUILD unbound-0-r3.ebuild 320 BLAKE2B 381b4caf69fa6b30b3b0fc5f6b81b5cee55dfb3aba816deb7c1eb0e717518f8be3b56051f50221084b992d4ab79101df84ecce8b8afb06e6055d6c07475ab155 SHA512 e2a4be96bd3a8e17ea620f20c8c89581b3e1a7f63be7f1facdcd2fdccac4993fecce927c9816c597bb50b12ea535077f88f9fc69bb8812ab3c519c4fc0913d2c
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-user/unbound/unbound-0-r2.ebuild b/acct-user/unbound/unbound-0-r2.ebuild
deleted file mode 100644
index df1e218524b2..000000000000
--- a/acct-user/unbound/unbound-0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/unbound/unbound-0-r3.ebuild b/acct-user/unbound/unbound-0-r3.ebuild
new file mode 100644
index 000000000000..f522b170c46e
--- /dev/null
+++ b/acct-user/unbound/unbound-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 2902822b86b8..66dbde0f497f 100644
--- a/acct-user/unifi-video/Manifest
+++ b/acct-user/unifi-video/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-video-0-r1.ebuild 237 BLAKE2B c3c070c5e493b9d5b94a8a6d639b2cf910f89e6e1ec3a8760e617fc3b685d56c121d889bfa2531974b7b16546b6fcf027264b4c3c0a06e737d3b14d3eaaf71e2 SHA512 7542b79fdfc1ab0a1d56907409e59c195508cbc1ebba5836bfb5bd8df965f84de6a12c1b089f95eafff2712c565f55915644b0532eec5eb12a51fe839eac42a4
+EBUILD unifi-video-0-r2.ebuild 237 BLAKE2B 35cf44702118bb4cdf77604cd1b825fa42f649b5ec2317c93602672621685764f18daa6648616931c6ecd131e786f9fc0ceec97b9b06b1199672bc23ea7cc0bd SHA512 634c267b0ba1f27e7f1be22d7dcc99561e0ca21485b1bda009d5056293bb2e23ee5c56b25558f2a99fd2c2179b102ec1c94c497159342831e317ba02fb20f8e5
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
deleted file mode 100644
index 61784923cdd6..000000000000
--- a/acct-user/unifi-video/unifi-video-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/unifi-video/unifi-video-0-r2.ebuild
new file mode 100644
index 000000000000..6b57a514dca5
--- /dev/null
+++ b/acct-user/unifi-video/unifi-video-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 35272b4d92d2..64061c2dd4ee 100644
--- a/acct-user/unifi/Manifest
+++ b/acct-user/unifi/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-0-r2.ebuild 279 BLAKE2B a62cf945fc8d484af502d2d5dd2f0e43cfe738aff7bf1eb044cb4d2fd234b547d0987981d689172612e5cb3e085a1802b7b74c69259ff392fb7ad6d375e27198 SHA512 efca3e2d2e9163b951a09ac1cf9c86b13069ee30d8dc24ed02fa2d39cb037dcbbdd1b50ff1e5328f20950e94780f136321b3f96f74797a11d4defe54f3a73fab
+EBUILD unifi-0-r3.ebuild 279 BLAKE2B 4dfc8f921b08585cbaf435e7631a919fb6623a13eda0097654da91d9839ac2fa8cf59fe220c3c72e797c9a95090e84cbb6886788518b066990f0fd6550c86b66 SHA512 c5f1e0fc1a654ba7aae19f2fe64db1362c0ba6f4d7a3d76a7973539245f5fa1e57a9cd3744535a80ae41b87a2b15eac3859ea43e811d28887cdbcae0943b2c3c
MISC metadata.xml 580 BLAKE2B 29e2c3d6f265a80010ab1c110bddcf2b32d0609c6cba665096ef1842d1f964f26672fe4f1fb051861115b7796888c98b8f458cdce4b5bdbc1ee94d5c2ea69c47 SHA512 87b708f2edca5e9b1bdbecf9ff34ab59ac4c2523840dd011e86fcdc91c7fa9cc7a908ae55b11eb09f3dd435124cd5689c1d370eeaf62ca163722ad75b9bf1e98
diff --git a/acct-user/unifi/unifi-0-r2.ebuild b/acct-user/unifi/unifi-0-r2.ebuild
deleted file mode 100644
index 6e7e3dae218f..000000000000
--- a/acct-user/unifi/unifi-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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 UniFi Controller"
-
-ACCT_USER_GROUPS=( "unifi" )
-ACCT_USER_HOME="/var/lib/unifi"
-ACCT_USER_ID="113"
-
-acct-user_add_deps
diff --git a/acct-user/unifi/unifi-0-r3.ebuild b/acct-user/unifi/unifi-0-r3.ebuild
new file mode 100644
index 000000000000..4358cd4ae20e
--- /dev/null
+++ b/acct-user/unifi/unifi-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for the UniFi Controller"
+
+ACCT_USER_GROUPS=( "unifi" )
+ACCT_USER_HOME="/var/lib/unifi"
+ACCT_USER_ID="113"
+
+acct-user_add_deps
diff --git a/acct-user/upmpdcli/Manifest b/acct-user/upmpdcli/Manifest
index 0d0b60007e80..eed922932832 100644
--- a/acct-user/upmpdcli/Manifest
+++ b/acct-user/upmpdcli/Manifest
@@ -1,2 +1,2 @@
-EBUILD upmpdcli-0-r1.ebuild 231 BLAKE2B c50db5c6e723240ed6bf409c646e4b2c17b0ef62af65558aa2f4365dd69fcfc9fd3f688971db694da2cb1560d3fce8eca7ffa875204236513408e6fa5526ce86 SHA512 73f9ad55f17c4e6efe78a7e10cb2102109f832595d202e55aa617e284d5b745e623f6fb454e83c0d13925c79c8bc38173e8c18d7cd0e1b13dad74c05cfc4d40f
+EBUILD upmpdcli-0-r2.ebuild 231 BLAKE2B ba207500fe2065f519e99fb75a1aae8fa0c620907383943d97641147131fc7ddd1ed1a1fdd793512a7fd3269f21ac9c971c5a148a16a04a7836483e30edd4224 SHA512 4bef519671e86b9dae480acff9f32a334b52cd9585aafbbf6861a9b4127f5a57344f7fe862ed048269d33fdd26bcc47a7e7055b5b60b8ab084f8089f28d180cc
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
deleted file mode 100644
index 29d8cc165013..000000000000
--- a/acct-user/upmpdcli/upmpdcli-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/upmpdcli/upmpdcli-0-r2.ebuild
new file mode 100644
index 000000000000..1f18010a6e45
--- /dev/null
+++ b/acct-user/upmpdcli/upmpdcli-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for upmpdcli"
+ACCT_USER_ID=372
+ACCT_USER_GROUPS=( upmpdcli )
+
+acct-user_add_deps
diff --git a/acct-user/usbmux/Manifest b/acct-user/usbmux/Manifest
index c6c89976c88d..e8733dfb2c59 100644
--- a/acct-user/usbmux/Manifest
+++ b/acct-user/usbmux/Manifest
@@ -1,2 +1,2 @@
-EBUILD usbmux-0-r2.ebuild 244 BLAKE2B bd3232c9dc768ead3d68c5115941a4a65bfd47dd63dd12c8fa390cc61248cf5835dd65d2edbbf992aca0cf4c40a463b815bd139b257e7b10ec7a9a7572be1bab SHA512 c922c90a7db2f63c140b0d1750a6ffeedeaeb28356ad4da39e53ffb82e394fb06d6348374167b14fda1076687bd6dfc611424a714b2d181ed90494c4e06a0969
+EBUILD usbmux-0-r3.ebuild 244 BLAKE2B a94aa8c38beb742dcb9b02e75fd813dd242708915f0ba187329731166d94054a2e900644ec624e2fe6410e31f38d47549982fcade60998167b28ac248e4b107e SHA512 0555eb0c3722586462c27a61ada14f9e4b388713d6a6f229c0f316e4e0cf92129d70e740fdd5bdb4c1a5918812b2ba6aa49d2162c55a10ff8cf6c8e210dd3bff
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/usbmux/usbmux-0-r2.ebuild b/acct-user/usbmux/usbmux-0-r2.ebuild
deleted file mode 100644
index e3eef86c0e7e..000000000000
--- a/acct-user/usbmux/usbmux-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/usbmux/usbmux-0-r3.ebuild b/acct-user/usbmux/usbmux-0-r3.ebuild
new file mode 100644
index 000000000000..83834396c9e3
--- /dev/null
+++ b/acct-user/usbmux/usbmux-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 45054f364581..ee254659e476 100644
--- a/acct-user/ushare/Manifest
+++ b/acct-user/ushare/Manifest
@@ -1,2 +1,2 @@
-EBUILD ushare-0-r1.ebuild 227 BLAKE2B b72677b3e862147a46d789a89850533eb78864011c5a4afba0f09cc17423cfdee203e149e6cbce4f10eb28a448f78c4f82ddb967d40ccac8cdca127a89bf2bfb SHA512 a5c926ff6431b484983a9a80102aa72102d8ecfbb6b8596b3b4ed3c3506a27e228df4b95d5fdc6671c0493925ec2cbe7292388155161e3326df1c4a275a8dec1
+EBUILD ushare-0-r2.ebuild 227 BLAKE2B 25cd91d8a5c99d7435a690271cbff0cae39dca8399aef54727206ee2978d51552146e06749b4840533b10c3f37de9b9668ab5db318042bfbe7b7f6f2057509c4 SHA512 43583e0db3111f1c62a4980f6d2c4ea7de9db56f35c4be0f936eae94a5e8b37c32096a4f865928493e8bcbfff49c8df06c2f7bdae28de5bcbbcde75a26cee7ed
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
deleted file mode 100644
index 86e0e2ed7b1b..000000000000
--- a/acct-user/ushare/ushare-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-r2.ebuild b/acct-user/ushare/ushare-0-r2.ebuild
new file mode 100644
index 000000000000..7c37b771e16f
--- /dev/null
+++ b/acct-user/ushare/ushare-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 740b48fdf9d7..479d1f47674e 100644
--- a/acct-user/uwsgi_exporter/Manifest
+++ b/acct-user/uwsgi_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD uwsgi_exporter-0-r1.ebuild 262 BLAKE2B 1eecce84eb6ab97fc90a138baa2321c08586c5030b0d58f22abd7476590dfbbbeb27f90483a031b69206a88748f02a9b8de13a61b0e3ed0790f17bb1b0db7f6a SHA512 f2c075e7145e42565195c1559c4a7bfc8cca613ffc030d88ab4fb9084189e1159006338802e3eb8d8af5116140fbbbded95ec863249481ffc568c7f785b6ab6d
+EBUILD uwsgi_exporter-0-r2.ebuild 262 BLAKE2B 0cc01749979116042351f80c9a9917b93b8d531559e0ee9bbccaecbec34b4fa8446fe6e04c8dae9a9560c7ef711659a874d65737de0b1ca34c3452f71510792c SHA512 c07a0b75e5912b285141e886fdcb50e81b7b34699bc40bc0b7cee26e19abdf6124cc7941602c6c871cb0002ec921bfa7121733c7e185789fbcecfecaedf213ef
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
deleted file mode 100644
index ec75b2e127f1..000000000000
--- a/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4a2ced1bb45d
--- /dev/null
+++ b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 56ceb100cdf3..05b407cc8941 100644
--- a/acct-user/vacation/Manifest
+++ b/acct-user/vacation/Manifest
@@ -1,2 +1,2 @@
-EBUILD vacation-0-r1.ebuild 251 BLAKE2B 45a3fa1fd22e458bf6568341c2ccd0237cc4200e596b4345bce4bfcda108c77e8875ef5ccd448f7f04badea0ca2b1bafdca2c4a38dcb6dbb842b8c24fb2540e1 SHA512 7ec13d0385860989b94ad4e0da51770c283d43cace258e05591b48d6f2c5dab95c0051e9edff16eee8e180db59baefb88c2e1ba971737077342d5c93c5e664d6
+EBUILD vacation-0-r2.ebuild 251 BLAKE2B 8e6b3854f01ce9fa2ee841a7c7c960d4f66f751f99cbfcdb528859efa9e59a90c6a390f8d220aa667000aefb116ac004a6495635b9d58330716dce98e6a75edd SHA512 49b965fb42da7db2a1eda77ca5a994e4ea52aad82a3f513ee4153f6e063db04cd25d17c17d07ca77e07905e252417f1c457a41fffa028f612cf9f870a532c099
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
deleted file mode 100644
index a08d55604bb1..000000000000
--- a/acct-user/vacation/vacation-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/vacation/vacation-0-r2.ebuild
new file mode 100644
index 000000000000..cb4f3fe38638
--- /dev/null
+++ b/acct-user/vacation/vacation-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 32bec8cf1371..1ecac0ab6df5 100644
--- a/acct-user/varnish/Manifest
+++ b/acct-user/varnish/Manifest
@@ -1,2 +1,2 @@
-EBUILD varnish-0-r2.ebuild 287 BLAKE2B 5689740b1642ca99c427d00d769b459b30366ae2fbc55f7f941ad4eb0302001d83a7a7d09547c6589b877891a9956aabe9fcdf428ac4e17cc9c2b66db84d7f08 SHA512 4fdb16a4da64e3222195d4dd5e327d2316c85b661a8f228947617f1dd3ecdc0b9a45a7f3d64316fb822315fa7f765482764cb2766d477e98def89496fb1ad593
+EBUILD varnish-0-r3.ebuild 287 BLAKE2B eae2cbcb4c04e1fb8461c39f5124eb1d24ce535b2a73fdac1f1bbf074ee162289fc69a37d330bc22b29e979279b8af3f5522f71a73ad003977855d7ccc8882fe SHA512 8624d7d540ceb11929b55c2b6fc4e4496904522dec52b1ef2f9f9b4e18396092c1c6ebe71505786eccd165bf4d22fb6a108b0df44755ed4dea8692990ba15afc
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/varnish/varnish-0-r2.ebuild b/acct-user/varnish/varnish-0-r2.ebuild
deleted file mode 100644
index 5727e7795c24..000000000000
--- a/acct-user/varnish/varnish-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/varnish/varnish-0-r3.ebuild b/acct-user/varnish/varnish-0-r3.ebuild
new file mode 100644
index 000000000000..8b3a7a0bbc12
--- /dev/null
+++ b/acct-user/varnish/varnish-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 645b0994d411..db3ae1d39d28 100644
--- a/acct-user/vault/Manifest
+++ b/acct-user/vault/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault-0-r2.ebuild 225 BLAKE2B 3bf68a3d7bf750c5f447ac1ae0f1485d999bab8ff09b3aa718bbcec3c53338e8d0a4ce77499ad2457fae05495e12cdad905204c4fead61eba9c76e35acc57259 SHA512 ba9a34159637fd3c59df3a0ede7e8b279877952e5ac066bfcd2a525a8b453fd5c0af93d748b17c2a7f615e2bd15c5f60b3090423405d5b16281f428510879a1e
+EBUILD vault-0-r3.ebuild 225 BLAKE2B 6bd02532e190ee8a1cb8eaa7e9e4e4f49329baaeee1ce3f561f968e6ae8ad81cb781850aa40192ff291a27b3396ef3801bfeedf3fab66cc7c119ecb945e70e4a SHA512 da85a5809e12af7ffc1aabecf3df58213d2dd854387360c45f29193d9f1c83a331869d0c60fe3433f083ef96e238964a114cc4299da3269b0a9ae3617ef8d07e
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-user/vault/vault-0-r2.ebuild b/acct-user/vault/vault-0-r2.ebuild
deleted file mode 100644
index a47d6ed16eec..000000000000
--- a/acct-user/vault/vault-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/vault-0-r3.ebuild b/acct-user/vault/vault-0-r3.ebuild
new file mode 100644
index 000000000000..bf6a93e519b8
--- /dev/null
+++ b/acct-user/vault/vault-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 0b3862e1d192..aa42b85d0f04 100644
--- a/acct-user/vault_exporter/Manifest
+++ b/acct-user/vault_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault_exporter-0-r1.ebuild 262 BLAKE2B f0b56f58a9426d786e955c50f64712a82cb2d2fc3cda535c081d5a23cb17d6882338c2960799a4ad3d9416539a5ebb8b16b7b51a422baf4d81a88a24e3d1b3fd SHA512 acb1dda6d7766d259c9a80355e0ed157a14ce37fef8a928d43b6ee7b8e533f5b644d51737b5baab31210a4b8815086accc4bdef63c0aa64a67a57702cec7e784
+EBUILD vault_exporter-0-r2.ebuild 262 BLAKE2B 7117ade274045301d0079c4f1d645e3b29cafa9db1ec3bfc9594a5d663803803fe3ac620288da6605dfbf9aef3fd72352de4479f9e71e119b9b64089fa5699e5 SHA512 7c5cfa5d3bfc8340481e87476f5033bf848782962bc9b711993b9e7395e16786d412d5fdb8008d0e11ab7378e59a69e0f35b43e3fbfacc9a74a030ded642fba1
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
deleted file mode 100644
index a1be409f83a2..000000000000
--- a/acct-user/vault_exporter/vault_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/vault_exporter/vault_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2123506e29c9
--- /dev/null
+++ b/acct-user/vault_exporter/vault_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ac0490aff6e8..8082c11eaa17 100644
--- a/acct-user/vboxguest/Manifest
+++ b/acct-user/vboxguest/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxguest-0-r2.ebuild 276 BLAKE2B ce0c6be7b81744307906b2f7d111ff6fccac7ce50572530489d9b81c6133c17cc1adfac62731d8050602ea8aade34b013190b1dff12156e84f6af99a11365ff4 SHA512 ec12339422ffb6a3a4e303f715ecddd14a5648d624b12cb6dc0d713c0daba315342a9f4cfe987c3475bf940e0b8e079d1a0a1074df7f4b25bbec7f3434958bf4
+EBUILD vboxguest-0-r3.ebuild 276 BLAKE2B 621d44f7bcdd5ca94e4114b8d6e96a9c312bf5430062e526982e5869c5c04ce90dbededef51ecf56b2609c35ec2fa391560460db38af68b0601bb2a7b4bc5dad SHA512 229318a37df859e4367a1eee264288a15b19cfd73a067ad72e0032281833568e2cfc5a20e11637d02bb6a72a7774809032da145ffdb8eca6d7c4bb96d2e1f1c7
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/vboxguest/vboxguest-0-r2.ebuild b/acct-user/vboxguest/vboxguest-0-r2.ebuild
deleted file mode 100644
index dc0bced73287..000000000000
--- a/acct-user/vboxguest/vboxguest-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/vboxguest/vboxguest-0-r3.ebuild b/acct-user/vboxguest/vboxguest-0-r3.ebuild
new file mode 100644
index 000000000000..08a3dc5f7809
--- /dev/null
+++ b/acct-user/vboxguest/vboxguest-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/vdradmin/Manifest b/acct-user/vdradmin/Manifest
index dadddabdcd65..57281df4cc8c 100644
--- a/acct-user/vdradmin/Manifest
+++ b/acct-user/vdradmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdradmin-0-r2.ebuild 310 BLAKE2B 66122597cf9fd9fcadc8f93724be779bb0797e088991084a7a082a608d1cb6176d009d49a5b815898c4b6265d87c691d8259fc4e023cef50dd1724ebc75cbd15 SHA512 64ceea49884eb17bcfb5f8a22d3d2a613fcf1f8b13f3d48624cc0c21916cbbc415e38149eab79dd8f3be9d48fc8564fb615ed2745262328be274f6c90dbace54
+EBUILD vdradmin-0-r3.ebuild 310 BLAKE2B c4d080fbf74e9ea89f14e70205fff29cf26a60ce2d9c2d480aeace2b1c9f3707d3cd9fca9c110cd8bb24a4cb785fa9c319b10b500b7026b5a87e52bcc74a8847 SHA512 881f63f52fa46f076b5935d27118b6fe10b56d67052286a96b0615bd8322f568b27fb4f18eb58b17048b0fdfe961450cec0525527881451400339e1845779c6b
MISC metadata.xml 246 BLAKE2B fa708d64ea2840e21fa1a00402de140be19ef4c1cf90b00fcd40f2ab10fe5e1397e5bd0a259162c3571a01056535d42d4cb492e97e6ae1756d38831019463db0 SHA512 503c7151fa63101f3a082546d033ecabb7f5ac47f752200d450faaa46c2cd6dfdfc387aa029ad8cb5786d91f7217a3ba64d92dc21ce9268de823fd58feed7db6
diff --git a/acct-user/vdradmin/vdradmin-0-r2.ebuild b/acct-user/vdradmin/vdradmin-0-r2.ebuild
deleted file mode 100644
index 59912a877e0d..000000000000
--- a/acct-user/vdradmin/vdradmin-0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/vdradmin/vdradmin-0-r3.ebuild b/acct-user/vdradmin/vdradmin-0-r3.ebuild
new file mode 100644
index 000000000000..c16cb6cea5b1
--- /dev/null
+++ b/acct-user/vdradmin/vdradmin-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/vpopmail/Manifest b/acct-user/vpopmail/Manifest
index 30f914233db8..798de19159d6 100644
--- a/acct-user/vpopmail/Manifest
+++ b/acct-user/vpopmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD vpopmail-0-r2.ebuild 259 BLAKE2B d3f509bd19e62f97395938a08ce44766db82610d4e14960d742caa19533d8081f5c89565b99e71f551b1f24e2c5ffbb2d8768ee33d24f42f25655f6f32c31a67 SHA512 c53c4aca2dec2ddd1474d69e1148f76806e6dcd2c1e66a9da6089f7696c27413280c76b58fffd17e726e54a96ccf4b81cd5e5d31d61f7dcd4e79b6f37f3c9d55
+EBUILD vpopmail-0-r3.ebuild 259 BLAKE2B 51e38d1b527c1fb81dee625d85aa8c6328a83cffd3dc876ee78ad18b813480e6373268c5930f444e1886f4a66a1ca9696ba2a77d077866f9c74caa4c4fff35a5 SHA512 05373be12efcbb7c29a3e7717234215950cadcb63005ce6c7783afa856c029ccbb32cfd840e033581836f60253b4d3027debb065603974c2da4e70b0d8737a0f
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/vpopmail/vpopmail-0-r2.ebuild b/acct-user/vpopmail/vpopmail-0-r2.ebuild
deleted file mode 100644
index 1992b9dc7f63..000000000000
--- a/acct-user/vpopmail/vpopmail-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/vpopmail/vpopmail-0-r3.ebuild b/acct-user/vpopmail/vpopmail-0-r3.ebuild
new file mode 100644
index 000000000000..ef63f68fa5a6
--- /dev/null
+++ b/acct-user/vpopmail/vpopmail-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 6027e176dad5..b48e8c957fcc 100644
--- a/acct-user/wesnoth/Manifest
+++ b/acct-user/wesnoth/Manifest
@@ -1,2 +1,2 @@
-EBUILD wesnoth-0-r2.ebuild 272 BLAKE2B 1526fc0a6388b0e32063077767022228645d11c070aa267ba1067db0b5fdbf82071a3128c2400847d4cd394cf57115581682fe9398c375391b7dd6e3e4003d52 SHA512 5169cdef71754e95466bdf998c5982b1e322218205e923dd88e6190f8bd700fad504caddfbf6145d26fc712b2bff2dc2bca5e0f4d1786291d4e77c8ec8d8447a
+EBUILD wesnoth-0-r3.ebuild 272 BLAKE2B e37e3de980ed09f39d4c4184b8dc93a011f78f6a43617cd39197438c0e12f2986b70efc81876831497f1d3b5ba8b7d6706aab0568924f5a35a22433f000f8a92 SHA512 01219fe4ab7ee82489cfcd91f0fd55239dbc685899abd81199a7f497e2f5151000100240a8588039751360035d605f04b7effcff1b80836d5b7d437f0fef3f23
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-user/wesnoth/wesnoth-0-r2.ebuild b/acct-user/wesnoth/wesnoth-0-r2.ebuild
deleted file mode 100644
index f7391c12fca0..000000000000
--- a/acct-user/wesnoth/wesnoth-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/wesnoth/wesnoth-0-r3.ebuild b/acct-user/wesnoth/wesnoth-0-r3.ebuild
new file mode 100644
index 000000000000..4486fa1af919
--- /dev/null
+++ b/acct-user/wesnoth/wesnoth-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 280b50a2f1ab..9fe7c9d55177 100644
--- a/acct-user/wwwoffle/Manifest
+++ b/acct-user/wwwoffle/Manifest
@@ -1,2 +1,2 @@
-EBUILD wwwoffle-0-r1.ebuild 283 BLAKE2B d885d83b5eff9b709a48ce8851073fa357edffcf66cbec57a16f41fe4ecdad1bef98695381568b721894d49525bc1147c91255d941f350219db7197000a8d503 SHA512 5ca0285ffeeda456d04b80a44c8deaa0cd11ec79848192edb8fec88cb3f556ec96b92726c87cd21b68f95fa071bb62070d655acdc878f49c71d33ac8d8e3d0ca
+EBUILD wwwoffle-0-r2.ebuild 283 BLAKE2B 9fc0ecc2af4a3122ad82bd725fd77cb9e2c369dd4ad2a3b0a1aeba95a1c786a04e91fa2ccfa947b4e877ee25e586d802590b989be21c269748101c78844bc891 SHA512 22d2e77342c5f8ddec3e85effe9b88a0d865e55d9d6c068946170a7888be1df4c91c890e9ac6df81334f6617a05fb35808e619605d954989ef7d449a9e21a0d0
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
deleted file mode 100644
index 0af0edc9861f..000000000000
--- a/acct-user/wwwoffle/wwwoffle-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/wwwoffle/wwwoffle-0-r2.ebuild
new file mode 100644
index 000000000000..cd5903ffd8f3
--- /dev/null
+++ b/acct-user/wwwoffle/wwwoffle-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c7a713ae4287..fa9f31179201 100644
--- a/acct-user/x2goprint/Manifest
+++ b/acct-user/x2goprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2goprint-0-r2.ebuild 281 BLAKE2B 26c8f9b438b0dbb2be2a01e9dc331e5f023f22bd25793ac829ae0fbefb73fceee45cc66af26dc3ccda0b1b53c30240be3c58e16e255eb709b45781781f98688b SHA512 8ea215ba40272238428be21dec49dcf8233a8a32383c6774b3fb821b0b0446f1421f80d4c5a92461f709eecf704efa84b5dbcbf12320fb68c0ca4ba992acd8b6
+EBUILD x2goprint-0-r3.ebuild 281 BLAKE2B 053e64ac30513af6012167d4e05541490236f8ab16b3cdab2a2b90599996b64e667e13e70f73aaf7fd36790f6d221a21eee0e792b85c051dc84c45dd89da3f11 SHA512 e76ab6fd3ca5b55c12919c46fc34852d1be449e98adb10ac75a3d1525a53ff071aa7289289d88f879cd7bebb96f2a9affe457e442d1238c2d13678273748f5a6
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-user/x2goprint/x2goprint-0-r2.ebuild b/acct-user/x2goprint/x2goprint-0-r2.ebuild
deleted file mode 100644
index adfa585f2ef9..000000000000
--- a/acct-user/x2goprint/x2goprint-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/x2goprint/x2goprint-0-r3.ebuild b/acct-user/x2goprint/x2goprint-0-r3.ebuild
new file mode 100644
index 000000000000..a3e6f2817ec7
--- /dev/null
+++ b/acct-user/x2goprint/x2goprint-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 736ef3568c78..315abf692c4f 100644
--- a/acct-user/x2gouser/Manifest
+++ b/acct-user/x2gouser/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2gouser-0-r2.ebuild 273 BLAKE2B 19c4cc1654e4f54a60db2e9c142521e897712374d3111cd79ed80a929cee47bdcd172370927fa830aabc6b0db6c1e22257472c2e8805608418be668c47a401e5 SHA512 0b3e7a25a19a0021b48351b247406bbbee7d8caad6a48634c9ed7f42de592c5832ae0f24c982a85ebab1f2ce6b4db65e6279188d34337ba7d86fe95c5cb242f6
+EBUILD x2gouser-0-r3.ebuild 273 BLAKE2B 59eef0918fbb81ec26432aada5ce4e870d917f879de855fe6716492149eb67a1f7a874dec32b020680561971e1a6aee1743b672daa1a5902212909ca18c9a230 SHA512 9684a8f8c26de92317a302fff5ac9d2982f3aed84b58cfb1dad5d84ff2589c92998d6298551b05ba1d05ea7c5d2363026eb7a7dbc8ac06840cba36287b132e62
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-user/x2gouser/x2gouser-0-r2.ebuild b/acct-user/x2gouser/x2gouser-0-r2.ebuild
deleted file mode 100644
index b510b563a401..000000000000
--- a/acct-user/x2gouser/x2gouser-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/x2gouser/x2gouser-0-r3.ebuild b/acct-user/x2gouser/x2gouser-0-r3.ebuild
new file mode 100644
index 000000000000..790555e5b54f
--- /dev/null
+++ b/acct-user/x2gouser/x2gouser-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 1475a0ff186b..9018c44ddb2e 100644
--- a/acct-user/xrootd/Manifest
+++ b/acct-user/xrootd/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrootd-0-r2.ebuild 239 BLAKE2B cced29616d0bbb2da3fd22ea12f1ed52ed0f60bfe3512f86261d9b09686f6a5da959fff009b200be2cb4a175259862d05b61f19edcf0b2710d3e7059e9737e9e SHA512 7f3815cdd78e6ccac51848259624cdbd39a75c36696d7fe3d5394f90d38ab451327e601bb376a35a509399dbde286583925960919277d3d41db7cac5d5247af5
+EBUILD xrootd-0-r3.ebuild 239 BLAKE2B 57ca2b8cdb43a4ca49401d34ad1d253c17b53840f0c590112f63abfe667413dcd92f940c1d2fec13d52f26ed60db32c9bb0d3ac98f2b24440ea7254fba4e63f7 SHA512 2ae3abc3349e5a07ec2d5fd8c68a1523563a46817ecfe1ebdf5cdf6246155e3b487da33f63b7d4b4d0d370d2df60d545e06b06927a40db488f7b4392a306b24b
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
diff --git a/acct-user/xrootd/xrootd-0-r2.ebuild b/acct-user/xrootd/xrootd-0-r2.ebuild
deleted file mode 100644
index 3e5b2c648ea4..000000000000
--- a/acct-user/xrootd/xrootd-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/xrootd/xrootd-0-r3.ebuild b/acct-user/xrootd/xrootd-0-r3.ebuild
new file mode 100644
index 000000000000..e4a4f24ae3d2
--- /dev/null
+++ b/acct-user/xrootd/xrootd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/zabbix/Manifest b/acct-user/zabbix/Manifest
index ac277f4e1a72..5b217c5bced5 100644
--- a/acct-user/zabbix/Manifest
+++ b/acct-user/zabbix/Manifest
@@ -1,2 +1,2 @@
-EBUILD zabbix-0-r1.ebuild 362 BLAKE2B 9aaf9bb25b83776d0359e98843b0137c08bc121a934aa6d30fa2ec06147ee8c9474b9f1d1ae6f013e8f8f76923b3dffe92c921a3f11bfc04a26df18567cae0ec SHA512 ec5c0045820d62694af75a22f5c5f09c3fed86d70093e8211db71d515aae7d297420e20063d883d7d1a0f2678b7420fbd23c1f2dc46c300ab2b6345c564bdd1b
+EBUILD zabbix-0-r2.ebuild 362 BLAKE2B 0586193fade3c83a79d9237d963a085c20a7d291303f84c36d9735814a3db06413d461fb9ffabdd29e754b9b8b164400e1d9d6fe3d6fc9087c4b5c2fe0c50d8a SHA512 ccf0441c722b5f3d79b8758a89af1389037af01fa94e53afbbd82006d9879cae71feb02a2063c377988995613d010b1d458cb2bdcd13ae60cf4a8fa84ffe8cde
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
deleted file mode 100644
index e446f599587e..000000000000
--- a/acct-user/zabbix/zabbix-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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-r2.ebuild b/acct-user/zabbix/zabbix-0-r2.ebuild
new file mode 100644
index 000000000000..5841624d6998
--- /dev/null
+++ b/acct-user/zabbix/zabbix-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 8ff27f3e9a51..95b1d6a6078a 100644
--- a/acct-user/zeppelin/Manifest
+++ b/acct-user/zeppelin/Manifest
@@ -1,2 +1,2 @@
-EBUILD zeppelin-0-r2.ebuild 309 BLAKE2B 561a8842ea282ae6bdc10919d96cf1419ad520712d8c30de12e7db651a419005938a1d36e5e94790e135dd07d8993995741b8088dcfa4cbf970f06fe96b05b50 SHA512 7cd898d5ee551a80fb5b72841ad1ecb3fa5dca9346e380ddafd583198d4bf104e23ad30c39d13df66c7edb196c2be61fb955aa49c4a6595c13da4d2c099da92c
+EBUILD zeppelin-0-r3.ebuild 309 BLAKE2B f8b5d8049a9ffef6a9d64902530ad244565f9dd572f047e2efd9ae2aa17611f7468c0487b6c81a6cb2de4e477dd2794743f4681ddde4dfc685505f93f8c0c8ab SHA512 bec8135ff0374dd745bf3f1f2138c59ddb6febd323e5597fe395237e982d46a6b1e2af5b3ba8599cc2d9b4cabc7cea7f8e5ede627cc43c0310be0a6c4df6edc0
MISC metadata.xml 342 BLAKE2B 1684316dabed0d0d2468052855244c3bb2504173b417c5b6f9ff9d2263ed3adf90d406201e19ca132d46ef7a5f072e571e8f16f9f5dc0a95ef0e0723c229ec5e SHA512 cb9dd8f18c328d49b61d1de97b20bebbd1261e944f7a56949e1ce72e7b62413716d83d77f72bce4387fa245d3414fe1b379f0d283487f7be55f2e2c256718a68
diff --git a/acct-user/zeppelin/zeppelin-0-r2.ebuild b/acct-user/zeppelin/zeppelin-0-r2.ebuild
deleted file mode 100644
index 582d17bb219c..000000000000
--- a/acct-user/zeppelin/zeppelin-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/zeppelin/zeppelin-0-r3.ebuild b/acct-user/zeppelin/zeppelin-0-r3.ebuild
new file mode 100644
index 000000000000..15d2f615fe0e
--- /dev/null
+++ b/acct-user/zeppelin/zeppelin-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 59169b5b26d0..a4d51e1c79e2 100644
--- a/acct-user/zetcd/Manifest
+++ b/acct-user/zetcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD zetcd-0-r1.ebuild 242 BLAKE2B 3cc558fcdd32b9435caf230260c8ed37686536cd9547f5d4f1ee01530e4556b9124b8d21bd1d2cd23970dcd270f2231eb051e5a4e7a0648ef4200c962c766d80 SHA512 cc3a04cb36862b87eda1138b99a3d66c080812002183e5f99ee448739bdfd1ebc7dca2ca2096da367085aa0f6e9c451bd14b0b7d9a8d02b32d12d0063491a891
+EBUILD zetcd-0-r2.ebuild 242 BLAKE2B 8b9bc1ab5e60d658b0d1d5de0f93f4583fa941351c68581d300aab30860c33c757d3abb017d387835039bfd25ee1fe9bf3e2c8a9fe9cf73abf682d78244506f9 SHA512 df2b794020bf80ec7e81d13520418337425d81fad87f151e9d63c5fcb2496f50efc6c964fb0eb73cfe5495845fc09c4dda07aa1c2611fc596693ffd5e7f107c9
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
deleted file mode 100644
index 1062f1a71837..000000000000
--- a/acct-user/zetcd/zetcd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-r2.ebuild b/acct-user/zetcd/zetcd-0-r2.ebuild
new file mode 100644
index 000000000000..960d718dca30
--- /dev/null
+++ b/acct-user/zetcd/zetcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 dc3df0772235..2debf75bde7c 100644
--- a/acct-user/ziproxy/Manifest
+++ b/acct-user/ziproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ziproxy-0-r1.ebuild 198 BLAKE2B 3fa3f4a1728872a0944219f030fcaedcf4750410d53763be622c3280252a1b992ebb09181702a3cb8199997ced7925db1917c041f6b8862d3fa7848668c9ee8c SHA512 8d70b3a2e04825f3c25529fbecdde22391dec1b12aa8df32f152c01888e022c391ae31c5111118a1ec81d7605491b55bbc3f23a18c52ba62c6a4191cc7c6d091
+EBUILD ziproxy-0-r2.ebuild 198 BLAKE2B 7d49ff629a8b782a9f8b01316624a89dcfb2373f605a242e18fa34455e723584fd71abe58dc35380c202a96eb012a47103f270b6baaee94c02ce982e742d579a SHA512 2bf3c63c25c4c5dac84a451faecbd0f9e70a17f918d75d58666abe635a0741e48f2548505325879b31f3a48357cf5c77b58f95bcc0a0049b7299d4d0a31fbebc
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
deleted file mode 100644
index aa9df06ff0dc..000000000000
--- a/acct-user/ziproxy/ziproxy-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-r2.ebuild b/acct-user/ziproxy/ziproxy-0-r2.ebuild
new file mode 100644
index 000000000000..22a019769a95
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 b5d389d87a4c..4d4e0dc5522a 100644
--- a/acct-user/znc/Manifest
+++ b/acct-user/znc/Manifest
@@ -1,2 +1,2 @@
-EBUILD znc-0-r2.ebuild 358 BLAKE2B be3f7674b1a30e7388da85ed69de0111b1ce3036b05355f801f6bfcada7161d287ffc8b0b42d196876dfb871660e8de44e5083940713d0868ea9166b1e06cbb4 SHA512 392c1d59dcdc86ca55fa468178747db1fd0b3552170919162efa20b822999eb6a48b7f24caa8f7d78464db869d9047394b2a3ba308d9ba47e2a9a149bd8a108b
+EBUILD znc-0-r3.ebuild 358 BLAKE2B cca0f571b88b0382c9b6cb25abc5d80a9c436ad6d065e85b8fcdae05d45236f6a7849b17a06d740732d6da27d118e87a94b5ad2d2ebf803b621126472fb9acf3 SHA512 229b70f29a39a15e9ab468fac56be9a7d7b3ac61e30df863178d7678ee2f5a851e0bad320de2f9443f606673d6a1978c8bb7bc26c9be1129acd6fdcc62db4404
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-user/znc/znc-0-r2.ebuild b/acct-user/znc/znc-0-r2.ebuild
deleted file mode 100644
index 9381b0301b03..000000000000
--- a/acct-user/znc/znc-0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/znc/znc-0-r3.ebuild b/acct-user/znc/znc-0-r3.ebuild
new file mode 100644
index 000000000000..045ff97ee989
--- /dev/null
+++ b/acct-user/znc/znc-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 d965cb8313a5..047861544b32 100644
--- a/acct-user/zookeeper/Manifest
+++ b/acct-user/zookeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD zookeeper-0-r1.ebuild 292 BLAKE2B 6a7d023d5fc8a77b0569b422d795c5a4f52e40ade691c5faa3e5740a6e72cd44c519d650bd54327fa496e53319eda39552295a3090acf55d4ab9a759468d1f1e SHA512 709f5230999007c555bc7114a872f10a0cd201142e329f844b714675fd0863aad54d5337cf948f13703525e3baee9b25bb9c2469c2b6321ab8948c5cc55291ac
+EBUILD zookeeper-0-r2.ebuild 292 BLAKE2B 017abd9e8a1278caf32fa1f89e20c3185c036ff64564ab541bbee8fe124e06a8dc4144523beb8c3fee2aa918c03653178969594cfc4479939e744cfe404a1325 SHA512 9dd63a9aaa7eefda9f83b4a4171611fd4e877a685dc3c165eba9af81f75a3977d6046e80280da8afb492f49b222e4153fc2dcd34eb4e2f56da9a3b96586f20b2
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
deleted file mode 100644
index 668e3452c457..000000000000
--- a/acct-user/zookeeper/zookeeper-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-r2.ebuild b/acct-user/zookeeper/zookeeper-0-r2.ebuild
new file mode 100644
index 000000000000..ab674235230f
--- /dev/null
+++ b/acct-user/zookeeper/zookeeper-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-cluster/zookeeper-bin"
+
+ACCT_USER_GROUPS=( "zookeeper" )
+ACCT_USER_HOME="/var/lib/zookeeper"
+ACCT_USER_ID="211"
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a52f07bc2dc1..12362905a217 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 5595e89afd47..0c49d974585d 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -26,5 +26,5 @@ DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1
EBUILD salt-3005.5-r1.ebuild 12567 BLAKE2B 0ee7db92b7ba6d5035b11135da669ecb08fdfd435829e1b97218fc6ac4a6e4587d52728c4a5b86abc3b0663de749428acfa7f50473e2368ad697dc9a21021ce5 SHA512 0b7c2feb5e2b3b464973617c76f2dfb9e79836f402af1b44af1d7f5a89a00623bc45244d4ed299b12f2e1a9c33222f87dc82d4832d0a60bf52d9758b2b08a580
EBUILD salt-3006.5-r1.ebuild 15196 BLAKE2B beb3924f91cf050c2a57414e0121d08c54991c2aa1b5c89a1c67afa644c1ef030415dc588b36e6aa11adf651d851f82365b4d5ccfa27e043c707756ddfe4c6c8 SHA512 c4b1d4a50546196f75c9d1327aa13bb649a61349b52f60b91cc958ad5bfcb1c438042c29d513a94aebb9f92d4d5acc47438d4e34468701e840ca0a0e52f7805e
EBUILD salt-3006.7-r1.ebuild 15374 BLAKE2B b98136c7f1758989a62a5244dddeb818f326e7a5c102ae027b187b487af0cad930189baf9e9d5cfd89dede0de4a00695427fb9965bcb7f93a4c0815eaa59d591 SHA512 d206b90d3b0306cf66c308f4d7d763ef268796a78e8241d9b2cbe8861010738ef80a443c37e0056f214218a3a640bcc194a135047f6e322a40279c6189f2932d
-EBUILD salt-3007.0.ebuild 30926 BLAKE2B 10fb023229ef616c09eed936616c008d22503fea415a215c14dc9a72586d5ec347639a4f3e8e154fef9d7fb7dbbdf9afe6ae0c2531b5ecdb2892f412899b9aa8 SHA512 9ba276e0b871532137977bbf3a5551de0ea72760742ed11e6afbc5508f25fcb84372be2569ffd31365ec3a39260625095c94005e3dd2c783f1bf5940e9e1ea2a
+EBUILD salt-3007.0-r1.ebuild 30877 BLAKE2B ee941343b6074c1fb5a1392fbb9a6228125f2761a3c602cb39ee96ebab38517e32fb9b9a4e319928076a79643d3e8b3ec559602b5b18ffd15a98ea3426011907 SHA512 e48cfee790e9151894e50474150ce0f29aad25ec6d274212655b7fe2f6b6a318d636b5745e8d9cc67a77a3b36a2b74530b5a1b5abde12244afda526e325a575d
MISC metadata.xml 2304 BLAKE2B 8fac51fe1b0c0dae5fe71d88f1bf84df1de8cc8b3d836b59c3b2e82bfa085f57352e3aafd999766ae69104a8bd9798f2fffdb64e1df1e0a1ca8561dba1ef7d5e SHA512 7d3706c40c27dd67509bd638cd0550bb4822f0895fef929ecad21c218cdaa0512da443c901cc2b3a8d4afd9f5e9bc461622ac3bab2a332ccd9c64c4cbf99bf74
diff --git a/app-admin/salt/salt-3007.0-r1.ebuild b/app-admin/salt/salt-3007.0-r1.ebuild
new file mode 100644
index 000000000000..0400dc0b8b7a
--- /dev/null
+++ b/app-admin/salt/salt-3007.0-r1.ebuild
@@ -0,0 +1,610 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_1{0..2} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+ https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+else
+ inherit pypi
+ KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+ cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+ mongodb neutron nova portage profile redis selinux test raet
+ +zeromq vim-syntax
+"
+
+RDEPEND="
+ sys-apps/pciutils
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.5[${PYTHON_USEDEP}]
+ dev-python/importlib-metadata[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/libnacl[${PYTHON_USEDEP}]
+ dev-python/looseversion[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+ dev-python/python-gnupg[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
+ dev-python/tornado[${PYTHON_USEDEP}]
+ dev-python/watchdog[${PYTHON_USEDEP}]
+ libcloud? (
+ >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]
+ dev-python/aiosignal[${PYTHON_USEDEP}]
+ >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+ dev-python/async-timeout[${PYTHON_USEDEP}]
+ )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? (
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
+ genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ nova? (
+ $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
+ )
+ neutron? (
+ $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
+ )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )
+ zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+ sys-apps/findutils
+ dev-python/build[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ app-arch/zip
+ dev-python/apache-libcloud[${PYTHON_USEDEP}]
+ dev-python/boto3[${PYTHON_USEDEP}]
+ >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
+ dev-python/cherrypy[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+ <dev-python/moto-5[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/pygit2[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}]
+ dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+ dev-python/pytest-subtests[${PYTHON_USEDEP}]
+ dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+ dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+ dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+ dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ net-dns/bind-tools
+ >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+ dev-util/yamllint[${PYTHON_USEDEP}]
+ !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
+ )
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="
+ || ( raet zeromq )
+ test? ( cheetah genshi )
+ nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
+ neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
+"
+RESTRICT="
+ !test? ( test )
+ x86? ( test )
+"
+
+PATCHES=(
+ "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+)
+
+python_prepare_all() {
+ local -a remove_test_files=(
+ # remove tests with external dependencies that may not be available, and
+ # tests that don't work in sandbox
+ tests/integration/externalapi/test_venafiapi.py
+ tests/integration/modules/test_rabbitmq.py
+ tests/integration/modules/test_supervisord.py
+ tests/integration/states/test_match.py
+ tests/pytests/functional/fileserver/hgfs/test_hgfs.py
+ tests/pytests/functional/loader/test_loader.py
+ tests/pytests/functional/modules/file/test_readlink.py
+ tests/pytests/functional/modules/file/test_symlink.py
+ tests/pytests/functional/modules/state/test_jinja_filters.py
+ tests/pytests/functional/modules/state/test_jinja_renderer.py
+ tests/pytests/functional/modules/state/test_mako_renderer.py
+ tests/pytests/functional/modules/state/test_pyobjects_renderer.py
+ tests/pytests/functional/modules/test_aptpkg.py
+ tests/pytests/functional/modules/test_dockermod.py
+ tests/pytests/functional/modules/test_etcd_mod.py
+ tests/pytests/functional/modules/test_grains.py
+ tests/pytests/functional/modules/test_mac_service.py
+ tests/pytests/functional/modules/test_saltcheck.py
+ tests/pytests/functional/modules/test_saltutil.py
+ tests/pytests/functional/modules/test_test.py
+ tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py
+ tests/pytests/functional/pillar/test_git_pillar.py
+ tests/pytests/functional/pillar/test_gpg.py
+ tests/pytests/functional/returners/test_etcd_return.py
+ tests/pytests/functional/runners/test_winrepo.py
+ tests/pytests/functional/sdb/test_etcd_db.py
+ tests/pytests/functional/state/test_masterless_tops.py
+ tests/pytests/functional/states/file/test_keyvalue.py
+ tests/pytests/functional/states/file/test_patch.py
+ tests/pytests/functional/states/file/test_rename.py
+ tests/pytests/functional/states/rabbitmq
+ tests/pytests/functional/states/test_docker_container.py
+ tests/pytests/functional/states/test_docker_network.py
+ tests/pytests/functional/states/test_etcd_mod.py
+ tests/pytests/functional/states/test_module.py
+ tests/pytests/functional/states/test_mysql.py
+ tests/pytests/functional/states/test_svn.py
+ tests/pytests/functional/states/test_virtualenv_mod.py
+ tests/pytests/functional/test_version.py
+ tests/pytests/functional/utils/test_vault.py
+ tests/pytests/integration/cli/test_syndic_eauth.py
+ tests/pytests/integration/daemons/test_memory_leak.py
+ tests/pytests/integration/grains/test_grains.py
+ tests/pytests/integration/master/test_clear_funcs.py
+ tests/pytests/integration/minion/test_reauth.py
+ tests/pytests/integration/modules/grains/test_append.py
+ tests/pytests/integration/modules/grains/test_module.py
+ tests/pytests/integration/modules/saltutil/test_grains.py
+ tests/pytests/integration/modules/saltutil/test_modules.py
+ tests/pytests/integration/modules/saltutil/test_wheel.py
+ tests/pytests/integration/modules/state/test_state_pillar_errors.py
+ tests/pytests/integration/modules/state/test_state_test.py
+ tests/pytests/integration/modules/test_cmdmod.py
+ tests/pytests/integration/modules/test_event.py
+ tests/pytests/integration/modules/test_file.py
+ tests/pytests/integration/modules/test_jinja.py
+ tests/pytests/integration/modules/test_pillar.py
+ tests/pytests/integration/modules/test_pip.py
+ tests/pytests/integration/modules/test_vault.py
+ tests/pytests/integration/modules/test_virt.py
+ tests/pytests/integration/modules/test_x509_v2.py
+ tests/pytests/integration/proxy/test_deltaproxy.py
+ tests/pytests/integration/proxy/test_shell.py
+ tests/pytests/integration/reactor/test_reactor.py
+ tests/pytests/integration/returners/test_noop_return.py
+ tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py
+ tests/pytests/integration/runners/test_cache.py
+ tests/pytests/integration/runners/test_jobs.py
+ tests/pytests/integration/runners/test_manage.py
+ tests/pytests/integration/runners/test_saltutil.py
+ tests/pytests/integration/runners/test_vault.py
+ tests/pytests/integration/sdb/test_vault.py
+ tests/pytests/integration/ssh/state/test_pillar_override.py
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py
+ tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py
+ tests/pytests/integration/ssh/state/test_retcode_render_exception.py
+ tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py
+ tests/pytests/integration/ssh/state/test_retcode_run_fail.py
+ tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py
+ tests/pytests/integration/ssh/state/test_state.py
+ tests/pytests/integration/ssh/state/test_with_import_dir.py
+ tests/pytests/integration/ssh/test_cmdmod.py
+ tests/pytests/integration/ssh/test_config.py
+ tests/pytests/integration/ssh/test_cp.py
+ tests/pytests/integration/ssh/test_deploy.py
+ tests/pytests/integration/ssh/test_grains.py
+ tests/pytests/integration/ssh/test_jinja_mods.py
+ tests/pytests/integration/ssh/test_master.py
+ tests/pytests/integration/ssh/test_mine.py
+ tests/pytests/integration/ssh/test_pillar.py
+ tests/pytests/integration/ssh/test_pillar_compilation.py
+ tests/pytests/integration/ssh/test_pre_flight.py
+ tests/pytests/integration/ssh/test_publish.py
+ tests/pytests/integration/ssh/test_py_versions.py
+ tests/pytests/integration/ssh/test_raw.py
+ tests/pytests/integration/ssh/test_saltcheck.py
+ tests/pytests/integration/ssh/test_slsutil.py
+ tests/pytests/integration/states/test_beacon.py
+ tests/pytests/integration/states/test_file.py
+ tests/pytests/integration/states/test_include.py
+ tests/pytests/integration/states/test_ini_manage.py
+ tests/pytests/integration/states/test_state_test.py
+ tests/pytests/integration/states/test_x509_v2.py
+ tests/pytests/integration/utils/test_templates.py
+ tests/pytests/integration/wheel/test_key.py
+ tests/pytests/pkg/integration/test_check_imports.py
+ tests/pytests/pkg/integration/test_clean_zmq_teardown.py
+ tests/pytests/pkg/integration/test_enabled_disabled.py
+ tests/pytests/pkg/integration/test_help.py
+ tests/pytests/pkg/integration/test_logrotate_config.py
+ tests/pytests/pkg/integration/test_pkg.py
+ tests/pytests/pkg/integration/test_python.py
+ tests/pytests/scenarios/compat/test_with_versions.py
+ tests/pytests/unit/loader/test_lazy.py
+ tests/pytests/unit/modules/test_mongodb.py
+ tests/pytests/unit/modules/test_mysql.py
+ tests/pytests/unit/modules/test_schedule.py
+ tests/pytests/unit/pillar/test_consul_pillar.py
+ tests/pytests/unit/pillar/test_mysql.py
+ tests/pytests/unit/renderers/test_yamlex.py
+ tests/pytests/unit/roster/test_ansible.py
+ tests/pytests/unit/roster/test_dir.py
+ tests/pytests/unit/runners/test_reactor.py
+ tests/pytests/unit/states/file/test_keyvalue.py
+ tests/pytests/unit/utils/jinja/test_get_template.py
+ tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
+ tests/pytests/unit/utils/test_cache.py
+ tests/pytests/unit/utils/test_etcd_util.py
+ tests/pytests/unit/utils/test_package.py
+ tests/pytests/unit/utils/test_versions.py
+ tests/unit/ext/test_ipaddress.py
+ tests/unit/modules/test_boto_elb.py
+ tests/unit/modules/test_boto_secgroup.py
+ tests/unit/modules/test_boto_vpc.py
+ tests/unit/modules/test_elasticsearch.py
+ tests/unit/modules/test_k8s.py
+ tests/unit/modules/test_kubernetesmod.py
+ tests/unit/modules/test_vsphere.py
+ tests/unit/netapi/rest_tornado/test_saltnado.py
+ tests/unit/states/test_boto_vpc.py
+ tests/unit/states/test_module.py
+ tests/unit/test_module_names.py
+ tests/unit/test_zypp_plugins.py
+ tests/unit/utils/test_extend.py
+ tests/unit/utils/test_pbm.py
+ tests/unit/utils/test_schema.py
+ tests/unit/utils/test_vmware.py
+ tests/unit/utils/test_vsan.py
+
+ # tests that require network access
+ tests/integration/cloud
+ tests/integration/netapi
+ tests/kitchen/test_kitchen.py
+ tests/kitchen/tests/wordpress/tests
+ tests/pytests/functional/cli/test_salt_cloud.py
+ tests/pytests/functional/cli/test_salt_run_.py
+ tests/pytests/functional/modules/test_ansiblegate.py
+ tests/pytests/functional/modules/test_http.py
+ tests/pytests/functional/modules/test_pip.py
+ tests/pytests/functional/netapi
+ tests/pytests/functional/utils/test_etcd_util.py
+ tests/pytests/functional/utils/test_http.py
+ tests/pytests/integration/cli/test_salt_proxy.py
+ tests/pytests/integration/daemons/test_masterapi.py
+ tests/pytests/integration/modules/state/test_state.py
+ tests/pytests/integration/modules/state/test_state_state_events.py
+ tests/pytests/integration/netapi
+ tests/pytests/integration/pillar/cache/test_pillar_cache.py
+ tests/pytests/integration/pillar/test_fileclient.py
+ tests/pytests/integration/pillar/test_pillar_include.py
+ tests/pytests/integration/proxy/test_simple.py
+ tests/pytests/integration/runners/state/orchestrate/test_events.py
+ tests/pytests/integration/wheel/test_pillar_roots.py
+ tests/pytests/pkg/downgrade/test_salt_downgrade.py
+ tests/pytests/pkg/integration/test_pip.py
+ tests/pytests/pkg/integration/test_pip_upgrade.py
+ tests/pytests/pkg/integration/test_salt_api.py
+ tests/pytests/pkg/integration/test_salt_call.py
+ tests/pytests/pkg/integration/test_salt_exec.py
+ tests/pytests/pkg/integration/test_salt_grains.py
+ tests/pytests/pkg/integration/test_salt_key.py
+ tests/pytests/pkg/integration/test_salt_minion.py
+ tests/pytests/pkg/integration/test_salt_output.py
+ tests/pytests/pkg/integration/test_salt_pillar.py
+ tests/pytests/pkg/integration/test_salt_state_file.py
+ tests/pytests/pkg/integration/test_salt_ufw.py
+ tests/pytests/pkg/integration/test_salt_user.py
+ tests/pytests/pkg/integration/test_systemd_config.py
+ tests/pytests/pkg/integration/test_version.py
+ tests/pytests/pkg/upgrade/test_salt_upgrade.py
+ tests/pytests/scenarios/cluster/test_cluster.py
+ tests/pytests/unit/client/ssh/test_ssh.py
+ tests/pytests/unit/cloud/clouds/vmware
+ tests/pytests/unit/loader/test_loading_modules.py
+ tests/pytests/unit/runners/test_net.py
+ tests/pytests/unit/states/file/test_mod_beacon.py
+ tests/pytests/unit/test_client.py
+ tests/pytests/unit/utils/test_aws.py
+ tests/pytests/unit/utils/test_http.py
+ tests/unit/modules/test_boto3_elasticsearch.py
+ tests/unit/modules/test_boto3_route53.py
+ tests/unit/modules/test_network.py
+ tests/unit/modules/test_zcbuildout.py
+ tests/unit/states/test_zcbuildout.py
+
+ # tests require root access
+ tests/integration/pillar/test_git_pillar.py
+ tests/integration/states/test_lxd_container.py
+ tests/integration/states/test_lxd_image.py
+ tests/integration/states/test_lxd_profile.py
+ tests/integration/states/test_supervisord.py
+ tests/pytests/functional/cache/test_mysql.py
+ tests/pytests/functional/cli/test_salt.py
+ tests/pytests/functional/modules/test_mysql.py
+ tests/pytests/functional/modules/test_vault.py
+ tests/pytests/functional/states/file/test_accumulated.py
+ tests/pytests/functional/utils/test_gitfs.py
+ tests/pytests/functional/utils/test_pillar.py
+ tests/pytests/scenarios/performance/test_performance.py
+ tests/pytests/unit/cloud/test_map.py
+ tests/pytests/unit/engines/test_slack_bolt_engine.py
+ tests/pytests/unit/modules/state/test_state.py
+ tests/pytests/unit/modules/state/test_top_file_merge.py
+ tests/pytests/unit/proxy/test_netmiko_px.py
+ tests/pytests/unit/proxy/test_ssh_sample.py
+ tests/pytests/unit/roster/test_sshknownhosts.py
+
+ # tests that require boto
+ tests/pytests/unit/engines/test_sqs_events.py
+
+ # first test always fails
+ tests/pytests/unit/utils/parsers/test_log_parsers.py
+ )
+
+ rm -r "${remove_test_files[@]}" || die
+
+ # axe the boto dep (bug #888235)
+ find "${S}/tests" -name 'test_boto_*.py' -delete || die
+
+ # removes contextvars, see bug: https://bugs.gentoo.org/799431
+ sed -i '/^contextvars/d' requirements/base.txt || die
+
+ # called_once should be assert_called_once_with
+ find "${S}/tests" -name '*.py' -print0 \
+ | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ local -x USE_SETUPTOOLS=1
+ distutils-r1_python_install_all
+
+ local svc
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local -a EPYTEST_DESELECT=(
+ # doesn't like the distutils warning
+ tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+ tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+
+ # hangs indefinitely
+ tests/pytests/unit/test_minion.py::test_master_type_disable
+
+ # needs root
+ tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+ tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure
+
+ # don't like sandbox
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest
+ tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward
+ tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
+ tests/pytests/functional/modules/test_defaults.py::test_defaults_get
+ tests/pytests/functional/modules/test_system.py::test_get_system_date_time
+ tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc
+ tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
+ tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
+ tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source
+ tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
+ tests/pytests/functional/states/file/test_comment.py::test_issue_62121
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
+ tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
+ tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
+ tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
+ tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+ tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
+ tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
+ tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
+ tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
+ tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
+ tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
+ tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
+ tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings
+ tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state
+ tests/pytests/functional/states/test_pip_state.py::test_issue_54755
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env
+ tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]"
+ tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
+ tests/pytests/functional/utils/test_pillar.py::test_gitpython_env
+ tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request
+ tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos
+ tests/pytests/functional/utils/test_pillar.py::test_pygit2_env
+ tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos
+ tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple
+ tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple
+ tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout
+ tests/pytests/integration/minion/test_return_retries.py::test_publish_retry
+ tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]"
+ tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]"
+ tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
+ tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
+ tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call
+ tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt
+ tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]"
+ tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]"
+ tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]"
+ tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime
+ tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster
+ tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
+ tests/pytests/unit/grains/test_core.py::test_get_machine_id
+ tests/pytests/unit/grains/test_package.py::test_grain_package_type
+ tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
+ tests/pytests/unit/modules/test_beacons.py::test_add
+ tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module
+ tests/pytests/unit/modules/test_beacons.py::test_delete
+ tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module
+ tests/pytests/unit/modules/test_beacons.py::test_disable
+ tests/pytests/unit/modules/test_beacons.py::test_enable
+ tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module
+ tests/pytests/unit/modules/test_beacons.py::test_save
+ tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar
+ tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase
+ tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
+ tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+ tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
+ tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
+ tests/pytests/unit/states/test_pkg.py::test_mod_beacon
+ tests/pytests/unit/states/test_service.py::test_mod_beacon
+ tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+ tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
+ tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
+ tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
+ tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir
+ tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
+ tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
+ tests/unit/utils/test_vt.py::VTTestCase::test_vt_size
+
+ # tests that need network access
+ tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
+ tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
+ tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
+ tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
+ tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
+ tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+ tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
+ tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
+ tests/pytests/unit/utils/test_http.py::test_query_proxy
+ tests/pytests/unit/utils/test_network.py::test_isportopen
+
+ # tests that need root access
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1
+ )
+ [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
+ tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
+ tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
+ )
+ [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
+ tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt
+ tests/integration/modules/test_mine.py::MineTest::test_mine_delete
+ tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt
+ tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_json
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_nested
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_raw
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_txt
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper
+ tests/integration/output/test_output.py::OutputReturnTest::test_static_simple
+ tests/integration/runners/test_manage.py::ManageTest::test_down
+ tests/integration/runners/test_manage.py::ManageTest::test_up
+ tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized
+ tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false
+ tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
+ tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
+ tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]"
+ tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
+ tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
+ )
+
+ # testsuite likes lots of files
+ ulimit -n 4096 || die
+
+ # ${T} is too long a path for the tests to work
+ local TMPDIR
+ TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
+ (
+ test_exports=(
+ TMPDIR
+ SHELL="/bin/bash"
+ USE_SETUPTOOLS=1
+ NO_INTERNET=1
+ PYTHONDONTWRITEBYTECODE=1
+ )
+ export "${test_exports[@]}"
+
+ cleanup() { rm -rf "${TMPDIR}" || die; }
+
+ trap cleanup EXIT
+
+ addwrite "${TMPDIR}"
+
+ epytest --run-slow
+ )
+}
diff --git a/app-admin/salt/salt-3007.0.ebuild b/app-admin/salt/salt-3007.0.ebuild
deleted file mode 100644
index c9ef355f3f3f..000000000000
--- a/app-admin/salt/salt-3007.0.ebuild
+++ /dev/null
@@ -1,611 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_1{0..2} )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
- cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova portage profile redis selinux test raet
- +zeromq vim-syntax
-"
-
-RDEPEND="
- sys-apps/pciutils
- dev-libs/openssl:0=[-bindist(-)]
- dev-python/aiohttp[${PYTHON_USEDEP}]
- >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}]
- >=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}]
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- dev-python/importlib-metadata[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- dev-python/looseversion[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
- dev-python/python-gnupg[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/tornado[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${PYTHON_USEDEP}]
- )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
- )
- neutron? (
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- sys-apps/findutils
- dev-python/build[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- app-arch/zip
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
- <dev-python/moto-5[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/pygit2[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="
- || ( raet zeromq )
- test? ( cheetah genshi )
- nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
- neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
-"
-RESTRICT="
- !test? ( test )
- x86? ( test )
-"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
-)
-
-python_prepare_all() {
- local -a remove_test_files=(
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- tests/integration/externalapi/test_venafiapi.py
- tests/integration/modules/test_rabbitmq.py
- tests/integration/modules/test_supervisord.py
- tests/integration/states/test_match.py
- tests/pytests/functional/fileserver/hgfs/test_hgfs.py
- tests/pytests/functional/loader/test_loader.py
- tests/pytests/functional/modules/file/test_readlink.py
- tests/pytests/functional/modules/file/test_symlink.py
- tests/pytests/functional/modules/state/test_jinja_filters.py
- tests/pytests/functional/modules/state/test_jinja_renderer.py
- tests/pytests/functional/modules/state/test_mako_renderer.py
- tests/pytests/functional/modules/state/test_pyobjects_renderer.py
- tests/pytests/functional/modules/test_aptpkg.py
- tests/pytests/functional/modules/test_dockermod.py
- tests/pytests/functional/modules/test_etcd_mod.py
- tests/pytests/functional/modules/test_grains.py
- tests/pytests/functional/modules/test_mac_service.py
- tests/pytests/functional/modules/test_saltcheck.py
- tests/pytests/functional/modules/test_saltutil.py
- tests/pytests/functional/modules/test_test.py
- tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py
- tests/pytests/functional/pillar/test_git_pillar.py
- tests/pytests/functional/pillar/test_gpg.py
- tests/pytests/functional/returners/test_etcd_return.py
- tests/pytests/functional/runners/test_winrepo.py
- tests/pytests/functional/sdb/test_etcd_db.py
- tests/pytests/functional/state/test_masterless_tops.py
- tests/pytests/functional/states/file/test_keyvalue.py
- tests/pytests/functional/states/file/test_patch.py
- tests/pytests/functional/states/file/test_rename.py
- tests/pytests/functional/states/rabbitmq
- tests/pytests/functional/states/test_docker_container.py
- tests/pytests/functional/states/test_docker_network.py
- tests/pytests/functional/states/test_etcd_mod.py
- tests/pytests/functional/states/test_module.py
- tests/pytests/functional/states/test_mysql.py
- tests/pytests/functional/states/test_svn.py
- tests/pytests/functional/states/test_virtualenv_mod.py
- tests/pytests/functional/test_version.py
- tests/pytests/functional/utils/test_vault.py
- tests/pytests/integration/cli/test_syndic_eauth.py
- tests/pytests/integration/daemons/test_memory_leak.py
- tests/pytests/integration/grains/test_grains.py
- tests/pytests/integration/master/test_clear_funcs.py
- tests/pytests/integration/minion/test_reauth.py
- tests/pytests/integration/modules/grains/test_append.py
- tests/pytests/integration/modules/grains/test_module.py
- tests/pytests/integration/modules/saltutil/test_grains.py
- tests/pytests/integration/modules/saltutil/test_modules.py
- tests/pytests/integration/modules/saltutil/test_wheel.py
- tests/pytests/integration/modules/state/test_state_pillar_errors.py
- tests/pytests/integration/modules/state/test_state_test.py
- tests/pytests/integration/modules/test_cmdmod.py
- tests/pytests/integration/modules/test_event.py
- tests/pytests/integration/modules/test_file.py
- tests/pytests/integration/modules/test_jinja.py
- tests/pytests/integration/modules/test_pillar.py
- tests/pytests/integration/modules/test_pip.py
- tests/pytests/integration/modules/test_vault.py
- tests/pytests/integration/modules/test_virt.py
- tests/pytests/integration/modules/test_x509_v2.py
- tests/pytests/integration/proxy/test_deltaproxy.py
- tests/pytests/integration/proxy/test_shell.py
- tests/pytests/integration/reactor/test_reactor.py
- tests/pytests/integration/returners/test_noop_return.py
- tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py
- tests/pytests/integration/runners/test_cache.py
- tests/pytests/integration/runners/test_jobs.py
- tests/pytests/integration/runners/test_manage.py
- tests/pytests/integration/runners/test_saltutil.py
- tests/pytests/integration/runners/test_vault.py
- tests/pytests/integration/sdb/test_vault.py
- tests/pytests/integration/ssh/state/test_pillar_override.py
- tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py
- tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py
- tests/pytests/integration/ssh/state/test_retcode_render_exception.py
- tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py
- tests/pytests/integration/ssh/state/test_retcode_run_fail.py
- tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py
- tests/pytests/integration/ssh/state/test_state.py
- tests/pytests/integration/ssh/state/test_with_import_dir.py
- tests/pytests/integration/ssh/test_cmdmod.py
- tests/pytests/integration/ssh/test_config.py
- tests/pytests/integration/ssh/test_cp.py
- tests/pytests/integration/ssh/test_deploy.py
- tests/pytests/integration/ssh/test_grains.py
- tests/pytests/integration/ssh/test_jinja_mods.py
- tests/pytests/integration/ssh/test_master.py
- tests/pytests/integration/ssh/test_mine.py
- tests/pytests/integration/ssh/test_pillar.py
- tests/pytests/integration/ssh/test_pillar_compilation.py
- tests/pytests/integration/ssh/test_pre_flight.py
- tests/pytests/integration/ssh/test_publish.py
- tests/pytests/integration/ssh/test_py_versions.py
- tests/pytests/integration/ssh/test_raw.py
- tests/pytests/integration/ssh/test_saltcheck.py
- tests/pytests/integration/ssh/test_slsutil.py
- tests/pytests/integration/states/test_beacon.py
- tests/pytests/integration/states/test_file.py
- tests/pytests/integration/states/test_include.py
- tests/pytests/integration/states/test_ini_manage.py
- tests/pytests/integration/states/test_state_test.py
- tests/pytests/integration/states/test_x509_v2.py
- tests/pytests/integration/utils/test_templates.py
- tests/pytests/integration/wheel/test_key.py
- tests/pytests/pkg/integration/test_check_imports.py
- tests/pytests/pkg/integration/test_clean_zmq_teardown.py
- tests/pytests/pkg/integration/test_enabled_disabled.py
- tests/pytests/pkg/integration/test_help.py
- tests/pytests/pkg/integration/test_logrotate_config.py
- tests/pytests/pkg/integration/test_pkg.py
- tests/pytests/pkg/integration/test_python.py
- tests/pytests/scenarios/compat/test_with_versions.py
- tests/pytests/unit/loader/test_lazy.py
- tests/pytests/unit/modules/test_mongodb.py
- tests/pytests/unit/modules/test_mysql.py
- tests/pytests/unit/modules/test_schedule.py
- tests/pytests/unit/pillar/test_consul_pillar.py
- tests/pytests/unit/pillar/test_mysql.py
- tests/pytests/unit/renderers/test_yamlex.py
- tests/pytests/unit/roster/test_ansible.py
- tests/pytests/unit/roster/test_dir.py
- tests/pytests/unit/runners/test_reactor.py
- tests/pytests/unit/states/file/test_keyvalue.py
- tests/pytests/unit/utils/jinja/test_get_template.py
- tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
- tests/pytests/unit/utils/test_cache.py
- tests/pytests/unit/utils/test_etcd_util.py
- tests/pytests/unit/utils/test_package.py
- tests/pytests/unit/utils/test_versions.py
- tests/unit/ext/test_ipaddress.py
- tests/unit/modules/test_boto_elb.py
- tests/unit/modules/test_boto_secgroup.py
- tests/unit/modules/test_boto_vpc.py
- tests/unit/modules/test_elasticsearch.py
- tests/unit/modules/test_k8s.py
- tests/unit/modules/test_kubernetesmod.py
- tests/unit/modules/test_vsphere.py
- tests/unit/netapi/rest_tornado/test_saltnado.py
- tests/unit/states/test_boto_vpc.py
- tests/unit/states/test_module.py
- tests/unit/test_module_names.py
- tests/unit/test_zypp_plugins.py
- tests/unit/utils/test_extend.py
- tests/unit/utils/test_pbm.py
- tests/unit/utils/test_schema.py
- tests/unit/utils/test_vmware.py
- tests/unit/utils/test_vsan.py
-
- # tests that require network access
- tests/integration/cloud
- tests/integration/netapi
- tests/kitchen/test_kitchen.py
- tests/kitchen/tests/wordpress/tests
- tests/pytests/functional/cli/test_salt_cloud.py
- tests/pytests/functional/cli/test_salt_run_.py
- tests/pytests/functional/modules/test_ansiblegate.py
- tests/pytests/functional/modules/test_http.py
- tests/pytests/functional/modules/test_pip.py
- tests/pytests/functional/netapi
- tests/pytests/functional/utils/test_etcd_util.py
- tests/pytests/functional/utils/test_http.py
- tests/pytests/integration/cli/test_salt_proxy.py
- tests/pytests/integration/daemons/test_masterapi.py
- tests/pytests/integration/modules/state/test_state.py
- tests/pytests/integration/modules/state/test_state_state_events.py
- tests/pytests/integration/netapi
- tests/pytests/integration/pillar/cache/test_pillar_cache.py
- tests/pytests/integration/pillar/test_fileclient.py
- tests/pytests/integration/pillar/test_pillar_include.py
- tests/pytests/integration/proxy/test_simple.py
- tests/pytests/integration/runners/state/orchestrate/test_events.py
- tests/pytests/integration/wheel/test_pillar_roots.py
- tests/pytests/pkg/downgrade/test_salt_downgrade.py
- tests/pytests/pkg/integration/test_pip.py
- tests/pytests/pkg/integration/test_pip_upgrade.py
- tests/pytests/pkg/integration/test_salt_api.py
- tests/pytests/pkg/integration/test_salt_call.py
- tests/pytests/pkg/integration/test_salt_exec.py
- tests/pytests/pkg/integration/test_salt_grains.py
- tests/pytests/pkg/integration/test_salt_key.py
- tests/pytests/pkg/integration/test_salt_minion.py
- tests/pytests/pkg/integration/test_salt_output.py
- tests/pytests/pkg/integration/test_salt_pillar.py
- tests/pytests/pkg/integration/test_salt_state_file.py
- tests/pytests/pkg/integration/test_salt_ufw.py
- tests/pytests/pkg/integration/test_salt_user.py
- tests/pytests/pkg/integration/test_systemd_config.py
- tests/pytests/pkg/integration/test_version.py
- tests/pytests/pkg/upgrade/test_salt_upgrade.py
- tests/pytests/scenarios/cluster/test_cluster.py
- tests/pytests/unit/client/ssh/test_ssh.py
- tests/pytests/unit/cloud/clouds/vmware
- tests/pytests/unit/loader/test_loading_modules.py
- tests/pytests/unit/runners/test_net.py
- tests/pytests/unit/states/file/test_mod_beacon.py
- tests/pytests/unit/test_client.py
- tests/pytests/unit/utils/test_aws.py
- tests/pytests/unit/utils/test_http.py
- tests/unit/modules/test_boto3_elasticsearch.py
- tests/unit/modules/test_boto3_route53.py
- tests/unit/modules/test_network.py
- tests/unit/modules/test_zcbuildout.py
- tests/unit/states/test_zcbuildout.py
-
- # tests require root access
- tests/integration/pillar/test_git_pillar.py
- tests/integration/states/test_lxd_container.py
- tests/integration/states/test_lxd_image.py
- tests/integration/states/test_lxd_profile.py
- tests/integration/states/test_supervisord.py
- tests/pytests/functional/cache/test_mysql.py
- tests/pytests/functional/cli/test_salt.py
- tests/pytests/functional/modules/test_mysql.py
- tests/pytests/functional/modules/test_vault.py
- tests/pytests/functional/states/file/test_accumulated.py
- tests/pytests/functional/utils/test_gitfs.py
- tests/pytests/functional/utils/test_pillar.py
- tests/pytests/scenarios/performance/test_performance.py
- tests/pytests/unit/cloud/test_map.py
- tests/pytests/unit/engines/test_slack_bolt_engine.py
- tests/pytests/unit/modules/state/test_state.py
- tests/pytests/unit/modules/state/test_top_file_merge.py
- tests/pytests/unit/proxy/test_netmiko_px.py
- tests/pytests/unit/proxy/test_ssh_sample.py
- tests/pytests/unit/roster/test_sshknownhosts.py
-
- # tests that require boto
- tests/pytests/unit/engines/test_sqs_events.py
-
- # first test always fails
- tests/pytests/unit/utils/parsers/test_log_parsers.py
- )
-
- rm -r "${remove_test_files[@]}" || die
-
- # axe the boto dep (bug #888235)
- find "${S}/tests" -name 'test_boto_*.py' -delete || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # called_once should be assert_called_once_with
- find "${S}/tests" -name '*.py' -print0 \
- | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- local -x USE_SETUPTOOLS=1
- distutils-r1_python_install_all
-
- local svc
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
- tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
-
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
-
- # needs root
- tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
- tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
- tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert
- tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure
-
- # don't like sandbox
- tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https
- tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp
- tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https
- tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty
- tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest
- tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward
- tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
- tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
- tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
- tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
- tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
- tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
- tests/pytests/functional/modules/test_defaults.py::test_defaults_get
- tests/pytests/functional/modules/test_system.py::test_get_system_date_time
- tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc
- tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
- tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
- tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source
- tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
- tests/pytests/functional/states/file/test_comment.py::test_issue_62121
- tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
- tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
- tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
- tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
- tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
- tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
- tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
- tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
- tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
- tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
- tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
- tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
- tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
- tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
- tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings
- tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state
- tests/pytests/functional/states/test_pip_state.py::test_issue_54755
- tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors
- tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed
- tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv
- tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env
- tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]"
- tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
- tests/pytests/functional/utils/test_pillar.py::test_gitpython_env
- tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request
- tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos
- tests/pytests/functional/utils/test_pillar.py::test_pygit2_env
- tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos
- tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple
- tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple
- tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout
- tests/pytests/integration/minion/test_return_retries.py::test_publish_retry
- tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]"
- tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]"
- tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
- tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
- tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call
- tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt
- tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]"
- tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]"
- tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]"
- tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]"
- tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]"
- tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]"
- tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]"
- tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]"
- tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]"
- tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime
- tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster
- tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
- tests/pytests/unit/grains/test_core.py::test_get_machine_id
- tests/pytests/unit/grains/test_package.py::test_grain_package_type
- tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
- tests/pytests/unit/modules/test_beacons.py::test_add
- tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module
- tests/pytests/unit/modules/test_beacons.py::test_delete
- tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module
- tests/pytests/unit/modules/test_beacons.py::test_disable
- tests/pytests/unit/modules/test_beacons.py::test_enable
- tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module
- tests/pytests/unit/modules/test_beacons.py::test_save
- tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar
- tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase
- tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
- tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
- tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
- tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
- tests/pytests/unit/states/test_pkg.py::test_mod_beacon
- tests/pytests/unit/states/test_service.py::test_mod_beacon
- tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
- tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
- tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
- tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
- tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir
- tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
- tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
- tests/unit/utils/test_vt.py::VTTestCase::test_vt_size
-
- # tests that need network access
- tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
- tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
- tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
- tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
- tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
- tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
- tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
- tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
- tests/pytests/unit/utils/test_http.py::test_query_proxy
- tests/pytests/unit/utils/test_network.py::test_isportopen
-
- # tests that need root access
- tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command
- tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2
- tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1
- )
- [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
- tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
- tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
- )
- [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
- tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt
- tests/integration/modules/test_mine.py::MineTest::test_mine_delete
- tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt
- tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound
- tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall
- tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv
- tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run
- tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv
- tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state
- tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate
- tests/integration/output/test_output.py::OutputReturnTest::test_output_json
- tests/integration/output/test_output.py::OutputReturnTest::test_output_nested
- tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint
- tests/integration/output/test_output.py::OutputReturnTest::test_output_raw
- tests/integration/output/test_output.py::OutputReturnTest::test_output_txt
- tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml
- tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper
- tests/integration/output/test_output.py::OutputReturnTest::test_static_simple
- tests/integration/runners/test_manage.py::ManageTest::test_down
- tests/integration/runners/test_manage.py::ManageTest::test_up
- tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized
- tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false
- tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip
- tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
- tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
- tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
- tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
- tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
- tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
- tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
- tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]"
- tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
- tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
- )
-
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
- (
- test_exports=(
- TMPDIR
- SHELL="/bin/bash"
- USE_SETUPTOOLS=1
- NO_INTERNET=1
- PYTHONDONTWRITEBYTECODE=1
- )
- export "${test_exports[@]}"
-
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- epytest --run-slow
- )
-}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 8640f95b2b8f..b1461a8f5424 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
Binary files differ
diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index 6c52dd628907..e94e5a88e74a 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -4,7 +4,10 @@ DIST earthly-0.8.4-deps.tar.xz 158470344 BLAKE2B c3ec6369f8b397abd9b76dc77461c62
DIST earthly-0.8.4.tar.gz 8041021 BLAKE2B 66057e29d4b287a220d8799efb4a1c5c43ea7641029e3af59bf8556125df28f9eafddc20d515fd20fab8c09bbb6278af4ea525f4bbe38d0e24ee031fc65c7336 SHA512 b663a10feb255329dfca30d5d70cb5c36ad5f96ed2b0cd30c46dd1b4ad087ab15b941fe6d3be3e32b1eee8199b5ee8ae50d61739c290b8967b6fcfd4126327db
DIST earthly-0.8.5-deps.tar.xz 157843872 BLAKE2B aade314abdcd8aaf18737908df1a90d71c907f286df463c9f8ce9654d5e212387b7107070225bf85f54d6e4688a741b7838b5c70d9f1a09ac15e904b83d4d2b8 SHA512 557b3477c1773c27934429677a53efbdc104230fcbd536cb73e8cd631ccf2af488731acc5555484298fc579e08b8e52031191b49ef0610595b2b67cc987232e3
DIST earthly-0.8.5.tar.gz 8051712 BLAKE2B b9310a28d79bec7a59525a541cdd51960762b0695ccf15fd33be8a9917a7e52b2251a4ebf202c4f02036b3c178b8d26fc9bc4802b9d6a73a5bfc39623c5075d7 SHA512 206dc95c2ef4b89ea7dd65b2b04f4ac7606d63891cea708f7d7dcdff8f3e9ed113b090b65c0285175412cd76fca18852bf77eeddc2e0f2782f390e5bce1f8b86
-EBUILD earthly-0.8.3.ebuild 1805 BLAKE2B 393b8ab9d4dbef4448f16b672dd83b99e20681ab2c3a6496ec208d88cda0282b9874e149a3ee125b4b85a4c288c7af5f479cc7f38576cacb13bb516d0c75a1e9 SHA512 9dc024fa2326ac983b0e18329f62c1a4d68dc03448485157b32facca57d4327650cbfb05e9304e36f077800439eb313804ed78a348cf5aaf93521cbb89ede887
-EBUILD earthly-0.8.4.ebuild 1806 BLAKE2B 76b450d95330496cc88850d080993a09fdfec4b3c9ddea23cfb0e11e376058d782e67adf713e6a042f939951cb40fcf9c5b6b97e47f3042ac90730079005b207 SHA512 08f376f6f2b2aca415881f4e34fd4b058020de98168bbf1341a245d36b9a5100487ca51fc1d1e2a297547817c6435196e2656b83f5ef2b8910502b19adaa977d
-EBUILD earthly-0.8.5.ebuild 1806 BLAKE2B 07a436cabd245f99cec1f90182f37810af90599383f59982cb8e6860b823f4dfd3287fa5b7cd2b8e8a3668609f903b94416b46f96555636b5708fc49c927a547 SHA512 3ba66ec7966dd1a73df700f97f7af3dfe9e5805ca3de2fd0318361bab702f2c3610d4c2f20ac48da56916f8736194c635694f617f670dd8c359dda5661c0018c
+DIST earthly-0.8.6-deps.tar.xz 157843872 BLAKE2B aade314abdcd8aaf18737908df1a90d71c907f286df463c9f8ce9654d5e212387b7107070225bf85f54d6e4688a741b7838b5c70d9f1a09ac15e904b83d4d2b8 SHA512 557b3477c1773c27934429677a53efbdc104230fcbd536cb73e8cd631ccf2af488731acc5555484298fc579e08b8e52031191b49ef0610595b2b67cc987232e3
+DIST earthly-0.8.6.tar.gz 8052646 BLAKE2B 43cb74b7ad198d6418a60dd8b3bac61c1bf67f460b73ca3627647ce71778178e69075bc5122a24cfe33c075c40e962db60845ae6d0933782432eb56087ed83f2 SHA512 4c5ae65452ff940bbeeff7ec489882c5db82597977d18ac3f187ae6a444f6b78222f16f3e0ff10250100195227b925d1a73e24c2ffce618b8675fd826302a47a
+EBUILD earthly-0.8.3.ebuild 1781 BLAKE2B 9e30a6e86c0e3ccb5984850296ce8f75ba3ab101c2f9fe073e4d1360363c702fcdafa64ae2b3a10871d88066f5aea12a65bb6207146c8b7d2ebcbc6819a909b9 SHA512 52fca0ea0ce433f21cd78eb54efd5b6946437be55a53ad940e2725f946f4cf9becc287ee897932190d0df3d7aa229ae9bc8ab44ba82201e326607b1ae2a3d87d
+EBUILD earthly-0.8.4.ebuild 1782 BLAKE2B fee5e508dc98576084de7d6d0dd8f6986b654b2910d831fae3576e7cc8d63e22bd2294cc372e18260ccee17c0844baf973b773a1b669f1b6150b452d66186c89 SHA512 ac74257ea18df5c186b38318c9f10eefc2765b6614f8f90d8729ce04f9c9c9133dbcc4211567cffeee5ab583388f0fa0543e37e4c55fc251e3f87601bbe74037
+EBUILD earthly-0.8.5.ebuild 1782 BLAKE2B 720acd491c6ef2c2ec1f6520866d295174a3490281a269f5e488bf7116c5d3f4c0e52b77311f006a580041bfb43e630acf7f90df4e8742e43e53a4ddc4912487 SHA512 a381e131461389d91028fcc920e61e3ca49a6790977bbed4408368ed0aaadfe4135254ca7f6a8e98bafa526bfecdc920a5168b3d6cf7e6dacfadf0da17178c31
+EBUILD earthly-0.8.6.ebuild 1782 BLAKE2B a468ae75e56269713a31bd8bd69726603668ab76ffc778e7d93fa64f018726982ed2bdf45de73a69c46246c7cf497398e5db62b90d4ea6a8d684ce383b85c62f SHA512 ae2ad347f5ab0d3ee92759c8ad18b3808faad7740a9a87b087524de92918278ef938163c612776ef7fc104aee566765fc37f2526985be010fde3ce2fdd6aab63
MISC metadata.xml 927 BLAKE2B b7d5184df16f39603bf6df8b503e701d737fec188d1d97673e4ca59babd990c1b872784c91db04c74d9a08dbffa76f4e7530d8b021cbbe9ae51fd9966f709522 SHA512 f7f49eb583b2b5a9939c26e9eaff3917392525c3a94e5f8274c89b69e172547ad02fa4ed1b078e7d778f765659e1b9a7cf99d88042034cfbfbef54e685c8b6dd
diff --git a/app-containers/earthly/earthly-0.8.3.ebuild b/app-containers/earthly/earthly-0.8.3.ebuild
index 11beaa04885d..95cb587f25e6 100644
--- a/app-containers/earthly/earthly-0.8.3.ebuild
+++ b/app-containers/earthly/earthly-0.8.3.ebuild
@@ -35,8 +35,6 @@ RDEPEND="
DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
src_compile() {
- # mkdir -p bin || die
-
local go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
local go_ldflags="
-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
diff --git a/app-containers/earthly/earthly-0.8.4.ebuild b/app-containers/earthly/earthly-0.8.4.ebuild
index 2d492ba3b144..b6506a380599 100644
--- a/app-containers/earthly/earthly-0.8.4.ebuild
+++ b/app-containers/earthly/earthly-0.8.4.ebuild
@@ -35,8 +35,6 @@ RDEPEND="
DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
src_compile() {
- # mkdir -p bin || die
-
local go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
local go_ldflags="
-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
diff --git a/app-containers/earthly/earthly-0.8.5.ebuild b/app-containers/earthly/earthly-0.8.5.ebuild
index 5b4f4944a279..97d327f570a3 100644
--- a/app-containers/earthly/earthly-0.8.5.ebuild
+++ b/app-containers/earthly/earthly-0.8.5.ebuild
@@ -35,8 +35,6 @@ RDEPEND="
DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
src_compile() {
- # mkdir -p bin || die
-
local go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
local go_ldflags="
-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
diff --git a/app-containers/earthly/earthly-0.8.6.ebuild b/app-containers/earthly/earthly-0.8.6.ebuild
new file mode 100644
index 000000000000..4396b9231a9e
--- /dev/null
+++ b/app-containers/earthly/earthly-0.8.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Git commit SHA is needed at runtime by earthly to pull and bootstrap images.
+if [[ "${PV}" == 0.8.6 ]] ; then
+ COMMIT_SHA=b20c1db1cfe5816a5d2f7d416d598d5777d8f4bb
+else
+ die 'Could not detect "COMMIT_SHA", please update the ebuild.'
+fi
+
+inherit go-module
+
+DESCRIPTION="Build automation tool that executes in containers"
+HOMEPAGE="https://earthly.dev/
+ https://github.com/earthly/earthly/"
+SRC_URI="
+ https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz
+ https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ || (
+ app-containers/docker
+ app-containers/podman
+ )
+"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+src_compile() {
+ local go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
+ local go_ldflags="
+ -X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
+ -X main.GitSha=${COMMIT_SHA}
+ -X main.Version=v${PV}
+ "
+ local -a go_buildargs=(
+ -tags "${go_tags}"
+ -ldflags "${go_ldflags}"
+ -o ./bin/
+ )
+ ego build "${go_buildargs[@]}" ./cmd/...
+}
+
+src_install() {
+ exeinto /usr/bin
+ doexe bin/earthly
+ newexe bin/debugger earthly-debugger
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ if has_version "app-containers/podman" ; then
+ ewarn "Podman is supported but not recommended."
+ ewarn "If issues arise, then please try running earthly with docker."
+ fi
+
+ if has_version "app-containers/podman[rootless]" ; then
+ ewarn "Running podman in rootless mode is not supported because"
+ ewarn "earthly/dind and earthly/buildkit require privileged access."
+ ewarn "For more info see: https://docs.earthly.dev/docs/guides/podman/"
+ fi
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ea271b742db1..3e9d3d3bdc68 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
Binary files differ
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 8737ff1416b7..89cd33d6a0a3 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,8 +1,10 @@
+AUX retext-8.0.1-fix-set-desktop-entry.patch 517 BLAKE2B e9f6c821e8925f912916604db5d2afac99b9ad58481a2518b755bbbabbf0ac3daaad4360b3b61cf184663ab933aca59a86ed009e850123593f5ede1634ff6fa8 SHA512 77d0eb4c286b20ddbd6a117e9872d132e7def06b524db8419d2929daee5bdde58c1d49eeef3570ca6bd9492f9498f0fdb951e34140112b82d807cc87fb40b6ac
DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da
DIST ReText-8.0.0.tar.gz 492823 BLAKE2B ba80f01f1a40981220c0b3e16dd04bf551319a35c1a5c7f6d5e70135404537e74fa4625fe4c05c7ee54202de9ae16d181c110fcae9b9172761ca5ecf6400f7de SHA512 0f2480bcc8569cf60ebfe55847a2a068d1e5dd262a4ff212873bf58660ec31e9c37d9b21bdc66229d681c065a0d96b6ff11652e8d9a7c77841ea551480d1154c
DIST ReText-8.0.1.tar.gz 538968 BLAKE2B 6ee18b4becf47ed3edae9e1d3ea8167a5db2685ae55b206be1ffca78bb765a559f53575da8aa105eae5d1b1fb87419723cdfd02cfff2eb422de9722589a0b97a SHA512 a2a03a821ac06e0408cd036189e9fce18f4b693085aaa15e0d95f2a80157f6ab09b0bcecd9574673ce57fc9cde937457e8d62971f1553cbc26c681039401178a
EBUILD retext-7.2.3.ebuild 1983 BLAKE2B d406bcef6bc9bf2a545862329231fad68d6711e7ca711e1d80fc88ffa4077de808fbbd055e26ad53032f3232d7f399ae79564446b72868f18c8f543c629224e3 SHA512 8b52132d60dc5fdc0a506706e97aff082b070ae36d2a0a7a28356bb704e355199e48e2aa97aa90301cd169ba7ac5e284fb904c7fc7362c953561c573a73c607f
EBUILD retext-8.0.0.ebuild 1931 BLAKE2B e81a28006291152c19dd45b2b90a667080e0f7ba7643f43aa829992a90025ecdd96df30dc018e42d41bb03754cdeb40a93fe8a47cad4ae9dc1bb488e2bc5fccb SHA512 7bf10821c6c512252ce0d0fcf4bd8d9f9de1bdf7693d8845382889e3f6e7b540240ae8c6f7b080d9b5badf99f69c3a0e34ce35e4fdb02604972eaf9897fdf1ae
+EBUILD retext-8.0.1-r1.ebuild 2059 BLAKE2B 184bb00aa4d0b9af0978280254ab4bf8a3c20c52b33d5db8ca4d3b44b0ed261ba7ae057354cb3430404f9acdffad7cb062e445473ed13fc0fbe192bf2d4416da SHA512 25558ccaa0c0b147f70062bbbd7924499aaf31a32f105d196efd362082c926d0e99f68390389095cef1c109650a9ae1c8d25b4870d5de0c6848c5f8c11f41e9c
EBUILD retext-8.0.1.ebuild 1853 BLAKE2B d80ecac1de7c4d3c04483e17ffdbfb0fd1d3d9ed59daff3e18b5af6f687594bbbd358990bcd6983fe9015449111174b104166cb59f334d6125b5ba645a33ac31 SHA512 2b83182d3435dd86072b3e944c1146a7dfe4f588d0f05bde484dc236b5209f3425be993f1ca6e8c1a552cff043d32f421afcd97cd2cd5389760e7ccf918a499d
-EBUILD retext-9999.ebuild 1854 BLAKE2B 2405c914764bb13828a56b12a6bc2e4b3540f9747b198069ff04cca2d05e0e693fb3bcfc1c816390e561f00aaa43fa4f8712b8419c5ebdbd18bd4843197c4bce SHA512 1cd79d2e4c12dd3551282d8d611b75c5bdee76021cc8c068def2295a4fbb3d54b4e720a2e4d1aa49f8d6fe285974ccc08b7f38d7834a3ad76270274cc353b4f0
+EBUILD retext-9999.ebuild 1998 BLAKE2B d5b427f7fe0aa376b1c4687a9332249c756feb979c22048639730e8f09dda4d7f906b4d547c67eede911eccbe52bec3a9a3c6e562d7a88e30cb8754fbae4d6c4 SHA512 1e8adcae6fb0de3749ebc14d3813709d5f53e755b6181770590f813766e7497a1628fb30496ce6070c163d37633268b36690c3741fca4ec9b209e57c3fd515b2
MISC metadata.xml 535 BLAKE2B 94fbf92941c956601e9ec037a78919fcbddb572baa20f74c0daae31e438e44d214b57926cfa6d31eb176b8be72d2078e44686bada4a4794e130956c7d91b5865 SHA512 5ed97d1ed19c618b1246375d02860f96ce7f58aa759c467ae69e35d6b003cdac44f5c59f166ae6970e9a082e783550381b34540ad1ba03d661a3f3fde7d26dec
diff --git a/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch
new file mode 100644
index 000000000000..0ff685b89152
--- /dev/null
+++ b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch
@@ -0,0 +1,15 @@
+# Set desktop file name to correspond to the one installed by
+# the ebuild ("retext.desktop").
+# Bug: https://bugs.gentoo.org/925726
+
+--- a/ReText/__main__.py
++++ b/ReText/__main__.py
+@@ -65,7 +65,7 @@ def main():
+ app.setApplicationDisplayName("ReText")
+ app.setApplicationVersion(app_version)
+ app.setOrganizationDomain('mitya57.me')
+- app.setDesktopFileName('me.mitya57.ReText.desktop')
++ app.setDesktopFileName('retext')
+ QNetworkProxyFactory.setUseSystemConfiguration(True)
+
+ RtTranslator = QTranslator()
diff --git a/app-editors/retext/retext-8.0.1-r1.ebuild b/app-editors/retext/retext-8.0.1-r1.ebuild
new file mode 100644
index 000000000000..8e3e6c409fc7
--- /dev/null
+++ b/app-editors/retext/retext-8.0.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{9..11} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="ReText"
+
+inherit desktop distutils-r1 optfeature qmake-utils virtualx xdg
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+else
+ inherit pypi
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ >=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/python-markdown-math[${PYTHON_USEDEP}]
+ dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-qt/linguist-tools
+ test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-set-desktop-entry.patch
+)
+
+distutils_enable_tests unittest
+
+pkg_setup() {
+ # Needed for lrelease
+ export PATH="$(qt5_get_bindir):${PATH}"
+}
+
+src_test() {
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ virtx eunittest
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ newicon data/retext-kde5.png retext.png
+
+ # Fixme: The application actually provides a desktop file which theoretically
+ # could be used. So far though I could not make it install properly.
+ make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "dictionary support" dev-python/pyenchant
+
+ einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
+ einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
+ einfo "For more details take a look at:"
+ einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index aa9aaadfcf57..38c1165fb129 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -47,13 +47,6 @@ pkg_setup() {
export PATH="$(qt5_get_bindir):${PATH}"
}
-python_install() {
- distutils-r1_python_install
-
- newicon data/retext-kde5.png retext.png
- make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor"
-}
-
src_test() {
virtx distutils-r1_src_test
}
@@ -62,6 +55,16 @@ python_test() {
virtx eunittest
}
+src_install() {
+ distutils-r1_src_install
+
+ newicon data/retext-kde5.png retext.png
+
+ # Fixme: The application actually provides a desktop file which theoretically
+ # could be used, so far though I could not make it install properly.
+ make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor"
+}
+
pkg_postinst() {
xdg_pkg_postinst
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 95100d64dbca..fa22c8392894 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
Binary files differ
diff --git a/app-shells/irregular/Manifest b/app-shells/irregular/Manifest
new file mode 100644
index 000000000000..23987489a8af
--- /dev/null
+++ b/app-shells/irregular/Manifest
@@ -0,0 +1,3 @@
+DIST irregular-0.7.8.tar.gz 530657 BLAKE2B e6a350d3ba582bfcfd23a2ff8b3a992fa43a4dbd0fbf18eb9bdb1f5c76f8140c1d27b02cc6feb28bfe1c45be480f72ca8a592b0bb54efb529c78904a79f95019 SHA512 c4a2a8cfe202ec7222c038125b2fed4c58b6611e03bff836b3d90b7e0c6a932a4d00e430cd6212b43fa30e471c8ba8fdbcf0f43474f89c84078386f55575b635
+EBUILD irregular-0.7.8.ebuild 806 BLAKE2B 147bf167bcb22b6e80a5bf60ace7a0d682692c4aaeb5b09d332a3b1d555e55f0dcc775037633c065d33bcdb004def86cec0bf7bb71a32f020c80c6467283ae17 SHA512 e48636128b4c22c7c5f244ae97fee0e4fc081a273b0094e42ae19d472071281debc9c9633016277617534911b25f56a227f5b97a9f042e0d93d9ce7ecd9c0013
+MISC metadata.xml 433 BLAKE2B 599ecbe58562c297c4b376a49188548bef45bbfb0779553331dfb9e92ae699e6992fa71bea5fde9d543c5be70ca908710c0b5b2525ef8af05845b1fda35495f7 SHA512 9eb054e527e06f2a442b11eec27708eaf36542cac8a3ff5b34310dcadbc795a0b3b314f029562fbea9da67b136c6e3463dc010c283add7528e75507f49c59a57
diff --git a/app-shells/irregular/irregular-0.7.8.ebuild b/app-shells/irregular/irregular-0.7.8.ebuild
new file mode 100644
index 000000000000..fbaf088f26c5
--- /dev/null
+++ b/app-shells/irregular/irregular-0.7.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PowerShell module that helps to understand, use, and build regular expressions"
+HOMEPAGE="https://irregular.start-automating.com/
+ https://github.com/StartAutomating/Irregular/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/StartAutomating/${PN^}.git"
+else
+ SRC_URI="https://github.com/StartAutomating/${PN^}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}/${P^}"
+
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="${PV}"
+
+RDEPEND="virtual/pwsh:*"
+
+src_install() {
+ insinto "/usr/share/GentooPowerShell/Modules/${PN^}/${PV}"
+ doins "${PN^}.psd1"
+ doins *.ps1 *.ps1xml *.psm1
+ doins -r Formatting RegEx Types en-us
+
+ dodoc *.md
+}
diff --git a/app-shells/irregular/metadata.xml b/app-shells/irregular/metadata.xml
new file mode 100644
index 000000000000..57f0f430cade
--- /dev/null
+++ b/app-shells/irregular/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+ <maintainer type="project">
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://gitlab.com/StartAutomating/Irregular/issues/</bugs-to>
+ <remote-id type="github">StartAutomating/Irregular</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-shells/ugit/Manifest b/app-shells/ugit/Manifest
new file mode 100644
index 000000000000..e551fb983994
--- /dev/null
+++ b/app-shells/ugit/Manifest
@@ -0,0 +1,3 @@
+DIST ugit-0.4.3.tar.gz 105253 BLAKE2B c1d38fc005a2e577923b57eca1290add3742153155618dff7d88ebe41faeea0a0046da87f89f6bcf675c61e9f5125a840bb690ce6ade4f0f080db4326bb9ec20 SHA512 9ea573029cd3191809a5da60a1533f5f026c1facc9da74a957a166129ba92ba92b4076de2654cc90dfd66563d2858bb25f43d8a3be92404776ce049aed2f6c93
+EBUILD ugit-0.4.3.ebuild 779 BLAKE2B 69d9aab5a0b9d144d471608c3bd3b03117d99343b7e55881e3f97c4fa65f8aa5a62e67cc9b87a1f77971e195f970e412619fd61dd4bd467fd5886773fdf52f66 SHA512 ccbaed205d1b74fb3b0b57c66f775e536ab3a594fc2b3a6450a7f4fa1ad774e12a14aa857aa90e546f7bc3814e3e792418c61960ab9eadbe2b8ced67743c8cfd
+MISC metadata.xml 423 BLAKE2B 621438909ee7b04cb57711f68a88cad10e7031dbee489e8b3209e4786fe5ac614d2df5942d5382be3ddffd7eeb5afc616bfb71b3c6f2f36c7992e4009f91580b SHA512 add4e472e8a873958b5967966a4b642a8dccbe4205e3e23f19361eb7cf3133e997a12291128605c2e3f2d95d6588df76c2c8d72160bbb58f549c0d47c4fb1d88
diff --git a/app-shells/ugit/metadata.xml b/app-shells/ugit/metadata.xml
new file mode 100644
index 000000000000..16e9adce3978
--- /dev/null
+++ b/app-shells/ugit/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+ <maintainer type="project">
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://gitlab.com/StartAutomating/ugit/issues/</bugs-to>
+ <remote-id type="github">StartAutomating/ugit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-shells/ugit/ugit-0.4.3.ebuild b/app-shells/ugit/ugit-0.4.3.ebuild
new file mode 100644
index 000000000000..f321df3b91f8
--- /dev/null
+++ b/app-shells/ugit/ugit-0.4.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PowerShell wrapper for git, automate repos and output git as objects"
+HOMEPAGE="https://ugit.start-automating.com/
+ https://github.com/StartAutomating/ugit/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/StartAutomating/${PN}.git"
+else
+ SRC_URI="https://github.com/StartAutomating/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="${PV}"
+
+RDEPEND="
+ dev-vcs/git
+ virtual/pwsh:*
+"
+
+src_install() {
+ insinto "/usr/share/GentooPowerShell/Modules/${PN}/${PV}"
+ doins "${PN}.psd1"
+ doins *.ps1 *.ps1xml *.psm1
+ doins -r Commands Extensions Types en-us
+
+ dodoc *.md
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 695c6ba19229..84eb2efdae6a 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
Binary files differ
diff --git a/dev-ada/VSS/Manifest b/dev-ada/VSS/Manifest
index 4070116cfafa..7c00549721d6 100644
--- a/dev-ada/VSS/Manifest
+++ b/dev-ada/VSS/Manifest
@@ -3,5 +3,5 @@ DIST VSS-23.0.0.tar.gz 481748 BLAKE2B eb84e1b84b2d3a463a0e19a3cdd8b6e1e0dd666f72
DIST VSS-24.0.0.tar.gz 1116669 BLAKE2B 5f703b4bf5234b38485a3104bd4e32ce0b2666fa00e2808b9a03df5c28c11ca0ac95c655f5490dbd04f113ef2894b45f2795f87cbf297ffa07f85f5a4e7d4710 SHA512 2b77646a299c073535ab0a315a9950e2fc6d43375fa62e0cb2e93ed4094ee42994ad74747c8a3d16ade5473c5520926edd59e4422321398c5deb17c6aedb66ee
EBUILD VSS-22.0.0-r2.ebuild 921 BLAKE2B 35c243f6c3b3db2dca87cdfcc7249c4ce56ae8e9ad6429f80b804b982e6335932ec06d121395ec90cb325aa937f1302bb0b6ddc303ce63cfb74e9537fde943d9 SHA512 7ca05726673e52c775ee8988525ae8d46fa99a7f36ec5ff539c2ff06f0a1a0facd690ba5aab1d86d00782d82a6133de7d08c009f6f249a6a39c67266c5993d68
EBUILD VSS-23.0.0-r2.ebuild 1034 BLAKE2B ba594d0c05f51c56c642505cb260d5449af71b820cf38a29a8166651eaede9b0847e228289c251b3d887cdb45d6a664cee7c0a79d5f1aac71b33bf5d382047be SHA512 29fb68c4f4fa8b72521a7ea767c1aaca276a47ced9ab23ec9049dc808424c250f2114722868b844d835cff87d48da414055dce74a45e74354404cf88a632036e
-EBUILD VSS-24.0.0.ebuild 989 BLAKE2B f6d15cf0ce536ef3f7a25b73fb90a08fbe464b585fa9d55c3ce7cae4524b78f604b26ccb87b77cf617407c47b99d72253e8bb3547cba59ca054625ced571f613 SHA512 1e1f4a429be91fe8e02abf2ab8b96f3f7b79eaf9aaf51d639f79678b55dba8026188f6ad3a20549cb0bf23d51c3a18a1d87535bf272994af649238a07553e9ce
-MISC metadata.xml 292 BLAKE2B 5a618f9fd5bd6c227fb9c7a5c40c47ed72a314d5dbf2d5f93cb97a7c34236064ed43c4f874561e5e48b385c10eebb9d8a75f9916a722e5f460091738cf6e4679 SHA512 9440e2195e1500bb2edbb5cf4b800d211f6637749a2b5833d341409cfb11a854b0d18cb997e8ff4bfd1afbfb8d49b6f23957cf9b93bcaffd9bc0a60e7e8d8079
+EBUILD VSS-24.0.0-r1.ebuild 2231 BLAKE2B 3ae0236a43e8d1128e5b7fd6b196cea94f37cb4ffc07723dfa28c4d864dd0edf24e8af4f2acae289f17b5621948359c1224e43dd68a35976c4c3f1cfe2d8133b SHA512 6673685692707cfac1dd3da6aa6d344a67dc45a355684d63dff4787785bb4b57efffc6f03a7880783a5b8d99f93975319c85d7fdf867863c48c2e2970523d3f9
+MISC metadata.xml 425 BLAKE2B e23422badd5f393a4dd2829ce9372e6393523896ab5199e2a9c339aabb8eca12c45d0bd8becf9c23ca47929d7f1f37982d86c104855169b17816d37e9dbd43a5 SHA512 5fed9ed285d559f2424060a9f88d3174e99b5e1ab3623da0d060f8a8a6da03a07f5eafe1ca6cf6934c52f3d22cdd32cb2720ee51e0a1fd33a4848e085b99bc08
diff --git a/dev-ada/VSS/VSS-24.0.0-r1.ebuild b/dev-ada/VSS/VSS-24.0.0-r1.ebuild
new file mode 100644
index 000000000000..5837246d67bc
--- /dev/null
+++ b/dev-ada/VSS/VSS-24.0.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+inherit ada multiprocessing
+
+DESCRIPTION="A high level string and text processing library"
+HOMEPAGE="https://github.com/AdaCore/VSS"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+ dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
+ test? (
+ app-i18n/unicode-data
+ )"
+
+src_prepare() {
+ ln -sf /usr/share/unicode-data data/ucd || die
+ default
+}
+
+src_compile() {
+ build () {
+ gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+ gnat/vss_gnat.gpr \
+ -cargs:Ada ${ADAFLAGS} || die
+ gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+ gnat/vss_text.gpr \
+ -cargs:Ada ${ADAFLAGS} || die
+ gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+ gnat/vss_json.gpr \
+ -cargs:Ada ${ADAFLAGS} || die
+ gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+ gnat/vss_regexp.gpr \
+ -cargs:Ada ${ADAFLAGS} || die
+ gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+ gnat/vss_xml.gpr \
+ -cargs:Ada ${ADAFLAGS} || die
+ gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+ gnat/vss_xml_templates.gpr \
+ -cargs:Ada ${ADAFLAGS} || die
+ gprbuild -XVSS_LIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 -p \
+ -j$(makeopts_jobs) -v gnat/vss_xml_xmlada.gpr \
+ -cargs:Ada ${ADAFLAGS} || die
+ }
+ if use shared; then
+ build relocatable
+ fi
+ if use static-libs; then
+ build static
+ fi
+ if use static-pic; then
+ build static-pic
+ fi
+}
+
+src_test() {
+ emake -j1 GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v" build_tests
+ # To run all the test need to follow data/README.md
+ emake check_html
+}
+
+src_install() {
+ build () {
+ emake -j1 DESTDIR="${D}" install-libs-$1
+ }
+ use shared && build relocatable
+ use static-libs && build static
+ use static-pic && build static-pic
+ rm -r "${D}"/usr/share/gpr/manifests || die
+ einstalldocs
+}
diff --git a/dev-ada/VSS/VSS-24.0.0.ebuild b/dev-ada/VSS/VSS-24.0.0.ebuild
deleted file mode 100644
index c313680fa3e5..000000000000
--- a/dev-ada/VSS/VSS-24.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gcc_12 gcc_13 )
-inherit ada multiprocessing
-
-DESCRIPTION="A high level string and text processing library"
-HOMEPAGE="https://github.com/AdaCore/VSS"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}
- dev-ada/xmlada[${ADA_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
- test? (
- app-i18n/unicode-data
- )"
-
-src_prepare() {
- mkdir data
- ln -sf /usr/share/unicode-data data/ucd || die
- default
-}
-
-src_compile() {
- emake GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v"
-}
-
-src_test() {
- emake -j1 GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v" build_tests
- # To run all the test need to follow data/README.md
- emake check_html
-}
diff --git a/dev-ada/VSS/metadata.xml b/dev-ada/VSS/metadata.xml
index 640859a7d0d5..6c54f03b5a01 100644
--- a/dev-ada/VSS/metadata.xml
+++ b/dev-ada/VSS/metadata.xml
@@ -4,6 +4,10 @@
<maintainer type="project">
<email>ada@gentoo.org</email>
</maintainer>
+ <use>
+ <flag name="shared">Build shared library</flag>
+ <flag name="static-pic">Build static library with pic code</flag>
+ </use>
<upstream>
<remote-id type="github">AdaCore/VSS</remote-id>
</upstream>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5a87aa120cd8..03f464398589 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index ec3075e4b8b2..c34c7e445643 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,4 +1,3 @@
-AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
DIST commons-httpclient-3.1-src.tar.gz.asc 189 BLAKE2B 44661748db96429682a82d8dba5ad71d0d1fc2aaf03e2f1dda059985757547a78ab04dff38863ca421e65d13100a68c8cb909ed4c34e0a66a837b6fdb91baf63 SHA512 3832c90048de4db1f96efecd2f467153f0bdce1ebd533b848b8fc78a92da0bba3ba8bb3447e6c8d34f4c1c731a5b41ab941754a1509728ff4ea96e238927ab09
EBUILD commons-httpclient-3.1-r3.ebuild 1433 BLAKE2B 035dae2cbf5dfa6ae6815e3770f4c8e548b7930835acce6d0a7ba40ea2d9201de02872660c002020188ec85fc10b5bb03576a58d7b0dc60e0ff77f86a5a89226 SHA512 a86d11b7eac91ef6062ed73fa67f4e227891b0600d1bf1e1fdf3f69efd46655bff510ddab006a3fef6aa0a6edc354f64f66a81db921df5b4a2e2c5b36cb1e2df
diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
deleted file mode 100644
index c059bf496a45..000000000000
--- a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
+++ /dev/null
@@ -1,369 +0,0 @@
---- ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
-+++ ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
-@@ -31,10 +31,25 @@
- package org.apache.commons.httpclient.protocol;
-
- import java.io.IOException;
-+import java.io.InputStream;
- import java.net.InetAddress;
- import java.net.Socket;
- import java.net.UnknownHostException;
--
-+import java.security.cert.Certificate;
-+import java.security.cert.CertificateParsingException;
-+import java.security.cert.X509Certificate;
-+import java.util.Arrays;
-+import java.util.Collection;
-+import java.util.Iterator;
-+import java.util.LinkedList;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.StringTokenizer;
-+import java.util.regex.Pattern;
-+
-+import javax.net.ssl.SSLException;
-+import javax.net.ssl.SSLSession;
-+import javax.net.ssl.SSLSocket;
- import javax.net.ssl.SSLSocketFactory;
-
- import org.apache.commons.httpclient.ConnectTimeoutException;
-@@ -55,6 +70,11 @@
- */
- private static final SSLProtocolSocketFactory factory = new SSLProtocolSocketFactory();
-
-+ // This is a a sorted list, if you insert new elements do it orderdered.
-+ private final static String[] BAD_COUNTRY_2LDS =
-+ {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
-+ "lg", "ne", "net", "or", "org"};
-+
- /**
- * Gets an singleton instance of the SSLProtocolSocketFactory.
- * @return a SSLProtocolSocketFactory
-@@ -79,12 +99,14 @@
- InetAddress clientHost,
- int clientPort)
- throws IOException, UnknownHostException {
-- return SSLSocketFactory.getDefault().createSocket(
-+ Socket sslSocket = SSLSocketFactory.getDefault().createSocket(
- host,
- port,
- clientHost,
- clientPort
- );
-+ verifyHostName(host, (SSLSocket) sslSocket);
-+ return sslSocket;
- }
-
- /**
-@@ -124,16 +146,19 @@
- }
- int timeout = params.getConnectionTimeout();
- if (timeout == 0) {
-- return createSocket(host, port, localAddress, localPort);
-+ Socket sslSocket = createSocket(host, port, localAddress, localPort);
-+ verifyHostName(host, (SSLSocket) sslSocket);
-+ return sslSocket;
- } else {
- // To be eventually deprecated when migrated to Java 1.4 or above
-- Socket socket = ReflectionSocketFactory.createSocket(
-+ Socket sslSocket = ReflectionSocketFactory.createSocket(
- "javax.net.ssl.SSLSocketFactory", host, port, localAddress, localPort, timeout);
-- if (socket == null) {
-- socket = ControllerThreadSocketFactory.createSocket(
-+ if (sslSocket == null) {
-+ sslSocket = ControllerThreadSocketFactory.createSocket(
- this, host, port, localAddress, localPort, timeout);
- }
-- return socket;
-+ verifyHostName(host, (SSLSocket) sslSocket);
-+ return sslSocket;
- }
- }
-
-@@ -142,10 +167,12 @@
- */
- public Socket createSocket(String host, int port)
- throws IOException, UnknownHostException {
-- return SSLSocketFactory.getDefault().createSocket(
-+ Socket sslSocket = SSLSocketFactory.getDefault().createSocket(
- host,
- port
- );
-+ verifyHostName(host, (SSLSocket) sslSocket);
-+ return sslSocket;
- }
-
- /**
-@@ -157,13 +184,271 @@
- int port,
- boolean autoClose)
- throws IOException, UnknownHostException {
-- return ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(
-+ Socket sslSocket = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(
- socket,
- host,
- port,
- autoClose
- );
-+ verifyHostName(host, (SSLSocket) sslSocket);
-+ return sslSocket;
-+ }
-+
-+
-+
-+
-+ /**
-+ * Verifies that the given hostname in certicifate is the hostname we are trying to connect to
-+ * http://www.cvedetails.com/cve/CVE-2012-5783/
-+ * @param host
-+ * @param ssl
-+ * @throws IOException
-+ */
-+
-+ private static void verifyHostName(String host, SSLSocket ssl)
-+ throws IOException {
-+ if (host == null) {
-+ throw new IllegalArgumentException("host to verify was null");
-+ }
-+
-+ SSLSession session = ssl.getSession();
-+ if (session == null) {
-+ // In our experience this only happens under IBM 1.4.x when
-+ // spurious (unrelated) certificates show up in the server's chain.
-+ // Hopefully this will unearth the real problem:
-+ InputStream in = ssl.getInputStream();
-+ in.available();
-+ /*
-+ If you're looking at the 2 lines of code above because you're
-+ running into a problem, you probably have two options:
-+
-+ #1. Clean up the certificate chain that your server
-+ is presenting (e.g. edit "/etc/apache2/server.crt" or
-+ wherever it is your server's certificate chain is
-+ defined).
-+
-+ OR
-+
-+ #2. Upgrade to an IBM 1.5.x or greater JVM, or switch to a
-+ non-IBM JVM.
-+ */
-+
-+ // If ssl.getInputStream().available() didn't cause an exception,
-+ // maybe at least now the session is available?
-+ session = ssl.getSession();
-+ if (session == null) {
-+ // If it's still null, probably a startHandshake() will
-+ // unearth the real problem.
-+ ssl.startHandshake();
-+
-+ // Okay, if we still haven't managed to cause an exception,
-+ // might as well go for the NPE. Or maybe we're okay now?
-+ session = ssl.getSession();
-+ }
-+ }
-+
-+ Certificate[] certs = session.getPeerCertificates();
-+ verifyHostName(host.trim().toLowerCase(Locale.US), (X509Certificate) certs[0]);
-+ }
-+ /**
-+ * Extract the names from the certificate and tests host matches one of them
-+ * @param host
-+ * @param cert
-+ * @throws SSLException
-+ */
-+
-+ private static void verifyHostName(final String host, X509Certificate cert)
-+ throws SSLException {
-+ // I'm okay with being case-insensitive when comparing the host we used
-+ // to establish the socket to the hostname in the certificate.
-+ // Don't trim the CN, though.
-+
-+ String cn = getCN(cert);
-+ String[] subjectAlts = getDNSSubjectAlts(cert);
-+ verifyHostName(host, cn.toLowerCase(Locale.US), subjectAlts);
-+
-+ }
-+
-+ /**
-+ * Extract all alternative names from a certificate.
-+ * @param cert
-+ * @return
-+ */
-+ private static String[] getDNSSubjectAlts(X509Certificate cert) {
-+ LinkedList subjectAltList = new LinkedList();
-+ Collection c = null;
-+ try {
-+ c = cert.getSubjectAlternativeNames();
-+ } catch (CertificateParsingException cpe) {
-+ // Should probably log.debug() this?
-+ cpe.printStackTrace();
-+ }
-+ if (c != null) {
-+ Iterator it = c.iterator();
-+ while (it.hasNext()) {
-+ List list = (List) it.next();
-+ int type = ((Integer) list.get(0)).intValue();
-+ // If type is 2, then we've got a dNSName
-+ if (type == 2) {
-+ String s = (String) list.get(1);
-+ subjectAltList.add(s);
-+ }
-+ }
-+ }
-+ if (!subjectAltList.isEmpty()) {
-+ String[] subjectAlts = new String[subjectAltList.size()];
-+ subjectAltList.toArray(subjectAlts);
-+ return subjectAlts;
-+ } else {
-+ return new String[0];
-+ }
-+
-+ }
-+ /**
-+ * Verifies
-+ * @param host
-+ * @param cn
-+ * @param subjectAlts
-+ * @throws SSLException
-+ */
-+
-+ private static void verifyHostName(final String host, String cn, String[] subjectAlts)throws SSLException{
-+ StringBuffer cnTested = new StringBuffer();
-+
-+ for (int i = 0; i < subjectAlts.length; i++){
-+ String name = subjectAlts[i];
-+ if (name != null) {
-+ name = name.toLowerCase();
-+ if (verifyHostName(host, name)){
-+ return;
-+ }
-+ cnTested.append("/").append(name);
-+ }
-+ }
-+ if (cn != null && verifyHostName(host, cn)){
-+ return;
-+ }
-+ cnTested.append("/").append(cn);
-+ throw new SSLException("hostname in certificate didn't match: <"
-+ + host + "> != <" + cnTested + ">");
-+
-+ }
-+
-+ private static boolean verifyHostName(final String host, final String cn){
-+ if (doWildCard(cn) && !isIPAddress(host)) {
-+ return matchesWildCard(cn, host);
-+ }
-+ return host.equalsIgnoreCase(cn);
-+ }
-+ private static boolean doWildCard(String cn) {
-+ // Contains a wildcard
-+ // wildcard in the first block
-+ // not an ipaddress (ip addres must explicitily be equal)
-+ // not using 2nd level common tld : ex: not for *.co.uk
-+ String parts[] = cn.split("\\.");
-+ return parts.length >= 3 &&
-+ parts[0].endsWith("*") &&
-+ acceptableCountryWildcard(cn) &&
-+ !isIPAddress(cn);
- }
-+
-+
-+ private static final Pattern IPV4_PATTERN =
-+ Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
-+
-+ private static final Pattern IPV6_STD_PATTERN =
-+ Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
-+
-+ private static final Pattern IPV6_HEX_COMPRESSED_PATTERN =
-+ Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
-+
-+
-+ private static boolean isIPAddress(final String hostname) {
-+ return hostname != null
-+ && (
-+ IPV4_PATTERN.matcher(hostname).matches()
-+ || IPV6_STD_PATTERN.matcher(hostname).matches()
-+ || IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches()
-+ );
-+
-+ }
-+
-+ private static boolean acceptableCountryWildcard(final String cn) {
-+ // The CN better have at least two dots if it wants wildcard action,
-+ // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc...
-+ // The [*.co.uk] problem is an interesting one. Should we just
-+ // hope that CA's would never foolishly allow such a
-+ // certificate to happen?
-+
-+ String[] parts = cn.split("\\.");
-+ // Only checks for 3 levels, with country code of 2 letters.
-+ if (parts.length > 3 || parts[parts.length - 1].length() != 2) {
-+ return true;
-+ }
-+ String countryCode = parts[parts.length - 2];
-+ return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0;
-+ }
-+
-+ private static boolean matchesWildCard(final String cn,
-+ final String hostName) {
-+ String parts[] = cn.split("\\.");
-+ boolean match = false;
-+ String firstpart = parts[0];
-+ if (firstpart.length() > 1) {
-+ // server∗
-+ // e.g. server
-+ String prefix = firstpart.substring(0, firstpart.length() - 1);
-+ // skipwildcard part from cn
-+ String suffix = cn.substring(firstpart.length());
-+ // skip wildcard part from host
-+ String hostSuffix = hostName.substring(prefix.length());
-+ match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix);
-+ } else {
-+ match = hostName.endsWith(cn.substring(1));
-+ }
-+ if (match) {
-+ // I f we're in strict mode ,
-+ // [ ∗.foo.com] is not allowed to match [a.b.foo.com]
-+ match = countDots(hostName) == countDots(cn);
-+ }
-+ return match;
-+ }
-+
-+ private static int countDots(final String data) {
-+ int dots = 0;
-+ for (int i = 0; i < data.length(); i++) {
-+ if (data.charAt(i) == '.') {
-+ dots += 1;
-+ }
-+ }
-+ return dots;
-+ }
-+
-+ private static String getCN(X509Certificate cert) {
-+ // Note: toString() seems to do a better job than getName()
-+ //
-+ // For example, getName() gives me this:
-+ // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d
-+ //
-+ // whereas toString() gives me this:
-+ // EMAILADDRESS=juliusdavies@cucbc.com
-+ String subjectPrincipal = cert.getSubjectX500Principal().toString();
-+
-+ return getCN(subjectPrincipal);
-+
-+ }
-+ private static String getCN(String subjectPrincipal) {
-+ StringTokenizer st = new StringTokenizer(subjectPrincipal, ",");
-+ while(st.hasMoreTokens()) {
-+ String tok = st.nextToken().trim();
-+ if (tok.length() > 3) {
-+ if (tok.substring(0, 3).equalsIgnoreCase("CN=")) {
-+ return tok.substring(3);
-+ }
-+ }
-+ }
-+ return null;
-+ }
-
- /**
- * All instances of SSLProtocolSocketFactory are the same.
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ff099b77169b..c475280e92b6 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/dafny/Manifest b/dev-lang/dafny/Manifest
index a0a3d990bb69..fa26690f9fa9 100644
--- a/dev-lang/dafny/Manifest
+++ b/dev-lang/dafny/Manifest
@@ -374,5 +374,5 @@ DIST xunit.runner.visualstudio.2.4.3.nupkg 809588 BLAKE2B ce18ac895657d1efa9752e
DIST xunit.runner.visualstudio.2.5.1.nupkg 348549 BLAKE2B 530ffc6b699a1589ad6a7fb5aa826d7238b63ea8dcd13ce5705a3d29a0ba70edeac2d9950cd1a00a13a779add761e4e14335689051a43b4cd662a330734e4df7 SHA512 0cc7887e7c7c3315db31aab79df236db9b5542e0234c27543dd5b11cf917674a8fdebc384e7331663b08d586fcf20628479a20ad7edbed4e61667903e812c6f0
DIST xunit.skippablefact.1.4.8.nupkg 44542 BLAKE2B 3c9b09d5196e8901770099b2e5078d9373e8ebc2da058a9071707d6fee56eab7c876578734f3be5b088db6ae83c8ad81a3aadfcab38e1fd2b28bd25601fe5463 SHA512 a2c680223bda4f9bfdbd751c8d6a5319e0a4611533272860ca0a396b26c473a13065301a5d8973074ea2bb5119caaeec5a67d547a96ae5d762dc09f337f51ad1
EBUILD dafny-4.4.0-r1.ebuild 18791 BLAKE2B 82082f5eeadc299a7854a17896199a6feb084b95ca383fa1cf55d402a3a2099e038cb48f8502a5abdbc1f8f31fa985f4c376dc88889c39e5c2743907f4d50d19 SHA512 f50a039842519acd5c93d5f29d563fdbfdf4615344b4b1cfb6493a1a3a54d7dd646c8db49ebaa2541f482156b6660ab72f9315a4d47107fd5bb650acd9ebc472
-EBUILD dafny-4.5.0.ebuild 19421 BLAKE2B 69da91700d20e89689ffc91d1552abefc388289d2e2c1e4a99b2b261e6d621742479275d3f6544d93966511211338869e2c55064798e2b7c6a86013eac3586cb SHA512 73055410ee68a2ad7ff4a39bb1e16ec44791f7e6ec57bbe9818097cecd50379c7929b373690e71a4531c4725e8686f821f722994a73a993b866e2def700c967d
+EBUILD dafny-4.5.0.ebuild 19547 BLAKE2B ec7d8bc7fc9c9270f8a8bf497b4e2e7caf813b5edb75ae756174ba643e5d5eb0d468ddaac00b2523b4113fbe41fc1f4785209261681714bf7edafdac7851b5c4 SHA512 374ff6264d48ac542a1ca9b82566709878444821333ce6eb26468818744fc91c489ebcc92e6ec6bb4f7a2eec1fa089db5a33f1c4797b2daeb9a997e79b1df9ec
MISC metadata.xml 1884 BLAKE2B e3a53cfd90a4edf1d9fd9f567ac3c23fd88cc46602cfe6aea31ddc40585ebc89ab82833dcd21c82083671a54454d62f162f45d56d6b0ec9c202148b3d5ea2c6d SHA512 4cffb9c237ed85097ce1496a72f5aa9c5a0f5758402fe66ff745a3b1dbc3f8d9a40fecc9140ee1b9418f09b62794f7e0a47f908e6ba01b370087d4df62bfa46e
diff --git a/dev-lang/dafny/dafny-4.5.0.ebuild b/dev-lang/dafny/dafny-4.5.0.ebuild
index 1f25339c17f6..601423b0fbfa 100644
--- a/dev-lang/dafny/dafny-4.5.0.ebuild
+++ b/dev-lang/dafny/dafny-4.5.0.ebuild
@@ -485,7 +485,10 @@ src_prepare() {
git-issues/git-issue-2299.dfy
git-issues/git-issue-2301.dfy
git-issues/git-issue-505.dfy
+ metatests/InconsistentCompilerBehavior.dfy
+ metatests/TestBeyondVerifierExpect.dfy
separate-verification/assumptions.dfy
+ server/counterexample_none.transcript
triggers/emptyTrigger.dfy
unicodechars/DafnyTests/RunAllTestsOption.dfy
vstte2012/Combinators.dfy
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index ec6c7ca31853..045a2abf99e9 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,4 +1,3 @@
-AUX moarvm-2023.02-fix-build-clang16.patch 1050 BLAKE2B fa384226d7eaa5fa5dfe26c51d9de6fcb355af8e808097c75839d3ca8eab8919391c5b1cde7863899a51c11a8237285fd3d0d6ae26a77a0c02cda6b008a6364a SHA512 2baea3fb8787a87cef2fc298e1aaa01d82143942e1cfdd0891609f2fbf51b8a54457fd3ecd7ad7d0e25a805db5f86cf6a8df3c25e9dd66f7c1d112a4cecdf516
DIST MoarVM-2023.12.tar.gz 14942980 BLAKE2B f42caa33cadf2b878c1d0de0994c32d18b81b6e56c684a7ccee54c6abc3ff6abaa4f1e5420f2320aca185d29b2fbf02ec81abaf3eb5e334a5c903c3475d55db7 SHA512 9e756e8248cd8fd02efc3d14cd5e0a32cfbb7050a96d94d011009aeb9ec1ca5e9646a3c25b8741702b88abf3faf6aae43df43ca719e1ab17478c6d1984720f59
DIST MoarVM-2024.02.tar.gz 14951164 BLAKE2B 9416cea0b454b29c6d5662090428d790ea437bca1814a084a2c1478268c0eb74764205bca892b5e8de820b2201df154b92503e6243eb4a927a822374a5c09f86 SHA512 e629edb3fb365fd4cd988d9c08d46ecaf002156452e22c3a0c716641eeadb5b7f0434de4e2ec3ce9c8dc354280dc419d716382c160d400ba3970decffc996ed8
EBUILD moarvm-2023.12.ebuild 1458 BLAKE2B fa2c83706ff582875199707fae7563bebf66c7079c0b7a8520df715553da2e32f551a2e912a8e1cdfe6ab03f5accb57a852be82f22c136436aecbefe7ce6d7ee SHA512 a7cfc6c83239aeb394b87f0b7149f40001075f4c26e2b935fccd7e30113d6e2d5dc8aec2182cea2f36eb66aa8dc9263b850eeba024910656ba7ae0722f55806c
diff --git a/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch b/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch
deleted file mode 100644
index 9f8a60672ee2..000000000000
--- a/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/881335
-Upstream PR: https://github.com/MoarVM/MoarVM/pull/1764
---- a/src/6model/containers.c
-+++ b/src/6model/containers.c
-@@ -114,7 +114,7 @@ static const MVMContainerSpec code_pair_spec = {
- code_pair_fetch_s,
- code_pair_store,
- code_pair_store_i,
-- code_pair_store_i, /* FIXME need a code_pair_store_u but lacking tests showing this need */
-+ (void *)code_pair_store_i, /* FIXME need a code_pair_store_u but lacking tests showing this need */
- code_pair_store_n,
- code_pair_store_s,
- code_pair_store,
-@@ -371,7 +371,7 @@ static const MVMContainerSpec value_desc_cont_spec = {
- value_desc_cont_fetch_s,
- value_desc_cont_store,
- value_desc_cont_store_i,
-- value_desc_cont_store_i, /* FIXME need a value_desc_cont_store_u but lacking tests showing this need */
-+ (void *)value_desc_cont_store_i, /* FIXME need a value_desc_cont_store_u but lacking tests showing this need */
- value_desc_cont_store_n,
- value_desc_cont_store_s,
- value_desc_cont_store_unchecked,
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 85030087f736..5ee2a5554484 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 1730731b9ed3..38aa559f969e 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,5 +1,4 @@
AUX rocksdb-6.14.6-gcc13.patch 1139 BLAKE2B 9cc1fc9a51f6e96c36564c1df33ab0648ce823c1dda7415bf122904028e3a5ec54386f90426cff77580f0b3a0d7ad55650610a8421400caf966ee7600644ec96 SHA512 c72bbe325d989411fbc6b34f5f1ce55053703bf49f30355e9b45595bcc611785dd5783cb21b59c381e4eeee5df458abb2b9717afcaea278135785006216eb922
-AUX rocksdb-6.17.3-add_timer_for_riscv.patch 1647 BLAKE2B d1e78c98149f534ce8d02754f5e15b5aeccadb99cf82586bd24c44c68aef5134bdd5d00f5f81699bae59f27ae9f565f40069afedba081f7a76ec54d90a37462b SHA512 ebcf6c5df091860bf53edf54af47678e90da251f28d0ed46be7ac1cf32f50528f8185e94d82ec770c97aa23d24dfcbba634ffcf2671a5dad5fcfd6104115bb69
AUX rocksdb-6.17.3-libatomic.patch 2131 BLAKE2B 2f12fee9b062cf4bf633d784bd4234a1076d0b763f85b9ab0332c828661674944251098e7784b07118e95aa2f4729360cfe3b7b0c95afe58772ea0d3579afd96 SHA512 4717fb67b322f34a2fa351eac1d8fdcbf239acedefd8bcb69c07f11f472f0adc8579e7ddf01be6ba9239009f81d8df4b1cbfb1b88e996ad63fc1d3ff8b801526
AUX rocksdb-7.9.2-gcc-13.patch 1117 BLAKE2B 675802fdeee88304b37e0a7a50685f5103d52b017fe8551ef562f7336421cc28501774a5c7e0ec83e18ddff2be8258a67e3e6abe8131158207963a385de4deb2 SHA512 c55e33fcca683248bd49a342e923736f27b3fbf98443f09bb6a2df7dfe571b93d99997aa8cf308879d77d63beed12e3b50dd30aa0b745b4488304055decf5c29
DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
diff --git a/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch b/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch
deleted file mode 100644
index b98cc9dc5fd6..000000000000
--- a/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Add timer for riscv.
-Upstream PR status: https://github.com/facebook/rocksdb/pull/9215
-This PR hasn't been merged into the main branch.
-https://bugs.gentoo.org/834855
-
---- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-@@ -101,7 +101,7 @@ int toku_clock_gettime(clockid_t clk_id, struct timespec *ts) __attribute__((__v
- typedef uint64_t tokutime_t; // Time type used in by tokutek timers.
-
- #if 0
--// The value of tokutime_t is not specified here.
-+// The value of tokutime_t is not specified here.
- // It might be microseconds since 1/1/1970 (if gettimeofday() is
- // used), or clock cycles since boot (if rdtsc is used). Or something
- // else.
-@@ -133,6 +133,23 @@ static inline tokutime_t toku_time_now(void) {
- return result;
- #elif defined(__powerpc__)
- return __ppc_get_timebase();
-+#elif defined(__riscv) && __riscv_xlen == 32
-+ uint32_t cycles_lo, cycles_hi0, cycles_hi1;
-+ // Implemented in assembly because Clang insisted on branching.
-+ asm volatile(
-+ "rdcycleh %0\n"
-+ "rdcycle %1\n"
-+ "rdcycleh %2\n"
-+ "sub %0, %0, %2\n"
-+ "seqz %0, %0\n"
-+ "sub %0, zero, %0\n"
-+ "and %1, %1, %0\n"
-+ : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1));
-+ return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
-+#elif defined(__riscv) && __riscv_xlen == 64
-+ uint64_t cycles;
-+ asm volatile("rdcycle %0" : "=r"(cycles));
-+ return cycles;
- #else
- #error No timer implementation for this platform
- #endif
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f272d51a649f..4048aca8926d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 8d9500d72219..3ed47220d0ba 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,4 +1,3 @@
-AUX build-1.0.3-setuptools-69.patch 3954 BLAKE2B 7c62fb1deb7cce42de31bd66a0aeea9f6393c8d52406d94056fc8b820488573134f7246eec906a6666cd6178f06cca68bfbc6e3ad831c568eba3f909aaac108e SHA512 2d07f6796a3673ce301a93967cc1b681ff80b143ea11f4bae3a0c96740d1911d68aa0d400ea4d4af6d32819bf4c4bcc3213c7d3bbe48755fbd9534c84b491657
DIST build-1.1.1.gh.tar.gz 44605 BLAKE2B aa1d554d55007e8cb715981938bb8765230ae5ddc6c5bc29efeb52c0e18b6337a13c27f3389772a83cc0ecc9b7d3e889fbc305e91f1290424d7031a1782f683f SHA512 5fa64b07f2c22faca074d1447f5fcb12b7ad40e5fe897f034901d7932d8a9aa2c1dfa806d373503246255d7d9a2429b336384a980376f4ae7c810ae275b735da
EBUILD build-1.1.1.ebuild 1684 BLAKE2B 0dfc43a98f0edb7693d533cd3b75570191e716e87ce00e1255f2d1a3d40fa06bc028f1895535e8eac7f38b0d3c95da057ae9e93cef1eb763043a471441bea5e7 SHA512 b65bacfcde9bc791b724a9e3d461a1398b206117bea5f3aabbfc5ea96c174ba56979903adde1d10734939685b45c2bf91b832036c21e7220186c38173fded8c1
MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/files/build-1.0.3-setuptools-69.patch b/dev-python/build/files/build-1.0.3-setuptools-69.patch
deleted file mode 100644
index 3aa79d080245..000000000000
--- a/dev-python/build/files/build-1.0.3-setuptools-69.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 9f6e34228a0da7e5ce724f400a34bc9f4e69a1ac Mon Sep 17 00:00:00 2001
-From: Henry Schreiner <HenrySchreinerIII@gmail.com>
-Date: Wed, 17 Jan 2024 02:44:57 -0500
-Subject: [PATCH] tests: support setuptools v69.0.3+ (#722)
-
-* tests: support setuptools v69.0.3+
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
-* tests: missed one more normalization fix
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
-* fix: add MANIFEST.in for old setuptools in tests
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
-* tests: used the wrong name
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
----------
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
----
- tests/packages/test-setuptools/MANIFEST.in | 1 +
- tests/test_projectbuilder.py | 6 ++++--
- tests/test_self_packaging.py | 1 +
- tests/test_util.py | 6 ++++--
- 4 files changed, 10 insertions(+), 4 deletions(-)
- create mode 100644 tests/packages/test-setuptools/MANIFEST.in
-
-diff --git a/tests/packages/test-setuptools/MANIFEST.in b/tests/packages/test-setuptools/MANIFEST.in
-new file mode 100644
-index 0000000..e69e3cf
---- /dev/null
-+++ b/tests/packages/test-setuptools/MANIFEST.in
-@@ -0,0 +1 @@
-+include pyproject.toml setup.cfg
-diff --git a/tests/test_projectbuilder.py b/tests/test_projectbuilder.py
-index d46927b..69914ab 100644
---- a/tests/test_projectbuilder.py
-+++ b/tests/test_projectbuilder.py
-@@ -502,7 +502,8 @@ def test_metadata_path_no_prepare(tmp_dir, package_test_no_prepare):
- pathlib.Path(builder.metadata_path(tmp_dir)),
- ).metadata
-
-- assert metadata['name'] == 'test-no-prepare'
-+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+ assert metadata['name'].replace('-', '_') == 'test_no_prepare'
- assert metadata['Version'] == '1.0.0'
-
-
-@@ -513,7 +514,8 @@ def test_metadata_path_with_prepare(tmp_dir, package_test_setuptools):
- pathlib.Path(builder.metadata_path(tmp_dir)),
- ).metadata
-
-- assert metadata['name'] == 'test-setuptools'
-+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+ assert metadata['name'].replace('-', '_') == 'test_setuptools'
- assert metadata['Version'] == '1.0.0'
-
-
-diff --git a/tests/test_self_packaging.py b/tests/test_self_packaging.py
-index fb1d124..3a436ef 100644
---- a/tests/test_self_packaging.py
-+++ b/tests/test_self_packaging.py
-@@ -27,6 +27,7 @@ sdist_files = {
- 'tests/constraints.txt',
- 'tests/packages/test-cant-build-via-sdist/some-file-that-is-needed-for-build.txt',
- 'tests/packages/test-no-project/empty.txt',
-+ 'tests/packages/test-setuptools/MANIFEST.in',
- 'tox.ini',
- }
-
-diff --git a/tests/test_util.py b/tests/test_util.py
-index 8045b51..0ab81b8 100644
---- a/tests/test_util.py
-+++ b/tests/test_util.py
-@@ -12,7 +12,8 @@ import build.util
- def test_wheel_metadata(package_test_setuptools, isolated):
- metadata = build.util.project_wheel_metadata(package_test_setuptools, isolated)
-
-- assert metadata['name'] == 'test-setuptools'
-+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+ assert metadata['name'].replace('-', '_') == 'test_setuptools'
- assert metadata['version'] == '1.0.0'
- assert isinstance(metadata.json, dict)
-
-@@ -41,7 +42,8 @@ def test_wheel_metadata_isolation(package_test_flit):
- def test_with_get_requires(package_test_metadata):
- metadata = build.util.project_wheel_metadata(package_test_metadata)
-
-- assert metadata['name'] == 'test-metadata'
-+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+ assert metadata['name'].replace('-', '_') == 'test_metadata'
- assert str(metadata['version']) == '1.0.0'
- assert metadata['summary'] == 'hello!'
- assert isinstance(metadata.json, dict)
---
-2.43.0
-
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 97cec0928664..9bb4e7f3843c 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
-AUX pipenv-2023.11.15-fix-import-path-PackageDAG.patch 795 BLAKE2B 4e1d473b97c59c455b53b59340f456ddc3e9dd07a604798a7b16da7f59cffcb6f1131b4a4726feb2613e30efce829b467bd1628ada6583e5a2ea2ebfe9ece84f SHA512 d352ce2aa493115d9c0dfcebf2e0fd4b49c2da9bc4f6af5f2b5d7ca4e8b8604704c486c92893cc62b0317761e3dc924924ec6dd882f55322413dac79a98a126e
AUX pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch 1043 BLAKE2B 09a50ba813d21a82333905e098dbd99b11a6c6f07c2ae512eed4189bfee371b0ceb2e27ffff41fb414b336c8ec49014c43903f3a2f12fb9b6323dafdf13f8634 SHA512 c900dc2589b5f4b3f36b15ddf2287d74dcafb1395c96330058a400ac3698a525715b69cd32b5780cc7ec9d71d067f159c623deaf63c9e4c11876cd651c069f87
AUX pipenv-2023.9.8-inject-system-packages.patch 1672 BLAKE2B d803b80a5c46bac67ab7c361f369fad58b1c2a933bc2f78b2d4fa5fa172a23e7e5c026edf48cf398b3232280428eaf40369cafdf4c6c019c3dc9e397e884564d SHA512 5600a8bd7bc5cdf2152d84fc7791359a04df15f38d11f8c9517b709a2793ce05c6fc5acc1d1d8b763078465012e421826699287d2e3ae97838e155a9a1694650
DIST pipenv-2023.12.1.gh.tar.gz 10728288 BLAKE2B dc9425303e24652b797c9f9f9f6cc6f13f30e32775fe0458ee472af5d859ee245c58f3adb6040390bd53d3e1efd6493f930c7336e69956516b36e26e70ca14b7 SHA512 caadbeb32c0445abfae65d86df8d9a5875e71c1a0a281193194ae61c0b095c8f9361a5dd67f92acd5b64d8dc1d877324e959357470894d7d60ceb1a619c831db
diff --git a/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch b/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch
deleted file mode 100644
index 25035da66115..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b1e69d07afc4f94c6148f4ec65834e341a67b10d Mon Sep 17 00:00:00 2001
-From: Oz Tiram <oz.tiram@gmail.com>
-Date: Thu, 4 Jan 2024 14:59:33 +0100
-Subject: [PATCH 1/2] Fix import path of PackageDAG
-
-pipdeptree moved it in the recent versions.
-
-Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
----
- pipenv/environment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/environment.py b/pipenv/environment.py
-index 26975ce0d..7e0206ade 100644
---- a/pipenv/environment.py
-+++ b/pipenv/environment.py
-@@ -678,7 +678,7 @@ class Environment:
- def get_package_requirements(self, pkg=None):
- from itertools import chain
-
-- from pipdeptree import PackageDAG
-+ from pipdeptree._models import PackageDAG
-
- flatten = chain.from_iterable
-
---
-2.41.0
-
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 520dba606740..812ef6be34de 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
Binary files differ
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index b698d00069ce..e18e3f6e72d6 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -1,4 +1,3 @@
-AUX itk-4.2.3-install.patch 370 BLAKE2B b9fab6657f70b79d09adbd28848b4f26a3d5673de52306702b5560f24fe51340816ec4bc56042a1e228cb54f547b821c79fe6b92a231bbff6eacf2b594460c35 SHA512 9162c60170f0ef2767bfc90b12e296b66565c1ca4322513b3f252b0cb1849d727c9e096ce69ebf6b0823264d9e0df85aca427f11a43cf85e6f395b923578ea39
DIST itk-4-2-3.tar.gz 168217 BLAKE2B 450c9f3393228b93a716cf338ad322ecc8934aca08a1f7c4a81dab07a38ac6729ab2ae43b7197130e3cda1bc03ed61c81f9d63cac542d8dcbb199764d47ae4d7 SHA512 0c5c70119b0d0dd950a8e3a52f5a508935bad920f647c38193980a414f617589711a65f4eac3ec67c4bef72f787205cae12513d4d3d35c3b8a795b1bb763fac4
DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
DIST tclconfig-2023.12.11.tar.gz 49691 BLAKE2B 53bb91d125fd080b79ac83af1053d8bb981a8e917b7c8e4db71da89c43263d75a9604623a85d560bcbf3d686f61ccf21bffd794d333aa6cb35c959ab3042991d SHA512 c4eaa31ca1ec585536cd6d31a548b347dae3167197433674d2f3912ce85bad00dda55b0c60eebf26cb5f9d651c8437688e1829f7d3996a22bba2d93e4538946c
diff --git a/dev-tcltk/itk/files/itk-4.2.3-install.patch b/dev-tcltk/itk/files/itk-4.2.3-install.patch
deleted file mode 100644
index 63e673bf1c30..000000000000
--- a/dev-tcltk/itk/files/itk-4.2.3-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure 2024-02-29 19:28:27.192049469 +0100
-+++ b/configure 2024-02-29 19:28:41.507876154 +0100
-@@ -2627,7 +2627,7 @@
-
- # Configure the installer.
-
-- INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
-+ INSTALL='install -c'
- INSTALL_DATA_DIR='${INSTALL} -d -m 755'
- INSTALL_DATA='${INSTALL} -m 644'
- INSTALL_PROGRAM='${INSTALL} -m 755'
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c75ad914cf46..918824e33a99 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 41413ff2b744..b84614813724 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,7 +1,6 @@
AUX perf-6.0-c++17.patch 1127 BLAKE2B 923390f761b588a01935e2b36ff25f916f91e752f76fc6e02999ddc51e297a13798b38a9d3523deab327c8fd6ee2ea02e93f454a4b799f61552c11c1cad574aa SHA512 add3956108a83fd58ca949f6f6a611c44a0f29a4b4eef28c4883a1ba6058b66203064837878becbd64d8afebef57beb1cefcfcedb2a95c221f6792dffcaf38cb
AUX perf-6.0-clang.patch 1862 BLAKE2B e88655e51cb785b80cd44fefb73bb7668bf6d57205e478b106a0d0fbbee4e7089850c2328e796530347c354eb8e7e46e947c18e03ded488bede41de5f74f0b8e SHA512 0e92ba2e878b2b20f6d7c30ba5fde43388378c7f8e752a7c07dd65abc66e576be8f74cf9c06abb79713cc8c1cab37c9cd678f4e5bba8bb99ed1020317f278eb2
AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871ca92b9cf9f57b2e44627fddfcedaf6d7f64ddf74fd103c23aa0db71c4d147f7841743eb5c5a466c9bbb150597ea SHA512 da1b69c190491dd926ba1e98a43965a5ffd543df4134e6a10d187ab544695617fcffede3190bce4cbef13b897d113dee743f67a98ff249a486f8de2d49e62f9f
-AUX perf-6.6-ia64.patch 383 BLAKE2B b591a771293efba21529489ab82f64e7b31005a4a8299fc43f89f9ee427a7be8d7b19de6be86d842c0366c0d0fc8e0be2987b1152908bf167d7d9aff9ad74208 SHA512 6e52b7f1b1f42773db7c4bee8b34e52e1ab5cde6bfadfbb028f54b70676cfbff85db3284f6a6d1963298e5959810ddac131f19538458b2d2a5b910524e779016
AUX perf-6.7-expr.patch 1257 BLAKE2B 1ff41975d84f835a343d2b2f9f049edd817bf80ca576879c7f819608506341b5d19147cf3ecd67a731ab6ecf9a45ce494a8a665aa1bff86cc14f3967a6dd12a0 SHA512 8f1a5a8412464f7623b10da562552b2ac17ca8e70eb4507a3751493662e64066828f2b7a73f1bc7546f463d8d21919f59622b978a6bacafed6a93f232a15ff0b
DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
diff --git a/dev-util/perf/files/perf-6.6-ia64.patch b/dev-util/perf/files/perf-6.6-ia64.patch
deleted file mode 100644
index 111efe2ff2e7..000000000000
--- a/dev-util/perf/files/perf-6.6-ia64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tools/arch/ia64/include/asm/barrier.h b/tools/arch/ia64/include/asm/barrier.h
-index 6fffe5682713..9753f11d79ad 100644
---- a/tools/arch/ia64/include/asm/barrier.h
-+++ b/tools/arch/ia64/include/asm/barrier.h
-@@ -14,6 +14,7 @@
- #ifndef _TOOLS_LINUX_ASM_IA64_BARRIER_H
- #define _TOOLS_LINUX_ASM_IA64_BARRIER_H
-
-+#include <asm/intrinsics.h>
- #include <linux/compiler.h>
-
- /*
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c6a260aae8ce..6b55646f94ac 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 0cda4ecd2162..b587de33d56f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Mar 2024 18:09:52 +0000
+Tue, 19 Mar 2024 00:09:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d7954f335148..95f9929bad30 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 569335 BLAKE2B 07f6153cc527f8ef0be40a2cc21b4fbdd6901249b5c3c569cd1c78321017cd55d98800cf292cc33ffbd6842d685a59c8343e534c4ede0d598730df983a8c33f4 SHA512 5d341348a510bcd14cd0388e2d6bdaccf622bfa08eed783dcee916769bbf2f8d31fa0fb57d0f3bfcce315df08c0e1c93572bfdc703a005d69ab200628e23c99b
-TIMESTAMP 2024-03-18T18:09:55Z
+TIMESTAMP 2024-03-19T00:09:57Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX4g3NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX419VfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAyng/+IRypuuD6ldzJnasilgnLoObvqfLcOeeZg71zC0fZeV6LkR1aMnYwi/1Y
-SQULZBrTYT+lyYfhPK6oMPH9ZzqcFTg7Loa/6/iPPSRilk4FAb7tI+GHHe3TdNsv
-Qq8sWRV5n9RC+Chj2t3LWjrEgycOhLiqxYz+l0zgqNO7ynuG6YgUW1bBSgQaxPYv
-iGOypduwljuYscMX0nBBAueBY6560/gbaRJ4b9ex66OOOJiM7MTaWl7vClZDDx48
-7u8l1cic8ZLe2Kl24Gx7aBmOGYaFLeEExqecdotORluXIuQQBeZ7JGlb3Fahd1JW
-kL68lpMWxugyGo7aQyHvab8OcC82Kav31TSAfSRmS4d92mC7LWpd7DlLvURJoJPZ
-llPyxgGlHuZ22vDTtzPaQqAl4mn36gNQCHwo0aiVRqp4tkJZPX2VPCURKEcPUb4Q
-yUghL4R+YX6LiOjoysWMg5wVLyZ5/dqAWwz2fcrjOTteeX1YTX10dqRtgAvUk6Xp
-CfWqVOK02eP4byOI9E5jGj1IgoRUvokpK17k8TlulokLUzC3A7qsaq8my2b7NvMg
-6qBsQuUE6k3fDthHOrAGt6Qi7mPIyvh1hUqTGy0tfPVDLlmJ1wcXFNAqdYl7zy6D
-6aoGv0S21rsqL0X65lO5pEFP3HkxFCJW5hG47h+piW7PYjVPFIc=
-=/qlg
+klCL6g/8Dp7mnpF0E+dfLqXF/zLotTRR4p8vLwGTmzwT+GDJfiwGRrZTjaLnCT5n
+OCw4Cpi2UnvkDoqhI29h3i7ABu/969Ea4wrC0v7BjdfAC4XK0sR5RvQSIwkFp4eL
+ih5UYdQBURPyRW3IpxzD5ZURgd3J7aGQ1WMX+tin7mqHxt71shv065lCyBTc//tk
+EtrQlOK3yFdWXG0uWYDqF96PRqUNJvrXQ8DcYyhlJiTOWoMTgFuHIz242RLB+FWp
+j1S1hEIAgcOhwrqR8Yo8t0MZt3kDlpilLRfJ7dgA94PZDsQ1Qlo4tBuzhXPwVDqa
+dcrsx6biJEyMtkHXcpIq6bacnT7dzmt60LPFS95M61Nq3sso49ZdEM29dZ50ErQ0
+8mf9stHp1R1m00GILIpnAIYibZyiSAniNF56jvXTbRhGVPmUMZIXkACvng0SYy+p
+4iDQ1d9xp/BFgUopMTFKRbeE3XA30Apc6tTKQMr6Aah49M6EbhmYk9s5XDzSmaXE
+4CCp8ZEefXtt4hhSJs182ISeoBpFNLHGy4gqH1vXr03hMCAIaHqCI0zWCpA9RdOF
+/1bKHmrFY1OrvcLgTjZLIhPT/q6nyjEsKixsNTohUe+czQ20aT80dFpClBRtlqzi
+3x3tyoa5TS+Q0/q47EW4sLK547sFJ5tDajESUfNXJeQakuSCqcY=
+=oxVY
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0cda4ecd2162..b587de33d56f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Mar 2024 18:09:52 +0000
+Tue, 19 Mar 2024 00:09:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0d0d0d824b0b..3de5bf815341 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 2e5db8600e1c..98b1a3e96a20 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/adm-0-r2 b/metadata/md5-cache/acct-group/adm-0-r2
deleted file mode 100644
index 6bd458bf60b1..000000000000
--- a/metadata/md5-cache/acct-group/adm-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cd98d2657ed4806e240de9edd8d70698
diff --git a/metadata/md5-cache/acct-group/adm-0-r3 b/metadata/md5-cache/acct-group/adm-0-r3
new file mode 100644
index 000000000000..da16beea2b70
--- /dev/null
+++ b/metadata/md5-cache/acct-group/adm-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: adm
+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_=a34d7c7e9ebaa5f96ecdc681b060fb58
diff --git a/metadata/md5-cache/acct-group/aerospike-amc-0-r1 b/metadata/md5-cache/acct-group/aerospike-amc-0-r1
deleted file mode 100644
index f3dcc443661f..000000000000
--- a/metadata/md5-cache/acct-group/aerospike-amc-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=32ef9508cce8abba3aa04dd80096c681
diff --git a/metadata/md5-cache/acct-group/aerospike-amc-0-r2 b/metadata/md5-cache/acct-group/aerospike-amc-0-r2
new file mode 100644
index 000000000000..59fb5466aaaa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/aerospike-amc-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/aerospike-amc-community
+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_=0927c8665cb3c2d066a0e71d53672f96
diff --git a/metadata/md5-cache/acct-group/airdcppd-0-r2 b/metadata/md5-cache/acct-group/airdcppd-0-r2
deleted file mode 100644
index 1b61b9dc6577..000000000000
--- a/metadata/md5-cache/acct-group/airdcppd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ee7b7a1ed6298c6bc9dbee719c92af83
diff --git a/metadata/md5-cache/acct-group/airdcppd-0-r3 b/metadata/md5-cache/acct-group/airdcppd-0-r3
new file mode 100644
index 000000000000..b223e7205be4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/airdcppd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/airdcpp-webclient
+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_=a13b58a629b69e9311b50798c96fcac9
diff --git a/metadata/md5-cache/acct-group/alertmanager-0-r1 b/metadata/md5-cache/acct-group/alertmanager-0-r1
deleted file mode 100644
index a6cc7029c2e0..000000000000
--- a/metadata/md5-cache/acct-group/alertmanager-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b3eef80aae6b1f74a86b394ac9bb4f36
diff --git a/metadata/md5-cache/acct-group/alertmanager-0-r2 b/metadata/md5-cache/acct-group/alertmanager-0-r2
new file mode 100644
index 000000000000..86de7ed29832
--- /dev/null
+++ b/metadata/md5-cache/acct-group/alertmanager-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: alertmanager
+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_=bfa305cca9c32b2db3c2c70b25277c64
diff --git a/metadata/md5-cache/acct-group/amanda-0-r1 b/metadata/md5-cache/acct-group/amanda-0-r1
deleted file mode 100644
index 80f2d034c120..000000000000
--- a/metadata/md5-cache/acct-group/amanda-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ddf9e9b411f9a048d244dc1d3f0d120c
diff --git a/metadata/md5-cache/acct-group/amanda-0-r2 b/metadata/md5-cache/acct-group/amanda-0-r2
new file mode 100644
index 000000000000..64a341729197
--- /dev/null
+++ b/metadata/md5-cache/acct-group/amanda-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: amanda
+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_=f238b9d0b7912a8ca7a60c7a033927a3
diff --git a/metadata/md5-cache/acct-group/amavis-0-r2 b/metadata/md5-cache/acct-group/amavis-0-r2
deleted file mode 100644
index 94fea31954f8..000000000000
--- a/metadata/md5-cache/acct-group/amavis-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cc1c528a96ffd6f75425daea5eab2a59
diff --git a/metadata/md5-cache/acct-group/amavis-0-r3 b/metadata/md5-cache/acct-group/amavis-0-r3
new file mode 100644
index 000000000000..c8f1522b2d3b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/amavis-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-filter/amavisd-new
+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_=b190b33356036ff519bb58578824dbc9
diff --git a/metadata/md5-cache/acct-group/amule-0-r2 b/metadata/md5-cache/acct-group/amule-0-r2
deleted file mode 100644
index ea60c720d10b..000000000000
--- a/metadata/md5-cache/acct-group/amule-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dd5cf69dc9eb82500990099687aadf62
diff --git a/metadata/md5-cache/acct-group/amule-0-r3 b/metadata/md5-cache/acct-group/amule-0-r3
new file mode 100644
index 000000000000..269957603f9b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/amule-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/amule
+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_=7b69f888e88b21c54437d93d1ed642ca
diff --git a/metadata/md5-cache/acct-group/android-0-r1 b/metadata/md5-cache/acct-group/android-0-r1
deleted file mode 100644
index f4773c6e3bdf..000000000000
--- a/metadata/md5-cache/acct-group/android-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e174d764294fd2e68ff637e4be575f9d
diff --git a/metadata/md5-cache/acct-group/android-0-r2 b/metadata/md5-cache/acct-group/android-0-r2
new file mode 100644
index 000000000000..211b716c77ce
--- /dev/null
+++ b/metadata/md5-cache/acct-group/android-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for dev-util/android-{ndk,sdk-update-manager}
+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_=351af2942609b0bd03dd7e9561056c7e
diff --git a/metadata/md5-cache/acct-group/apt-cacher-ng-0-r1 b/metadata/md5-cache/acct-group/apt-cacher-ng-0-r1
deleted file mode 100644
index 2886554cc53b..000000000000
--- a/metadata/md5-cache/acct-group/apt-cacher-ng-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cad7a2c85f293e8fef55d1d6b680ddb9
diff --git a/metadata/md5-cache/acct-group/apt-cacher-ng-0-r2 b/metadata/md5-cache/acct-group/apt-cacher-ng-0-r2
new file mode 100644
index 000000000000..a6c63a3d13ef
--- /dev/null
+++ b/metadata/md5-cache/acct-group/apt-cacher-ng-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: apt-cacher-ng
+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_=ea2b5a6fe80402ce8e506fea912abf4a
diff --git a/metadata/md5-cache/acct-group/argus-0-r1 b/metadata/md5-cache/acct-group/argus-0-r1
deleted file mode 100644
index 4d5a42927526..000000000000
--- a/metadata/md5-cache/acct-group/argus-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f0ab5812001018bfc6dcf8a4db3f4249
diff --git a/metadata/md5-cache/acct-group/argus-0-r2 b/metadata/md5-cache/acct-group/argus-0-r2
new file mode 100644
index 000000000000..ee9e292f288c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/argus-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-analyzer/argus
+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_=942ab7bed077f7658317533cf89c1218
diff --git a/metadata/md5-cache/acct-group/arpwatch-0-r1 b/metadata/md5-cache/acct-group/arpwatch-0-r1
deleted file mode 100644
index 3190085ec549..000000000000
--- a/metadata/md5-cache/acct-group/arpwatch-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9a01e2def74080db4cf786e6905841ca
diff --git a/metadata/md5-cache/acct-group/arpwatch-0-r2 b/metadata/md5-cache/acct-group/arpwatch-0-r2
new file mode 100644
index 000000000000..3c957e34ac3c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/arpwatch-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/arpwatch
+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_=5d8b42b5f9117520531e1b53dfe04f34
diff --git a/metadata/md5-cache/acct-group/aspnet-0-r1 b/metadata/md5-cache/acct-group/aspnet-0-r1
deleted file mode 100644
index 2a69e0a2e0b5..000000000000
--- a/metadata/md5-cache/acct-group/aspnet-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0b55e2f0eb7330d0f262a019ffd25444
diff --git a/metadata/md5-cache/acct-group/aspnet-0-r2 b/metadata/md5-cache/acct-group/aspnet-0-r2
new file mode 100644
index 000000000000..5a7e4f1dde58
--- /dev/null
+++ b/metadata/md5-cache/acct-group/aspnet-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: aspnet
+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_=e5c6ed2db7258512048ab7691b67c317
diff --git a/metadata/md5-cache/acct-group/asterisk-0-r2 b/metadata/md5-cache/acct-group/asterisk-0-r2
deleted file mode 100644
index 555a10580166..000000000000
--- a/metadata/md5-cache/acct-group/asterisk-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8e88e4352ae93af8385e2efadfc4b02b
diff --git a/metadata/md5-cache/acct-group/asterisk-0-r3 b/metadata/md5-cache/acct-group/asterisk-0-r3
new file mode 100644
index 000000000000..cd47aaf46ea5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/asterisk-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for asterisk
+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_=85a118fc36c2b3910fe4270de988c998
diff --git a/metadata/md5-cache/acct-group/at-0-r1 b/metadata/md5-cache/acct-group/at-0-r1
deleted file mode 100644
index 8411cde2f053..000000000000
--- a/metadata/md5-cache/acct-group/at-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9ccb16390467649566664a5c4909d7b9
diff --git a/metadata/md5-cache/acct-group/at-0-r2 b/metadata/md5-cache/acct-group/at-0-r2
new file mode 100644
index 000000000000..d6942e73a180
--- /dev/null
+++ b/metadata/md5-cache/acct-group/at-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: at
+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_=63379ba6cedaaec7afcd1adc13f11b0a
diff --git a/metadata/md5-cache/acct-group/atheme-services-0-r2 b/metadata/md5-cache/acct-group/atheme-services-0-r2
deleted file mode 100644
index e507e5c66015..000000000000
--- a/metadata/md5-cache/acct-group/atheme-services-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8313c9fa36cb4c202676cf78339eef80
diff --git a/metadata/md5-cache/acct-group/atheme-services-0-r3 b/metadata/md5-cache/acct-group/atheme-services-0-r3
new file mode 100644
index 000000000000..8ded6bcfedda
--- /dev/null
+++ b/metadata/md5-cache/acct-group/atheme-services-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Atheme 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_=dbd980c1876dfd07e229bfbd8f7e961f
diff --git a/metadata/md5-cache/acct-group/audio-0-r2 b/metadata/md5-cache/acct-group/audio-0-r2
deleted file mode 100644
index cc601a019b52..000000000000
--- a/metadata/md5-cache/acct-group/audio-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c8f92c870a2f2a92e45e441e43b172c1
diff --git a/metadata/md5-cache/acct-group/audio-0-r3 b/metadata/md5-cache/acct-group/audio-0-r3
new file mode 100644
index 000000000000..765ff14904fc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/audio-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: audio
+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_=92275a24a571db3f21d24386787484b1
diff --git a/metadata/md5-cache/acct-group/automatic-0-r1 b/metadata/md5-cache/acct-group/automatic-0-r1
deleted file mode 100644
index 44cfc295600c..000000000000
--- a/metadata/md5-cache/acct-group/automatic-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dd01a2a872be8542d76ac1882f0465cc
diff --git a/metadata/md5-cache/acct-group/automatic-0-r2 b/metadata/md5-cache/acct-group/automatic-0-r2
new file mode 100644
index 000000000000..867510518a90
--- /dev/null
+++ b/metadata/md5-cache/acct-group/automatic-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: automatic
+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_=91f4fcf091fc6fbb34dbd58467297dc4
diff --git a/metadata/md5-cache/acct-group/automx2-0-r2 b/metadata/md5-cache/acct-group/automx2-0-r2
deleted file mode 100644
index 6f80889c97a8..000000000000
--- a/metadata/md5-cache/acct-group/automx2-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=149252e1846ffcb63196b1743f99c8fe
diff --git a/metadata/md5-cache/acct-group/automx2-0-r3 b/metadata/md5-cache/acct-group/automx2-0-r3
new file mode 100644
index 000000000000..fd4c3c828c88
--- /dev/null
+++ b/metadata/md5-cache/acct-group/automx2-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/automx2
+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_=e608cee262a507e27208620f3da1c77b
diff --git a/metadata/md5-cache/acct-group/avahi-0-r2 b/metadata/md5-cache/acct-group/avahi-0-r2
deleted file mode 100644
index 6d8443d5ac2f..000000000000
--- a/metadata/md5-cache/acct-group/avahi-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3f14a0352604a9e41919ff976fd6d707
diff --git a/metadata/md5-cache/acct-group/avahi-0-r3 b/metadata/md5-cache/acct-group/avahi-0-r3
new file mode 100644
index 000000000000..e0f0c7c7cf51
--- /dev/null
+++ b/metadata/md5-cache/acct-group/avahi-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for avahi
+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_=39af5f82caa7fa5e2f4c0204a2b258e4
diff --git a/metadata/md5-cache/acct-group/avahi-autoipd-0-r2 b/metadata/md5-cache/acct-group/avahi-autoipd-0-r2
deleted file mode 100644
index fbb5b28cd4d6..000000000000
--- a/metadata/md5-cache/acct-group/avahi-autoipd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=66d5202b0f772dbb53626c899ad3b557
diff --git a/metadata/md5-cache/acct-group/avahi-autoipd-0-r3 b/metadata/md5-cache/acct-group/avahi-autoipd-0-r3
new file mode 100644
index 000000000000..16b63c2df3f1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/avahi-autoipd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for avahi-autoipd
+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_=be06804cfb4a46ddefd90fec1f12a24a
diff --git a/metadata/md5-cache/acct-group/axtls-0-r1 b/metadata/md5-cache/acct-group/axtls-0-r1
deleted file mode 100644
index b79b8b7bf666..000000000000
--- a/metadata/md5-cache/acct-group/axtls-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=df27d0d23d834ef66357827f5089aca9
diff --git a/metadata/md5-cache/acct-group/axtls-0-r2 b/metadata/md5-cache/acct-group/axtls-0-r2
new file mode 100644
index 000000000000..3d13b448cf19
--- /dev/null
+++ b/metadata/md5-cache/acct-group/axtls-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-libs/axtls
+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_=031e3af7be0ad72de3b16a057b8dd333
diff --git a/metadata/md5-cache/acct-group/backuppc-0-r1 b/metadata/md5-cache/acct-group/backuppc-0-r1
deleted file mode 100644
index 8aa6f5bff0f0..000000000000
--- a/metadata/md5-cache/acct-group/backuppc-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0c77367045efcd1c67cb0c446c7f1e69
diff --git a/metadata/md5-cache/acct-group/backuppc-0-r2 b/metadata/md5-cache/acct-group/backuppc-0-r2
new file mode 100644
index 000000000000..68f8554170e5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/backuppc-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-backup/backuppc
+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_=c38efff5075ee783e3fa55123b397e3d
diff --git a/metadata/md5-cache/acct-group/bacula-0-r2 b/metadata/md5-cache/acct-group/bacula-0-r2
deleted file mode 100644
index f4d334b9dc9d..000000000000
--- a/metadata/md5-cache/acct-group/bacula-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1ccef992be769fba15fcfdcaeee5b905
diff --git a/metadata/md5-cache/acct-group/bacula-0-r3 b/metadata/md5-cache/acct-group/bacula-0-r3
new file mode 100644
index 000000000000..bf92761a254f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bacula-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the bacula backup system
+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_=607a0599ae69b2281ff4811f352296d8
diff --git a/metadata/md5-cache/acct-group/bareos-0-r2 b/metadata/md5-cache/acct-group/bareos-0-r2
deleted file mode 100644
index bf84e4f6cb59..000000000000
--- a/metadata/md5-cache/acct-group/bareos-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=36886fa6e4baf96ee5d47e6c0b5cef96
diff --git a/metadata/md5-cache/acct-group/bareos-0-r3 b/metadata/md5-cache/acct-group/bareos-0-r3
new file mode 100644
index 000000000000..e2937ac3e442
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bareos-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the bareos network backup suite
+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_=3c9ea49bb76b1a5f087e68fd01875061
diff --git a/metadata/md5-cache/acct-group/beanstalk-0-r1 b/metadata/md5-cache/acct-group/beanstalk-0-r1
deleted file mode 100644
index c7d44b127257..000000000000
--- a/metadata/md5-cache/acct-group/beanstalk-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=12d3b357b4bdc9bd49f9cac16f344df7
diff --git a/metadata/md5-cache/acct-group/beanstalk-0-r2 b/metadata/md5-cache/acct-group/beanstalk-0-r2
new file mode 100644
index 000000000000..19a3b9b5c4fb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/beanstalk-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/beanstalkd
+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_=6ef72fd9f1f92a32d3fdd811a036b2a8
diff --git a/metadata/md5-cache/acct-group/bedrock-0-r2 b/metadata/md5-cache/acct-group/bedrock-0-r2
deleted file mode 100644
index 192780053136..000000000000
--- a/metadata/md5-cache/acct-group/bedrock-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b5b164e74cf17618414f0e385a8573ed
diff --git a/metadata/md5-cache/acct-group/bedrock-0-r3 b/metadata/md5-cache/acct-group/bedrock-0-r3
new file mode 100644
index 000000000000..3610e8bf7aa9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bedrock-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Minecraft Bedrock 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_=28613d1c4b57d416272b98907e8215c3
diff --git a/metadata/md5-cache/acct-group/bind_exporter-0-r2 b/metadata/md5-cache/acct-group/bind_exporter-0-r2
deleted file mode 100644
index e98c3e1ff904..000000000000
--- a/metadata/md5-cache/acct-group/bind_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9910f0625a0c60dcac1440308ccf11d6
diff --git a/metadata/md5-cache/acct-group/bind_exporter-0-r3 b/metadata/md5-cache/acct-group/bind_exporter-0-r3
new file mode 100644
index 000000000000..1767e7e8f781
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bind_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bind_exporter
+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_=e925360fee28eb3232e7aa46db93fea1
diff --git a/metadata/md5-cache/acct-group/bird-0-r1 b/metadata/md5-cache/acct-group/bird-0-r1
deleted file mode 100644
index a209cec6294f..000000000000
--- a/metadata/md5-cache/acct-group/bird-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0bea27fb7ebb84eb41d5a00708ceca1c
diff --git a/metadata/md5-cache/acct-group/bird-0-r2 b/metadata/md5-cache/acct-group/bird-0-r2
new file mode 100644
index 000000000000..7aa9a82c2d90
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bird-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bird
+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_=e56d833158108f7ab5f9d00ee30097e0
diff --git a/metadata/md5-cache/acct-group/bitcoin-0-r2 b/metadata/md5-cache/acct-group/bitcoin-0-r2
deleted file mode 100644
index eecd6333b66f..000000000000
--- a/metadata/md5-cache/acct-group/bitcoin-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=573570ef0c80ed706fe2ca03dba88340
diff --git a/metadata/md5-cache/acct-group/bitcoin-0-r3 b/metadata/md5-cache/acct-group/bitcoin-0-r3
new file mode 100644
index 000000000000..76649a465399
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitcoin-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for users with access to system-wide Bitcoin 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_=d15da2402023fdd62cab0ed598969c30
diff --git a/metadata/md5-cache/acct-group/bitflu-0-r1 b/metadata/md5-cache/acct-group/bitflu-0-r1
deleted file mode 100644
index ad8c3b98778a..000000000000
--- a/metadata/md5-cache/acct-group/bitflu-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=767e454d5a51ed2e44068efe8e29f93b
diff --git a/metadata/md5-cache/acct-group/bitflu-0-r2 b/metadata/md5-cache/acct-group/bitflu-0-r2
new file mode 100644
index 000000000000..38c55b37af99
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitflu-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-p2p/bitflu
+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_=4b81d6af8d5487b446c1f3984950574f
diff --git a/metadata/md5-cache/acct-group/bitlbee-0-r2 b/metadata/md5-cache/acct-group/bitlbee-0-r2
deleted file mode 100644
index 18754be0cad3..000000000000
--- a/metadata/md5-cache/acct-group/bitlbee-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bcd4111914e10bb450a012a675ad1676
diff --git a/metadata/md5-cache/acct-group/bitlbee-0-r3 b/metadata/md5-cache/acct-group/bitlbee-0-r3
new file mode 100644
index 000000000000..bd20f951a2d4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitlbee-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bitlbee
+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_=61af4c8053a8f0be66364aa173c7ab08
diff --git a/metadata/md5-cache/acct-group/blackbox_exporter-0-r1 b/metadata/md5-cache/acct-group/blackbox_exporter-0-r1
deleted file mode 100644
index 9db6cef7a6b4..000000000000
--- a/metadata/md5-cache/acct-group/blackbox_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=25cb65e056591212af2269321ebfc5f0
diff --git a/metadata/md5-cache/acct-group/blackbox_exporter-0-r2 b/metadata/md5-cache/acct-group/blackbox_exporter-0-r2
new file mode 100644
index 000000000000..92180aaf111b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/blackbox_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: blackbox_exporter
+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_=73249e941879cd6902cdc70cfa42fcc5
diff --git a/metadata/md5-cache/acct-group/boinc-0-r1 b/metadata/md5-cache/acct-group/boinc-0-r1
deleted file mode 100644
index e2e9fb6cccea..000000000000
--- a/metadata/md5-cache/acct-group/boinc-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5f35b3f1386e961c149ff39b10af3d80
diff --git a/metadata/md5-cache/acct-group/boinc-0-r2 b/metadata/md5-cache/acct-group/boinc-0-r2
new file mode 100644
index 000000000000..10b3d313ce90
--- /dev/null
+++ b/metadata/md5-cache/acct-group/boinc-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sci-misc/boinc
+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_=88ca599d4034dfe8644ebad90319b284
diff --git a/metadata/md5-cache/acct-group/brlapi-0-r1 b/metadata/md5-cache/acct-group/brlapi-0-r1
deleted file mode 100644
index f0917dab6f23..000000000000
--- a/metadata/md5-cache/acct-group/brlapi-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ef8f5cfa2b8e31390d76ba7c6057858a
diff --git a/metadata/md5-cache/acct-group/brlapi-0-r2 b/metadata/md5-cache/acct-group/brlapi-0-r2
new file mode 100644
index 000000000000..2c54944a10d3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/brlapi-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: brlapi
+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_=debf869dcddef384940cad1da6db5e5a
diff --git a/metadata/md5-cache/acct-group/brltty-0-r1 b/metadata/md5-cache/acct-group/brltty-0-r1
deleted file mode 100644
index 25184c1ba242..000000000000
--- a/metadata/md5-cache/acct-group/brltty-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b72194110f0f64e2d48eec5e61d5476d
diff --git a/metadata/md5-cache/acct-group/brltty-0-r2 b/metadata/md5-cache/acct-group/brltty-0-r2
new file mode 100644
index 000000000000..1fa33ada3c19
--- /dev/null
+++ b/metadata/md5-cache/acct-group/brltty-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: brltty
+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_=25ed752222b5efb8568ff0cd6cc3584d
diff --git a/metadata/md5-cache/acct-group/buildbot-0-r2 b/metadata/md5-cache/acct-group/buildbot-0-r2
deleted file mode 100644
index 13a7d7856738..000000000000
--- a/metadata/md5-cache/acct-group/buildbot-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ba73e9cac029d167d9f90e5fc2c80333
diff --git a/metadata/md5-cache/acct-group/buildbot-0-r3 b/metadata/md5-cache/acct-group/buildbot-0-r3
new file mode 100644
index 000000000000..d5b9b639fab3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/buildbot-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Buildbot 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_=77497d110aad0236b0e230c89d980994
diff --git a/metadata/md5-cache/acct-group/bumblebee-0-r1 b/metadata/md5-cache/acct-group/bumblebee-0-r1
deleted file mode 100644
index adf6ea01a33c..000000000000
--- a/metadata/md5-cache/acct-group/bumblebee-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=666b833b0756072928e11a9f9fbfb660
diff --git a/metadata/md5-cache/acct-group/bumblebee-0-r2 b/metadata/md5-cache/acct-group/bumblebee-0-r2
new file mode 100644
index 000000000000..cba6e7f4bc0f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bumblebee-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bumblebee
+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_=c53a4ec491abbc32e9ca1f55c2f0a6ce
diff --git a/metadata/md5-cache/acct-group/burp-0-r2 b/metadata/md5-cache/acct-group/burp-0-r2
deleted file mode 100644
index 481e5c4df77f..000000000000
--- a/metadata/md5-cache/acct-group/burp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3b3813d4b833ad5336bc1f2cc5350c3f
diff --git a/metadata/md5-cache/acct-group/burp-0-r3 b/metadata/md5-cache/acct-group/burp-0-r3
new file mode 100644
index 000000000000..4ac56eac0e55
--- /dev/null
+++ b/metadata/md5-cache/acct-group/burp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the app-backup/burp 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_=f2c1df7a55ef3429502aa59f9d95b22e
diff --git a/metadata/md5-cache/acct-group/burrow_exporter-0-r2 b/metadata/md5-cache/acct-group/burrow_exporter-0-r2
deleted file mode 100644
index a92dff5975d1..000000000000
--- a/metadata/md5-cache/acct-group/burrow_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=222ffc753a7c2d85656fdb52644abf51
diff --git a/metadata/md5-cache/acct-group/burrow_exporter-0-r3 b/metadata/md5-cache/acct-group/burrow_exporter-0-r3
new file mode 100644
index 000000000000..4ff646955495
--- /dev/null
+++ b/metadata/md5-cache/acct-group/burrow_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/burrow_exporter
+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_=9ff030a5ae79229fe390a683eadd369b
diff --git a/metadata/md5-cache/acct-group/cadvisor-0-r2 b/metadata/md5-cache/acct-group/cadvisor-0-r2
deleted file mode 100644
index 430203eb11f1..000000000000
--- a/metadata/md5-cache/acct-group/cadvisor-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bb7bf280f4e6c9b5cec200b955a470d0
diff --git a/metadata/md5-cache/acct-group/cadvisor-0-r3 b/metadata/md5-cache/acct-group/cadvisor-0-r3
new file mode 100644
index 000000000000..999b764377ff
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cadvisor-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: cadvisor
+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_=5835decdbf2516a0a38b3d485e50047e
diff --git a/metadata/md5-cache/acct-group/cancd-0-r1 b/metadata/md5-cache/acct-group/cancd-0-r1
deleted file mode 100644
index 750b1776c8de..000000000000
--- a/metadata/md5-cache/acct-group/cancd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0f9dff926c9be807dcaa9c065eb47978
diff --git a/metadata/md5-cache/acct-group/cancd-0-r2 b/metadata/md5-cache/acct-group/cancd-0-r2
new file mode 100644
index 000000000000..d7c2352b3bb4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cancd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the CA NetConsole 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_=72a8f18eb2b93c4674746461032e3e68
diff --git a/metadata/md5-cache/acct-group/carbon-0-r2 b/metadata/md5-cache/acct-group/carbon-0-r2
deleted file mode 100644
index aa61b0e0ecb5..000000000000
--- a/metadata/md5-cache/acct-group/carbon-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=aa828275bb92176e2b4d72df7b462d1a
diff --git a/metadata/md5-cache/acct-group/carbon-0-r3 b/metadata/md5-cache/acct-group/carbon-0-r3
new file mode 100644
index 000000000000..f2741090a0c9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/carbon-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: carbon
+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_=892886e7b63b0c0891d80e955c5bd57d
diff --git a/metadata/md5-cache/acct-group/cdrom-0-r2 b/metadata/md5-cache/acct-group/cdrom-0-r2
deleted file mode 100644
index 4234ce7b6891..000000000000
--- a/metadata/md5-cache/acct-group/cdrom-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=aeda8fce0959a35b3cac51281f04ec44
diff --git a/metadata/md5-cache/acct-group/cdrom-0-r3 b/metadata/md5-cache/acct-group/cdrom-0-r3
new file mode 100644
index 000000000000..3d0fe6fd9934
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cdrom-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: cdrom
+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_=78d513c07157233d16d5f60ee529ec70
diff --git a/metadata/md5-cache/acct-group/ceph-0-r2 b/metadata/md5-cache/acct-group/ceph-0-r2
deleted file mode 100644
index 9fc032904e02..000000000000
--- a/metadata/md5-cache/acct-group/ceph-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=32dfe27b92ceae5f5dba3276271341f4
diff --git a/metadata/md5-cache/acct-group/ceph-0-r3 b/metadata/md5-cache/acct-group/ceph-0-r3
new file mode 100644
index 000000000000..bdd1a6af4d91
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ceph-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ceph
+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_=07f2f21a663eb641c9f051fbe061bfce
diff --git a/metadata/md5-cache/acct-group/cgit-0-r1 b/metadata/md5-cache/acct-group/cgit-0-r1
deleted file mode 100644
index 1f6fc63566c1..000000000000
--- a/metadata/md5-cache/acct-group/cgit-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8c9df8d7add2d960a4e824cc5a88662f
diff --git a/metadata/md5-cache/acct-group/cgit-0-r2 b/metadata/md5-cache/acct-group/cgit-0-r2
new file mode 100644
index 000000000000..42805e931076
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cgit-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: cgit
+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_=32ec3efda9a7098cdc5af0e935407967
diff --git a/metadata/md5-cache/acct-group/chronograf-0-r2 b/metadata/md5-cache/acct-group/chronograf-0-r2
deleted file mode 100644
index 231dc27afb1e..000000000000
--- a/metadata/md5-cache/acct-group/chronograf-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=418a890fad31ad8addba5acdb7bd088b
diff --git a/metadata/md5-cache/acct-group/chronograf-0-r3 b/metadata/md5-cache/acct-group/chronograf-0-r3
new file mode 100644
index 000000000000..48385bf9171c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/chronograf-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: chronograf
+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_=a4d8560378149a850471a90dfd71d57b
diff --git a/metadata/md5-cache/acct-group/clair-0-r2 b/metadata/md5-cache/acct-group/clair-0-r2
deleted file mode 100644
index 656b0bc96965..000000000000
--- a/metadata/md5-cache/acct-group/clair-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8703a9aa88f0b72551419735892b76d3
diff --git a/metadata/md5-cache/acct-group/clair-0-r3 b/metadata/md5-cache/acct-group/clair-0-r3
new file mode 100644
index 000000000000..470a250689b5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/clair-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: clair
+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_=4b03e17f8bfb773f0c1848b7c7c588e2
diff --git a/metadata/md5-cache/acct-group/clamav-0-r2 b/metadata/md5-cache/acct-group/clamav-0-r2
deleted file mode 100644
index eddf25ff035b..000000000000
--- a/metadata/md5-cache/acct-group/clamav-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f9098aa5f93f9fab274dc15ad4f2d89e
diff --git a/metadata/md5-cache/acct-group/clamav-0-r3 b/metadata/md5-cache/acct-group/clamav-0-r3
new file mode 100644
index 000000000000..5fa04e47c2f2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/clamav-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: clamav
+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_=553377f094081082d9bc03055f1753f9
diff --git a/metadata/md5-cache/acct-group/cntlm-0-r1 b/metadata/md5-cache/acct-group/cntlm-0-r1
deleted file mode 100644
index 15eaf7467956..000000000000
--- a/metadata/md5-cache/acct-group/cntlm-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d4c2293c5d1036d03edb95d7a1761529
diff --git a/metadata/md5-cache/acct-group/cntlm-0-r2 b/metadata/md5-cache/acct-group/cntlm-0-r2
new file mode 100644
index 000000000000..da9c9f1ea8b1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cntlm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-proxy/cntlm
+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_=36e9bb2ebd32948acf9feba57c8dec53
diff --git a/metadata/md5-cache/acct-group/cockroach-0-r1 b/metadata/md5-cache/acct-group/cockroach-0-r1
deleted file mode 100644
index b82fba61bc81..000000000000
--- a/metadata/md5-cache/acct-group/cockroach-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=899c65488cf1eff9c4f29fc97333d4f1
diff --git a/metadata/md5-cache/acct-group/cockroach-0-r2 b/metadata/md5-cache/acct-group/cockroach-0-r2
new file mode 100644
index 000000000000..d9301015caed
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cockroach-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/cockroach
+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_=b6e4fdae3ffa2c3236ad6b80c9771d57
diff --git a/metadata/md5-cache/acct-group/collectd-0-r1 b/metadata/md5-cache/acct-group/collectd-0-r1
deleted file mode 100644
index b195a9b01f26..000000000000
--- a/metadata/md5-cache/acct-group/collectd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d3345ae6c4363a2d3d8086db7ecc346a
diff --git a/metadata/md5-cache/acct-group/collectd-0-r2 b/metadata/md5-cache/acct-group/collectd-0-r2
new file mode 100644
index 000000000000..671e3cddddc1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/collectd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=collectd 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_=35ee22070c6c22905d3e7fc16bff29ff
diff --git a/metadata/md5-cache/acct-group/colord-0-r1 b/metadata/md5-cache/acct-group/colord-0-r1
deleted file mode 100644
index 9a6739208b6d..000000000000
--- a/metadata/md5-cache/acct-group/colord-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2457f8216bbd069536329f91c347775c
diff --git a/metadata/md5-cache/acct-group/colord-0-r2 b/metadata/md5-cache/acct-group/colord-0-r2
new file mode 100644
index 000000000000..4ce4ca64bf0a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/colord-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: colord
+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_=f300700aa82260597dbb6ea968b0f841
diff --git a/metadata/md5-cache/acct-group/consul-0-r2 b/metadata/md5-cache/acct-group/consul-0-r2
deleted file mode 100644
index a67d8d00525e..000000000000
--- a/metadata/md5-cache/acct-group/consul-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d96b6d7da6769f828b60e9090bc7f90f
diff --git a/metadata/md5-cache/acct-group/consul-0-r3 b/metadata/md5-cache/acct-group/consul-0-r3
new file mode 100644
index 000000000000..6c79e3533471
--- /dev/null
+++ b/metadata/md5-cache/acct-group/consul-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: consul
+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_=05c534c7cb737650adf2a12d26fb8726
diff --git a/metadata/md5-cache/acct-group/consul-template-0-r2 b/metadata/md5-cache/acct-group/consul-template-0-r2
deleted file mode 100644
index 6a610d4fc621..000000000000
--- a/metadata/md5-cache/acct-group/consul-template-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=469ea2ed7ed7347fd08929ac5af895af
diff --git a/metadata/md5-cache/acct-group/consul-template-0-r3 b/metadata/md5-cache/acct-group/consul-template-0-r3
new file mode 100644
index 000000000000..7699efcd7d08
--- /dev/null
+++ b/metadata/md5-cache/acct-group/consul-template-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: consul-template
+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_=85addb35ed1ff97100e104ae047374d4
diff --git a/metadata/md5-cache/acct-group/consul_exporter-0-r1 b/metadata/md5-cache/acct-group/consul_exporter-0-r1
deleted file mode 100644
index 12068ede815e..000000000000
--- a/metadata/md5-cache/acct-group/consul_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2e89d3282ea21dba1a78ea834d8c523f
diff --git a/metadata/md5-cache/acct-group/consul_exporter-0-r2 b/metadata/md5-cache/acct-group/consul_exporter-0-r2
new file mode 100644
index 000000000000..ea6f0cc7ccf2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/consul_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: consul_exporter
+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_=caf8a24f3387dd3eb1b072fa33453a15
diff --git a/metadata/md5-cache/acct-group/coredns-0-r1 b/metadata/md5-cache/acct-group/coredns-0-r1
deleted file mode 100644
index 8c34ca804436..000000000000
--- a/metadata/md5-cache/acct-group/coredns-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=774453be73e85735f4f7964cb67dcf37
diff --git a/metadata/md5-cache/acct-group/coredns-0-r2 b/metadata/md5-cache/acct-group/coredns-0-r2
new file mode 100644
index 000000000000..889e6ca1ea9c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/coredns-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dns/coredns
+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_=3d17167343602468fb6acc68adde4c73
diff --git a/metadata/md5-cache/acct-group/cron-0-r1 b/metadata/md5-cache/acct-group/cron-0-r1
deleted file mode 100644
index 1001b24e97fe..000000000000
--- a/metadata/md5-cache/acct-group/cron-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=84c29d8f5ffbceb5565e1b977f4c98b7
diff --git a/metadata/md5-cache/acct-group/cron-0-r2 b/metadata/md5-cache/acct-group/cron-0-r2
new file mode 100644
index 000000000000..7b341249578b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cron-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/cronbase
+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_=c09390cf7d74794d22abe28b8ba2fdd1
diff --git a/metadata/md5-cache/acct-group/crontab-0-r1 b/metadata/md5-cache/acct-group/crontab-0-r1
deleted file mode 100644
index 469a815a4787..000000000000
--- a/metadata/md5-cache/acct-group/crontab-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5b795cc64102c10143ea350bf7e096c0
diff --git a/metadata/md5-cache/acct-group/crontab-0-r2 b/metadata/md5-cache/acct-group/crontab-0-r2
new file mode 100644
index 000000000000..5bfebcae0142
--- /dev/null
+++ b/metadata/md5-cache/acct-group/crontab-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: crontab
+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_=831bd0777c4b6b1dcaba5b081fd088cf
diff --git a/metadata/md5-cache/acct-group/cvmfs-0-r2 b/metadata/md5-cache/acct-group/cvmfs-0-r2
deleted file mode 100644
index 86a74900745e..000000000000
--- a/metadata/md5-cache/acct-group/cvmfs-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f478f3bc54f20758674d9745ef0395c8
diff --git a/metadata/md5-cache/acct-group/cvmfs-0-r3 b/metadata/md5-cache/acct-group/cvmfs-0-r3
new file mode 100644
index 000000000000..69b979bf1f64
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cvmfs-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the CernVM-FS network file system
+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_=1d24a3142015d6edde63ab471e64f688
diff --git a/metadata/md5-cache/acct-group/davfs2-0-r2 b/metadata/md5-cache/acct-group/davfs2-0-r2
deleted file mode 100644
index f19a04b7d49e..000000000000
--- a/metadata/md5-cache/acct-group/davfs2-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=278004887aa6815c1ce619f5b453e722
diff --git a/metadata/md5-cache/acct-group/davfs2-0-r3 b/metadata/md5-cache/acct-group/davfs2-0-r3
new file mode 100644
index 000000000000..f5115663bcd6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/davfs2-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: davfs2
+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_=edccf9501728aa1da48ece8df9023d0b
diff --git a/metadata/md5-cache/acct-group/dbmail-0-r1 b/metadata/md5-cache/acct-group/dbmail-0-r1
deleted file mode 100644
index 3943891c7f6a..000000000000
--- a/metadata/md5-cache/acct-group/dbmail-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9122dff3259bd382d18460407eff34cf
diff --git a/metadata/md5-cache/acct-group/dbmail-0-r2 b/metadata/md5-cache/acct-group/dbmail-0-r2
new file mode 100644
index 000000000000..48bb5604a318
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dbmail-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dbmail
+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_=74cb34ee753c92b7afcd17b2a44fd935
diff --git a/metadata/md5-cache/acct-group/dbskkd-0-r1 b/metadata/md5-cache/acct-group/dbskkd-0-r1
deleted file mode 100644
index 1334f48c1a51..000000000000
--- a/metadata/md5-cache/acct-group/dbskkd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bca3dba051bdbb7ecf409f3a403274bb
diff --git a/metadata/md5-cache/acct-group/dbskkd-0-r2 b/metadata/md5-cache/acct-group/dbskkd-0-r2
new file mode 100644
index 000000000000..aaeffef1da83
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dbskkd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-i18n/dbskkd-cdb
+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_=095eacd5935bd76255a9d5d4c1f7b278
diff --git a/metadata/md5-cache/acct-group/ddclient-0-r2 b/metadata/md5-cache/acct-group/ddclient-0-r2
deleted file mode 100644
index 12e550572703..000000000000
--- a/metadata/md5-cache/acct-group/ddclient-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dcef536203ded10ec74f3c27e34fc28f
diff --git a/metadata/md5-cache/acct-group/ddclient-0-r3 b/metadata/md5-cache/acct-group/ddclient-0-r3
new file mode 100644
index 000000000000..7424726d2b9c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ddclient-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the dynamic DNS client
+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_=62357cfeed5b920cc288c96353f91d85
diff --git a/metadata/md5-cache/acct-group/defang-0-r1 b/metadata/md5-cache/acct-group/defang-0-r1
deleted file mode 100644
index ad1f1bc6ee1d..000000000000
--- a/metadata/md5-cache/acct-group/defang-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d79bf743170b0d0ff3baa36590ed1588
diff --git a/metadata/md5-cache/acct-group/defang-0-r2 b/metadata/md5-cache/acct-group/defang-0-r2
new file mode 100644
index 000000000000..5c4f2e271c35
--- /dev/null
+++ b/metadata/md5-cache/acct-group/defang-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for mail-filter/mimedefang
+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_=883f5731c96bd3563865229b04ca1a40
diff --git a/metadata/md5-cache/acct-group/dehydrated-0-r1 b/metadata/md5-cache/acct-group/dehydrated-0-r1
deleted file mode 100644
index de7fc4114080..000000000000
--- a/metadata/md5-cache/acct-group/dehydrated-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=75c6a1a13199a337a45b4f411b856227
diff --git a/metadata/md5-cache/acct-group/dehydrated-0-r2 b/metadata/md5-cache/acct-group/dehydrated-0-r2
new file mode 100644
index 000000000000..25896fb88d78
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dehydrated-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=dehydrated 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_=6c1901364bb70782cc4ded4c3ea81601
diff --git a/metadata/md5-cache/acct-group/deluge-0-r2 b/metadata/md5-cache/acct-group/deluge-0-r2
deleted file mode 100644
index a99caaaa8335..000000000000
--- a/metadata/md5-cache/acct-group/deluge-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=18a1f3f8e5da7de50b060f76bf94a16b
diff --git a/metadata/md5-cache/acct-group/deluge-0-r3 b/metadata/md5-cache/acct-group/deluge-0-r3
new file mode 100644
index 000000000000..d3a6343460d1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/deluge-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: deluge
+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_=4a8f8aab1266fa50164fe7e84e656337
diff --git a/metadata/md5-cache/acct-group/dhcp-0-r2 b/metadata/md5-cache/acct-group/dhcp-0-r2
deleted file mode 100644
index b1d921115216..000000000000
--- a/metadata/md5-cache/acct-group/dhcp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=73109fa23d0d615a435061d0fd582f9a
diff --git a/metadata/md5-cache/acct-group/dhcp-0-r3 b/metadata/md5-cache/acct-group/dhcp-0-r3
new file mode 100644
index 000000000000..d86967182824
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dhcp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dhcp
+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_=bf9c7bec8f9e61b43761b46f5035655f
diff --git a/metadata/md5-cache/acct-group/dhcpcd-0-r2 b/metadata/md5-cache/acct-group/dhcpcd-0-r2
deleted file mode 100644
index 9f5aef4ccab9..000000000000
--- a/metadata/md5-cache/acct-group/dhcpcd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c272ea800907a9dcf0a20a61e797b63d
diff --git a/metadata/md5-cache/acct-group/dhcpcd-0-r3 b/metadata/md5-cache/acct-group/dhcpcd-0-r3
new file mode 100644
index 000000000000..c9890e85b634
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dhcpcd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dhcpcd
+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_=b3b309a98e04328b80f9c4204bdc2ee5
diff --git a/metadata/md5-cache/acct-group/dialout-0-r2 b/metadata/md5-cache/acct-group/dialout-0-r2
deleted file mode 100644
index d004496f85ad..000000000000
--- a/metadata/md5-cache/acct-group/dialout-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2b48ec5627d741f38f6bb827650fead1
diff --git a/metadata/md5-cache/acct-group/dialout-0-r3 b/metadata/md5-cache/acct-group/dialout-0-r3
new file mode 100644
index 000000000000..e15477689bb9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dialout-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dialout
+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_=37800f9d62c84940d63a050c10cc2b89
diff --git a/metadata/md5-cache/acct-group/dictd-0-r1 b/metadata/md5-cache/acct-group/dictd-0-r1
deleted file mode 100644
index 0efa096fc5a4..000000000000
--- a/metadata/md5-cache/acct-group/dictd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4030ee872affccf50bb7e266e4bf04d3
diff --git a/metadata/md5-cache/acct-group/dictd-0-r2 b/metadata/md5-cache/acct-group/dictd-0-r2
new file mode 100644
index 000000000000..5b46132c7bfa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dictd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for app-text/dictd
+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_=948376368392bde07352756708bd88d4
diff --git a/metadata/md5-cache/acct-group/dirsrv-0-r1 b/metadata/md5-cache/acct-group/dirsrv-0-r1
deleted file mode 100644
index c9be9a314a72..000000000000
--- a/metadata/md5-cache/acct-group/dirsrv-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a57bd9ebcefef3f292dda064feb68360
diff --git a/metadata/md5-cache/acct-group/dirsrv-0-r2 b/metadata/md5-cache/acct-group/dirsrv-0-r2
new file mode 100644
index 000000000000..16651038bed4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dirsrv-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-nds/389-ds-base
+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_=d19ad3184fc8b45d8acff76ed471fc40
diff --git a/metadata/md5-cache/acct-group/disk-0-r2 b/metadata/md5-cache/acct-group/disk-0-r2
deleted file mode 100644
index 91e0bb4f8f60..000000000000
--- a/metadata/md5-cache/acct-group/disk-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9a900585eed557b50f7076e541784651
diff --git a/metadata/md5-cache/acct-group/disk-0-r3 b/metadata/md5-cache/acct-group/disk-0-r3
new file mode 100644
index 000000000000..ee768a902926
--- /dev/null
+++ b/metadata/md5-cache/acct-group/disk-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: disk
+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_=110279fa14c91d7489fcd3aec26dac82
diff --git a/metadata/md5-cache/acct-group/distcc-1-r1 b/metadata/md5-cache/acct-group/distcc-1-r1
deleted file mode 100644
index 774536e11145..000000000000
--- a/metadata/md5-cache/acct-group/distcc-1-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2c96cd49815000b0e36f3c1aa08b7c6e
diff --git a/metadata/md5-cache/acct-group/distcc-1-r2 b/metadata/md5-cache/acct-group/distcc-1-r2
new file mode 100644
index 000000000000..023189884a72
--- /dev/null
+++ b/metadata/md5-cache/acct-group/distcc-1-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: distcc
+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_=4066147437e509a0a0e9caaac169d81a
diff --git a/metadata/md5-cache/acct-group/dnrd-0-r1 b/metadata/md5-cache/acct-group/dnrd-0-r1
deleted file mode 100644
index 350878e66d88..000000000000
--- a/metadata/md5-cache/acct-group/dnrd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=615d5819aaf220d8bbd656204e37e7e4
diff --git a/metadata/md5-cache/acct-group/dnrd-0-r2 b/metadata/md5-cache/acct-group/dnrd-0-r2
new file mode 100644
index 000000000000..4ec5d5533515
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnrd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-dns/dnrd
+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_=c09aa966e022edf6199f3c44be90feaa
diff --git a/metadata/md5-cache/acct-group/dnsdist-0-r2 b/metadata/md5-cache/acct-group/dnsdist-0-r2
deleted file mode 100644
index e09c9a7c9b95..000000000000
--- a/metadata/md5-cache/acct-group/dnsdist-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3ed217211e84f2d038788d5e81842fb8
diff --git a/metadata/md5-cache/acct-group/dnsdist-0-r3 b/metadata/md5-cache/acct-group/dnsdist-0-r3
new file mode 100644
index 000000000000..1e228c815194
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnsdist-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dns/dnsdist
+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_=97d91b75d3461db3b6e63c58ef37500b
diff --git a/metadata/md5-cache/acct-group/dnsmasq-0-r2 b/metadata/md5-cache/acct-group/dnsmasq-0-r2
deleted file mode 100644
index 2cb9ecff90e7..000000000000
--- a/metadata/md5-cache/acct-group/dnsmasq-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d0ed4408e7406b4f4d107f906de8f189
diff --git a/metadata/md5-cache/acct-group/dnsmasq-0-r3 b/metadata/md5-cache/acct-group/dnsmasq-0-r3
new file mode 100644
index 000000000000..eeb6d50bc476
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnsmasq-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dnsmasq
+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_=f9c30a69112d30b86699c11204fa3eae
diff --git a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r2 b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r2
deleted file mode 100644
index cb63c9d3a0ab..000000000000
--- a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=27ec8aa91e7dd5394181ffc5b87ba8d5
diff --git a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r3 b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r3
new file mode 100644
index 000000000000..f2f0bc21a570
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dnsmasq_exporter
+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_=f2e4765978e028fcc2f6704bb5ecb53a
diff --git a/metadata/md5-cache/acct-group/docker-0-r2 b/metadata/md5-cache/acct-group/docker-0-r2
deleted file mode 100644
index a7a61d10ba22..000000000000
--- a/metadata/md5-cache/acct-group/docker-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=91befdfc3842cb54e21f09188dfb3951
diff --git a/metadata/md5-cache/acct-group/docker-0-r3 b/metadata/md5-cache/acct-group/docker-0-r3
new file mode 100644
index 000000000000..95c26d9910ce
--- /dev/null
+++ b/metadata/md5-cache/acct-group/docker-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: docker
+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_=fcab6b119007e90dcfed79f794fbf4ae
diff --git a/metadata/md5-cache/acct-group/docker_auth-0-r2 b/metadata/md5-cache/acct-group/docker_auth-0-r2
deleted file mode 100644
index 92530a440881..000000000000
--- a/metadata/md5-cache/acct-group/docker_auth-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5ba22aad9c96aa51806cd3f4a0d782d6
diff --git a/metadata/md5-cache/acct-group/docker_auth-0-r3 b/metadata/md5-cache/acct-group/docker_auth-0-r3
new file mode 100644
index 000000000000..65c057365fb2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/docker_auth-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: docker_auth
+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_=fe72d6cc5d6383eefd77d195bf31fd3b
diff --git a/metadata/md5-cache/acct-group/dovecot-0-r2 b/metadata/md5-cache/acct-group/dovecot-0-r2
deleted file mode 100644
index b6ca1c558ca7..000000000000
--- a/metadata/md5-cache/acct-group/dovecot-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7b3a511140d474b52c89142e4e6c5b87
diff --git a/metadata/md5-cache/acct-group/dovecot-0-r3 b/metadata/md5-cache/acct-group/dovecot-0-r3
new file mode 100644
index 000000000000..ddf3c8978a7b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dovecot-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dovecot
+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_=25128ee974269c0bb0d6562213a3270e
diff --git a/metadata/md5-cache/acct-group/dovenull-0-r2 b/metadata/md5-cache/acct-group/dovenull-0-r2
deleted file mode 100644
index f3b97b6be91e..000000000000
--- a/metadata/md5-cache/acct-group/dovenull-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1472053d1a74a3d7b4ae8fdf422720e3
diff --git a/metadata/md5-cache/acct-group/dovenull-0-r3 b/metadata/md5-cache/acct-group/dovenull-0-r3
new file mode 100644
index 000000000000..42b9aeee582d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dovenull-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dovenull
+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_=558372a2590700b9f0f3af73222f333e
diff --git a/metadata/md5-cache/acct-group/drone-0-r1 b/metadata/md5-cache/acct-group/drone-0-r1
deleted file mode 100644
index 6d562981df48..000000000000
--- a/metadata/md5-cache/acct-group/drone-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4f293b9e0c1b09206c3c478469d18cbd
diff --git a/metadata/md5-cache/acct-group/drone-0-r2 b/metadata/md5-cache/acct-group/drone-0-r2
new file mode 100644
index 000000000000..75da907652b7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/drone-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-util/drone
+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_=1f268c5d9f04c0a3c48df972fa8e0333
diff --git a/metadata/md5-cache/acct-group/ejabberd-0-r1 b/metadata/md5-cache/acct-group/ejabberd-0-r1
deleted file mode 100644
index f44b1cc55148..000000000000
--- a/metadata/md5-cache/acct-group/ejabberd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=876169913665732d3a1c13b288442424
diff --git a/metadata/md5-cache/acct-group/ejabberd-0-r2 b/metadata/md5-cache/acct-group/ejabberd-0-r2
new file mode 100644
index 000000000000..acc26c3b09b3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ejabberd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-im/ejabberd
+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_=5515852ae244a8cdb4acfa9e0fccd116
diff --git a/metadata/md5-cache/acct-group/elasticsearch-0-r2 b/metadata/md5-cache/acct-group/elasticsearch-0-r2
deleted file mode 100644
index f3c8351fe98c..000000000000
--- a/metadata/md5-cache/acct-group/elasticsearch-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c6824ebeef841a6d1410771a2a11a519
diff --git a/metadata/md5-cache/acct-group/elasticsearch-0-r3 b/metadata/md5-cache/acct-group/elasticsearch-0-r3
new file mode 100644
index 000000000000..4f0acb0b8c76
--- /dev/null
+++ b/metadata/md5-cache/acct-group/elasticsearch-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Elasticsearch 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_=0d3687824f4ca5411ccbfd495e4ceda9
diff --git a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r2 b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r2
deleted file mode 100644
index 0e98e052b0a8..000000000000
--- a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=57ccaa08e49a0cc537b69471c05e97f6
diff --git a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r3 b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r3
new file mode 100644
index 000000000000..2cb41833e144
--- /dev/null
+++ b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/elasticsearch_exporter
+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_=1538b144473132bb8b3c8782f07803d8
diff --git a/metadata/md5-cache/acct-group/energi3-0-r1 b/metadata/md5-cache/acct-group/energi3-0-r1
deleted file mode 100644
index 3da5aa9beca1..000000000000
--- a/metadata/md5-cache/acct-group/energi3-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=016b6016277cb75629732f2abef669f0
diff --git a/metadata/md5-cache/acct-group/energi3-0-r2 b/metadata/md5-cache/acct-group/energi3-0-r2
new file mode 100644
index 000000000000..9dfd59625f15
--- /dev/null
+++ b/metadata/md5-cache/acct-group/energi3-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for system-wide net-p2p/energi3
+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_=d4e783361018a970d91a23f44ec0f5d0
diff --git a/metadata/md5-cache/acct-group/epam-0-r1 b/metadata/md5-cache/acct-group/epam-0-r1
deleted file mode 100644
index 0695eb2e3a35..000000000000
--- a/metadata/md5-cache/acct-group/epam-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e21948f82d0136f6828c1a04a638353f
diff --git a/metadata/md5-cache/acct-group/epam-0-r2 b/metadata/md5-cache/acct-group/epam-0-r2
new file mode 100644
index 000000000000..9ff801030c7f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/epam-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for ejabberd's epam functionality
+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_=24570883518061674abb9153556f5109
diff --git a/metadata/md5-cache/acct-group/epmd-0-r2 b/metadata/md5-cache/acct-group/epmd-0-r2
deleted file mode 100644
index 342841b23a34..000000000000
--- a/metadata/md5-cache/acct-group/epmd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f0407b599feb2abf255c42785141ded1
diff --git a/metadata/md5-cache/acct-group/epmd-0-r3 b/metadata/md5-cache/acct-group/epmd-0-r3
new file mode 100644
index 000000000000..8df6287d425d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/epmd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Erlang Portmapper 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_=c7fda05134ad9a8dc2e3e0c75269ba2e
diff --git a/metadata/md5-cache/acct-group/err-0-r1 b/metadata/md5-cache/acct-group/err-0-r1
deleted file mode 100644
index 909248cb1f46..000000000000
--- a/metadata/md5-cache/acct-group/err-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2a94dd1f3e6230a7990af31c18896714
diff --git a/metadata/md5-cache/acct-group/err-0-r2 b/metadata/md5-cache/acct-group/err-0-r2
new file mode 100644
index 000000000000..1cc272983d74
--- /dev/null
+++ b/metadata/md5-cache/acct-group/err-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: err
+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_=e34f192b8a8e3f0d454287172c9c9139
diff --git a/metadata/md5-cache/acct-group/etcd-0-r2 b/metadata/md5-cache/acct-group/etcd-0-r2
deleted file mode 100644
index dcc3eaa7a014..000000000000
--- a/metadata/md5-cache/acct-group/etcd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c5a40e682e6b2dcbcc93e1d3ea4e9902
diff --git a/metadata/md5-cache/acct-group/etcd-0-r3 b/metadata/md5-cache/acct-group/etcd-0-r3
new file mode 100644
index 000000000000..338beac3dd00
--- /dev/null
+++ b/metadata/md5-cache/acct-group/etcd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: etcd
+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_=0a52b3e6944c793ce82ff34cc7956469
diff --git a/metadata/md5-cache/acct-group/exabgp-0-r2 b/metadata/md5-cache/acct-group/exabgp-0-r2
deleted file mode 100644
index 20294cd7f2f8..000000000000
--- a/metadata/md5-cache/acct-group/exabgp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a2b497237362ebdf5c14391d953f5fe1
diff --git a/metadata/md5-cache/acct-group/exabgp-0-r3 b/metadata/md5-cache/acct-group/exabgp-0-r3
new file mode 100644
index 000000000000..b1960163ed2c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/exabgp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: exabgp
+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_=c04290e9213a73089c58417c79765399
diff --git a/metadata/md5-cache/acct-group/ez-ipupd-0-r1 b/metadata/md5-cache/acct-group/ez-ipupd-0-r1
deleted file mode 100644
index 291028f47ea4..000000000000
--- a/metadata/md5-cache/acct-group/ez-ipupd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=06f5860d8ee49c8e842dc665252f4ac5
diff --git a/metadata/md5-cache/acct-group/ez-ipupd-0-r2 b/metadata/md5-cache/acct-group/ez-ipupd-0-r2
new file mode 100644
index 000000000000..eb97edb91f29
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ez-ipupd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-dns/ez-ipupdate
+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_=a3ea435b1a70f963a2d8468936f2435d
diff --git a/metadata/md5-cache/acct-group/fax-0-r1 b/metadata/md5-cache/acct-group/fax-0-r1
deleted file mode 100644
index f806442e8909..000000000000
--- a/metadata/md5-cache/acct-group/fax-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=da0472516de449e4da6bbe4b0884afd6
diff --git a/metadata/md5-cache/acct-group/fax-0-r2 b/metadata/md5-cache/acct-group/fax-0-r2
new file mode 100644
index 000000000000..8ba50c45b5ea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fax-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dialup/mgetty
+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_=1124faf350bd8fedbf377599e498c52e
diff --git a/metadata/md5-cache/acct-group/fcron-0-r1 b/metadata/md5-cache/acct-group/fcron-0-r1
deleted file mode 100644
index 1f882f05a8cc..000000000000
--- a/metadata/md5-cache/acct-group/fcron-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fb28a0995eca4de1acae22a2a367b724
diff --git a/metadata/md5-cache/acct-group/fcron-0-r2 b/metadata/md5-cache/acct-group/fcron-0-r2
new file mode 100644
index 000000000000..f3cdc129e9c5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fcron-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/fcron
+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_=207be509b97514cec899e71332dd0ef9
diff --git a/metadata/md5-cache/acct-group/fdm-0-r1 b/metadata/md5-cache/acct-group/fdm-0-r1
deleted file mode 100644
index 7d2ed0140c6c..000000000000
--- a/metadata/md5-cache/acct-group/fdm-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=20af1728fdc90e03ee169b45ce17929f
diff --git a/metadata/md5-cache/acct-group/fdm-0-r2 b/metadata/md5-cache/acct-group/fdm-0-r2
new file mode 100644
index 000000000000..210abebfdd37
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fdm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/fdm
+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_=afb5cb79b2f8931d6a3a2ec1f4efc829
diff --git a/metadata/md5-cache/acct-group/fetchmail-0-r2 b/metadata/md5-cache/acct-group/fetchmail-0-r2
deleted file mode 100644
index ff837ad7984c..000000000000
--- a/metadata/md5-cache/acct-group/fetchmail-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=12fd5483a4361d35877f508b18a3eef4
diff --git a/metadata/md5-cache/acct-group/fetchmail-0-r3 b/metadata/md5-cache/acct-group/fetchmail-0-r3
new file mode 100644
index 000000000000..14493b608f7e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fetchmail-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/fetchmail
+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_=0c294972a77b2535de1ed383e2686278
diff --git a/metadata/md5-cache/acct-group/fhem-0-r2 b/metadata/md5-cache/acct-group/fhem-0-r2
deleted file mode 100644
index d61aa51ffefa..000000000000
--- a/metadata/md5-cache/acct-group/fhem-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=930921877b8f1f6916aa8d480cbbac76
diff --git a/metadata/md5-cache/acct-group/fhem-0-r3 b/metadata/md5-cache/acct-group/fhem-0-r3
new file mode 100644
index 000000000000..b506c31e0781
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fhem-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the FHEM perl server for house automation
+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_=5aac9c43ac18818c54f73821ec085e08
diff --git a/metadata/md5-cache/acct-group/fingerprint-0-r2 b/metadata/md5-cache/acct-group/fingerprint-0-r2
deleted file mode 100644
index 43da6620d7bb..000000000000
--- a/metadata/md5-cache/acct-group/fingerprint-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=31e38030ae7a775c9cdb5fd55dc9e752
diff --git a/metadata/md5-cache/acct-group/fingerprint-0-r3 b/metadata/md5-cache/acct-group/fingerprint-0-r3
new file mode 100644
index 000000000000..c2bd5e7c69ed
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fingerprint-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: fingerprint
+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_=d9ba211cfebd57585c8d813737661775
diff --git a/metadata/md5-cache/acct-group/flatpak-0-r1 b/metadata/md5-cache/acct-group/flatpak-0-r1
deleted file mode 100644
index 5d233554381e..000000000000
--- a/metadata/md5-cache/acct-group/flatpak-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1633dcca7cf89110f5783523d3228620
diff --git a/metadata/md5-cache/acct-group/flatpak-0-r2 b/metadata/md5-cache/acct-group/flatpak-0-r2
new file mode 100644
index 000000000000..961dd04c13c7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/flatpak-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: flatpak
+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_=4d7aafc588acff8f1434bb60a34a1ee1
diff --git a/metadata/md5-cache/acct-group/flows-0-r1 b/metadata/md5-cache/acct-group/flows-0-r1
deleted file mode 100644
index 269cbc8e06a6..000000000000
--- a/metadata/md5-cache/acct-group/flows-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=eec8e6c0006124e5e286e10ffe08873c
diff --git a/metadata/md5-cache/acct-group/flows-0-r2 b/metadata/md5-cache/acct-group/flows-0-r2
new file mode 100644
index 000000000000..35d0b1891c01
--- /dev/null
+++ b/metadata/md5-cache/acct-group/flows-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-analyzer/flow-tools
+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_=8f99154718ab7bd00c4f3f2bd18dc3b7
diff --git a/metadata/md5-cache/acct-group/fluentd-0-r2 b/metadata/md5-cache/acct-group/fluentd-0-r2
deleted file mode 100644
index 5af2060568fc..000000000000
--- a/metadata/md5-cache/acct-group/fluentd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7ebe0bde6d9fd24a5161632f7ec3d084
diff --git a/metadata/md5-cache/acct-group/fluentd-0-r3 b/metadata/md5-cache/acct-group/fluentd-0-r3
new file mode 100644
index 000000000000..726cc65ee90c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fluentd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/fluentd
+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_=b8cbec5d0f27f51fb9010579e6cb25e7
diff --git a/metadata/md5-cache/acct-group/foldingathome-0-r1 b/metadata/md5-cache/acct-group/foldingathome-0-r1
deleted file mode 100644
index 4b28e8824c35..000000000000
--- a/metadata/md5-cache/acct-group/foldingathome-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=282cc03acffcb5354dca939f0a8f60aa
diff --git a/metadata/md5-cache/acct-group/foldingathome-0-r2 b/metadata/md5-cache/acct-group/foldingathome-0-r2
new file mode 100644
index 000000000000..87bbd42047d2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/foldingathome-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sci-biology/foldingathome
+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_=498e256f3873f2b6ef5ac6c8a4696d26
diff --git a/metadata/md5-cache/acct-group/fp-multiuser-0-r1 b/metadata/md5-cache/acct-group/fp-multiuser-0-r1
deleted file mode 100644
index d83c0e9dc2a0..000000000000
--- a/metadata/md5-cache/acct-group/fp-multiuser-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a4093881e08134cda7a58c2ce73e3de9
diff --git a/metadata/md5-cache/acct-group/fp-multiuser-0-r2 b/metadata/md5-cache/acct-group/fp-multiuser-0-r2
new file mode 100644
index 000000000000..cc00b65ca3fa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fp-multiuser-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/fp-multiuser
+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_=ca9d9968c008272942a9afdef7398446
diff --git a/metadata/md5-cache/acct-group/freenet-0-r1 b/metadata/md5-cache/acct-group/freenet-0-r1
deleted file mode 100644
index fe7dfab8f817..000000000000
--- a/metadata/md5-cache/acct-group/freenet-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=02fc680e535e52ceffdfab6402854f81
diff --git a/metadata/md5-cache/acct-group/freenet-0-r2 b/metadata/md5-cache/acct-group/freenet-0-r2
new file mode 100644
index 000000000000..70ef10f8d5e7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/freenet-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/freenet
+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_=8221ca65a5ed4fdc024a10bf2b7e8e2e
diff --git a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r1 b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r1
deleted file mode 100644
index 03556c9d4758..000000000000
--- a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=45c19cb89ed973dbb98c47b654467bd2
diff --git a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r2 b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r2
new file mode 100644
index 000000000000..94e5b2205567
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: fritzbox_smarthome_exporter
+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_=6f267100b2ecd383d9f625740f6956b7
diff --git a/metadata/md5-cache/acct-group/frr-0-r1 b/metadata/md5-cache/acct-group/frr-0-r1
deleted file mode 100644
index fa22c6174df3..000000000000
--- a/metadata/md5-cache/acct-group/frr-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6715d71976161fe665dd5740c310d942
diff --git a/metadata/md5-cache/acct-group/frr-0-r2 b/metadata/md5-cache/acct-group/frr-0-r2
new file mode 100644
index 000000000000..e8bae96081ef
--- /dev/null
+++ b/metadata/md5-cache/acct-group/frr-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: frr
+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_=9b65a03534ebd8fed073623792393c6e
diff --git a/metadata/md5-cache/acct-group/ftp-0-r2 b/metadata/md5-cache/acct-group/ftp-0-r2
deleted file mode 100644
index f088d5c4d9d8..000000000000
--- a/metadata/md5-cache/acct-group/ftp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e3d7d8c16c51bc5a2beffdadd7b4f959
diff --git a/metadata/md5-cache/acct-group/ftp-0-r3 b/metadata/md5-cache/acct-group/ftp-0-r3
new file mode 100644
index 000000000000..59f756cc53a5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ftp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=File Transfer Protocol server user
+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_=6f2ab3e13940cd667c4fa0610509474c
diff --git a/metadata/md5-cache/acct-group/ftpproxy-0-r1 b/metadata/md5-cache/acct-group/ftpproxy-0-r1
deleted file mode 100644
index 36dbada2474d..000000000000
--- a/metadata/md5-cache/acct-group/ftpproxy-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=99226a0e8663b8207af28314bb99298a
diff --git a/metadata/md5-cache/acct-group/ftpproxy-0-r2 b/metadata/md5-cache/acct-group/ftpproxy-0-r2
new file mode 100644
index 000000000000..71cf8943914d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ftpproxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-ftp/frox
+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_=55511d36e9b0d9781a344079d6cfbd1c
diff --git a/metadata/md5-cache/acct-group/fvwm-crystal-0-r2 b/metadata/md5-cache/acct-group/fvwm-crystal-0-r2
deleted file mode 100644
index 2fe3b92b4626..000000000000
--- a/metadata/md5-cache/acct-group/fvwm-crystal-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7bc1d53b431b1757f00752982a6a2478
diff --git a/metadata/md5-cache/acct-group/fvwm-crystal-0-r3 b/metadata/md5-cache/acct-group/fvwm-crystal-0-r3
new file mode 100644
index 000000000000..c588cb301453
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fvwm-crystal-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: fvwm-crystal
+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_=32c97af4c461e59290316324f4c0454f
diff --git a/metadata/md5-cache/acct-group/gamemode-0-r1 b/metadata/md5-cache/acct-group/gamemode-0-r1
deleted file mode 100644
index 87f8f07d01bc..000000000000
--- a/metadata/md5-cache/acct-group/gamemode-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2969b38b0d360ffbbe2302686d513f7e
diff --git a/metadata/md5-cache/acct-group/gamemode-0-r2 b/metadata/md5-cache/acct-group/gamemode-0-r2
new file mode 100644
index 000000000000..03811e4c15fb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gamemode-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide games-util/gamemode resource 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_=fd6bc931affbdc4028c633229c293c81
diff --git a/metadata/md5-cache/acct-group/gamestat-0-r2 b/metadata/md5-cache/acct-group/gamestat-0-r2
deleted file mode 100644
index d4e2fb1c81d0..000000000000
--- a/metadata/md5-cache/acct-group/gamestat-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9427de9ac6d5cd3124166336897c4eab
diff --git a/metadata/md5-cache/acct-group/gamestat-0-r3 b/metadata/md5-cache/acct-group/gamestat-0-r3
new file mode 100644
index 000000000000..6182737828e7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gamestat-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for shared high-score and game state files
+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_=21ef276a0082f3abc4abeb084ad5aa83
diff --git a/metadata/md5-cache/acct-group/gatling-0-r2 b/metadata/md5-cache/acct-group/gatling-0-r2
deleted file mode 100644
index 31c3e8a2fdcc..000000000000
--- a/metadata/md5-cache/acct-group/gatling-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bf10839d83f4739df37e01f5e206a0ad
diff --git a/metadata/md5-cache/acct-group/gatling-0-r3 b/metadata/md5-cache/acct-group/gatling-0-r3
new file mode 100644
index 000000000000..68bd6361248f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gatling-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gatling
+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_=cc5ef287c415967db7486ec88f56b062
diff --git a/metadata/md5-cache/acct-group/gauth-0-r1 b/metadata/md5-cache/acct-group/gauth-0-r1
deleted file mode 100644
index a7ef03f57e7d..000000000000
--- a/metadata/md5-cache/acct-group/gauth-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bc0c9c71d8cd5e2840d8740130a6f0af
diff --git a/metadata/md5-cache/acct-group/gauth-0-r2 b/metadata/md5-cache/acct-group/gauth-0-r2
new file mode 100644
index 000000000000..4b6980cae2fb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gauth-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/google-authenticator-wrappers
+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_=e747f16fc778876a48b76f8987d57d96
diff --git a/metadata/md5-cache/acct-group/gdm-0-r1 b/metadata/md5-cache/acct-group/gdm-0-r1
deleted file mode 100644
index bc8dfa98ee92..000000000000
--- a/metadata/md5-cache/acct-group/gdm-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1e7834d442af7a5d83072e2f2b7a1230
diff --git a/metadata/md5-cache/acct-group/gdm-0-r2 b/metadata/md5-cache/acct-group/gdm-0-r2
new file mode 100644
index 000000000000..95bb6dee9f23
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gdm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gdm
+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_=c3ad30efee350b1e105d42c2976b6df4
diff --git a/metadata/md5-cache/acct-group/geneweb-0-r2 b/metadata/md5-cache/acct-group/geneweb-0-r2
deleted file mode 100644
index ae08f9a134de..000000000000
--- a/metadata/md5-cache/acct-group/geneweb-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c732b5bb035d4169113b1ac078d8b84d
diff --git a/metadata/md5-cache/acct-group/geneweb-0-r3 b/metadata/md5-cache/acct-group/geneweb-0-r3
new file mode 100644
index 000000000000..091fcea1e22e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/geneweb-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for geneweb 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_=bd1ef835f9d645c6889a699ffa12a62f
diff --git a/metadata/md5-cache/acct-group/geoclue-0-r1 b/metadata/md5-cache/acct-group/geoclue-0-r1
deleted file mode 100644
index fc4573f42ccc..000000000000
--- a/metadata/md5-cache/acct-group/geoclue-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=71b45fa23cfebe6d0a25b3ded3a0cd0f
diff --git a/metadata/md5-cache/acct-group/geoclue-0-r2 b/metadata/md5-cache/acct-group/geoclue-0-r2
new file mode 100644
index 000000000000..0c51adbb5d58
--- /dev/null
+++ b/metadata/md5-cache/acct-group/geoclue-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: geoclue
+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_=b8cef78816d007c70669a4bbe6c03baf
diff --git a/metadata/md5-cache/acct-group/gerbera-0-r2 b/metadata/md5-cache/acct-group/gerbera-0-r2
deleted file mode 100644
index eb1bb79929f6..000000000000
--- a/metadata/md5-cache/acct-group/gerbera-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f7a0ff3527c5c2f9b07aaba9ff01659e
diff --git a/metadata/md5-cache/acct-group/gerbera-0-r3 b/metadata/md5-cache/acct-group/gerbera-0-r3
new file mode 100644
index 000000000000..6c6238cb21e6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gerbera-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Gerbera UPnP Media Server 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_=b5ce83ba7cfd46cb30ef44332736bc57
diff --git a/metadata/md5-cache/acct-group/git-0-r2 b/metadata/md5-cache/acct-group/git-0-r2
deleted file mode 100644
index 9308f8d878d4..000000000000
--- a/metadata/md5-cache/acct-group/git-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7e630c293efc0155e267643e646f9286
diff --git a/metadata/md5-cache/acct-group/git-0-r3 b/metadata/md5-cache/acct-group/git-0-r3
new file mode 100644
index 000000000000..6f42ebe9d14e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/git-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: git
+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_=d233c7a0020d89999455d3216aee6243
diff --git a/metadata/md5-cache/acct-group/github-exporter-0-r1 b/metadata/md5-cache/acct-group/github-exporter-0-r1
deleted file mode 100644
index e5c6b58984e8..000000000000
--- a/metadata/md5-cache/acct-group/github-exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e2b2d1a4866fa6f684d5cbaf701e1267
diff --git a/metadata/md5-cache/acct-group/github-exporter-0-r2 b/metadata/md5-cache/acct-group/github-exporter-0-r2
new file mode 100644
index 000000000000..7c099d50202e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/github-exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: github-exporter
+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_=a1176e45cb899aca2f04bb37d85b7222
diff --git a/metadata/md5-cache/acct-group/gitlab-runner-1-r1 b/metadata/md5-cache/acct-group/gitlab-runner-1-r1
deleted file mode 100644
index b37cef02cae6..000000000000
--- a/metadata/md5-cache/acct-group/gitlab-runner-1-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3b166dd7f9d6fa0e007923125e395c67
diff --git a/metadata/md5-cache/acct-group/gitlab-runner-1-r2 b/metadata/md5-cache/acct-group/gitlab-runner-1-r2
new file mode 100644
index 000000000000..8c0756c3e2e3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gitlab-runner-1-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gitlab-runner
+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_=bfe760842b1a7bb0250a22016c8850fc
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0-r2 b/metadata/md5-cache/acct-group/gkrellmd-0-r2
deleted file mode 100644
index 0fadc37e3ca1..000000000000
--- a/metadata/md5-cache/acct-group/gkrellmd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c3daabdd333d2e1ee41262cd6ac49a39
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0-r3 b/metadata/md5-cache/acct-group/gkrellmd-0-r3
new file mode 100644
index 000000000000..0805d91407ef
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gkrellmd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gkrellmd
+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_=2b761ead9208038c273b7289507055d0
diff --git a/metadata/md5-cache/acct-group/gluster-0-r2 b/metadata/md5-cache/acct-group/gluster-0-r2
deleted file mode 100644
index ebe7739623fe..000000000000
--- a/metadata/md5-cache/acct-group/gluster-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=72b0d51fede94d33df0d85a11262d979
diff --git a/metadata/md5-cache/acct-group/gluster-0-r3 b/metadata/md5-cache/acct-group/gluster-0-r3
new file mode 100644
index 000000000000..0dcfa1c6b279
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gluster-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gluster
+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_=06640d1d7101d0f71fefb66a9ca94b78
diff --git a/metadata/md5-cache/acct-group/gnump3d-0-r1 b/metadata/md5-cache/acct-group/gnump3d-0-r1
deleted file mode 100644
index 5f95417ff092..000000000000
--- a/metadata/md5-cache/acct-group/gnump3d-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=88d496746aa8bf95580a510d325d1b84
diff --git a/metadata/md5-cache/acct-group/gnump3d-0-r2 b/metadata/md5-cache/acct-group/gnump3d-0-r2
new file mode 100644
index 000000000000..5e23863ac504
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gnump3d-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/gnump3d
+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_=bb378f061777b846ed963b85a7114652
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r1 b/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r1
deleted file mode 100644
index 33048a9a1ba5..000000000000
--- a/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=df4259f820bbdf49d05c7f77a5cd9ada
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r2 b/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r2
new file mode 100644
index 000000000000..c14c2deef621
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-crypt/gnupg-pkcs11-scd
+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_=68047115e805369f7db54ac822184f53
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
deleted file mode 100644
index 04c20e025129..000000000000
--- a/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b001c3e413ff37089c90e02e10064f61
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r2 b/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r2
new file mode 100644
index 000000000000..390ab2c67fb3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-crypt/gnupg-pkcs11-scd
+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_=43e75356d22743c1371926ea453f0b01
diff --git a/metadata/md5-cache/acct-group/gopher-0-r1 b/metadata/md5-cache/acct-group/gopher-0-r1
deleted file mode 100644
index 4f5bf0ad8ce8..000000000000
--- a/metadata/md5-cache/acct-group/gopher-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fa0dc2ed1dcac76dc205f5480d04471b
diff --git a/metadata/md5-cache/acct-group/gopher-0-r2 b/metadata/md5-cache/acct-group/gopher-0-r2
new file mode 100644
index 000000000000..ed1ee03525ed
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gopher-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gopher
+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_=84f521d8633e3bbc6d287e0265af989e
diff --git a/metadata/md5-cache/acct-group/gopherd-0-r1 b/metadata/md5-cache/acct-group/gopherd-0-r1
deleted file mode 100644
index 0de0fb8d5416..000000000000
--- a/metadata/md5-cache/acct-group/gopherd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3ea299900d54476e2e719d72de4c8ea2
diff --git a/metadata/md5-cache/acct-group/gopherd-0-r2 b/metadata/md5-cache/acct-group/gopherd-0-r2
new file mode 100644
index 000000000000..0af5ba8d7977
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gopherd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/geomyidae
+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_=f812d37ea93d1ddf0c8c2ce2e7d8202e
diff --git a/metadata/md5-cache/acct-group/gpib-0-r2 b/metadata/md5-cache/acct-group/gpib-0-r2
deleted file mode 100644
index ecc8359ec875..000000000000
--- a/metadata/md5-cache/acct-group/gpib-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5b31588c769c43cb1cdeca3f6f702dc7
diff --git a/metadata/md5-cache/acct-group/gpib-0-r3 b/metadata/md5-cache/acct-group/gpib-0-r3
new file mode 100644
index 000000000000..b1275391811c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gpib-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gpib
+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_=80c1a9c2750ddc756102d5ce3fe65a3c
diff --git a/metadata/md5-cache/acct-group/grafana-0-r2 b/metadata/md5-cache/acct-group/grafana-0-r2
deleted file mode 100644
index 852f9ec1bd2d..000000000000
--- a/metadata/md5-cache/acct-group/grafana-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=614b15ed9f5315414132bf878cb723f1
diff --git a/metadata/md5-cache/acct-group/grafana-0-r3 b/metadata/md5-cache/acct-group/grafana-0-r3
new file mode 100644
index 000000000000..8e7fafca0e49
--- /dev/null
+++ b/metadata/md5-cache/acct-group/grafana-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=grafana 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_=9ef896d8a1b65b9f9942a56bf5b73edc
diff --git a/metadata/md5-cache/acct-group/graylog-0-r2 b/metadata/md5-cache/acct-group/graylog-0-r2
deleted file mode 100644
index b28ff682095b..000000000000
--- a/metadata/md5-cache/acct-group/graylog-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8a8c632dfc06ddd974709e828dd54666
diff --git a/metadata/md5-cache/acct-group/graylog-0-r3 b/metadata/md5-cache/acct-group/graylog-0-r3
new file mode 100644
index 000000000000..b3ca2b08af78
--- /dev/null
+++ b/metadata/md5-cache/acct-group/graylog-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Graylog 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_=9555609e4bb889b152a0270fd39316c6
diff --git a/metadata/md5-cache/acct-group/greetd-0-r2 b/metadata/md5-cache/acct-group/greetd-0-r2
deleted file mode 100644
index a19ac37ec451..000000000000
--- a/metadata/md5-cache/acct-group/greetd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2d650a08a64155de26912b6594ebbd70
diff --git a/metadata/md5-cache/acct-group/greetd-0-r3 b/metadata/md5-cache/acct-group/greetd-0-r3
new file mode 100644
index 000000000000..e4147e1418ee
--- /dev/null
+++ b/metadata/md5-cache/acct-group/greetd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for gui-libs/greetd
+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_=1c0b9231e700e1af1b92ea9d415d3d72
diff --git a/metadata/md5-cache/acct-group/grok_exporter-0-r1 b/metadata/md5-cache/acct-group/grok_exporter-0-r1
deleted file mode 100644
index a77a075d7a10..000000000000
--- a/metadata/md5-cache/acct-group/grok_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=72883073a58a19e82add34dc2be3d46d
diff --git a/metadata/md5-cache/acct-group/grok_exporter-0-r2 b/metadata/md5-cache/acct-group/grok_exporter-0-r2
new file mode 100644
index 000000000000..9f2562d7bb1b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/grok_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/grok_exporter
+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_=7513ca8bc6809b764528d3137eb181c9
diff --git a/metadata/md5-cache/acct-group/groonga-0-r1 b/metadata/md5-cache/acct-group/groonga-0-r1
deleted file mode 100644
index e721a59ca3a5..000000000000
--- a/metadata/md5-cache/acct-group/groonga-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d46761a9030d97337581fe7f05efa8ce
diff --git a/metadata/md5-cache/acct-group/groonga-0-r2 b/metadata/md5-cache/acct-group/groonga-0-r2
new file mode 100644
index 000000000000..9d41188f9655
--- /dev/null
+++ b/metadata/md5-cache/acct-group/groonga-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-text/groonga
+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_=ddd3b2ac5ae7c314e7aa0e8ea3c70b49
diff --git a/metadata/md5-cache/acct-group/gvm-0-r2 b/metadata/md5-cache/acct-group/gvm-0-r2
deleted file mode 100644
index f4f7ee459c88..000000000000
--- a/metadata/md5-cache/acct-group/gvm-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8e5119d68c77c5236a0d8f9fe9a6b0bf
diff --git a/metadata/md5-cache/acct-group/gvm-0-r3 b/metadata/md5-cache/acct-group/gvm-0-r3
new file mode 100644
index 000000000000..e847dd26e086
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gvm-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Greenbone vulnerability management 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_=a5a25515abaed1504c742695b2af7c6e
diff --git a/metadata/md5-cache/acct-group/h2o-0-r1 b/metadata/md5-cache/acct-group/h2o-0-r1
deleted file mode 100644
index 42bf90aa3997..000000000000
--- a/metadata/md5-cache/acct-group/h2o-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c11d801fc979d0f17b9e5068635a3ea6
diff --git a/metadata/md5-cache/acct-group/h2o-0-r2 b/metadata/md5-cache/acct-group/h2o-0-r2
new file mode 100644
index 000000000000..086ec2b84cdf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/h2o-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/h2o
+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_=f13de8e7f83ab9404a43ffe01fa2b009
diff --git a/metadata/md5-cache/acct-group/haclient-0-r1 b/metadata/md5-cache/acct-group/haclient-0-r1
deleted file mode 100644
index 3d8fd163fa4d..000000000000
--- a/metadata/md5-cache/acct-group/haclient-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ec5dec99ec5dd5ff93c3370810642590
diff --git a/metadata/md5-cache/acct-group/haclient-0-r2 b/metadata/md5-cache/acct-group/haclient-0-r2
new file mode 100644
index 000000000000..8e38290f8293
--- /dev/null
+++ b/metadata/md5-cache/acct-group/haclient-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-cluster/cluster-glue
+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_=4b59ad83c90cbbc13eab53db0cbd4f76
diff --git a/metadata/md5-cache/acct-group/haproxy-0-r2 b/metadata/md5-cache/acct-group/haproxy-0-r2
deleted file mode 100644
index 0b4a664e2011..000000000000
--- a/metadata/md5-cache/acct-group/haproxy-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=aac22fda3e9903eb2fbd3d00c18b062b
diff --git a/metadata/md5-cache/acct-group/haproxy-0-r3 b/metadata/md5-cache/acct-group/haproxy-0-r3
new file mode 100644
index 000000000000..b611d791f3f7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/haproxy-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: haproxy
+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_=a5584b685748d29a6bbcfe088db8dfcd
diff --git a/metadata/md5-cache/acct-group/hsqldb-0-r1 b/metadata/md5-cache/acct-group/hsqldb-0-r1
deleted file mode 100644
index 6719221198af..000000000000
--- a/metadata/md5-cache/acct-group/hsqldb-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=804dab5b531173e9bc1197f5362a5a28
diff --git a/metadata/md5-cache/acct-group/hsqldb-0-r2 b/metadata/md5-cache/acct-group/hsqldb-0-r2
new file mode 100644
index 000000000000..e67dae84c734
--- /dev/null
+++ b/metadata/md5-cache/acct-group/hsqldb-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for hsqldb
+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_=9ec5ea4b912c88bd27eff50897abef23
diff --git a/metadata/md5-cache/acct-group/http-0-r1 b/metadata/md5-cache/acct-group/http-0-r1
deleted file mode 100644
index 05e5b9a4ef3e..000000000000
--- a/metadata/md5-cache/acct-group/http-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2f061c6e0ec191d0deb15c3c0dd4db15
diff --git a/metadata/md5-cache/acct-group/http-0-r2 b/metadata/md5-cache/acct-group/http-0-r2
new file mode 100644
index 000000000000..3c2c082db4e4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/http-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: http
+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_=d71dc5f0a52e5ad35069fd5092a53446
diff --git a/metadata/md5-cache/acct-group/i2c-0-r1 b/metadata/md5-cache/acct-group/i2c-0-r1
deleted file mode 100644
index 9a9d02e2dc69..000000000000
--- a/metadata/md5-cache/acct-group/i2c-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=117c9c3be0f324454df40966c52e2ea9
diff --git a/metadata/md5-cache/acct-group/i2c-0-r2 b/metadata/md5-cache/acct-group/i2c-0-r2
new file mode 100644
index 000000000000..0784617934fc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/i2c-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: i2c
+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_=1d5ce2c8ae811808a1613384f8acfa7b
diff --git a/metadata/md5-cache/acct-group/i2p-0-r2 b/metadata/md5-cache/acct-group/i2p-0-r2
deleted file mode 100644
index b8c9fd8ee064..000000000000
--- a/metadata/md5-cache/acct-group/i2p-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c496b9045dd4a220300d01db440141bb
diff --git a/metadata/md5-cache/acct-group/i2p-0-r3 b/metadata/md5-cache/acct-group/i2p-0-r3
new file mode 100644
index 000000000000..0016edfb66a3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/i2p-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for system-wide net-vpn/i2p
+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_=f741502c0cff70c1272bbe62f452a2ea
diff --git a/metadata/md5-cache/acct-group/i2pd-0-r2 b/metadata/md5-cache/acct-group/i2pd-0-r2
deleted file mode 100644
index b5968b8cd32f..000000000000
--- a/metadata/md5-cache/acct-group/i2pd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f0c369e5b4e3e0959ba16449cbacd8c3
diff --git a/metadata/md5-cache/acct-group/i2pd-0-r3 b/metadata/md5-cache/acct-group/i2pd-0-r3
new file mode 100644
index 000000000000..63865148ae02
--- /dev/null
+++ b/metadata/md5-cache/acct-group/i2pd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide net-vpn/i2pd 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_=f1d180550a1e6c0e4008e95cf65c615e
diff --git a/metadata/md5-cache/acct-group/icecast-0-r1 b/metadata/md5-cache/acct-group/icecast-0-r1
deleted file mode 100644
index ebc1aa44b028..000000000000
--- a/metadata/md5-cache/acct-group/icecast-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ab1f197aced5875c4dbd76fb5817b3e3
diff --git a/metadata/md5-cache/acct-group/icecast-0-r2 b/metadata/md5-cache/acct-group/icecast-0-r2
new file mode 100644
index 000000000000..73c305a8c4a9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecast-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/icecast
+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_=78cbb890bbd30c0cb7925a1ad27fe8f3
diff --git a/metadata/md5-cache/acct-group/icecream-0-r1 b/metadata/md5-cache/acct-group/icecream-0-r1
deleted file mode 100644
index f74667d1bd51..000000000000
--- a/metadata/md5-cache/acct-group/icecream-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a83abcfaba8eae2a903b7df6a413d9a0
diff --git a/metadata/md5-cache/acct-group/icecream-0-r2 b/metadata/md5-cache/acct-group/icecream-0-r2
new file mode 100644
index 000000000000..6c90234bbcd5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecream-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-devel/icecream
+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_=944e982cd10baa39e51f1e4ae934efae
diff --git a/metadata/md5-cache/acct-group/ices-0-r1 b/metadata/md5-cache/acct-group/ices-0-r1
deleted file mode 100644
index 589d1c8b3da0..000000000000
--- a/metadata/md5-cache/acct-group/ices-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=727de7698dc768ccfccd161abd76d38e
diff --git a/metadata/md5-cache/acct-group/ices-0-r2 b/metadata/md5-cache/acct-group/ices-0-r2
new file mode 100644
index 000000000000..763fde02bb05
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ices-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/ices
+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_=dc3924e2f4abd71b1f3edb3108e1a870
diff --git a/metadata/md5-cache/acct-group/icinga-0-r2 b/metadata/md5-cache/acct-group/icinga-0-r2
deleted file mode 100644
index fb64614384a4..000000000000
--- a/metadata/md5-cache/acct-group/icinga-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e34b27d0aba61323fc90096b3f4e22f6
diff --git a/metadata/md5-cache/acct-group/icinga-0-r3 b/metadata/md5-cache/acct-group/icinga-0-r3
new file mode 100644
index 000000000000..8555fff46e61
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icinga-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: icinga
+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_=697cc60fee7b24683cb0100de06e634f
diff --git a/metadata/md5-cache/acct-group/icingacmd-0-r2 b/metadata/md5-cache/acct-group/icingacmd-0-r2
deleted file mode 100644
index be0e48f96719..000000000000
--- a/metadata/md5-cache/acct-group/icingacmd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=47725f9e21636ac11e07cab03986022f
diff --git a/metadata/md5-cache/acct-group/icingacmd-0-r3 b/metadata/md5-cache/acct-group/icingacmd-0-r3
new file mode 100644
index 000000000000..2afa1263384e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icingacmd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: icingacmd
+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_=5fec307b55bbe3b3d17f1ae8a49dfa8d
diff --git a/metadata/md5-cache/acct-group/icingaweb2-0-r2 b/metadata/md5-cache/acct-group/icingaweb2-0-r2
deleted file mode 100644
index d8e56d9bb225..000000000000
--- a/metadata/md5-cache/acct-group/icingaweb2-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0615ce0291c9b1c79d2902e1f15dd538
diff --git a/metadata/md5-cache/acct-group/icingaweb2-0-r3 b/metadata/md5-cache/acct-group/icingaweb2-0-r3
new file mode 100644
index 000000000000..bce4049e8731
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icingaweb2-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: icingaweb2
+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_=0e25219c8ff3d0ee03b07c8d5f8b1936
diff --git a/metadata/md5-cache/acct-group/influxdb-0-r2 b/metadata/md5-cache/acct-group/influxdb-0-r2
deleted file mode 100644
index 2b76e94d3fd9..000000000000
--- a/metadata/md5-cache/acct-group/influxdb-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4eb8546afa421321fd7c715e5103365d
diff --git a/metadata/md5-cache/acct-group/influxdb-0-r3 b/metadata/md5-cache/acct-group/influxdb-0-r3
new file mode 100644
index 000000000000..00eb1a1949a6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/influxdb-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: influxdb
+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_=b0c392f3a5d48ce5b37e0e2d1e36b1c7
diff --git a/metadata/md5-cache/acct-group/input-0-r2 b/metadata/md5-cache/acct-group/input-0-r2
deleted file mode 100644
index 0d50016eee1a..000000000000
--- a/metadata/md5-cache/acct-group/input-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=546e03af1b25fc371fdb3fbcd77ebf97
diff --git a/metadata/md5-cache/acct-group/input-0-r3 b/metadata/md5-cache/acct-group/input-0-r3
new file mode 100644
index 000000000000..61006709c729
--- /dev/null
+++ b/metadata/md5-cache/acct-group/input-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: input
+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_=d0bb76c77778c6efac06d63c338692d0
diff --git a/metadata/md5-cache/acct-group/inspircd-0-r2 b/metadata/md5-cache/acct-group/inspircd-0-r2
deleted file mode 100644
index 78bfcda5ace8..000000000000
--- a/metadata/md5-cache/acct-group/inspircd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e03dd8aae9e5fb9e21eda92d54384c0b
diff --git a/metadata/md5-cache/acct-group/inspircd-0-r3 b/metadata/md5-cache/acct-group/inspircd-0-r3
new file mode 100644
index 000000000000..036b383e3987
--- /dev/null
+++ b/metadata/md5-cache/acct-group/inspircd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: inspircd
+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_=c4e3ccf045d2efa6915533894335cc59
diff --git a/metadata/md5-cache/acct-group/ipfs-0-r2 b/metadata/md5-cache/acct-group/ipfs-0-r2
deleted file mode 100644
index 38cae3119249..000000000000
--- a/metadata/md5-cache/acct-group/ipfs-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d1b080cd1df0a265af658554fe5acd9d
diff --git a/metadata/md5-cache/acct-group/ipfs-0-r3 b/metadata/md5-cache/acct-group/ipfs-0-r3
new file mode 100644
index 000000000000..871b2597fe46
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipfs-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide net-p2p/go-ipfs-bin 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_=20ab63b9b5aaad4b8bdce7a8a4d915f3
diff --git a/metadata/md5-cache/acct-group/ipsec-0-r1 b/metadata/md5-cache/acct-group/ipsec-0-r1
deleted file mode 100644
index 96e4463e51cd..000000000000
--- a/metadata/md5-cache/acct-group/ipsec-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=39e00237360ca37f616dc8ddf8d6ef2e
diff --git a/metadata/md5-cache/acct-group/ipsec-0-r2 b/metadata/md5-cache/acct-group/ipsec-0-r2
new file mode 100644
index 000000000000..db9b34219f6a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipsec-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=ipsec (strongswan) 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_=779f52ef4dc8004f40e6c2481df9277b
diff --git a/metadata/md5-cache/acct-group/ipsentinel-0-r1 b/metadata/md5-cache/acct-group/ipsentinel-0-r1
deleted file mode 100644
index e9c76d2d1791..000000000000
--- a/metadata/md5-cache/acct-group/ipsentinel-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=891e6fc4efea571f0e58c67cafee784d
diff --git a/metadata/md5-cache/acct-group/ipsentinel-0-r2 b/metadata/md5-cache/acct-group/ipsentinel-0-r2
new file mode 100644
index 000000000000..5b479eef52f8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipsentinel-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/ip-sentinel
+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_=b603f34e13b2cf2b44baa0c869ef0167
diff --git a/metadata/md5-cache/acct-group/iroffer-0-r1 b/metadata/md5-cache/acct-group/iroffer-0-r1
deleted file mode 100644
index 45237e7bd3eb..000000000000
--- a/metadata/md5-cache/acct-group/iroffer-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8992873cf7d7b10d66744967edd214e9
diff --git a/metadata/md5-cache/acct-group/iroffer-0-r2 b/metadata/md5-cache/acct-group/iroffer-0-r2
new file mode 100644
index 000000000000..0c132f7d4c21
--- /dev/null
+++ b/metadata/md5-cache/acct-group/iroffer-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: iroffer
+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_=7502e842a5367acc3414054055023fdc
diff --git a/metadata/md5-cache/acct-group/jenkins-0-r1 b/metadata/md5-cache/acct-group/jenkins-0-r1
deleted file mode 100644
index ac0ebe616a92..000000000000
--- a/metadata/md5-cache/acct-group/jenkins-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c1cc20b0610cae84e72473ae5be90f24
diff --git a/metadata/md5-cache/acct-group/jenkins-0-r2 b/metadata/md5-cache/acct-group/jenkins-0-r2
new file mode 100644
index 000000000000..758e39f9dc41
--- /dev/null
+++ b/metadata/md5-cache/acct-group/jenkins-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Jenkins 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_=d1512831705dadc5a0715bffaf008733
diff --git a/metadata/md5-cache/acct-group/kafka-0-r2 b/metadata/md5-cache/acct-group/kafka-0-r2
deleted file mode 100644
index 9227aaa9aa26..000000000000
--- a/metadata/md5-cache/acct-group/kafka-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b25d1b07e3519c918923456d1d16549d
diff --git a/metadata/md5-cache/acct-group/kafka-0-r3 b/metadata/md5-cache/acct-group/kafka-0-r3
new file mode 100644
index 000000000000..854a74cc18b3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kafka-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kafka
+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_=e7b957105143445627765a9f6dbe914f
diff --git a/metadata/md5-cache/acct-group/kapacitor-0-r2 b/metadata/md5-cache/acct-group/kapacitor-0-r2
deleted file mode 100644
index 2550071a29ef..000000000000
--- a/metadata/md5-cache/acct-group/kapacitor-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a6f00b3ec1f9add589aab5e2c2893133
diff --git a/metadata/md5-cache/acct-group/kapacitor-0-r3 b/metadata/md5-cache/acct-group/kapacitor-0-r3
new file mode 100644
index 000000000000..c71f6b539b72
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kapacitor-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kapacitor
+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_=d8e372b035955a8d2595122a3e1adae4
diff --git a/metadata/md5-cache/acct-group/karma-0-r1 b/metadata/md5-cache/acct-group/karma-0-r1
deleted file mode 100644
index af2ce4900a45..000000000000
--- a/metadata/md5-cache/acct-group/karma-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9c25e3c229f5d603cf70ba18aeb01cd3
diff --git a/metadata/md5-cache/acct-group/karma-0-r2 b/metadata/md5-cache/acct-group/karma-0-r2
new file mode 100644
index 000000000000..0a5697fe6ee8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/karma-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/karma-bin
+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_=a9e6e2d27d9d78dc895c60fd623195be
diff --git a/metadata/md5-cache/acct-group/kibana-0-r2 b/metadata/md5-cache/acct-group/kibana-0-r2
deleted file mode 100644
index e107e723660a..000000000000
--- a/metadata/md5-cache/acct-group/kibana-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0ace256d6cf32832fffa6a46b7a7ca6f
diff --git a/metadata/md5-cache/acct-group/kibana-0-r3 b/metadata/md5-cache/acct-group/kibana-0-r3
new file mode 100644
index 000000000000..b02f6989e453
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kibana-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Kibana 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_=7fb3a957bc3aa61d225e2550dca8ede7
diff --git a/metadata/md5-cache/acct-group/kismet-0-r2 b/metadata/md5-cache/acct-group/kismet-0-r2
deleted file mode 100644
index 208ef003d0cd..000000000000
--- a/metadata/md5-cache/acct-group/kismet-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d4dc90d6d45e52cee38739cc18c2393b
diff --git a/metadata/md5-cache/acct-group/kismet-0-r3 b/metadata/md5-cache/acct-group/kismet-0-r3
new file mode 100644
index 000000000000..0c14fb73a5fd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kismet-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=net-wireless/kismet
+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_=0b4d8997631c095d252c4f0bef72bb7f
diff --git a/metadata/md5-cache/acct-group/kmem-0-r2 b/metadata/md5-cache/acct-group/kmem-0-r2
deleted file mode 100644
index ff3722c61e6a..000000000000
--- a/metadata/md5-cache/acct-group/kmem-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=61bb2c4e792837f38fc594cc7058f597
diff --git a/metadata/md5-cache/acct-group/kmem-0-r3 b/metadata/md5-cache/acct-group/kmem-0-r3
new file mode 100644
index 000000000000..201cf1a8306c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kmem-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kmem
+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_=af2754cc3de4b0b870a147de1f479cbd
diff --git a/metadata/md5-cache/acct-group/knot-0-r2 b/metadata/md5-cache/acct-group/knot-0-r2
deleted file mode 100644
index 25b4e8b02a42..000000000000
--- a/metadata/md5-cache/acct-group/knot-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3448023d9d49414e2245bef009385f38
diff --git a/metadata/md5-cache/acct-group/knot-0-r3 b/metadata/md5-cache/acct-group/knot-0-r3
new file mode 100644
index 000000000000..3b653444ec1a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/knot-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: knot
+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_=b49cefe192a4e0ceb344f3bf2e0ba4f4
diff --git a/metadata/md5-cache/acct-group/kube-apiserver-0-r2 b/metadata/md5-cache/acct-group/kube-apiserver-0-r2
deleted file mode 100644
index 32c4ca12a1e5..000000000000
--- a/metadata/md5-cache/acct-group/kube-apiserver-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=059c1780f74c2ea8f44085bd62184db2
diff --git a/metadata/md5-cache/acct-group/kube-apiserver-0-r3 b/metadata/md5-cache/acct-group/kube-apiserver-0-r3
new file mode 100644
index 000000000000..409f2f9f2fdf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kube-apiserver-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kube-apiserver
+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_=8bab6a31f97b291774e90d79df80ce9c
diff --git a/metadata/md5-cache/acct-group/kube-controller-manager-0-r2 b/metadata/md5-cache/acct-group/kube-controller-manager-0-r2
deleted file mode 100644
index cf8ea43899ad..000000000000
--- a/metadata/md5-cache/acct-group/kube-controller-manager-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=47b58e1ad9597264ad900562d5a68eb3
diff --git a/metadata/md5-cache/acct-group/kube-controller-manager-0-r3 b/metadata/md5-cache/acct-group/kube-controller-manager-0-r3
new file mode 100644
index 000000000000..d5dfc59d53a5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kube-controller-manager-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kube-controller-manager
+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_=3e4720e7206158a3c409df3f19ad6d14
diff --git a/metadata/md5-cache/acct-group/kube-scheduler-0-r2 b/metadata/md5-cache/acct-group/kube-scheduler-0-r2
deleted file mode 100644
index 560945a28cfa..000000000000
--- a/metadata/md5-cache/acct-group/kube-scheduler-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=45957af585cd6bcffc088f26b82be71c
diff --git a/metadata/md5-cache/acct-group/kube-scheduler-0-r3 b/metadata/md5-cache/acct-group/kube-scheduler-0-r3
new file mode 100644
index 000000000000..9d22a2b476de
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kube-scheduler-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kube-scheduler
+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_=aded8d74e9f7f55e25715482a1ad3b5c
diff --git a/metadata/md5-cache/acct-group/kvm-0-r2 b/metadata/md5-cache/acct-group/kvm-0-r2
deleted file mode 100644
index 89934a5cc027..000000000000
--- a/metadata/md5-cache/acct-group/kvm-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e47f092ae0cce9cf39b7c58bca70780b
diff --git a/metadata/md5-cache/acct-group/kvm-0-r3 b/metadata/md5-cache/acct-group/kvm-0-r3
new file mode 100644
index 000000000000..3e96fd0373e0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kvm-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kvm
+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_=4da5dcaba7b368cecfe867ce5154623d
diff --git a/metadata/md5-cache/acct-group/ldap-0-r1 b/metadata/md5-cache/acct-group/ldap-0-r1
deleted file mode 100644
index f119f24fbb62..000000000000
--- a/metadata/md5-cache/acct-group/ldap-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cb1c293e91ce3b1d32e3e513375811d9
diff --git a/metadata/md5-cache/acct-group/ldap-0-r2 b/metadata/md5-cache/acct-group/ldap-0-r2
new file mode 100644
index 000000000000..fe3c2704429e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ldap-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ldap
+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_=864950e2c8d0043d74d9f044dcd523e9
diff --git a/metadata/md5-cache/acct-group/libvirt-0-r2 b/metadata/md5-cache/acct-group/libvirt-0-r2
deleted file mode 100644
index 0d6611a6fba4..000000000000
--- a/metadata/md5-cache/acct-group/libvirt-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2c3cfd31e9c11ebe3f974769def0b2cd
diff --git a/metadata/md5-cache/acct-group/libvirt-0-r3 b/metadata/md5-cache/acct-group/libvirt-0-r3
new file mode 100644
index 000000000000..740d3816e79b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/libvirt-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: libvirt
+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_=55b608e166185a76d6364c3f45ea0b4c
diff --git a/metadata/md5-cache/acct-group/lighttpd-0-r2 b/metadata/md5-cache/acct-group/lighttpd-0-r2
deleted file mode 100644
index bb864d62f5bf..000000000000
--- a/metadata/md5-cache/acct-group/lighttpd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f5ef23030725eb565f39cd7044d7a915
diff --git a/metadata/md5-cache/acct-group/lighttpd-0-r3 b/metadata/md5-cache/acct-group/lighttpd-0-r3
new file mode 100644
index 000000000000..4a7aa6dedc45
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lighttpd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lighttpd
+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_=bb662e5bd3d2e53e6d2c32bb78487580
diff --git a/metadata/md5-cache/acct-group/lldpd-0-r2 b/metadata/md5-cache/acct-group/lldpd-0-r2
deleted file mode 100644
index f90a0820b9cb..000000000000
--- a/metadata/md5-cache/acct-group/lldpd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=84939573530ea066bb9269647c1e1427
diff --git a/metadata/md5-cache/acct-group/lldpd-0-r3 b/metadata/md5-cache/acct-group/lldpd-0-r3
new file mode 100644
index 000000000000..8e211082b6c9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lldpd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lldpd
+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_=8351899ecef75b16ade1dc702ac7feae
diff --git a/metadata/md5-cache/acct-group/locate-0-r2 b/metadata/md5-cache/acct-group/locate-0-r2
deleted file mode 100644
index b5549d9c354c..000000000000
--- a/metadata/md5-cache/acct-group/locate-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=278587af9ec9fb5819dd85024ac36430
diff --git a/metadata/md5-cache/acct-group/locate-0-r3 b/metadata/md5-cache/acct-group/locate-0-r3
new file mode 100644
index 000000000000..8e4f647c912d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/locate-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: locate
+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_=773edc705726ed57133bb2db46a9c784
diff --git a/metadata/md5-cache/acct-group/logcheck-0-r1 b/metadata/md5-cache/acct-group/logcheck-0-r1
deleted file mode 100644
index d43e06002d1a..000000000000
--- a/metadata/md5-cache/acct-group/logcheck-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cc9a6d465d7b65b91e74037debe10783
diff --git a/metadata/md5-cache/acct-group/logcheck-0-r2 b/metadata/md5-cache/acct-group/logcheck-0-r2
new file mode 100644
index 000000000000..00d9d54b1e2a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/logcheck-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-admin/logcheck
+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_=723699b04c47a9a75179dd3d6a8a3684
diff --git a/metadata/md5-cache/acct-group/logstash-0-r2 b/metadata/md5-cache/acct-group/logstash-0-r2
deleted file mode 100644
index 374dbc65f491..000000000000
--- a/metadata/md5-cache/acct-group/logstash-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8c0c9a6e60156e95feb255d870fda6e2
diff --git a/metadata/md5-cache/acct-group/logstash-0-r3 b/metadata/md5-cache/acct-group/logstash-0-r3
new file mode 100644
index 000000000000..e476ba7bb7ba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/logstash-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Logstash 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_=238ac30d7928177e6dffca1e70a8c20a
diff --git a/metadata/md5-cache/acct-group/logsurfer-0-r1 b/metadata/md5-cache/acct-group/logsurfer-0-r1
deleted file mode 100644
index 7ad79f766d40..000000000000
--- a/metadata/md5-cache/acct-group/logsurfer-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=acc66d053c819d66de21a32a329a3ea3
diff --git a/metadata/md5-cache/acct-group/logsurfer-0-r2 b/metadata/md5-cache/acct-group/logsurfer-0-r2
new file mode 100644
index 000000000000..3810f2746057
--- /dev/null
+++ b/metadata/md5-cache/acct-group/logsurfer-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-admin/logsurfer
+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_=a7e4645d01ee8733420fae815894f027
diff --git a/metadata/md5-cache/acct-group/lp-0-r2 b/metadata/md5-cache/acct-group/lp-0-r2
deleted file mode 100644
index 3b5304028b7c..000000000000
--- a/metadata/md5-cache/acct-group/lp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3627df9b2c24ccc71db066a5427b04a2
diff --git a/metadata/md5-cache/acct-group/lp-0-r3 b/metadata/md5-cache/acct-group/lp-0-r3
new file mode 100644
index 000000000000..184c9c6f190d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lp
+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_=ee1b0b983caa4cc205a6d959611200c3
diff --git a/metadata/md5-cache/acct-group/lpadmin-0-r2 b/metadata/md5-cache/acct-group/lpadmin-0-r2
deleted file mode 100644
index 3fd296c44361..000000000000
--- a/metadata/md5-cache/acct-group/lpadmin-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4eee62fa518caf61e7cfeeb8dfba4189
diff --git a/metadata/md5-cache/acct-group/lpadmin-0-r3 b/metadata/md5-cache/acct-group/lpadmin-0-r3
new file mode 100644
index 000000000000..c4a9401f2dd8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lpadmin-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lpadmin
+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_=e1abc9d122705602737a0e6d530c6189
diff --git a/metadata/md5-cache/acct-group/lxc-0-r1 b/metadata/md5-cache/acct-group/lxc-0-r1
deleted file mode 100644
index 1e5f5b881248..000000000000
--- a/metadata/md5-cache/acct-group/lxc-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4a2aa9b19d7a77ce55eecf42d2af16a3
diff --git a/metadata/md5-cache/acct-group/lxc-0-r2 b/metadata/md5-cache/acct-group/lxc-0-r2
new file mode 100644
index 000000000000..48c840a31862
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lxc-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-containers/lxc
+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_=71eef30ef267d4fd72864279d9444482
diff --git a/metadata/md5-cache/acct-group/lxd-0-r2 b/metadata/md5-cache/acct-group/lxd-0-r2
deleted file mode 100644
index 161855ae43bb..000000000000
--- a/metadata/md5-cache/acct-group/lxd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=94f31dbe17e9b556ccc1ca94008bc8c5
diff --git a/metadata/md5-cache/acct-group/lxd-0-r3 b/metadata/md5-cache/acct-group/lxd-0-r3
new file mode 100644
index 000000000000..ff4f78c13b73
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lxd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-containers/lxd
+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_=f35d53dbc2d11b53e2e5865372b22dc9
diff --git a/metadata/md5-cache/acct-group/mail-0-r2 b/metadata/md5-cache/acct-group/mail-0-r2
deleted file mode 100644
index 53c0aff7c465..000000000000
--- a/metadata/md5-cache/acct-group/mail-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2d6bdcc46c23ef8d0c7355d1ad7261d7
diff --git a/metadata/md5-cache/acct-group/mail-0-r3 b/metadata/md5-cache/acct-group/mail-0-r3
new file mode 100644
index 000000000000..44b27e22b0f2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mail-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Mail 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_=76c1cd3af8d1d06776d31238fd1a8ee4
diff --git a/metadata/md5-cache/acct-group/man-0-r2 b/metadata/md5-cache/acct-group/man-0-r2
deleted file mode 100644
index 8d7149d99a51..000000000000
--- a/metadata/md5-cache/acct-group/man-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6fff94dd4b14c8a3fc2e5de439721e68
diff --git a/metadata/md5-cache/acct-group/man-0-r3 b/metadata/md5-cache/acct-group/man-0-r3
new file mode 100644
index 000000000000..9908182f9e95
--- /dev/null
+++ b/metadata/md5-cache/acct-group/man-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: man
+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_=e2fdeeb1985aea7a6d12d52f81cd53d6
diff --git a/metadata/md5-cache/acct-group/maradns-0-r2 b/metadata/md5-cache/acct-group/maradns-0-r2
deleted file mode 100644
index 45cbb0a5a2f7..000000000000
--- a/metadata/md5-cache/acct-group/maradns-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d62743dfbf040de7659eea2e72c4be43
diff --git a/metadata/md5-cache/acct-group/maradns-0-r3 b/metadata/md5-cache/acct-group/maradns-0-r3
new file mode 100644
index 000000000000..7bfaa11d99f1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/maradns-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: maradns
+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_=bae16ba70044c81ac01366a0f943d2de
diff --git a/metadata/md5-cache/acct-group/memcached-0-r2 b/metadata/md5-cache/acct-group/memcached-0-r2
deleted file mode 100644
index 51163f85c75a..000000000000
--- a/metadata/md5-cache/acct-group/memcached-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9869b0236e9da0a8203feb4212a90340
diff --git a/metadata/md5-cache/acct-group/memcached-0-r3 b/metadata/md5-cache/acct-group/memcached-0-r3
new file mode 100644
index 000000000000..b4fa1f56921c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/memcached-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: memcached
+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_=784575942c5ec641c2151761fee5786e
diff --git a/metadata/md5-cache/acct-group/memcached_exporter-0-r1 b/metadata/md5-cache/acct-group/memcached_exporter-0-r1
deleted file mode 100644
index 302f1f94a232..000000000000
--- a/metadata/md5-cache/acct-group/memcached_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=441a51174c92a34407ac13348e927ed3
diff --git a/metadata/md5-cache/acct-group/memcached_exporter-0-r2 b/metadata/md5-cache/acct-group/memcached_exporter-0-r2
new file mode 100644
index 000000000000..a6c7471f0724
--- /dev/null
+++ b/metadata/md5-cache/acct-group/memcached_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: memcached_exporter
+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_=2fdf05a68ea91b270778647e5ddee46e
diff --git a/metadata/md5-cache/acct-group/messagebus-0-r2 b/metadata/md5-cache/acct-group/messagebus-0-r2
deleted file mode 100644
index 667c7d7affc6..000000000000
--- a/metadata/md5-cache/acct-group/messagebus-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a8698d0a3465bed7515edd29e41701aa
diff --git a/metadata/md5-cache/acct-group/messagebus-0-r3 b/metadata/md5-cache/acct-group/messagebus-0-r3
new file mode 100644
index 000000000000..5060dac3c240
--- /dev/null
+++ b/metadata/md5-cache/acct-group/messagebus-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: messagebus
+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_=ce559128a2aa2a91b7b764dca420e1b7
diff --git a/metadata/md5-cache/acct-group/mgraph-0-r1 b/metadata/md5-cache/acct-group/mgraph-0-r1
deleted file mode 100644
index 116e1dde5c0f..000000000000
--- a/metadata/md5-cache/acct-group/mgraph-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=add4ab818ab659a9b0280c430f336f55
diff --git a/metadata/md5-cache/acct-group/mgraph-0-r2 b/metadata/md5-cache/acct-group/mgraph-0-r2
new file mode 100644
index 000000000000..77be8b671154
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mgraph-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/mailgraph
+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_=ea98f3e9c2d5ee8074d308f91b14e9c8
diff --git a/metadata/md5-cache/acct-group/milter-regex-0-r2 b/metadata/md5-cache/acct-group/milter-regex-0-r2
deleted file mode 100644
index 4d3f31ede954..000000000000
--- a/metadata/md5-cache/acct-group/milter-regex-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6c815ac507f6ce2fa73a76f26d098191
diff --git a/metadata/md5-cache/acct-group/milter-regex-0-r3 b/metadata/md5-cache/acct-group/milter-regex-0-r3
new file mode 100644
index 000000000000..ff0d1cf485dc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/milter-regex-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-filter/milter-regex
+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_=a87d2c0ced2736ba9f638a5a726f59e4
diff --git a/metadata/md5-cache/acct-group/minecraft-0-r2 b/metadata/md5-cache/acct-group/minecraft-0-r2
deleted file mode 100644
index 95cfd30e4845..000000000000
--- a/metadata/md5-cache/acct-group/minecraft-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=413129f6a466ec487dc0e186909ac8a2
diff --git a/metadata/md5-cache/acct-group/minecraft-0-r3 b/metadata/md5-cache/acct-group/minecraft-0-r3
new file mode 100644
index 000000000000..92d7ff68c7e8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minecraft-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Minecraft 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_=5015fb06778105806d985472655dbe66
diff --git a/metadata/md5-cache/acct-group/minetest-0-r2 b/metadata/md5-cache/acct-group/minetest-0-r2
deleted file mode 100644
index 996e3e137ff7..000000000000
--- a/metadata/md5-cache/acct-group/minetest-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3f63aafd4176cc193b18a783eb618a3b
diff --git a/metadata/md5-cache/acct-group/minetest-0-r3 b/metadata/md5-cache/acct-group/minetest-0-r3
new file mode 100644
index 000000000000..816322e0fdcb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minetest-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Minetest 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_=9f45b6a47da0d4669b1663e79e4eb539
diff --git a/metadata/md5-cache/acct-group/minidlna-0-r1 b/metadata/md5-cache/acct-group/minidlna-0-r1
deleted file mode 100644
index 33423f85f0d9..000000000000
--- a/metadata/md5-cache/acct-group/minidlna-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3392b1b574942709beecd38a283cfb39
diff --git a/metadata/md5-cache/acct-group/minidlna-0-r2 b/metadata/md5-cache/acct-group/minidlna-0-r2
new file mode 100644
index 000000000000..2e611ed0000b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minidlna-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: minidlna
+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_=763cb5578d84d02a5736e7da3a63c110
diff --git a/metadata/md5-cache/acct-group/mogile-0-r1 b/metadata/md5-cache/acct-group/mogile-0-r1
deleted file mode 100644
index c7e748286d04..000000000000
--- a/metadata/md5-cache/acct-group/mogile-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cb4ed72eb27f4e1a62869f0551a2424a
diff --git a/metadata/md5-cache/acct-group/mogile-0-r2 b/metadata/md5-cache/acct-group/mogile-0-r2
new file mode 100644
index 000000000000..590ca3d48209
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mogile-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=MogileFS 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_=a6be661ba6bc426aa9d5380915710518
diff --git a/metadata/md5-cache/acct-group/mongodb-0-r2 b/metadata/md5-cache/acct-group/mongodb-0-r2
deleted file mode 100644
index 79f0b4e1b41e..000000000000
--- a/metadata/md5-cache/acct-group/mongodb-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=de01836b63f4270a71a753ca0a5a7ce2
diff --git a/metadata/md5-cache/acct-group/mongodb-0-r3 b/metadata/md5-cache/acct-group/mongodb-0-r3
new file mode 100644
index 000000000000..daa574e9b695
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mongodb-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=MongoDB 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_=5daf873ac5c4e64c915731d323615f2a
diff --git a/metadata/md5-cache/acct-group/mongodb_exporter-0-r1 b/metadata/md5-cache/acct-group/mongodb_exporter-0-r1
deleted file mode 100644
index a1a9c882ea44..000000000000
--- a/metadata/md5-cache/acct-group/mongodb_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c66d329871b16883ecca3e1ef52d4eb3
diff --git a/metadata/md5-cache/acct-group/mongodb_exporter-0-r2 b/metadata/md5-cache/acct-group/mongodb_exporter-0-r2
new file mode 100644
index 000000000000..bb4acb13c0ca
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mongodb_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: mongodb_exporter
+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_=e28e8bbb1967be359956b0a4fc2e35c0
diff --git a/metadata/md5-cache/acct-group/monitorix-0-r2 b/metadata/md5-cache/acct-group/monitorix-0-r2
deleted file mode 100644
index f75f4f510891..000000000000
--- a/metadata/md5-cache/acct-group/monitorix-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5ac59b800af2ac3b86574f0c3ed5d767
diff --git a/metadata/md5-cache/acct-group/monitorix-0-r3 b/metadata/md5-cache/acct-group/monitorix-0-r3
new file mode 100644
index 000000000000..d004b7bf8f7f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monitorix-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Monitorix system tool 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_=46aea100c8710ea78e8bae5814c019ec
diff --git a/metadata/md5-cache/acct-group/monkeyd-0-r1 b/metadata/md5-cache/acct-group/monkeyd-0-r1
deleted file mode 100644
index 53fc3782773c..000000000000
--- a/metadata/md5-cache/acct-group/monkeyd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=413eafb7a2147e83f31cb6cabf99a931
diff --git a/metadata/md5-cache/acct-group/monkeyd-0-r2 b/metadata/md5-cache/acct-group/monkeyd-0-r2
new file mode 100644
index 000000000000..1a57c7c3c18d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monkeyd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/monkeyd
+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_=4dfe57ab397262331193ea6091dd6da3
diff --git a/metadata/md5-cache/acct-group/monkeysphere-0-r2 b/metadata/md5-cache/acct-group/monkeysphere-0-r2
deleted file mode 100644
index aaeee94ad666..000000000000
--- a/metadata/md5-cache/acct-group/monkeysphere-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=779d8890bb794b2fda76ee2b09dbc586
diff --git a/metadata/md5-cache/acct-group/monkeysphere-0-r3 b/metadata/md5-cache/acct-group/monkeysphere-0-r3
new file mode 100644
index 000000000000..494e8c2c721b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monkeysphere-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=monkeysphere 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_=0900214186d98fef562bf6da4a97e174
diff --git a/metadata/md5-cache/acct-group/mosquitto-0-r2 b/metadata/md5-cache/acct-group/mosquitto-0-r2
deleted file mode 100644
index 08bc1c153473..000000000000
--- a/metadata/md5-cache/acct-group/mosquitto-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dc217055cfcedfac102b7c9ba73f9293
diff --git a/metadata/md5-cache/acct-group/mosquitto-0-r3 b/metadata/md5-cache/acct-group/mosquitto-0-r3
new file mode 100644
index 000000000000..4b41ec851525
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mosquitto-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the mosquitto MQTT broker
+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_=53245ac59d600a5f20db5ad4b07fd8a3
diff --git a/metadata/md5-cache/acct-group/motion-0-r2 b/metadata/md5-cache/acct-group/motion-0-r2
deleted file mode 100644
index ce716d31e503..000000000000
--- a/metadata/md5-cache/acct-group/motion-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=025f5c7e008e6c01a3bbc77f15e25f2d
diff --git a/metadata/md5-cache/acct-group/motion-0-r3 b/metadata/md5-cache/acct-group/motion-0-r3
new file mode 100644
index 000000000000..c7a6288933fb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/motion-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: motion
+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_=5ded1720eaddcf011ac7cf80d6ba8a74
diff --git a/metadata/md5-cache/acct-group/msmtpd-0-r2 b/metadata/md5-cache/acct-group/msmtpd-0-r2
deleted file mode 100644
index a2ad3fa00e07..000000000000
--- a/metadata/md5-cache/acct-group/msmtpd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ec171961315fc509677134ec0ee2f76b
diff --git a/metadata/md5-cache/acct-group/msmtpd-0-r3 b/metadata/md5-cache/acct-group/msmtpd-0-r3
new file mode 100644
index 000000000000..240155383f0b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/msmtpd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: msmtpd
+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_=1932a14598cb76df2a685911889a7fa7
diff --git a/metadata/md5-cache/acct-group/munge-0-r1 b/metadata/md5-cache/acct-group/munge-0-r1
deleted file mode 100644
index 0ae2b086979e..000000000000
--- a/metadata/md5-cache/acct-group/munge-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bfc637fca5fcbd243ef0482e69036ae9
diff --git a/metadata/md5-cache/acct-group/munge-0-r2 b/metadata/md5-cache/acct-group/munge-0-r2
new file mode 100644
index 000000000000..63df5678b722
--- /dev/null
+++ b/metadata/md5-cache/acct-group/munge-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/munge
+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_=3a5f2dd446b7e1eeebb049ff5f40629a
diff --git a/metadata/md5-cache/acct-group/munin-0-r2 b/metadata/md5-cache/acct-group/munin-0-r2
deleted file mode 100644
index b6e197510cd4..000000000000
--- a/metadata/md5-cache/acct-group/munin-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fb5038d6a79fe1b34d7d53d50e066a5b
diff --git a/metadata/md5-cache/acct-group/munin-0-r3 b/metadata/md5-cache/acct-group/munin-0-r3
new file mode 100644
index 000000000000..3958efc04dd5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/munin-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: munin
+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_=566f7c61444197b79175a0449741250a
diff --git a/metadata/md5-cache/acct-group/murmur-0-r2 b/metadata/md5-cache/acct-group/murmur-0-r2
deleted file mode 100644
index 842c325b7bcb..000000000000
--- a/metadata/md5-cache/acct-group/murmur-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4706331cb4052d4c177b366fa01f2e4a
diff --git a/metadata/md5-cache/acct-group/murmur-0-r3 b/metadata/md5-cache/acct-group/murmur-0-r3
new file mode 100644
index 000000000000..0f37306d7d08
--- /dev/null
+++ b/metadata/md5-cache/acct-group/murmur-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: murmur
+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_=baed470b057015d996fa737a2af60669
diff --git a/metadata/md5-cache/acct-group/mysql-0-r2 b/metadata/md5-cache/acct-group/mysql-0-r2
deleted file mode 100644
index 6b8ed8b31a46..000000000000
--- a/metadata/md5-cache/acct-group/mysql-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d269e9b0063a0cfb1dd74c90ac8a5eff
diff --git a/metadata/md5-cache/acct-group/mysql-0-r3 b/metadata/md5-cache/acct-group/mysql-0-r3
new file mode 100644
index 000000000000..1b6962c59ffd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mysql-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=MySQL 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_=e034545b3fe344b849ba49d468a3c652
diff --git a/metadata/md5-cache/acct-group/mysqld_exporter-0-r2 b/metadata/md5-cache/acct-group/mysqld_exporter-0-r2
deleted file mode 100644
index 7458fb479d13..000000000000
--- a/metadata/md5-cache/acct-group/mysqld_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e59a6ad3bdd9112a051f3dec4b49f8cd
diff --git a/metadata/md5-cache/acct-group/mysqld_exporter-0-r3 b/metadata/md5-cache/acct-group/mysqld_exporter-0-r3
new file mode 100644
index 000000000000..fb7f6c2b2a45
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mysqld_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: mysqld_exporter
+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_=78905b59186a5cfaf2ef9c7ec7257e9b
diff --git a/metadata/md5-cache/acct-group/mythtv-0-r2 b/metadata/md5-cache/acct-group/mythtv-0-r2
deleted file mode 100644
index 9ca5ecb80e1b..000000000000
--- a/metadata/md5-cache/acct-group/mythtv-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7320e7fb047958898f6b5b842c2ac7c4
diff --git a/metadata/md5-cache/acct-group/mythtv-0-r3 b/metadata/md5-cache/acct-group/mythtv-0-r3
new file mode 100644
index 000000000000..ba2148ffc0f9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mythtv-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Mythtv mythbackend server/deamon 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_=b336a57e64297d05d9e2d5ff55cf966a
diff --git a/metadata/md5-cache/acct-group/nagios-0-r2 b/metadata/md5-cache/acct-group/nagios-0-r2
deleted file mode 100644
index e244a81813e4..000000000000
--- a/metadata/md5-cache/acct-group/nagios-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f84cd6c773d4b9c73d714e0e6020431f
diff --git a/metadata/md5-cache/acct-group/nagios-0-r3 b/metadata/md5-cache/acct-group/nagios-0-r3
new file mode 100644
index 000000000000..b6b3d151f479
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nagios-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nagios
+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_=f65d331b1d06e586f867b504a06fb10e
diff --git a/metadata/md5-cache/acct-group/named-0-r2 b/metadata/md5-cache/acct-group/named-0-r2
deleted file mode 100644
index 8b9f17ad118a..000000000000
--- a/metadata/md5-cache/acct-group/named-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d1a7635329d2b80cfbb8240d05001891
diff --git a/metadata/md5-cache/acct-group/named-0-r3 b/metadata/md5-cache/acct-group/named-0-r3
new file mode 100644
index 000000000000..f5aa5ae0af1f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/named-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: named
+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_=ef13fa831d74c982892c8b55d2a66ad4
diff --git a/metadata/md5-cache/acct-group/netdata-0-r2 b/metadata/md5-cache/acct-group/netdata-0-r2
deleted file mode 100644
index 43a36f17e76c..000000000000
--- a/metadata/md5-cache/acct-group/netdata-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=37992f7448c068f1849df78bb69b4cce
diff --git a/metadata/md5-cache/acct-group/netdata-0-r3 b/metadata/md5-cache/acct-group/netdata-0-r3
new file mode 100644
index 000000000000..825f8e98e3f0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netdata-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: netdata
+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_=2f901f36af3ea3a37a7b42375743d49b
diff --git a/metadata/md5-cache/acct-group/netdev-0-r2 b/metadata/md5-cache/acct-group/netdev-0-r2
deleted file mode 100644
index a74369af0f9c..000000000000
--- a/metadata/md5-cache/acct-group/netdev-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=59573bc9b286d23514d3af3e1518b064
diff --git a/metadata/md5-cache/acct-group/netdev-0-r3 b/metadata/md5-cache/acct-group/netdev-0-r3
new file mode 100644
index 000000000000..ea43225274dd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netdev-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for netdev (avahi)
+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_=671e182be955e439d8d929de7ed6b5fc
diff --git a/metadata/md5-cache/acct-group/netperf-0-r1 b/metadata/md5-cache/acct-group/netperf-0-r1
deleted file mode 100644
index 523083435167..000000000000
--- a/metadata/md5-cache/acct-group/netperf-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=122e03340d111e65d16dfc129a06896d
diff --git a/metadata/md5-cache/acct-group/netperf-0-r2 b/metadata/md5-cache/acct-group/netperf-0-r2
new file mode 100644
index 000000000000..daf424d2e3d3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netperf-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/netperf
+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_=bc7b997b2c1020cee55303cbc7a39573
diff --git a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r2 b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r2
deleted file mode 100644
index 7ea78d5b62fd..000000000000
--- a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ed598e7aa71465d549a84af0243c4a5b
diff --git a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r3 b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r3
new file mode 100644
index 000000000000..4a2f20750244
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nginx-vts-exporter
+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_=ed9818302d4c874feead2b0de3605bde
diff --git a/metadata/md5-cache/acct-group/ngrep-0-r2 b/metadata/md5-cache/acct-group/ngrep-0-r2
deleted file mode 100644
index 34282764b40a..000000000000
--- a/metadata/md5-cache/acct-group/ngrep-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0beef07e597d882cfc35cf3b3db2b453
diff --git a/metadata/md5-cache/acct-group/ngrep-0-r3 b/metadata/md5-cache/acct-group/ngrep-0-r3
new file mode 100644
index 000000000000..08295f4fbd3d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ngrep-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/ngrep
+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_=7282624f31b51d5d9f9fb415030d0053
diff --git a/metadata/md5-cache/acct-group/nm-openconnect-0-r1 b/metadata/md5-cache/acct-group/nm-openconnect-0-r1
deleted file mode 100644
index e193ab0f808c..000000000000
--- a/metadata/md5-cache/acct-group/nm-openconnect-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=40bfc8abff9fdb9a1737cf3431ed8fd3
diff --git a/metadata/md5-cache/acct-group/nm-openconnect-0-r2 b/metadata/md5-cache/acct-group/nm-openconnect-0-r2
new file mode 100644
index 000000000000..28f0b00d39dd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openconnect-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openconnect
+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_=be3349597dddf4039b0b48630a94d3c1
diff --git a/metadata/md5-cache/acct-group/nm-openvpn-0-r1 b/metadata/md5-cache/acct-group/nm-openvpn-0-r1
deleted file mode 100644
index 263506b7299a..000000000000
--- a/metadata/md5-cache/acct-group/nm-openvpn-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5bf212550b302f873041e5fb750d974a
diff --git a/metadata/md5-cache/acct-group/nm-openvpn-0-r2 b/metadata/md5-cache/acct-group/nm-openvpn-0-r2
new file mode 100644
index 000000000000..79a108f3d3a7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openvpn-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openvpn
+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_=236efb211c2a20a2fb87fbef098a1381
diff --git a/metadata/md5-cache/acct-group/nobody-0-r1 b/metadata/md5-cache/acct-group/nobody-0-r1
deleted file mode 100644
index b2e15904cfab..000000000000
--- a/metadata/md5-cache/acct-group/nobody-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a983bcba784d5ac25cca796a35d7f3bc
diff --git a/metadata/md5-cache/acct-group/nobody-0-r2 b/metadata/md5-cache/acct-group/nobody-0-r2
new file mode 100644
index 000000000000..fa9f221098a1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nobody-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nobody
+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_=81f2d639a3ca1180356a4869a4d30b34
diff --git a/metadata/md5-cache/acct-group/node_exporter-0-r2 b/metadata/md5-cache/acct-group/node_exporter-0-r2
deleted file mode 100644
index c871eb91c419..000000000000
--- a/metadata/md5-cache/acct-group/node_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2dc8762fd37021e1898f2437a31f8751
diff --git a/metadata/md5-cache/acct-group/node_exporter-0-r3 b/metadata/md5-cache/acct-group/node_exporter-0-r3
new file mode 100644
index 000000000000..d88807c02bb3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/node_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: node_exporter
+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_=1b84060568de69aefe3c4236a6c9e433
diff --git a/metadata/md5-cache/acct-group/nofiles-0-r2 b/metadata/md5-cache/acct-group/nofiles-0-r2
deleted file mode 100644
index 6b46aaab73fe..000000000000
--- a/metadata/md5-cache/acct-group/nofiles-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7293ee48927bc47df6470a410be36067
diff --git a/metadata/md5-cache/acct-group/nofiles-0-r3 b/metadata/md5-cache/acct-group/nofiles-0-r3
new file mode 100644
index 000000000000..ebbb26fe7921
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nofiles-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nofiles
+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_=f77eab94b72464f632dbf362b6208e4b
diff --git a/metadata/md5-cache/acct-group/notary-0-r1 b/metadata/md5-cache/acct-group/notary-0-r1
deleted file mode 100644
index aab88e37dc96..000000000000
--- a/metadata/md5-cache/acct-group/notary-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=37929d197aaf790be14fa956244bb38c
diff --git a/metadata/md5-cache/acct-group/notary-0-r2 b/metadata/md5-cache/acct-group/notary-0-r2
new file mode 100644
index 000000000000..0aea7aaa47d9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/notary-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-misc/notary
+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_=9b707a17c9de7efa5b7af07d5ad2239e
diff --git a/metadata/md5-cache/acct-group/nsd-0-r2 b/metadata/md5-cache/acct-group/nsd-0-r2
deleted file mode 100644
index 960f18cd1c98..000000000000
--- a/metadata/md5-cache/acct-group/nsd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5aff6e17701fbd812b15a3e5260d66c7
diff --git a/metadata/md5-cache/acct-group/nsd-0-r3 b/metadata/md5-cache/acct-group/nsd-0-r3
new file mode 100644
index 000000000000..c97a4e31fc5e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nsd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nsd
+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_=19b5cc7562c78ed9b9262346e65930aa
diff --git a/metadata/md5-cache/acct-group/nslcd-0-r2 b/metadata/md5-cache/acct-group/nslcd-0-r2
deleted file mode 100644
index ecaf0b685459..000000000000
--- a/metadata/md5-cache/acct-group/nslcd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c95088450e35ab780818a750da09a190
diff --git a/metadata/md5-cache/acct-group/nslcd-0-r3 b/metadata/md5-cache/acct-group/nslcd-0-r3
new file mode 100644
index 000000000000..c666767af9d7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nslcd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nslcd
+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_=2d1b31531bf5b78b491a7f71ff1769c9
diff --git a/metadata/md5-cache/acct-group/ntopng-0-r1 b/metadata/md5-cache/acct-group/ntopng-0-r1
deleted file mode 100644
index 7a2f158738a0..000000000000
--- a/metadata/md5-cache/acct-group/ntopng-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=54f52eeaea04da981e41383477f530b5
diff --git a/metadata/md5-cache/acct-group/ntopng-0-r2 b/metadata/md5-cache/acct-group/ntopng-0-r2
new file mode 100644
index 000000000000..ee44bdaee24e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ntopng-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ntopng
+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_=edcf95b53723a3503fbd5b9723f97e79
diff --git a/metadata/md5-cache/acct-group/ntp-0-r2 b/metadata/md5-cache/acct-group/ntp-0-r2
deleted file mode 100644
index 666adbf35e80..000000000000
--- a/metadata/md5-cache/acct-group/ntp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7099c5b630d3c9ed4195c76c7793b612
diff --git a/metadata/md5-cache/acct-group/ntp-0-r3 b/metadata/md5-cache/acct-group/ntp-0-r3
new file mode 100644
index 000000000000..46dca672666b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ntp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ntp
+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_=1372bbccd819f5549920fd0b52428f27
diff --git a/metadata/md5-cache/acct-group/nullmail-0-r1 b/metadata/md5-cache/acct-group/nullmail-0-r1
deleted file mode 100644
index 6e401616a271..000000000000
--- a/metadata/md5-cache/acct-group/nullmail-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d992b134cc7f6fb6ff2df2b4ee912f65
diff --git a/metadata/md5-cache/acct-group/nullmail-0-r2 b/metadata/md5-cache/acct-group/nullmail-0-r2
new file mode 100644
index 000000000000..3b14de5567ba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nullmail-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the nullmailer
+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_=d741d16683685e5cfdf14db7537696df
diff --git a/metadata/md5-cache/acct-group/nut-0-r1 b/metadata/md5-cache/acct-group/nut-0-r1
deleted file mode 100644
index b0e9fb638b7b..000000000000
--- a/metadata/md5-cache/acct-group/nut-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6e6fea128db4953c11f17a1f7e94da2e
diff --git a/metadata/md5-cache/acct-group/nut-0-r2 b/metadata/md5-cache/acct-group/nut-0-r2
new file mode 100644
index 000000000000..7547b1609fdb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nut-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Network-UPS Tools
+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_=d9154ad018de576c81d2f8884f056d4e
diff --git a/metadata/md5-cache/acct-group/nzbget-0-r1 b/metadata/md5-cache/acct-group/nzbget-0-r1
deleted file mode 100644
index 9accf2d1efdb..000000000000
--- a/metadata/md5-cache/acct-group/nzbget-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=590878c801b7d6fd07d9670aeea67e0c
diff --git a/metadata/md5-cache/acct-group/nzbget-0-r2 b/metadata/md5-cache/acct-group/nzbget-0-r2
new file mode 100644
index 000000000000..96f6619190be
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nzbget-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-nntp/nzbget
+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_=ff3f2cecf3091350fd231d6b447c675d
diff --git a/metadata/md5-cache/acct-group/oidentd-0-r2 b/metadata/md5-cache/acct-group/oidentd-0-r2
deleted file mode 100644
index 2ef3fa949bc2..000000000000
--- a/metadata/md5-cache/acct-group/oidentd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c766ad422b3eaf5a2ae44c8d501f564e
diff --git a/metadata/md5-cache/acct-group/oidentd-0-r3 b/metadata/md5-cache/acct-group/oidentd-0-r3
new file mode 100644
index 000000000000..c9afd73fb4e1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/oidentd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: oidentd
+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_=711e7a0acc7bd5977c36491417cabd55
diff --git a/metadata/md5-cache/acct-group/openct-0-r2 b/metadata/md5-cache/acct-group/openct-0-r2
deleted file mode 100644
index 5cccac217658..000000000000
--- a/metadata/md5-cache/acct-group/openct-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=df4b42283905cbcc957c66bdc828fa07
diff --git a/metadata/md5-cache/acct-group/openct-0-r3 b/metadata/md5-cache/acct-group/openct-0-r3
new file mode 100644
index 000000000000..cc3dccf15ef6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openct-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openct
+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_=5b57b8c03fb72a29fa24b02d497456e9
diff --git a/metadata/md5-cache/acct-group/opendkim-0-r2 b/metadata/md5-cache/acct-group/opendkim-0-r2
deleted file mode 100644
index ac406d6bc89f..000000000000
--- a/metadata/md5-cache/acct-group/opendkim-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=56400d5d7de6e75bb935df561c615aa9
diff --git a/metadata/md5-cache/acct-group/opendkim-0-r3 b/metadata/md5-cache/acct-group/opendkim-0-r3
new file mode 100644
index 000000000000..59fd897b2ebd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opendkim-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for OpenDKIM
+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_=7dabdb7149584221eef29b0807a4f02a
diff --git a/metadata/md5-cache/acct-group/opendnssec-0-r1 b/metadata/md5-cache/acct-group/opendnssec-0-r1
deleted file mode 100644
index 6ea526a409eb..000000000000
--- a/metadata/md5-cache/acct-group/opendnssec-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7eab05c2b0bc1c6adb3a1b4a7e19a5d2
diff --git a/metadata/md5-cache/acct-group/opendnssec-0-r2 b/metadata/md5-cache/acct-group/opendnssec-0-r2
new file mode 100644
index 000000000000..4854daf2cd48
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opendnssec-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dns/opendnssec
+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_=4880ca9fc7c4b14ecf3648e0a26e51df
diff --git a/metadata/md5-cache/acct-group/openntpd-0-r2 b/metadata/md5-cache/acct-group/openntpd-0-r2
deleted file mode 100644
index 6061101a549b..000000000000
--- a/metadata/md5-cache/acct-group/openntpd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cf20d2c689603c7b0189a6651674a2c2
diff --git a/metadata/md5-cache/acct-group/openntpd-0-r3 b/metadata/md5-cache/acct-group/openntpd-0-r3
new file mode 100644
index 000000000000..1bf0d28606fd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openntpd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openntpd
+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_=08e2c51baec40efbc77dac8dffd77385
diff --git a/metadata/md5-cache/acct-group/openrct2-0-r2 b/metadata/md5-cache/acct-group/openrct2-0-r2
deleted file mode 100644
index cb47f5ac8b8e..000000000000
--- a/metadata/md5-cache/acct-group/openrct2-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f3e5ba476736daffbb479fa7459954ad
diff --git a/metadata/md5-cache/acct-group/openrct2-0-r3 b/metadata/md5-cache/acct-group/openrct2-0-r3
new file mode 100644
index 000000000000..2728aed78fe2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openrct2-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the OpenRCT2 dedicated 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_=af8a8072f7c7a892b17fbe592dcef16e
diff --git a/metadata/md5-cache/acct-group/openvpn-0-r2 b/metadata/md5-cache/acct-group/openvpn-0-r2
deleted file mode 100644
index 25a281f71441..000000000000
--- a/metadata/md5-cache/acct-group/openvpn-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ed408f6a9be8f88c0651e455139a0ccf
diff --git a/metadata/md5-cache/acct-group/openvpn-0-r3 b/metadata/md5-cache/acct-group/openvpn-0-r3
new file mode 100644
index 000000000000..171075dea2cf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openvpn-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openvpn
+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_=e929ea641709f4bfaa11bb124229e203
diff --git a/metadata/md5-cache/acct-group/openvpn_exporter-0-r2 b/metadata/md5-cache/acct-group/openvpn_exporter-0-r2
deleted file mode 100644
index d27975d685ba..000000000000
--- a/metadata/md5-cache/acct-group/openvpn_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ef5651c132f43c851a857e6e1dde8bee
diff --git a/metadata/md5-cache/acct-group/openvpn_exporter-0-r3 b/metadata/md5-cache/acct-group/openvpn_exporter-0-r3
new file mode 100644
index 000000000000..d3df06a56153
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openvpn_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openvpn_exporter
+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_=cbdaed21372c27a4928fb57c447e5fb3
diff --git a/metadata/md5-cache/acct-group/oprofile-0-r2 b/metadata/md5-cache/acct-group/oprofile-0-r2
deleted file mode 100644
index 2ac2d8168fe2..000000000000
--- a/metadata/md5-cache/acct-group/oprofile-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ae7f058f404cb82d4e9db4f7a20bf330
diff --git a/metadata/md5-cache/acct-group/oprofile-0-r3 b/metadata/md5-cache/acct-group/oprofile-0-r3
new file mode 100644
index 000000000000..dd1aba14916d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/oprofile-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-util/oprofile JIT code processing
+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_=1fbed9acc2e4546f1e18cccd097dc3e0
diff --git a/metadata/md5-cache/acct-group/ossec-0-r2 b/metadata/md5-cache/acct-group/ossec-0-r2
deleted file mode 100644
index 338fa3c22e3e..000000000000
--- a/metadata/md5-cache/acct-group/ossec-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a79e34dd2cc7a8d313ed96b9298b388e
diff --git a/metadata/md5-cache/acct-group/ossec-0-r3 b/metadata/md5-cache/acct-group/ossec-0-r3
new file mode 100644
index 000000000000..9aebf91e1059
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ossec-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-analyzer/ossec-hids
+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_=a5697000d45eb9ffae8f02d7a1e2d44a
diff --git a/metadata/md5-cache/acct-group/p2p-0-r1 b/metadata/md5-cache/acct-group/p2p-0-r1
deleted file mode 100644
index a7eaf1d14266..000000000000
--- a/metadata/md5-cache/acct-group/p2p-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c0c68cc0ddd1d55fdace887cc429cefc
diff --git a/metadata/md5-cache/acct-group/p2p-0-r2 b/metadata/md5-cache/acct-group/p2p-0-r2
new file mode 100644
index 000000000000..2c729c36d1d7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/p2p-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mldonkey
+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_=75c62e20c5e0739df01c75532e143ca5
diff --git a/metadata/md5-cache/acct-group/pcscd-0-r2 b/metadata/md5-cache/acct-group/pcscd-0-r2
deleted file mode 100644
index f29a3578f2be..000000000000
--- a/metadata/md5-cache/acct-group/pcscd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=268efe9e54d63a61c08df9a0349e1365
diff --git a/metadata/md5-cache/acct-group/pcscd-0-r3 b/metadata/md5-cache/acct-group/pcscd-0-r3
new file mode 100644
index 000000000000..6975ba319f43
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pcscd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pcscd
+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_=0b064e40f3180c87858364a1029e77eb
diff --git a/metadata/md5-cache/acct-group/pdns-0-r2 b/metadata/md5-cache/acct-group/pdns-0-r2
deleted file mode 100644
index 5c6f37b53c93..000000000000
--- a/metadata/md5-cache/acct-group/pdns-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3d1cb5088b614846d6f54ef5d1ee659b
diff --git a/metadata/md5-cache/acct-group/pdns-0-r3 b/metadata/md5-cache/acct-group/pdns-0-r3
new file mode 100644
index 000000000000..08929ad7d920
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pdns-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pdns
+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_=ef69496d607ffd59c3adb0a48f9aaa0c
diff --git a/metadata/md5-cache/acct-group/pdnsd-0-r2 b/metadata/md5-cache/acct-group/pdnsd-0-r2
deleted file mode 100644
index ea4defdab120..000000000000
--- a/metadata/md5-cache/acct-group/pdnsd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=04f113527860abd77cb7c7e72b45818f
diff --git a/metadata/md5-cache/acct-group/pdnsd-0-r3 b/metadata/md5-cache/acct-group/pdnsd-0-r3
new file mode 100644
index 000000000000..401747784600
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pdnsd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pdnsd
+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_=5e8cd35377ae70c322601c126a75038a
diff --git a/metadata/md5-cache/acct-group/pgagent-0-r1 b/metadata/md5-cache/acct-group/pgagent-0-r1
deleted file mode 100644
index dc65a44b4293..000000000000
--- a/metadata/md5-cache/acct-group/pgagent-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a2425b9b22898f9f41e0f1f75fe926d9
diff --git a/metadata/md5-cache/acct-group/pgagent-0-r2 b/metadata/md5-cache/acct-group/pgagent-0-r2
new file mode 100644
index 000000000000..035bb035afb9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pgagent-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/pgagent
+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_=14fc0b7184713afead76c79bea552752
diff --git a/metadata/md5-cache/acct-group/pipewire-0-r1 b/metadata/md5-cache/acct-group/pipewire-0-r1
deleted file mode 100644
index dc4038813e2b..000000000000
--- a/metadata/md5-cache/acct-group/pipewire-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=58fb6fa93d93f6a7799e1a94f9480ec2
diff --git a/metadata/md5-cache/acct-group/pipewire-0-r2 b/metadata/md5-cache/acct-group/pipewire-0-r2
new file mode 100644
index 000000000000..f8883da10df4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pipewire-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pipewire
+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_=63db9e9a04945f7228fd37fbaad62d76
diff --git a/metadata/md5-cache/acct-group/pkcs11-0-r1 b/metadata/md5-cache/acct-group/pkcs11-0-r1
deleted file mode 100644
index bab45dfb33dd..000000000000
--- a/metadata/md5-cache/acct-group/pkcs11-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dd4c49c4eb3d7dc1991e813343fe1395
diff --git a/metadata/md5-cache/acct-group/pkcs11-0-r2 b/metadata/md5-cache/acct-group/pkcs11-0-r2
new file mode 100644
index 000000000000..bdbdaad6568f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pkcs11-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for dev-libs/opencryptoki
+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_=25e378880a3a3d7b28b7a4cdfa9d6c2b
diff --git a/metadata/md5-cache/acct-group/plex-0-r2 b/metadata/md5-cache/acct-group/plex-0-r2
deleted file mode 100644
index ba3f891d17d2..000000000000
--- a/metadata/md5-cache/acct-group/plex-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=149f1094f942b769bf9a24bf9934f5c5
diff --git a/metadata/md5-cache/acct-group/plex-0-r3 b/metadata/md5-cache/acct-group/plex-0-r3
new file mode 100644
index 000000000000..71b5a551ec34
--- /dev/null
+++ b/metadata/md5-cache/acct-group/plex-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Plex Media Server 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_=a4504f7dbd0433dedb9773e9928ab986
diff --git a/metadata/md5-cache/acct-group/plugdev-0-r2 b/metadata/md5-cache/acct-group/plugdev-0-r2
deleted file mode 100644
index 2dcfefd7fbbb..000000000000
--- a/metadata/md5-cache/acct-group/plugdev-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2422b900635f57974917b5b57c94ee6f
diff --git a/metadata/md5-cache/acct-group/plugdev-0-r3 b/metadata/md5-cache/acct-group/plugdev-0-r3
new file mode 100644
index 000000000000..6258de023b5b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/plugdev-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group controlling access to removable media
+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_=a5e16a7a5108fae17aeeb7c79c906bbd
diff --git a/metadata/md5-cache/acct-group/polkitd-0-r2 b/metadata/md5-cache/acct-group/polkitd-0-r2
deleted file mode 100644
index f98ebdaaed9d..000000000000
--- a/metadata/md5-cache/acct-group/polkitd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=091e9ff0be3d821fc6dce8ab531a1690
diff --git a/metadata/md5-cache/acct-group/polkitd-0-r3 b/metadata/md5-cache/acct-group/polkitd-0-r3
new file mode 100644
index 000000000000..9535b7c4d8d3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/polkitd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: polkitd
+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_=396627096e6c7d7d03032502ac780e0c
diff --git a/metadata/md5-cache/acct-group/polw-0-r1 b/metadata/md5-cache/acct-group/polw-0-r1
deleted file mode 100644
index 3c4a2aaee937..000000000000
--- a/metadata/md5-cache/acct-group/polw-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=552c094fb2f4dd9efc1bff2ba3521202
diff --git a/metadata/md5-cache/acct-group/polw-0-r2 b/metadata/md5-cache/acct-group/polw-0-r2
new file mode 100644
index 000000000000..78d400c840b6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/polw-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-filter/policyd-weight
+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_=fb27977ca7de92e45d0f54d2956d519b
diff --git a/metadata/md5-cache/acct-group/popa3d-0-r1 b/metadata/md5-cache/acct-group/popa3d-0-r1
deleted file mode 100644
index e989d625f04a..000000000000
--- a/metadata/md5-cache/acct-group/popa3d-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d41dcb997c065209c818da90638b3dd7
diff --git a/metadata/md5-cache/acct-group/popa3d-0-r2 b/metadata/md5-cache/acct-group/popa3d-0-r2
new file mode 100644
index 000000000000..5bd12e5bf981
--- /dev/null
+++ b/metadata/md5-cache/acct-group/popa3d-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/popa3d
+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_=ec74760da514a64af11cf0a02bac7172
diff --git a/metadata/md5-cache/acct-group/portage-0-r1 b/metadata/md5-cache/acct-group/portage-0-r1
deleted file mode 100644
index 99c814d63300..000000000000
--- a/metadata/md5-cache/acct-group/portage-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c7158877d8eb809b3d7d7928a90be203
diff --git a/metadata/md5-cache/acct-group/portage-0-r2 b/metadata/md5-cache/acct-group/portage-0-r2
new file mode 100644
index 000000000000..d41797b93054
--- /dev/null
+++ b/metadata/md5-cache/acct-group/portage-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: portage
+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_=cd1f7f4774e218b766405149b60e3aba
diff --git a/metadata/md5-cache/acct-group/postdrop-0-r2 b/metadata/md5-cache/acct-group/postdrop-0-r2
deleted file mode 100644
index 67d7aeb254e4..000000000000
--- a/metadata/md5-cache/acct-group/postdrop-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fedc38c276e8ef7d518a594bb9d64c80
diff --git a/metadata/md5-cache/acct-group/postdrop-0-r3 b/metadata/md5-cache/acct-group/postdrop-0-r3
new file mode 100644
index 000000000000..ef0cfa859035
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postdrop-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postdrop
+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_=d5a960e617cacd422d99ef122fac3641
diff --git a/metadata/md5-cache/acct-group/postfix-0-r2 b/metadata/md5-cache/acct-group/postfix-0-r2
deleted file mode 100644
index 1a2a2bc284aa..000000000000
--- a/metadata/md5-cache/acct-group/postfix-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=40c7af7a7b14d63ec2ea628078d02b0a
diff --git a/metadata/md5-cache/acct-group/postfix-0-r3 b/metadata/md5-cache/acct-group/postfix-0-r3
new file mode 100644
index 000000000000..4aab5fec1825
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postfix-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postfix
+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_=f350b6ac77bd4c093f67998bc02216c0
diff --git a/metadata/md5-cache/acct-group/postfix_exporter-0-r2 b/metadata/md5-cache/acct-group/postfix_exporter-0-r2
deleted file mode 100644
index d38ee0805fbd..000000000000
--- a/metadata/md5-cache/acct-group/postfix_exporter-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fcc623b62f1cc66600418a2ab2fc50fb
diff --git a/metadata/md5-cache/acct-group/postfix_exporter-0-r3 b/metadata/md5-cache/acct-group/postfix_exporter-0-r3
new file mode 100644
index 000000000000..0b708f664829
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postfix_exporter-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postfix_exporter
+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_=f75d1728bd0f110b7b7ff93f854a368a
diff --git a/metadata/md5-cache/acct-group/postfwd-0-r1 b/metadata/md5-cache/acct-group/postfwd-0-r1
deleted file mode 100644
index eb9d37fd4306..000000000000
--- a/metadata/md5-cache/acct-group/postfwd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f6144e811b948dff80d7279e10458199
diff --git a/metadata/md5-cache/acct-group/postfwd-0-r2 b/metadata/md5-cache/acct-group/postfwd-0-r2
new file mode 100644
index 000000000000..80ba06394143
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postfwd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for mail-filter/postfwd
+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_=56afb48943fb03f2e71f1db74521f0f4
diff --git a/metadata/md5-cache/acct-group/postgres-0-r2 b/metadata/md5-cache/acct-group/postgres-0-r2
deleted file mode 100644
index 20a7b5546728..000000000000
--- a/metadata/md5-cache/acct-group/postgres-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0ab5bc686d459370919c0e7f001db910
diff --git a/metadata/md5-cache/acct-group/postgres-0-r3 b/metadata/md5-cache/acct-group/postgres-0-r3
new file mode 100644
index 000000000000..3879c3b4f575
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postgres-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=PostgreSQL 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_=d932c3fd9db5682d8c60d4c9468f17aa
diff --git a/metadata/md5-cache/acct-group/postgres_exporter-0-r1 b/metadata/md5-cache/acct-group/postgres_exporter-0-r1
deleted file mode 100644
index 2fddc0dbbd4b..000000000000
--- a/metadata/md5-cache/acct-group/postgres_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2aff720206d6d3a52ad44d8b19c79c83
diff --git a/metadata/md5-cache/acct-group/postgres_exporter-0-r2 b/metadata/md5-cache/acct-group/postgres_exporter-0-r2
new file mode 100644
index 000000000000..a306c9d8cc50
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postgres_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postgres_exporter
+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_=9acd036df5e0f5c153a82c3769008c03
diff --git a/metadata/md5-cache/acct-group/privoxy-0-r2 b/metadata/md5-cache/acct-group/privoxy-0-r2
deleted file mode 100644
index 0d7fdc0875a9..000000000000
--- a/metadata/md5-cache/acct-group/privoxy-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5c783e9c277356e9f31fbf3bc0ba9357
diff --git a/metadata/md5-cache/acct-group/privoxy-0-r3 b/metadata/md5-cache/acct-group/privoxy-0-r3
new file mode 100644
index 000000000000..0e0244c993ca
--- /dev/null
+++ b/metadata/md5-cache/acct-group/privoxy-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A privoxy: privacy oriented web proxy 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_=6e84546b6456fb9404cae5ba1f8eb166
diff --git a/metadata/md5-cache/acct-group/prometheus-0-r2 b/metadata/md5-cache/acct-group/prometheus-0-r2
deleted file mode 100644
index d5c53aaa0717..000000000000
--- a/metadata/md5-cache/acct-group/prometheus-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6a62eb42c3cbac7b19c97c2cfe151ecd
diff --git a/metadata/md5-cache/acct-group/prometheus-0-r3 b/metadata/md5-cache/acct-group/prometheus-0-r3
new file mode 100644
index 000000000000..9cbf1dd3bfd4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/prometheus-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: prometheus
+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_=760ee6ad03380179baa02d3c86e549d0
diff --git a/metadata/md5-cache/acct-group/psybnc-0-r1 b/metadata/md5-cache/acct-group/psybnc-0-r1
deleted file mode 100644
index 367c47fc14c9..000000000000
--- a/metadata/md5-cache/acct-group/psybnc-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=29744ad04b7f6a945930cbdb1e104abc
diff --git a/metadata/md5-cache/acct-group/psybnc-0-r2 b/metadata/md5-cache/acct-group/psybnc-0-r2
new file mode 100644
index 000000000000..875eed688a2c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/psybnc-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-irc/psybnc
+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_=2b5035ab3626184cf2e4f3dc704fa9e5
diff --git a/metadata/md5-cache/acct-group/pulse-0-r1 b/metadata/md5-cache/acct-group/pulse-0-r1
deleted file mode 100644
index 2f8be483400b..000000000000
--- a/metadata/md5-cache/acct-group/pulse-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d2179f77cec9f06454577069525adf3a
diff --git a/metadata/md5-cache/acct-group/pulse-0-r2 b/metadata/md5-cache/acct-group/pulse-0-r2
new file mode 100644
index 000000000000..5a4848660f44
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pulse-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pulse
+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_=89f49914525e40e9edbee6f5b09612de
diff --git a/metadata/md5-cache/acct-group/pulse-access-0-r1 b/metadata/md5-cache/acct-group/pulse-access-0-r1
deleted file mode 100644
index f2e9e195d6a6..000000000000
--- a/metadata/md5-cache/acct-group/pulse-access-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8aa083074e861ce726074c6cc0517d2c
diff --git a/metadata/md5-cache/acct-group/pulse-access-0-r2 b/metadata/md5-cache/acct-group/pulse-access-0-r2
new file mode 100644
index 000000000000..a4129e6f9287
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pulse-access-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pulse-access
+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_=a4c435c024ed024a3cfed8f51c5837ea
diff --git a/metadata/md5-cache/acct-group/puppet-0-r2 b/metadata/md5-cache/acct-group/puppet-0-r2
deleted file mode 100644
index aa7eb724343a..000000000000
--- a/metadata/md5-cache/acct-group/puppet-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ead5ec406940589522974749d4f4c853
diff --git a/metadata/md5-cache/acct-group/puppet-0-r3 b/metadata/md5-cache/acct-group/puppet-0-r3
new file mode 100644
index 000000000000..c52356122926
--- /dev/null
+++ b/metadata/md5-cache/acct-group/puppet-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: puppet
+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_=a23541ca95308556ae6659047767249c
diff --git a/metadata/md5-cache/acct-group/puppetdb-0-r2 b/metadata/md5-cache/acct-group/puppetdb-0-r2
deleted file mode 100644
index ca31546a03da..000000000000
--- a/metadata/md5-cache/acct-group/puppetdb-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=518b25f89fe602c374e5638ca311ab92
diff --git a/metadata/md5-cache/acct-group/puppetdb-0-r3 b/metadata/md5-cache/acct-group/puppetdb-0-r3
new file mode 100644
index 000000000000..965f6f909c63
--- /dev/null
+++ b/metadata/md5-cache/acct-group/puppetdb-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: puppetdb
+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_=13cb41824ff94823c3c15423306fd6e2
diff --git a/metadata/md5-cache/acct-group/pushgateway-0-r1 b/metadata/md5-cache/acct-group/pushgateway-0-r1
deleted file mode 100644
index 180218f6c259..000000000000
--- a/metadata/md5-cache/acct-group/pushgateway-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=239eb0a139d76db8fceeaee9dbdc03d4
diff --git a/metadata/md5-cache/acct-group/pushgateway-0-r2 b/metadata/md5-cache/acct-group/pushgateway-0-r2
new file mode 100644
index 000000000000..e664a65aeb06
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pushgateway-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/pushgateway
+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_=9b5f116c53b52225fbb4cd6953974a99
diff --git a/metadata/md5-cache/acct-group/pvpgn-0-r1 b/metadata/md5-cache/acct-group/pvpgn-0-r1
deleted file mode 100644
index f0ed1a80359f..000000000000
--- a/metadata/md5-cache/acct-group/pvpgn-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=38c9381d05e6c8d5c1ba57928f4f7bf2
diff --git a/metadata/md5-cache/acct-group/pvpgn-0-r2 b/metadata/md5-cache/acct-group/pvpgn-0-r2
new file mode 100644
index 000000000000..65428b3158ab
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pvpgn-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for pvpgn (gaming server for Battle.Net compatible clients)
+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_=3515fae8db962f027c52458ad12daf76
diff --git a/metadata/md5-cache/acct-group/qemu-0-r2 b/metadata/md5-cache/acct-group/qemu-0-r2
deleted file mode 100644
index 9e8a6cafa4b5..000000000000
--- a/metadata/md5-cache/acct-group/qemu-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6302dff7b32fe9344230fdf702afe2f5
diff --git a/metadata/md5-cache/acct-group/qemu-0-r3 b/metadata/md5-cache/acct-group/qemu-0-r3
new file mode 100644
index 000000000000..e3613339ef2d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/qemu-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: qemu
+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_=b1aec899f801d0e39d2231abfbfc44f2
diff --git a/metadata/md5-cache/acct-group/qmail-0-r2 b/metadata/md5-cache/acct-group/qmail-0-r2
deleted file mode 100644
index 0a35c8e4ed9b..000000000000
--- a/metadata/md5-cache/acct-group/qmail-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1b10e92f1728ce595d76e6e53d090cc0
diff --git a/metadata/md5-cache/acct-group/qmail-0-r3 b/metadata/md5-cache/acct-group/qmail-0-r3
new file mode 100644
index 000000000000..00a3ca8514a7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/qmail-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: qmail
+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_=9ad5507c1386363fdc660121e4b34dbd
diff --git a/metadata/md5-cache/acct-group/rabbitmq-0-r1 b/metadata/md5-cache/acct-group/rabbitmq-0-r1
deleted file mode 100644
index e15aee885bcd..000000000000
--- a/metadata/md5-cache/acct-group/rabbitmq-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=84dd21650b472129de7f9ec1549b1d71
diff --git a/metadata/md5-cache/acct-group/rabbitmq-0-r2 b/metadata/md5-cache/acct-group/rabbitmq-0-r2
new file mode 100644
index 000000000000..e1d9ca43fa00
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/rabbitmq-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_=6cb73f782d8e81ffb6673d0f36c68152
diff --git a/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r1 b/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r1
deleted file mode 100644
index 765508df7b70..000000000000
--- a/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6867bee76de2a603a349d71dfb8f5782
diff --git a/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r2 b/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r2
new file mode 100644
index 000000000000..21abf2152216
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/rabbitmq_exporter
+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_=cf2802c3a6b21baf81063bda9886c920
diff --git a/metadata/md5-cache/acct-group/radicale-0-r2 b/metadata/md5-cache/acct-group/radicale-0-r2
deleted file mode 100644
index 7e185cbdb750..000000000000
--- a/metadata/md5-cache/acct-group/radicale-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f71fbf94f4294d9f7a70d625c219a68d
diff --git a/metadata/md5-cache/acct-group/radicale-0-r3 b/metadata/md5-cache/acct-group/radicale-0-r3
new file mode 100644
index 000000000000..8519cac721d4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/radicale-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the www-apps/radicale
+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_=0ebb68193f589ebec8ec262ab74e927f
diff --git a/metadata/md5-cache/acct-group/radius-0-r2 b/metadata/md5-cache/acct-group/radius-0-r2
deleted file mode 100644
index b84987685177..000000000000
--- a/metadata/md5-cache/acct-group/radius-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5916211723b68dc1d63cfc64c21a4d1f
diff --git a/metadata/md5-cache/acct-group/radius-0-r3 b/metadata/md5-cache/acct-group/radius-0-r3
new file mode 100644
index 000000000000..29bea4c658b4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/radius-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=FreeRadius 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_=dca99524bb25e405126fda9a23df94dc
diff --git a/metadata/md5-cache/acct-group/radvd-0-r1 b/metadata/md5-cache/acct-group/radvd-0-r1
deleted file mode 100644
index 7fb211c68b58..000000000000
--- a/metadata/md5-cache/acct-group/radvd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=10bd3ea9505d3fb75459175fd2b4f64c
diff --git a/metadata/md5-cache/acct-group/radvd-0-r2 b/metadata/md5-cache/acct-group/radvd-0-r2
new file mode 100644
index 000000000000..8765cc15907a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/radvd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Router Advertisement 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_=2152a17463965d0d3581664ebbc94153
diff --git a/metadata/md5-cache/acct-group/rbldns-0-r2 b/metadata/md5-cache/acct-group/rbldns-0-r2
deleted file mode 100644
index 23a485bfa28f..000000000000
--- a/metadata/md5-cache/acct-group/rbldns-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1a78b15ec83535837ddb91bcc2c8cdc6
diff --git a/metadata/md5-cache/acct-group/rbldns-0-r3 b/metadata/md5-cache/acct-group/rbldns-0-r3
new file mode 100644
index 000000000000..651a572d5dcb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rbldns-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: rbldns
+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_=f0968c817009a2bda19dc9bec1f7e8e4
diff --git a/metadata/md5-cache/acct-group/rbot-0-r1 b/metadata/md5-cache/acct-group/rbot-0-r1
deleted file mode 100644
index 2090c3b34006..000000000000
--- a/metadata/md5-cache/acct-group/rbot-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=538a1eb6911db561430c21ee0391d817
diff --git a/metadata/md5-cache/acct-group/rbot-0-r2 b/metadata/md5-cache/acct-group/rbot-0-r2
new file mode 100644
index 000000000000..ec636d3753a0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rbot-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-irc/rbot
+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_=1bf1eb58724878cddfdc9082f764a60b
diff --git a/metadata/md5-cache/acct-group/realtime-0-r1 b/metadata/md5-cache/acct-group/realtime-0-r1
deleted file mode 100644
index e9e9d8207888..000000000000
--- a/metadata/md5-cache/acct-group/realtime-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ffea3d60df57d6157c6e251cac0a0a0b
diff --git a/metadata/md5-cache/acct-group/realtime-0-r2 b/metadata/md5-cache/acct-group/realtime-0-r2
new file mode 100644
index 000000000000..c05dadac631f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/realtime-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=realtime privileges 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_=38622d550c4c3c61a9756b36dbc59f2f
diff --git a/metadata/md5-cache/acct-group/redis_exporter-0-r1 b/metadata/md5-cache/acct-group/redis_exporter-0-r1
deleted file mode 100644
index 3e74c23007b6..000000000000
--- a/metadata/md5-cache/acct-group/redis_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=51fca16e7d911ee2fb5147d30786837c
diff --git a/metadata/md5-cache/acct-group/redis_exporter-0-r2 b/metadata/md5-cache/acct-group/redis_exporter-0-r2
new file mode 100644
index 000000000000..b5fa502971f9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redis_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: redis_exporter
+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_=efbb366a34f99d46759459307eb9a016
diff --git a/metadata/md5-cache/acct-group/redmine-0-r2 b/metadata/md5-cache/acct-group/redmine-0-r2
deleted file mode 100644
index 76370a947106..000000000000
--- a/metadata/md5-cache/acct-group/redmine-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a555a3487fbc5e7922c75d419bc8ecbc
diff --git a/metadata/md5-cache/acct-group/redmine-0-r3 b/metadata/md5-cache/acct-group/redmine-0-r3
new file mode 100644
index 000000000000..87b376b0fc5e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redmine-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: redmine
+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_=1b6cd2259358eb2b8fe099cfd04acbe4
diff --git a/metadata/md5-cache/acct-group/redsocks-0-r2 b/metadata/md5-cache/acct-group/redsocks-0-r2
deleted file mode 100644
index bce2a0ae1de4..000000000000
--- a/metadata/md5-cache/acct-group/redsocks-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=72c1f748fad1058099d044c997244dd8
diff --git a/metadata/md5-cache/acct-group/redsocks-0-r3 b/metadata/md5-cache/acct-group/redsocks-0-r3
new file mode 100644
index 000000000000..8fb4046c39f0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redsocks-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-proxy/redsocks
+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_=fb0f1cb5f2b41bda54e139a09e90c64b
diff --git a/metadata/md5-cache/acct-group/reg-0-r2 b/metadata/md5-cache/acct-group/reg-0-r2
deleted file mode 100644
index 0a5765f17b80..000000000000
--- a/metadata/md5-cache/acct-group/reg-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c2be2347ea3305c64ed4908f45a85c0c
diff --git a/metadata/md5-cache/acct-group/reg-0-r3 b/metadata/md5-cache/acct-group/reg-0-r3
new file mode 100644
index 000000000000..c2e56c39a876
--- /dev/null
+++ b/metadata/md5-cache/acct-group/reg-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-containers/reg
+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_=0920c9f178e86b1e997689c7c952c5dd
diff --git a/metadata/md5-cache/acct-group/registry-0-r1 b/metadata/md5-cache/acct-group/registry-0-r1
deleted file mode 100644
index 835984317721..000000000000
--- a/metadata/md5-cache/acct-group/registry-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=63c56297aba731e6c7d96925e08a53c7
diff --git a/metadata/md5-cache/acct-group/registry-0-r2 b/metadata/md5-cache/acct-group/registry-0-r2
new file mode 100644
index 000000000000..5eccacba4f92
--- /dev/null
+++ b/metadata/md5-cache/acct-group/registry-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-containers/docker-registry
+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_=050c3a2afb492538d19e43135ecabd89
diff --git a/metadata/md5-cache/acct-group/render-0-r2 b/metadata/md5-cache/acct-group/render-0-r2
deleted file mode 100644
index 2e8166f390e2..000000000000
--- a/metadata/md5-cache/acct-group/render-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b0a1f9578dda9ea481e30d86fd8908e5
diff --git a/metadata/md5-cache/acct-group/render-0-r3 b/metadata/md5-cache/acct-group/render-0-r3
new file mode 100644
index 000000000000..4fc3a593b1d8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/render-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: render
+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_=587bb78a3ebfe4a631c1bad2fbc920a5
diff --git a/metadata/md5-cache/acct-group/roccat-0-r1 b/metadata/md5-cache/acct-group/roccat-0-r1
deleted file mode 100644
index 012ee7befe6d..000000000000
--- a/metadata/md5-cache/acct-group/roccat-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=43455afa3db570628ea8974ce8515fc5
diff --git a/metadata/md5-cache/acct-group/roccat-0-r2 b/metadata/md5-cache/acct-group/roccat-0-r2
new file mode 100644
index 000000000000..a61fe9693fa1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/roccat-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-apps/roccat-tools
+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_=eaa4aed894854266cd67c914c95b4662
diff --git a/metadata/md5-cache/acct-group/root-0-r1 b/metadata/md5-cache/acct-group/root-0-r1
deleted file mode 100644
index 8ef8ade8982e..000000000000
--- a/metadata/md5-cache/acct-group/root-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=da9101e1e7475c299a31c71974d667a0
diff --git a/metadata/md5-cache/acct-group/root-0-r2 b/metadata/md5-cache/acct-group/root-0-r2
new file mode 100644
index 000000000000..699bfeb26177
--- /dev/null
+++ b/metadata/md5-cache/acct-group/root-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: root
+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_=66f49d66d8b2238778553efa800d508b
diff --git a/metadata/md5-cache/acct-group/rslsync-0-r1 b/metadata/md5-cache/acct-group/rslsync-0-r1
deleted file mode 100644
index f0b7656a80e8..000000000000
--- a/metadata/md5-cache/acct-group/rslsync-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f899dac38c8243080ec427ff355dc612
diff --git a/metadata/md5-cache/acct-group/rslsync-0-r2 b/metadata/md5-cache/acct-group/rslsync-0-r2
new file mode 100644
index 000000000000..449f913388f6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rslsync-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-p2p/resilio-sync
+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_=72694393480c862f8a7c710587155847
diff --git a/metadata/md5-cache/acct-group/rspamd-0-r2 b/metadata/md5-cache/acct-group/rspamd-0-r2
deleted file mode 100644
index d1a05d605268..000000000000
--- a/metadata/md5-cache/acct-group/rspamd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b9c1bdf042fd47a93d2073e1da5487ab
diff --git a/metadata/md5-cache/acct-group/rspamd-0-r3 b/metadata/md5-cache/acct-group/rspamd-0-r3
new file mode 100644
index 000000000000..252484dfdcf8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rspamd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for rspamd - Rapid spam filtering system
+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_=23c3a9d3a666e4ca7a5d165e31dde899
diff --git a/metadata/md5-cache/acct-group/rtkit-0-r2 b/metadata/md5-cache/acct-group/rtkit-0-r2
deleted file mode 100644
index 91986d7ab172..000000000000
--- a/metadata/md5-cache/acct-group/rtkit-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=572cb7ef563a6d12fa04a514ec191c81
diff --git a/metadata/md5-cache/acct-group/rtkit-0-r3 b/metadata/md5-cache/acct-group/rtkit-0-r3
new file mode 100644
index 000000000000..379b8d155684
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rtkit-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the Realtime Policy and Watchdog 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_=d58b6e557cece8f15a520ed5154a0c86
diff --git a/metadata/md5-cache/acct-group/rwhoisd-0-r1 b/metadata/md5-cache/acct-group/rwhoisd-0-r1
deleted file mode 100644
index 91fb00807d47..000000000000
--- a/metadata/md5-cache/acct-group/rwhoisd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3b93e55e3dc0d73038ea511ae677bc9c
diff --git a/metadata/md5-cache/acct-group/rwhoisd-0-r2 b/metadata/md5-cache/acct-group/rwhoisd-0-r2
new file mode 100644
index 000000000000..7da54eaf3e78
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rwhoisd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/rwhoisd
+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_=b9b8a0a71c12a3d75dd35ebf052781b9
diff --git a/metadata/md5-cache/acct-group/sabnzbd-0-r2 b/metadata/md5-cache/acct-group/sabnzbd-0-r2
deleted file mode 100644
index dd9145242cd6..000000000000
--- a/metadata/md5-cache/acct-group/sabnzbd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4fbbb432841aee45dd7fe6049b3c1e9d
diff --git a/metadata/md5-cache/acct-group/sabnzbd-0-r3 b/metadata/md5-cache/acct-group/sabnzbd-0-r3
new file mode 100644
index 000000000000..e4af1d6e1ba8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sabnzbd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=SABnzbd 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_=e2cab43d0afc60251f536c42f4351e01
diff --git a/metadata/md5-cache/acct-group/sagan-0-r1 b/metadata/md5-cache/acct-group/sagan-0-r1
deleted file mode 100644
index 300202f85ba2..000000000000
--- a/metadata/md5-cache/acct-group/sagan-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=05a600b4557ea7d87df76da5853178dc
diff --git a/metadata/md5-cache/acct-group/sagan-0-r2 b/metadata/md5-cache/acct-group/sagan-0-r2
new file mode 100644
index 000000000000..30ae62599e5f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sagan-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the Sagan log monitoring system
+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_=143de106ccd260d1b1bd6564f6c7237a
diff --git a/metadata/md5-cache/acct-group/samplicator-0-r1 b/metadata/md5-cache/acct-group/samplicator-0-r1
deleted file mode 100644
index 399a9464d6f7..000000000000
--- a/metadata/md5-cache/acct-group/samplicator-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fdfa9d1d5a15469ea8f31e38cda95e27
diff --git a/metadata/md5-cache/acct-group/samplicator-0-r2 b/metadata/md5-cache/acct-group/samplicator-0-r2
new file mode 100644
index 000000000000..c36b626234a7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/samplicator-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/samplicator
+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_=9f628be721a7bf20bb2e45b9002b7509
diff --git a/metadata/md5-cache/acct-group/sancp-0-r1 b/metadata/md5-cache/acct-group/sancp-0-r1
deleted file mode 100644
index d9980580a1fc..000000000000
--- a/metadata/md5-cache/acct-group/sancp-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=24ca3908f6b1ddefe72c60815f380d5e
diff --git a/metadata/md5-cache/acct-group/sancp-0-r2 b/metadata/md5-cache/acct-group/sancp-0-r2
new file mode 100644
index 000000000000..43186e4beff3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sancp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-analyzer/sancp
+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_=212ffd2142d8b189d1ed08e3d5604e99
diff --git a/metadata/md5-cache/acct-group/sanlock-0-r2 b/metadata/md5-cache/acct-group/sanlock-0-r2
deleted file mode 100644
index 5fdb7b3a3dad..000000000000
--- a/metadata/md5-cache/acct-group/sanlock-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4ced398dba9cb70ec74e91d2be2e1e2f
diff --git a/metadata/md5-cache/acct-group/sanlock-0-r3 b/metadata/md5-cache/acct-group/sanlock-0-r3
new file mode 100644
index 000000000000..f17f82852774
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sanlock-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=shared storage lock manager
+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_=f091d444d210f1d2526f884b644355da
diff --git a/metadata/md5-cache/acct-group/sauerbraten-0-r2 b/metadata/md5-cache/acct-group/sauerbraten-0-r2
deleted file mode 100644
index 8fe5f84324f8..000000000000
--- a/metadata/md5-cache/acct-group/sauerbraten-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b5cde767075b74e914d026cbb6b14e6d
diff --git a/metadata/md5-cache/acct-group/sauerbraten-0-r3 b/metadata/md5-cache/acct-group/sauerbraten-0-r3
new file mode 100644
index 000000000000..3e256ea19fc5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sauerbraten-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Sauerbraten (FOSS game engine (Cube 2))
+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_=75383d95d897cdaabf7b25a245d73528
diff --git a/metadata/md5-cache/acct-group/scanlogd-0-r1 b/metadata/md5-cache/acct-group/scanlogd-0-r1
deleted file mode 100644
index 9f89ee6ba844..000000000000
--- a/metadata/md5-cache/acct-group/scanlogd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=82c8fa34126730afcebdaf5ba9516af3
diff --git a/metadata/md5-cache/acct-group/scanlogd-0-r2 b/metadata/md5-cache/acct-group/scanlogd-0-r2
new file mode 100644
index 000000000000..4dac4d1230a4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scanlogd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/scanlogd
+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_=3a0543f18018bdafd55dbc648dcadd15
diff --git a/metadata/md5-cache/acct-group/scanner-0-r1 b/metadata/md5-cache/acct-group/scanner-0-r1
deleted file mode 100644
index 4869084d664c..000000000000
--- a/metadata/md5-cache/acct-group/scanner-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=165819c77d9248fd415a13e103b327e9
diff --git a/metadata/md5-cache/acct-group/scanner-0-r2 b/metadata/md5-cache/acct-group/scanner-0-r2
new file mode 100644
index 000000000000..9d96b275a18f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scanner-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for media-gfx/sane-backends
+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_=d1ac87696ed3bedd910ab256e95b6595
diff --git a/metadata/md5-cache/acct-group/scponly-0-r2 b/metadata/md5-cache/acct-group/scponly-0-r2
deleted file mode 100644
index 979a6c663bde..000000000000
--- a/metadata/md5-cache/acct-group/scponly-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ee6fc70e17ae5f3cd0ad1d58431a8e85
diff --git a/metadata/md5-cache/acct-group/scponly-0-r3 b/metadata/md5-cache/acct-group/scponly-0-r3
new file mode 100644
index 000000000000..9dca12eb9d3a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scponly-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for scponly
+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_=46964b36a8b3dfecb0abd9e61b3e707d
diff --git a/metadata/md5-cache/acct-group/scsi-0-r1 b/metadata/md5-cache/acct-group/scsi-0-r1
deleted file mode 100644
index 6cf70a9e7229..000000000000
--- a/metadata/md5-cache/acct-group/scsi-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2293e766024824cd6f97321822720b6a
diff --git a/metadata/md5-cache/acct-group/scsi-0-r2 b/metadata/md5-cache/acct-group/scsi-0-r2
new file mode 100644
index 000000000000..4675431ce9b3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scsi-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: scsi
+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_=84d6266d6edfe75bc785d443de346737
diff --git a/metadata/md5-cache/acct-group/serf-0-r1 b/metadata/md5-cache/acct-group/serf-0-r1
deleted file mode 100644
index 1da466f14ee0..000000000000
--- a/metadata/md5-cache/acct-group/serf-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6a64037a677f9bc09359d8bb35f9570b
diff --git a/metadata/md5-cache/acct-group/serf-0-r2 b/metadata/md5-cache/acct-group/serf-0-r2
new file mode 100644
index 000000000000..479b0fcdc16c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/serf-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/serf
+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_=be5c28257df339d76854bfb0d0850c73
diff --git a/metadata/md5-cache/acct-group/sgx-0-r1 b/metadata/md5-cache/acct-group/sgx-0-r1
deleted file mode 100644
index 37f38329635a..000000000000
--- a/metadata/md5-cache/acct-group/sgx-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=969857ccafaf392d908924e2a7a977dd
diff --git a/metadata/md5-cache/acct-group/sgx-0-r2 b/metadata/md5-cache/acct-group/sgx-0-r2
new file mode 100644
index 000000000000..9995470e5b53
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sgx-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: used for SGX enclaves
+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_=b1238fc06a45d5ce07f2818eff74fdb0
diff --git a/metadata/md5-cache/acct-group/sispmctl-0-r1 b/metadata/md5-cache/acct-group/sispmctl-0-r1
deleted file mode 100644
index d9e71adfad29..000000000000
--- a/metadata/md5-cache/acct-group/sispmctl-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c792e525a3c1a168208fc1dd800d8d6d
diff --git a/metadata/md5-cache/acct-group/sispmctl-0-r2 b/metadata/md5-cache/acct-group/sispmctl-0-r2
new file mode 100644
index 000000000000..b0eaafaa6723
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sispmctl-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sys-power/sispmctl
+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_=8d2d8808e6358e2339653c59be53cb24
diff --git a/metadata/md5-cache/acct-group/sks-0-r1 b/metadata/md5-cache/acct-group/sks-0-r1
deleted file mode 100644
index be774b8d500a..000000000000
--- a/metadata/md5-cache/acct-group/sks-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9036f2f0ce9031c1010f99c615ee46ed
diff --git a/metadata/md5-cache/acct-group/sks-0-r2 b/metadata/md5-cache/acct-group/sks-0-r2
new file mode 100644
index 000000000000..f585d8ed995f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sks-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for SKS OpenPGP keyserver
+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_=1d2b6a505ee16218cea11f3472e5be31
diff --git a/metadata/md5-cache/acct-group/slurm-0-r2 b/metadata/md5-cache/acct-group/slurm-0-r2
deleted file mode 100644
index f5579ed57cce..000000000000
--- a/metadata/md5-cache/acct-group/slurm-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=98eccb5564d19247584ffe2204380d15
diff --git a/metadata/md5-cache/acct-group/slurm-0-r3 b/metadata/md5-cache/acct-group/slurm-0-r3
new file mode 100644
index 000000000000..bb85792dbea9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/slurm-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the slurm - Highly Scalable Resource Manager
+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_=1ab18dbdeeed8b7ed61aeb2a03a46cbc
diff --git a/metadata/md5-cache/acct-group/smmsp-0-r2 b/metadata/md5-cache/acct-group/smmsp-0-r2
deleted file mode 100644
index 6a6912bd5f77..000000000000
--- a/metadata/md5-cache/acct-group/smmsp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3db0bfc890e39321804dc8dd6d4216c0
diff --git a/metadata/md5-cache/acct-group/smmsp-0-r3 b/metadata/md5-cache/acct-group/smmsp-0-r3
new file mode 100644
index 000000000000..6aae2ad3674a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smmsp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: smmsp
+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_=aaa105b85112899a344c069e3545c3a8
diff --git a/metadata/md5-cache/acct-group/sms-0-r1 b/metadata/md5-cache/acct-group/sms-0-r1
deleted file mode 100644
index febf18139e48..000000000000
--- a/metadata/md5-cache/acct-group/sms-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d24b3ca5e372ceed161cd62fa23eabad
diff --git a/metadata/md5-cache/acct-group/sms-0-r2 b/metadata/md5-cache/acct-group/sms-0-r2
new file mode 100644
index 000000000000..9f89d413af5c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sms-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sms
+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_=17200c984c9cd8ac273e8104de00c160
diff --git a/metadata/md5-cache/acct-group/smtpd-0-r2 b/metadata/md5-cache/acct-group/smtpd-0-r2
deleted file mode 100644
index 0cd4305bebb4..000000000000
--- a/metadata/md5-cache/acct-group/smtpd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7dc435aa06bf02b7a3621f499642b15c
diff --git a/metadata/md5-cache/acct-group/smtpd-0-r3 b/metadata/md5-cache/acct-group/smtpd-0-r3
new file mode 100644
index 000000000000..850b0de5fea2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smtpd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=daemon group for smtpd
+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_=c929e13cfe3c6925ac6118532c3520a9
diff --git a/metadata/md5-cache/acct-group/smtpq-0-r2 b/metadata/md5-cache/acct-group/smtpq-0-r2
deleted file mode 100644
index c6d0861ec35d..000000000000
--- a/metadata/md5-cache/acct-group/smtpq-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1f3061fca0f2260b90aaa2d65e5e66f3
diff --git a/metadata/md5-cache/acct-group/smtpq-0-r3 b/metadata/md5-cache/acct-group/smtpq-0-r3
new file mode 100644
index 000000000000..23e1964d36ba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smtpq-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=queue group for smtpd
+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_=61d603808200541436613e4e3c1001ab
diff --git a/metadata/md5-cache/acct-group/snapserver-0-r1 b/metadata/md5-cache/acct-group/snapserver-0-r1
deleted file mode 100644
index f7ffe0fb8a21..000000000000
--- a/metadata/md5-cache/acct-group/snapserver-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e0d402e3edc6b3646f3b0cbba3879ae8
diff --git a/metadata/md5-cache/acct-group/snapserver-0-r2 b/metadata/md5-cache/acct-group/snapserver-0-r2
new file mode 100644
index 000000000000..a6993afa4f89
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snapserver-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Server group for media-sound/snapcast
+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_=4db40450ba007910db0c58d83ba7ee8d
diff --git a/metadata/md5-cache/acct-group/sniproxy-0-r1 b/metadata/md5-cache/acct-group/sniproxy-0-r1
deleted file mode 100644
index bb24fa7f8d32..000000000000
--- a/metadata/md5-cache/acct-group/sniproxy-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=49e3a265c628460ce0ed98f9da6af0c2
diff --git a/metadata/md5-cache/acct-group/sniproxy-0-r2 b/metadata/md5-cache/acct-group/sniproxy-0-r2
new file mode 100644
index 000000000000..20740ec38c0e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sniproxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sniproxy
+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_=60378121c2448dabd7faab4eb8321bae
diff --git a/metadata/md5-cache/acct-group/snmp_exporter-0-r1 b/metadata/md5-cache/acct-group/snmp_exporter-0-r1
deleted file mode 100644
index af5be3e87fa8..000000000000
--- a/metadata/md5-cache/acct-group/snmp_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3c28ef1b58f6d19e68cbe642fb7708f4
diff --git a/metadata/md5-cache/acct-group/snmp_exporter-0-r2 b/metadata/md5-cache/acct-group/snmp_exporter-0-r2
new file mode 100644
index 000000000000..5b24bb723f50
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snmp_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/snmp_exporter
+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_=315c49e67016a439528f8e2504dd519c
diff --git a/metadata/md5-cache/acct-group/snort-0-r1 b/metadata/md5-cache/acct-group/snort-0-r1
deleted file mode 100644
index fca756c750ca..000000000000
--- a/metadata/md5-cache/acct-group/snort-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=77cc8962fdfa8c71cda72fb7f2484e56
diff --git a/metadata/md5-cache/acct-group/snort-0-r2 b/metadata/md5-cache/acct-group/snort-0-r2
new file mode 100644
index 000000000000..e70ad0a90bba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snort-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: snort
+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_=8a7eb973b74a4f6a6eec3a289cfe022d
diff --git a/metadata/md5-cache/acct-group/sobexsrv-0-r1 b/metadata/md5-cache/acct-group/sobexsrv-0-r1
deleted file mode 100644
index 5ae76d34afba..000000000000
--- a/metadata/md5-cache/acct-group/sobexsrv-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9b42b9cc9af48b41391d1ef220b45384
diff --git a/metadata/md5-cache/acct-group/sobexsrv-0-r2 b/metadata/md5-cache/acct-group/sobexsrv-0-r2
new file mode 100644
index 000000000000..52137ed9e097
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sobexsrv-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sobexsrv: a secure OBEX 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_=7e7873d0ba786e1f3b022ff5448d05a5
diff --git a/metadata/md5-cache/acct-group/sockd-0-r1 b/metadata/md5-cache/acct-group/sockd-0-r1
deleted file mode 100644
index 30ad64dd567c..000000000000
--- a/metadata/md5-cache/acct-group/sockd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=881fc7f80b4f4ddbefeb80899858ad5f
diff --git a/metadata/md5-cache/acct-group/sockd-0-r2 b/metadata/md5-cache/acct-group/sockd-0-r2
new file mode 100644
index 000000000000..cf666363e0ea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sockd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-proxy/dante
+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_=088fcc40d7cd234de87b74a00ba6fe55
diff --git a/metadata/md5-cache/acct-group/sogo-0-r2 b/metadata/md5-cache/acct-group/sogo-0-r2
deleted file mode 100644
index 60358eca3dea..000000000000
--- a/metadata/md5-cache/acct-group/sogo-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ab2971ff047202331bc2878828bd1941
diff --git a/metadata/md5-cache/acct-group/sogo-0-r3 b/metadata/md5-cache/acct-group/sogo-0-r3
new file mode 100644
index 000000000000..cf0d850dc736
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sogo-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for gnustep-apps/sogo
+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_=98c6c8af50bc66a086944cadac9387bf
diff --git a/metadata/md5-cache/acct-group/spamd-0-r2 b/metadata/md5-cache/acct-group/spamd-0-r2
deleted file mode 100644
index 77d89e284363..000000000000
--- a/metadata/md5-cache/acct-group/spamd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5828e5ef533a811905d25aaeea3739db
diff --git a/metadata/md5-cache/acct-group/spamd-0-r3 b/metadata/md5-cache/acct-group/spamd-0-r3
new file mode 100644
index 000000000000..683d191cf18d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spamd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the SpamAssassin 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_=b88e94d428e19ac3cb1c59e552620443
diff --git a/metadata/md5-cache/acct-group/spectrum-0-r2 b/metadata/md5-cache/acct-group/spectrum-0-r2
deleted file mode 100644
index c745956ca395..000000000000
--- a/metadata/md5-cache/acct-group/spectrum-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e88d8ff4d3155de3c296e937c1636679
diff --git a/metadata/md5-cache/acct-group/spectrum-0-r3 b/metadata/md5-cache/acct-group/spectrum-0-r3
new file mode 100644
index 000000000000..a2826a3356e9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spectrum-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Spectrum messaging transport
+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_=54142afc3e69aa40e2791176af6f01c9
diff --git a/metadata/md5-cache/acct-group/spire-0-r2 b/metadata/md5-cache/acct-group/spire-0-r2
deleted file mode 100644
index b00b2aeca47b..000000000000
--- a/metadata/md5-cache/acct-group/spire-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5e72334ef813186cba330ad0c9f9776b
diff --git a/metadata/md5-cache/acct-group/spire-0-r3 b/metadata/md5-cache/acct-group/spire-0-r3
new file mode 100644
index 000000000000..f8e6953a2bb8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spire-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: spire
+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_=e91948defee821ba611bcb7e1635dcbe
diff --git a/metadata/md5-cache/acct-group/sqlgrey-0-r2 b/metadata/md5-cache/acct-group/sqlgrey-0-r2
deleted file mode 100644
index ae1af1f6c425..000000000000
--- a/metadata/md5-cache/acct-group/sqlgrey-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=201a66c75e30c4e20596d598c21a10cf
diff --git a/metadata/md5-cache/acct-group/sqlgrey-0-r3 b/metadata/md5-cache/acct-group/sqlgrey-0-r3
new file mode 100644
index 000000000000..1c1cd6f769bd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sqlgrey-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for SQLGrey
+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_=a663fdf771483c2062ff767e1bac0f75
diff --git a/metadata/md5-cache/acct-group/squid-0-r2 b/metadata/md5-cache/acct-group/squid-0-r2
deleted file mode 100644
index 7e3f73437c9f..000000000000
--- a/metadata/md5-cache/acct-group/squid-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b53a4f569a5bc95655a326d6614cb0fc
diff --git a/metadata/md5-cache/acct-group/squid-0-r3 b/metadata/md5-cache/acct-group/squid-0-r3
new file mode 100644
index 000000000000..58c884f40147
--- /dev/null
+++ b/metadata/md5-cache/acct-group/squid-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: squid
+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_=d8546234bbf57fee2bf3d892726ae452
diff --git a/metadata/md5-cache/acct-group/sshd-0-r2 b/metadata/md5-cache/acct-group/sshd-0-r2
deleted file mode 100644
index a61f5b90751c..000000000000
--- a/metadata/md5-cache/acct-group/sshd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a51bc2ae3c98b6437c5209c8038a5a93
diff --git a/metadata/md5-cache/acct-group/sshd-0-r3 b/metadata/md5-cache/acct-group/sshd-0-r3
new file mode 100644
index 000000000000..4af66aa9c8a6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sshd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sshd
+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_=2ac18be362a0ee9f16c958076fb2bdb3
diff --git a/metadata/md5-cache/acct-group/ssmtp-0-r1 b/metadata/md5-cache/acct-group/ssmtp-0-r1
deleted file mode 100644
index efa7dc7b77d0..000000000000
--- a/metadata/md5-cache/acct-group/ssmtp-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=80167f1fb896d68672dda1dc68d969f7
diff --git a/metadata/md5-cache/acct-group/ssmtp-0-r2 b/metadata/md5-cache/acct-group/ssmtp-0-r2
new file mode 100644
index 000000000000..7a0006e0d8bd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ssmtp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-mta/ssmtp
+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_=e350960708ed8629dead59ab6010c346
diff --git a/metadata/md5-cache/acct-group/sstpc-0-r1 b/metadata/md5-cache/acct-group/sstpc-0-r1
deleted file mode 100644
index 3938a1b55132..000000000000
--- a/metadata/md5-cache/acct-group/sstpc-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=667ae42883b06c6ac7fc5c3fe4eec871
diff --git a/metadata/md5-cache/acct-group/sstpc-0-r2 b/metadata/md5-cache/acct-group/sstpc-0-r2
new file mode 100644
index 000000000000..072ba8be6985
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sstpc-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/sstp-client
+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_=dfacc4871aca24f01fafce3754f259c2
diff --git a/metadata/md5-cache/acct-group/stapdev-0-r1 b/metadata/md5-cache/acct-group/stapdev-0-r1
deleted file mode 100644
index c99cb092a5b6..000000000000
--- a/metadata/md5-cache/acct-group/stapdev-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0eb292cb773985f1a32838d0526a6018
diff --git a/metadata/md5-cache/acct-group/stapdev-0-r2 b/metadata/md5-cache/acct-group/stapdev-0-r2
new file mode 100644
index 000000000000..e6125af13e4d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stapdev-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: stapdev
+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_=6600a1c8d8f57a6ed6ac90f333b20f90
diff --git a/metadata/md5-cache/acct-group/stapsys-0-r1 b/metadata/md5-cache/acct-group/stapsys-0-r1
deleted file mode 100644
index 568545d032d0..000000000000
--- a/metadata/md5-cache/acct-group/stapsys-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=af477cbd594d92e200d801b338d20ec9
diff --git a/metadata/md5-cache/acct-group/stapsys-0-r2 b/metadata/md5-cache/acct-group/stapsys-0-r2
new file mode 100644
index 000000000000..abf602a5a927
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stapsys-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: stapsys
+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_=4699a6e5890be7c3a1e9e6ae58e94dd5
diff --git a/metadata/md5-cache/acct-group/stapusr-0-r1 b/metadata/md5-cache/acct-group/stapusr-0-r1
deleted file mode 100644
index 7df234492322..000000000000
--- a/metadata/md5-cache/acct-group/stapusr-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bdd1610e5a5901acbbcd116fa1c197d6
diff --git a/metadata/md5-cache/acct-group/stapusr-0-r2 b/metadata/md5-cache/acct-group/stapusr-0-r2
new file mode 100644
index 000000000000..c9b6ee96bcee
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stapusr-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: stapusr
+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_=381f043178082994deaf754ca722ad75
diff --git a/metadata/md5-cache/acct-group/steamcmd-0-r2 b/metadata/md5-cache/acct-group/steamcmd-0-r2
deleted file mode 100644
index 2f36aaae0e96..000000000000
--- a/metadata/md5-cache/acct-group/steamcmd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=842a8103bdd2a1d406c0e7092369918b
diff --git a/metadata/md5-cache/acct-group/steamcmd-0-r3 b/metadata/md5-cache/acct-group/steamcmd-0-r3
new file mode 100644
index 000000000000..b4cdacbdd155
--- /dev/null
+++ b/metadata/md5-cache/acct-group/steamcmd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the SteamCMD 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_=e3882dfb06b7cc0d9ae6174db7385dd9
diff --git a/metadata/md5-cache/acct-group/stubby-0-r2 b/metadata/md5-cache/acct-group/stubby-0-r2
deleted file mode 100644
index f2399216611e..000000000000
--- a/metadata/md5-cache/acct-group/stubby-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5f954b33fbc0cd6e103fdd8a917c1aa1
diff --git a/metadata/md5-cache/acct-group/stubby-0-r3 b/metadata/md5-cache/acct-group/stubby-0-r3
new file mode 100644
index 000000000000..0ca1759f8920
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stubby-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Stubby program group (from net-dns/getdns)
+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_=556f0e4e6aacf10c0fdb4f6b788a188a
diff --git a/metadata/md5-cache/acct-group/stunnel-0-r2 b/metadata/md5-cache/acct-group/stunnel-0-r2
deleted file mode 100644
index 33c100cf3445..000000000000
--- a/metadata/md5-cache/acct-group/stunnel-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=692001b1b4fb1476fe1ab5574b86730d
diff --git a/metadata/md5-cache/acct-group/stunnel-0-r3 b/metadata/md5-cache/acct-group/stunnel-0-r3
new file mode 100644
index 000000000000..2125f5659b91
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stunnel-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for stunnel
+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_=fb7bbf3dd38794a7c28d90aeff3aaed9
diff --git a/metadata/md5-cache/acct-group/subsonic-0-r1 b/metadata/md5-cache/acct-group/subsonic-0-r1
deleted file mode 100644
index 4dbe02797ad2..000000000000
--- a/metadata/md5-cache/acct-group/subsonic-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=30324e4fa4f713e26dbfc850ce9a02ca
diff --git a/metadata/md5-cache/acct-group/subsonic-0-r2 b/metadata/md5-cache/acct-group/subsonic-0-r2
new file mode 100644
index 000000000000..5b85cf1b34c1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/subsonic-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/subsonic-bin
+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_=d798084c6ad32013bdbcc574025a82c4
diff --git a/metadata/md5-cache/acct-group/supervisor-0-r2 b/metadata/md5-cache/acct-group/supervisor-0-r2
deleted file mode 100644
index 359cb87ab1a0..000000000000
--- a/metadata/md5-cache/acct-group/supervisor-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5ed186d8d28028221855fae5c6af3f8d
diff --git a/metadata/md5-cache/acct-group/supervisor-0-r3 b/metadata/md5-cache/acct-group/supervisor-0-r3
new file mode 100644
index 000000000000..74753a6446bc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/supervisor-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group to grant access to app-admin/supervisor's management
+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_=48aac6b3a7be0e070aa34147d779dcb2
diff --git a/metadata/md5-cache/acct-group/suricata-0-r2 b/metadata/md5-cache/acct-group/suricata-0-r2
deleted file mode 100644
index a1db290040d8..000000000000
--- a/metadata/md5-cache/acct-group/suricata-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=78408a2a43d2e15b20042f1e3ab2307c
diff --git a/metadata/md5-cache/acct-group/suricata-0-r3 b/metadata/md5-cache/acct-group/suricata-0-r3
new file mode 100644
index 000000000000..646ca4988509
--- /dev/null
+++ b/metadata/md5-cache/acct-group/suricata-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Suricata IDS
+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_=a987fa700105a317c2c62f820976b131
diff --git a/metadata/md5-cache/acct-group/svnusers-0-r2 b/metadata/md5-cache/acct-group/svnusers-0-r2
deleted file mode 100644
index 5c6079716cb5..000000000000
--- a/metadata/md5-cache/acct-group/svnusers-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=406e43f8fc12d9e3b4432a9ab49898f9
diff --git a/metadata/md5-cache/acct-group/svnusers-0-r3 b/metadata/md5-cache/acct-group/svnusers-0-r3
new file mode 100644
index 000000000000..708cc8a33902
--- /dev/null
+++ b/metadata/md5-cache/acct-group/svnusers-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: svnusers
+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_=d8e421949bdee9fde4b60304cf80c558
diff --git a/metadata/md5-cache/acct-group/svxlink-0-r1 b/metadata/md5-cache/acct-group/svxlink-0-r1
deleted file mode 100644
index 2d87f710589e..000000000000
--- a/metadata/md5-cache/acct-group/svxlink-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9d6a6cf6e429c9f6259977f4a39d976e
diff --git a/metadata/md5-cache/acct-group/svxlink-0-r2 b/metadata/md5-cache/acct-group/svxlink-0-r2
new file mode 100644
index 000000000000..07519ce1e7c7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/svxlink-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the svxlink 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_=455efe4efeea69065313b0d6cdf59250
diff --git a/metadata/md5-cache/acct-group/syncthing-0-r2 b/metadata/md5-cache/acct-group/syncthing-0-r2
deleted file mode 100644
index ef36abd5f3cc..000000000000
--- a/metadata/md5-cache/acct-group/syncthing-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=44b1d2391a626a29e366c905f38457c4
diff --git a/metadata/md5-cache/acct-group/syncthing-0-r3 b/metadata/md5-cache/acct-group/syncthing-0-r3
new file mode 100644
index 000000000000..1caea855ca7e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/syncthing-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide net-p2p/syncthing 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_=af17f600b43ec39ed52b378fb76cfedb
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0-r2 b/metadata/md5-cache/acct-group/systemd-coredump-0-r2
deleted file mode 100644
index 15e934406c43..000000000000
--- a/metadata/md5-cache/acct-group/systemd-coredump-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9d78c2e9cbf684a332f07fd1323b400b
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0-r3 b/metadata/md5-cache/acct-group/systemd-coredump-0-r3
new file mode 100644
index 000000000000..f33972193661
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-coredump-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-coredump
+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_=be97db27388e62033982b3abd1017717
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0-r2 b/metadata/md5-cache/acct-group/systemd-journal-0-r2
deleted file mode 100644
index ac1b8ee23646..000000000000
--- a/metadata/md5-cache/acct-group/systemd-journal-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=61be895fdd401f2de1b3836a12f26ac4
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0-r3 b/metadata/md5-cache/acct-group/systemd-journal-0-r3
new file mode 100644
index 000000000000..5c1b0240f357
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-journal-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-journal
+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_=71c0f53c959c084e950cd4336942da0c
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r2 b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r2
deleted file mode 100644
index 684564ab456e..000000000000
--- a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1416b3e3792c6f85932e4bf0c3381515
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r3 b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r3
new file mode 100644
index 000000000000..41a247e9ecca
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-journal-remote
+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_=5b8aaa58c223e716a07e4449c35a5adc
diff --git a/metadata/md5-cache/acct-group/systemd-network-0-r2 b/metadata/md5-cache/acct-group/systemd-network-0-r2
deleted file mode 100644
index ae16da4928d4..000000000000
--- a/metadata/md5-cache/acct-group/systemd-network-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4f196111f74bfecfab4c9f639b49ecae
diff --git a/metadata/md5-cache/acct-group/systemd-network-0-r3 b/metadata/md5-cache/acct-group/systemd-network-0-r3
new file mode 100644
index 000000000000..c1582689b319
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-network-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-network
+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_=58faa55211918e56f0a6803af3526fec
diff --git a/metadata/md5-cache/acct-group/systemd-oom-0-r1 b/metadata/md5-cache/acct-group/systemd-oom-0-r1
deleted file mode 100644
index ec1d2e64f710..000000000000
--- a/metadata/md5-cache/acct-group/systemd-oom-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b44d29df3dd76751028b099a6085a5d5
diff --git a/metadata/md5-cache/acct-group/systemd-oom-0-r2 b/metadata/md5-cache/acct-group/systemd-oom-0-r2
new file mode 100644
index 000000000000..aadf4cff8a7a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-oom-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-oom
+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_=cd3337e2172b46675dd3e6368d572a5b
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0-r2 b/metadata/md5-cache/acct-group/systemd-resolve-0-r2
deleted file mode 100644
index 72cc28c8f6c7..000000000000
--- a/metadata/md5-cache/acct-group/systemd-resolve-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3b288d77ff20e1e79bc0e8b2a9ca2423
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0-r3 b/metadata/md5-cache/acct-group/systemd-resolve-0-r3
new file mode 100644
index 000000000000..efdc71592f74
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-resolve-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-resolve
+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_=3dfdde01ebb2a25c272d2ba634b4462a
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0-r2 b/metadata/md5-cache/acct-group/systemd-timesync-0-r2
deleted file mode 100644
index a6fcf36da1da..000000000000
--- a/metadata/md5-cache/acct-group/systemd-timesync-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=130dc85e1fce659a0cb3a7643b088501
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0-r3 b/metadata/md5-cache/acct-group/systemd-timesync-0-r3
new file mode 100644
index 000000000000..59718997fae0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-timesync-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-timesync
+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_=b65f49708d4cadd16cb29400abead414
diff --git a/metadata/md5-cache/acct-group/tape-0-r2 b/metadata/md5-cache/acct-group/tape-0-r2
deleted file mode 100644
index 3c1eb8e4001a..000000000000
--- a/metadata/md5-cache/acct-group/tape-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e1e6d1e741ddc52513d75aba12d33110
diff --git a/metadata/md5-cache/acct-group/tape-0-r3 b/metadata/md5-cache/acct-group/tape-0-r3
new file mode 100644
index 000000000000..2c8bf2a15663
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tape-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: tape
+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_=787ac4fae5a57a2c4a31c48d959244f0
diff --git a/metadata/md5-cache/acct-group/taskd-0-r1 b/metadata/md5-cache/acct-group/taskd-0-r1
deleted file mode 100644
index cb48ddae039e..000000000000
--- a/metadata/md5-cache/acct-group/taskd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d33c960cf02f90c77697170866f63f4e
diff --git a/metadata/md5-cache/acct-group/taskd-0-r2 b/metadata/md5-cache/acct-group/taskd-0-r2
new file mode 100644
index 000000000000..c9baa70c118e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/taskd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/taskd
+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_=5da4a898bc9778af9cd2766747dc9093
diff --git a/metadata/md5-cache/acct-group/teamspeak-0-r2 b/metadata/md5-cache/acct-group/teamspeak-0-r2
deleted file mode 100644
index c93dce76726d..000000000000
--- a/metadata/md5-cache/acct-group/teamspeak-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8052b569d6e7e0b6b2344c96cb67559f
diff --git a/metadata/md5-cache/acct-group/teamspeak-0-r3 b/metadata/md5-cache/acct-group/teamspeak-0-r3
new file mode 100644
index 000000000000..f285099cf0b1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/teamspeak-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the TeamSpeak 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_=cf16e46c9c3800d508a1f6c09091a93f
diff --git a/metadata/md5-cache/acct-group/telegraf-0-r2 b/metadata/md5-cache/acct-group/telegraf-0-r2
deleted file mode 100644
index d6b7ddd90421..000000000000
--- a/metadata/md5-cache/acct-group/telegraf-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3ef4620b3c355120f57fe5df3a247f0e
diff --git a/metadata/md5-cache/acct-group/telegraf-0-r3 b/metadata/md5-cache/acct-group/telegraf-0-r3
new file mode 100644
index 000000000000..70a2e837a0b6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/telegraf-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: telegraf
+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_=a49b5d8812ef329a85934bfb01db84f5
diff --git a/metadata/md5-cache/acct-group/tenshi-0-r1 b/metadata/md5-cache/acct-group/tenshi-0-r1
deleted file mode 100644
index 1e0e903838c8..000000000000
--- a/metadata/md5-cache/acct-group/tenshi-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b4e37c73e682bf527308155c12eb582d
diff --git a/metadata/md5-cache/acct-group/tenshi-0-r2 b/metadata/md5-cache/acct-group/tenshi-0-r2
new file mode 100644
index 000000000000..42c2e0d1ad04
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tenshi-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-admin/tenshi
+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_=ac4e68c4b5821ec472e3630158b7b5bd
diff --git a/metadata/md5-cache/acct-group/tinyproxy-0-r1 b/metadata/md5-cache/acct-group/tinyproxy-0-r1
deleted file mode 100644
index b8adbe61b868..000000000000
--- a/metadata/md5-cache/acct-group/tinyproxy-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d0c17795bb72d328b36388a5c7b624e2
diff --git a/metadata/md5-cache/acct-group/tinyproxy-0-r2 b/metadata/md5-cache/acct-group/tinyproxy-0-r2
new file mode 100644
index 000000000000..e807fc2d6a5e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tinyproxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-proxy/tinyproxy
+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_=2cb56fb62cd8a86916df3e81829609db
diff --git a/metadata/md5-cache/acct-group/tomcat-0-r1 b/metadata/md5-cache/acct-group/tomcat-0-r1
deleted file mode 100644
index 8626c2a1b032..000000000000
--- a/metadata/md5-cache/acct-group/tomcat-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f558653a65d3e6e5ebfb61186bfa30a1
diff --git a/metadata/md5-cache/acct-group/tomcat-0-r2 b/metadata/md5-cache/acct-group/tomcat-0-r2
new file mode 100644
index 000000000000..d51b5662914b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tomcat-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Apache Tomcat
+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_=d5e4acb29fc0e6e27d853cd2177ba3a2
diff --git a/metadata/md5-cache/acct-group/tor-0-r2 b/metadata/md5-cache/acct-group/tor-0-r2
deleted file mode 100644
index 3c9588070d84..000000000000
--- a/metadata/md5-cache/acct-group/tor-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2a242db27159895f7726f4b346d22119
diff --git a/metadata/md5-cache/acct-group/tor-0-r3 b/metadata/md5-cache/acct-group/tor-0-r3
new file mode 100644
index 000000000000..7ec80ce1416f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tor-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for tor 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_=019a9a2e8ee8fdd193b8b62d0c7d0e73
diff --git a/metadata/md5-cache/acct-group/tox-0-r2 b/metadata/md5-cache/acct-group/tox-0-r2
deleted file mode 100644
index 30e3823d7877..000000000000
--- a/metadata/md5-cache/acct-group/tox-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=aa1458a7642f44b44c65f0c7cc12bb07
diff --git a/metadata/md5-cache/acct-group/tox-0-r3 b/metadata/md5-cache/acct-group/tox-0-r3
new file mode 100644
index 000000000000..b212665311c2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tox-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group management for package net-libs/tox
+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_=7390f76815032e1d565405352e89f1db
diff --git a/metadata/md5-cache/acct-group/transmission-0-r2 b/metadata/md5-cache/acct-group/transmission-0-r2
deleted file mode 100644
index 3d49091f36eb..000000000000
--- a/metadata/md5-cache/acct-group/transmission-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=38dde80de4f492afbbe3e7a780ed12be
diff --git a/metadata/md5-cache/acct-group/transmission-0-r3 b/metadata/md5-cache/acct-group/transmission-0-r3
new file mode 100644
index 000000000000..fa62cc7107ec
--- /dev/null
+++ b/metadata/md5-cache/acct-group/transmission-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: transmission
+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_=1a6560dba8f60bdc0c48796e0fc6f01a
diff --git a/metadata/md5-cache/acct-group/trickster-0-r1 b/metadata/md5-cache/acct-group/trickster-0-r1
deleted file mode 100644
index ccec0175851f..000000000000
--- a/metadata/md5-cache/acct-group/trickster-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f083401dd7e72db17a24178173022f28
diff --git a/metadata/md5-cache/acct-group/trickster-0-r2 b/metadata/md5-cache/acct-group/trickster-0-r2
new file mode 100644
index 000000000000..2e5fd7d7a7d0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/trickster-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/trickster
+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_=a1cb62a48a76b3873a6ade4033462a29
diff --git a/metadata/md5-cache/acct-group/trojan-0-r1 b/metadata/md5-cache/acct-group/trojan-0-r1
deleted file mode 100644
index 0c2b5667c833..000000000000
--- a/metadata/md5-cache/acct-group/trojan-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8ee693abd8f9afb1f9e629cd7a0ae9b1
diff --git a/metadata/md5-cache/acct-group/trojan-0-r2 b/metadata/md5-cache/acct-group/trojan-0-r2
new file mode 100644
index 000000000000..bd34e3b9b997
--- /dev/null
+++ b/metadata/md5-cache/acct-group/trojan-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: trojan
+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_=7c47222d39b7998f9dae4a55c1f7784c
diff --git a/metadata/md5-cache/acct-group/tsm-0-r2 b/metadata/md5-cache/acct-group/tsm-0-r2
deleted file mode 100644
index f2d073cba37f..000000000000
--- a/metadata/md5-cache/acct-group/tsm-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=84e14400115b637e93d066b2e7c173ca
diff --git a/metadata/md5-cache/acct-group/tsm-0-r3 b/metadata/md5-cache/acct-group/tsm-0-r3
new file mode 100644
index 000000000000..d91c382bd517
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tsm-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: tsm
+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_=265677adbec49bdb7537537216193620
diff --git a/metadata/md5-cache/acct-group/tss-0-r2 b/metadata/md5-cache/acct-group/tss-0-r2
deleted file mode 100644
index 4e992543fbcc..000000000000
--- a/metadata/md5-cache/acct-group/tss-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a5a79800b3c446138ae30b1a67af6894
diff --git a/metadata/md5-cache/acct-group/tss-0-r3 b/metadata/md5-cache/acct-group/tss-0-r3
new file mode 100644
index 000000000000..338fc1729c67
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tss-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Trusted Software Stack for TPMs 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_=8f94956a2f02f0dff6938c0b4f584f46
diff --git a/metadata/md5-cache/acct-group/ttrssd-0-r1 b/metadata/md5-cache/acct-group/ttrssd-0-r1
deleted file mode 100644
index 7e31f94c6387..000000000000
--- a/metadata/md5-cache/acct-group/ttrssd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7585e9be93b71d0ef4695d3fc300ad3c
diff --git a/metadata/md5-cache/acct-group/ttrssd-0-r2 b/metadata/md5-cache/acct-group/ttrssd-0-r2
new file mode 100644
index 000000000000..36abe27d60d5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ttrssd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for www-apps/tt-rss
+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_=54f093c436a53ed89ccba514b4cccd73
diff --git a/metadata/md5-cache/acct-group/tty-0-r2 b/metadata/md5-cache/acct-group/tty-0-r2
deleted file mode 100644
index a4134341fb4f..000000000000
--- a/metadata/md5-cache/acct-group/tty-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3b125a0a82ad911b4872a997c20989a0
diff --git a/metadata/md5-cache/acct-group/tty-0-r3 b/metadata/md5-cache/acct-group/tty-0-r3
new file mode 100644
index 000000000000..4a902de14a6f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tty-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: tty
+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_=23bfe2a654b34dd0d8697b175f52209a
diff --git a/metadata/md5-cache/acct-group/turnserver-0-r2 b/metadata/md5-cache/acct-group/turnserver-0-r2
deleted file mode 100644
index bbaca6f0733a..000000000000
--- a/metadata/md5-cache/acct-group/turnserver-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0d10f9994cf128f686644d974122e926
diff --git a/metadata/md5-cache/acct-group/turnserver-0-r3 b/metadata/md5-cache/acct-group/turnserver-0-r3
new file mode 100644
index 000000000000..cb798fe06851
--- /dev/null
+++ b/metadata/md5-cache/acct-group/turnserver-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for a turn server like coturn
+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_=cecc7653b6a4ae5e5645236578b13b71
diff --git a/metadata/md5-cache/acct-group/ubridge-0-r2 b/metadata/md5-cache/acct-group/ubridge-0-r2
deleted file mode 100644
index 8eaa3f8fd025..000000000000
--- a/metadata/md5-cache/acct-group/ubridge-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c9ee2ea4179315dced0ed3a832eb29fe
diff --git a/metadata/md5-cache/acct-group/ubridge-0-r3 b/metadata/md5-cache/acct-group/ubridge-0-r3
new file mode 100644
index 000000000000..dab1a6233bec
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ubridge-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/ubridge
+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_=1517e60f57b128c2b555192c10ad5748
diff --git a/metadata/md5-cache/acct-group/ulogd-0-r1 b/metadata/md5-cache/acct-group/ulogd-0-r1
deleted file mode 100644
index 7c72f9893e49..000000000000
--- a/metadata/md5-cache/acct-group/ulogd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3d84bfdffa7f0eb0a9c21bf9f0273b40
diff --git a/metadata/md5-cache/acct-group/ulogd-0-r2 b/metadata/md5-cache/acct-group/ulogd-0-r2
new file mode 100644
index 000000000000..b4dff571643f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ulogd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for ulogd
+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_=ff484028e7c79f7f975e5c051a8d36e3
diff --git a/metadata/md5-cache/acct-group/unbound-0-r2 b/metadata/md5-cache/acct-group/unbound-0-r2
deleted file mode 100644
index c530004e2c27..000000000000
--- a/metadata/md5-cache/acct-group/unbound-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3f3ee0217357867ca06d0b1b471c8adf
diff --git a/metadata/md5-cache/acct-group/unbound-0-r3 b/metadata/md5-cache/acct-group/unbound-0-r3
new file mode 100644
index 000000000000..0a2236e27064
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unbound-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=unbound 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_=0f834c15ec2d79f688e58191c56b4f55
diff --git a/metadata/md5-cache/acct-group/unbound-telemetry-0-r1 b/metadata/md5-cache/acct-group/unbound-telemetry-0-r1
deleted file mode 100644
index 076c66db5dab..000000000000
--- a/metadata/md5-cache/acct-group/unbound-telemetry-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=436c9a18384fb0b6512c45ce5eb6d6b2
diff --git a/metadata/md5-cache/acct-group/unbound-telemetry-0-r2 b/metadata/md5-cache/acct-group/unbound-telemetry-0-r2
new file mode 100644
index 000000000000..d4ff44770d43
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unbound-telemetry-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: unbound-telemetry
+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_=c5e96c11908ee5030c8a71d1c8e66cc6
diff --git a/metadata/md5-cache/acct-group/unifi-0-r2 b/metadata/md5-cache/acct-group/unifi-0-r2
deleted file mode 100644
index adcef706a9ac..000000000000
--- a/metadata/md5-cache/acct-group/unifi-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f459ae81844b7f7d0e9903b2782c8a1f
diff --git a/metadata/md5-cache/acct-group/unifi-0-r3 b/metadata/md5-cache/acct-group/unifi-0-r3
new file mode 100644
index 000000000000..dd29708f4373
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unifi-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the UniFi controller
+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_=2b3209ce5874828f04183cfb712b05db
diff --git a/metadata/md5-cache/acct-group/unifi-video-0-r1 b/metadata/md5-cache/acct-group/unifi-video-0-r1
deleted file mode 100644
index a770c9372e7e..000000000000
--- a/metadata/md5-cache/acct-group/unifi-video-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=42fe7bde787ff2daab829ecc4c87a3ab
diff --git a/metadata/md5-cache/acct-group/unifi-video-0-r2 b/metadata/md5-cache/acct-group/unifi-video-0-r2
new file mode 100644
index 000000000000..8aa594413470
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unifi-video-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Unifi Video
+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_=047c5512a68b77e7e49c12fd1364c289
diff --git a/metadata/md5-cache/acct-group/upmpdcli-0-r1 b/metadata/md5-cache/acct-group/upmpdcli-0-r1
deleted file mode 100644
index ebf3379226a1..000000000000
--- a/metadata/md5-cache/acct-group/upmpdcli-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=27f70b34d37b0ef7cbb705ef33e8016b
diff --git a/metadata/md5-cache/acct-group/upmpdcli-0-r2 b/metadata/md5-cache/acct-group/upmpdcli-0-r2
new file mode 100644
index 000000000000..00fc1c8c6f6d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/upmpdcli-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for upmpdcli
+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_=0d496f47063fe1524f91da53ce21c985
diff --git a/metadata/md5-cache/acct-group/usb-0-r2 b/metadata/md5-cache/acct-group/usb-0-r2
deleted file mode 100644
index 8d717ec3961c..000000000000
--- a/metadata/md5-cache/acct-group/usb-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2496e666565227d662bc71597d2683e9
diff --git a/metadata/md5-cache/acct-group/usb-0-r3 b/metadata/md5-cache/acct-group/usb-0-r3
new file mode 100644
index 000000000000..6753f24a6a8c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/usb-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: usb
+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_=ac1a958770e34cadaa4ca4c193ea4209
diff --git a/metadata/md5-cache/acct-group/users-0-r1 b/metadata/md5-cache/acct-group/users-0-r1
deleted file mode 100644
index 052a88f7b913..000000000000
--- a/metadata/md5-cache/acct-group/users-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f210c3502abffd0d7d3e434f8bcd4d9b
diff --git a/metadata/md5-cache/acct-group/users-0-r2 b/metadata/md5-cache/acct-group/users-0-r2
new file mode 100644
index 000000000000..0612bf584dcd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/users-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: users
+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_=afd638730f616eaa2c6b4b90c1107ad7
diff --git a/metadata/md5-cache/acct-group/ushare-0-r1 b/metadata/md5-cache/acct-group/ushare-0-r1
deleted file mode 100644
index 342e3e1aab42..000000000000
--- a/metadata/md5-cache/acct-group/ushare-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cc2cf37fb4ac1f8ad0ae5bd481f1bb22
diff --git a/metadata/md5-cache/acct-group/ushare-0-r2 b/metadata/md5-cache/acct-group/ushare-0-r2
new file mode 100644
index 000000000000..e9764482c069
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ushare-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for uShare
+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_=9384dcc45824105f2234f8660e366029
diff --git a/metadata/md5-cache/acct-group/utmp-0-r2 b/metadata/md5-cache/acct-group/utmp-0-r2
deleted file mode 100644
index 6fdb5548feac..000000000000
--- a/metadata/md5-cache/acct-group/utmp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2e940304c310971624daa5ceb2f602de
diff --git a/metadata/md5-cache/acct-group/utmp-0-r3 b/metadata/md5-cache/acct-group/utmp-0-r3
new file mode 100644
index 000000000000..a9ea2a936335
--- /dev/null
+++ b/metadata/md5-cache/acct-group/utmp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: utmp
+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_=ac3266d1a04edf55c37e77b0abba44be
diff --git a/metadata/md5-cache/acct-group/uucp-0-r2 b/metadata/md5-cache/acct-group/uucp-0-r2
deleted file mode 100644
index 9315340a5aa2..000000000000
--- a/metadata/md5-cache/acct-group/uucp-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=377e8600972fe08042100bd840b5e007
diff --git a/metadata/md5-cache/acct-group/uucp-0-r3 b/metadata/md5-cache/acct-group/uucp-0-r3
new file mode 100644
index 000000000000..49b7ad729496
--- /dev/null
+++ b/metadata/md5-cache/acct-group/uucp-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: uucp
+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_=e2864e87dccbff4a61279e41b274175d
diff --git a/metadata/md5-cache/acct-group/uwsgi_exporter-0-r1 b/metadata/md5-cache/acct-group/uwsgi_exporter-0-r1
deleted file mode 100644
index b24979ca12cd..000000000000
--- a/metadata/md5-cache/acct-group/uwsgi_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8609c2b62c4fe41bbcc638cf8498faf1
diff --git a/metadata/md5-cache/acct-group/uwsgi_exporter-0-r2 b/metadata/md5-cache/acct-group/uwsgi_exporter-0-r2
new file mode 100644
index 000000000000..3e1677b31aff
--- /dev/null
+++ b/metadata/md5-cache/acct-group/uwsgi_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/uwsgi_exporter
+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_=e92d84ec7b2c9fc11d49f077b5e1ebd6
diff --git a/metadata/md5-cache/acct-group/vacation-0-r1 b/metadata/md5-cache/acct-group/vacation-0-r1
deleted file mode 100644
index 4cb1be67d767..000000000000
--- a/metadata/md5-cache/acct-group/vacation-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=37fbc6a8bf582dfdabad68a378b698ed
diff --git a/metadata/md5-cache/acct-group/vacation-0-r2 b/metadata/md5-cache/acct-group/vacation-0-r2
new file mode 100644
index 000000000000..b8a86f28e62e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vacation-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/postfixadmin
+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_=849599640e384cd4dc2c0a056e9a4b81
diff --git a/metadata/md5-cache/acct-group/varnish-0-r2 b/metadata/md5-cache/acct-group/varnish-0-r2
deleted file mode 100644
index 3e5b13ee327f..000000000000
--- a/metadata/md5-cache/acct-group/varnish-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4c8792f10a7f41b3519b5dc912145a32
diff --git a/metadata/md5-cache/acct-group/varnish-0-r3 b/metadata/md5-cache/acct-group/varnish-0-r3
new file mode 100644
index 000000000000..5a650f876733
--- /dev/null
+++ b/metadata/md5-cache/acct-group/varnish-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for varnish
+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_=db48e15050049cf2e430d545c9c50236
diff --git a/metadata/md5-cache/acct-group/vault-0-r2 b/metadata/md5-cache/acct-group/vault-0-r2
deleted file mode 100644
index cd49b80d6ee7..000000000000
--- a/metadata/md5-cache/acct-group/vault-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f46e3071783a02a18ee8e56bf1ad9930
diff --git a/metadata/md5-cache/acct-group/vault-0-r3 b/metadata/md5-cache/acct-group/vault-0-r3
new file mode 100644
index 000000000000..373c11098b3f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vault-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vault
+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_=293719a30ec9ca236410328fc610b544
diff --git a/metadata/md5-cache/acct-group/vault_exporter-0-r1 b/metadata/md5-cache/acct-group/vault_exporter-0-r1
deleted file mode 100644
index a0c15d2e2e85..000000000000
--- a/metadata/md5-cache/acct-group/vault_exporter-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=156476c4c3301bbc7e9c56b7b0728b55
diff --git a/metadata/md5-cache/acct-group/vault_exporter-0-r2 b/metadata/md5-cache/acct-group/vault_exporter-0-r2
new file mode 100644
index 000000000000..c7ee2301c233
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vault_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/vault_exporter
+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_=4e8ea4ea3c0fa43bc2677268c8985a44
diff --git a/metadata/md5-cache/acct-group/vboxguest-0-r2 b/metadata/md5-cache/acct-group/vboxguest-0-r2
deleted file mode 100644
index 62ccc1f82b55..000000000000
--- a/metadata/md5-cache/acct-group/vboxguest-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2a114c3e5ab7df66a2a3d00df8863860
diff --git a/metadata/md5-cache/acct-group/vboxguest-0-r3 b/metadata/md5-cache/acct-group/vboxguest-0-r3
new file mode 100644
index 000000000000..137f55eab482
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vboxguest-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vboxguest
+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_=299bd32b29915cd6bf5f894aa5792aea
diff --git a/metadata/md5-cache/acct-group/vboxsf-0-r2 b/metadata/md5-cache/acct-group/vboxsf-0-r2
deleted file mode 100644
index 2d4cd618a2ce..000000000000
--- a/metadata/md5-cache/acct-group/vboxsf-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6463d08fc655fb31383d60dfb8cca1f2
diff --git a/metadata/md5-cache/acct-group/vboxsf-0-r3 b/metadata/md5-cache/acct-group/vboxsf-0-r3
new file mode 100644
index 000000000000..2cb69c744713
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vboxsf-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vboxsf
+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_=a9f71b0f5bb99b03071d2cc3ac35b069
diff --git a/metadata/md5-cache/acct-group/vboxusers-0-r2 b/metadata/md5-cache/acct-group/vboxusers-0-r2
deleted file mode 100644
index 809d2f18327d..000000000000
--- a/metadata/md5-cache/acct-group/vboxusers-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=109e630d185b4c08cc9522261161c3e5
diff --git a/metadata/md5-cache/acct-group/vboxusers-0-r3 b/metadata/md5-cache/acct-group/vboxusers-0-r3
new file mode 100644
index 000000000000..7e469c56d205
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vboxusers-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vboxusers
+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_=e4a311f4d67a34702fe6a41293b7a3ee
diff --git a/metadata/md5-cache/acct-group/vdr-0-r2 b/metadata/md5-cache/acct-group/vdr-0-r2
deleted file mode 100644
index 961e62064455..000000000000
--- a/metadata/md5-cache/acct-group/vdr-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=54c7d735d90fdfff1ace94aa5fe2605d
diff --git a/metadata/md5-cache/acct-group/vdr-0-r3 b/metadata/md5-cache/acct-group/vdr-0-r3
new file mode 100644
index 000000000000..fa32261de8be
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vdr-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the VDR (VideoDiskRecorder)
+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_=a4042c1018e4e4883d0ac6c87148dc17
diff --git a/metadata/md5-cache/acct-group/vdradmin-0-r2 b/metadata/md5-cache/acct-group/vdradmin-0-r2
deleted file mode 100644
index e1345b4b9ea5..000000000000
--- a/metadata/md5-cache/acct-group/vdradmin-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=743ad2aa3fba1479efb1f9f65f3d9fba
diff --git a/metadata/md5-cache/acct-group/vdradmin-0-r3 b/metadata/md5-cache/acct-group/vdradmin-0-r3
new file mode 100644
index 000000000000..863f949f915b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vdradmin-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for www-misc/vdradmin-am
+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_=a0d3b4d2e916f0005a6372785f4bee08
diff --git a/metadata/md5-cache/acct-group/video-0-r2 b/metadata/md5-cache/acct-group/video-0-r2
deleted file mode 100644
index 992bc8f4ea25..000000000000
--- a/metadata/md5-cache/acct-group/video-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f12d76f0aa770ae9772b4d1008592b0d
diff --git a/metadata/md5-cache/acct-group/video-0-r3 b/metadata/md5-cache/acct-group/video-0-r3
new file mode 100644
index 000000000000..f819afc3b8b5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/video-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: video
+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_=1401fda768bcaed50852415c5fa09324
diff --git a/metadata/md5-cache/acct-group/vlock-0-r1 b/metadata/md5-cache/acct-group/vlock-0-r1
deleted file mode 100644
index e4a226bbcd5c..000000000000
--- a/metadata/md5-cache/acct-group/vlock-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7910b61e7694886f3188e5abc37dbc7d
diff --git a/metadata/md5-cache/acct-group/vlock-0-r2 b/metadata/md5-cache/acct-group/vlock-0-r2
new file mode 100644
index 000000000000..f49353a6fafe
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vlock-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/vlock
+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_=ef9eecbedfd7b621e94a10f8e8eb0ae9
diff --git a/metadata/md5-cache/acct-group/vpopmail-0-r2 b/metadata/md5-cache/acct-group/vpopmail-0-r2
deleted file mode 100644
index 3974bdb36dd3..000000000000
--- a/metadata/md5-cache/acct-group/vpopmail-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7d9a5d97d998f63fe9cccdc2917679e8
diff --git a/metadata/md5-cache/acct-group/vpopmail-0-r3 b/metadata/md5-cache/acct-group/vpopmail-0-r3
new file mode 100644
index 000000000000..02dff2b82eb3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vpopmail-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vpopmail
+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_=e774cfa2084cb1a21e5cc95b406b58e5
diff --git a/metadata/md5-cache/acct-group/wesnoth-0-r2 b/metadata/md5-cache/acct-group/wesnoth-0-r2
deleted file mode 100644
index b60e0d04c838..000000000000
--- a/metadata/md5-cache/acct-group/wesnoth-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bcf9219df87e14c564102f6cf7ecb4e6
diff --git a/metadata/md5-cache/acct-group/wesnoth-0-r3 b/metadata/md5-cache/acct-group/wesnoth-0-r3
new file mode 100644
index 000000000000..128fb5052126
--- /dev/null
+++ b/metadata/md5-cache/acct-group/wesnoth-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: wesnoth
+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_=aa91982ac2ea09cae9f9bcc5fd034cd7
diff --git a/metadata/md5-cache/acct-group/wheel-0-r2 b/metadata/md5-cache/acct-group/wheel-0-r2
deleted file mode 100644
index 9038f251ea2e..000000000000
--- a/metadata/md5-cache/acct-group/wheel-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=50ce75ca5c841d27309e82208988b29f
diff --git a/metadata/md5-cache/acct-group/wheel-0-r3 b/metadata/md5-cache/acct-group/wheel-0-r3
new file mode 100644
index 000000000000..d5fc8016950d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/wheel-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: wheel
+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_=e53272e3842ccaf46d65d3a9201e3d73
diff --git a/metadata/md5-cache/acct-group/wwwoffle-0-r1 b/metadata/md5-cache/acct-group/wwwoffle-0-r1
deleted file mode 100644
index d0218dd6760d..000000000000
--- a/metadata/md5-cache/acct-group/wwwoffle-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8d142b63725bbdc901aebe24e00cc7c7
diff --git a/metadata/md5-cache/acct-group/wwwoffle-0-r2 b/metadata/md5-cache/acct-group/wwwoffle-0-r2
new file mode 100644
index 000000000000..d852ec6cb5f4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/wwwoffle-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-proxy/wwwoffle
+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_=2d70c7742c6626f586ced4aea0b21962
diff --git a/metadata/md5-cache/acct-group/x2goprint-0-r2 b/metadata/md5-cache/acct-group/x2goprint-0-r2
deleted file mode 100644
index d69e3eefedd4..000000000000
--- a/metadata/md5-cache/acct-group/x2goprint-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ba48c64ad23be5644caec2f04e4c8c8e
diff --git a/metadata/md5-cache/acct-group/x2goprint-0-r3 b/metadata/md5-cache/acct-group/x2goprint-0-r3
new file mode 100644
index 000000000000..ec205cb0b1f8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/x2goprint-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/x2goserver
+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_=0ea995330d10ceb2094621f385f38d13
diff --git a/metadata/md5-cache/acct-group/x2gouser-0-r2 b/metadata/md5-cache/acct-group/x2gouser-0-r2
deleted file mode 100644
index d26a9d6e11f2..000000000000
--- a/metadata/md5-cache/acct-group/x2gouser-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e25e479b114a4fd371fca7c0411e972f
diff --git a/metadata/md5-cache/acct-group/x2gouser-0-r3 b/metadata/md5-cache/acct-group/x2gouser-0-r3
new file mode 100644
index 000000000000..1230969d7f50
--- /dev/null
+++ b/metadata/md5-cache/acct-group/x2gouser-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/x2goserver
+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_=9463e518b585b3baa36f2844b28985fa
diff --git a/metadata/md5-cache/acct-group/xpra-0-r1 b/metadata/md5-cache/acct-group/xpra-0-r1
deleted file mode 100644
index ce234bf0474f..000000000000
--- a/metadata/md5-cache/acct-group/xpra-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7b261cb5986cb5edee1c85f45b2826ac
diff --git a/metadata/md5-cache/acct-group/xpra-0-r2 b/metadata/md5-cache/acct-group/xpra-0-r2
new file mode 100644
index 000000000000..0a28f518250a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/xpra-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for x11-wm/xpra
+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_=da00ffd44f840afe48547d5e8f5a53e8
diff --git a/metadata/md5-cache/acct-group/xrootd-0-r2 b/metadata/md5-cache/acct-group/xrootd-0-r2
deleted file mode 100644
index 78850cd48960..000000000000
--- a/metadata/md5-cache/acct-group/xrootd-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8646de4db1232a3199dce9b1ec7f7188
diff --git a/metadata/md5-cache/acct-group/xrootd-0-r3 b/metadata/md5-cache/acct-group/xrootd-0-r3
new file mode 100644
index 000000000000..5314a795c37a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/xrootd-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the XRootD 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_=c0b2bc64442743e95c549b862652038e
diff --git a/metadata/md5-cache/acct-group/xwax-0-r1 b/metadata/md5-cache/acct-group/xwax-0-r1
deleted file mode 100644
index 7bda733ea095..000000000000
--- a/metadata/md5-cache/acct-group/xwax-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=67538f9f60611eb3a463b761fea28558
diff --git a/metadata/md5-cache/acct-group/xwax-0-r2 b/metadata/md5-cache/acct-group/xwax-0-r2
new file mode 100644
index 000000000000..6eb09eb149b9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/xwax-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/xwax
+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_=bf447a487c7569110f15bc4c270b4517
diff --git a/metadata/md5-cache/acct-group/zabbix-0-r1 b/metadata/md5-cache/acct-group/zabbix-0-r1
deleted file mode 100644
index 566a106f8c62..000000000000
--- a/metadata/md5-cache/acct-group/zabbix-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=10bf7a1f43e517745b3076db24731237
diff --git a/metadata/md5-cache/acct-group/zabbix-0-r2 b/metadata/md5-cache/acct-group/zabbix-0-r2
new file mode 100644
index 000000000000..06da29783e43
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zabbix-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Zabbix
+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_=948fda5360116a65e90e11677cd7196a
diff --git a/metadata/md5-cache/acct-group/zeppelin-0-r2 b/metadata/md5-cache/acct-group/zeppelin-0-r2
deleted file mode 100644
index 0ca2b97cf25e..000000000000
--- a/metadata/md5-cache/acct-group/zeppelin-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cc8d3c0d6b6eb2284ca6c9be7579ce3c
diff --git a/metadata/md5-cache/acct-group/zeppelin-0-r3 b/metadata/md5-cache/acct-group/zeppelin-0-r3
new file mode 100644
index 000000000000..c95753008341
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zeppelin-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for system-wide www-apps/zeppelin-bin
+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_=732c798a7a38c5b3cf4d184f7a76c3ae
diff --git a/metadata/md5-cache/acct-group/zetcd-0-r1 b/metadata/md5-cache/acct-group/zetcd-0-r1
deleted file mode 100644
index b6d89ef360d5..000000000000
--- a/metadata/md5-cache/acct-group/zetcd-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f20fe0a7917150d2b69a9f5f7b3435ec
diff --git a/metadata/md5-cache/acct-group/zetcd-0-r2 b/metadata/md5-cache/acct-group/zetcd-0-r2
new file mode 100644
index 000000000000..a78e2009efac
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zetcd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sys-cluster/zetcd
+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_=6715ea9cf72f581b082045da5bb02411
diff --git a/metadata/md5-cache/acct-group/ziproxy-0-r1 b/metadata/md5-cache/acct-group/ziproxy-0-r1
deleted file mode 100644
index 1b464642186a..000000000000
--- a/metadata/md5-cache/acct-group/ziproxy-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ebd4c1d7ae2b12ed29dd486fe3de2927
diff --git a/metadata/md5-cache/acct-group/ziproxy-0-r2 b/metadata/md5-cache/acct-group/ziproxy-0-r2
new file mode 100644
index 000000000000..f30a4f356329
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ziproxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ziproxy
+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_=3587475e010fafb410b9123bf8fd7f75
diff --git a/metadata/md5-cache/acct-group/znc-0-r2 b/metadata/md5-cache/acct-group/znc-0-r2
deleted file mode 100644
index 5b2d2bb7edd9..000000000000
--- a/metadata/md5-cache/acct-group/znc-0-r2
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=37d1cbcad8973f8fa8ebbf42072c4a72
diff --git a/metadata/md5-cache/acct-group/znc-0-r3 b/metadata/md5-cache/acct-group/znc-0-r3
new file mode 100644
index 000000000000..95f90d58c19b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/znc-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-irc/znc
+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_=ca32e9df3c35e6683f6ad6ff844a100c
diff --git a/metadata/md5-cache/acct-group/zookeeper-0-r1 b/metadata/md5-cache/acct-group/zookeeper-0-r1
deleted file mode 100644
index 932b23481244..000000000000
--- a/metadata/md5-cache/acct-group/zookeeper-0-r1
+++ /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 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e4fc8a8fde6477ec87024ead9ffc8013
diff --git a/metadata/md5-cache/acct-group/zookeeper-0-r2 b/metadata/md5-cache/acct-group/zookeeper-0-r2
new file mode 100644
index 000000000000..d3e61be33c19
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zookeeper-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-cluster/zookeeper-bin
+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_=e8054cd7e3e0322cea58404eafcb2695
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 38ec93e9aeb6..058fec56b534 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/aerospike-amc-0-r1 b/metadata/md5-cache/acct-user/aerospike-amc-0-r1
deleted file mode 100644
index 435130baa18a..000000000000
--- a/metadata/md5-cache/acct-user/aerospike-amc-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f1778ee07d2bf1ed531b95a967da8200
diff --git a/metadata/md5-cache/acct-user/aerospike-amc-0-r2 b/metadata/md5-cache/acct-user/aerospike-amc-0-r2
new file mode 100644
index 000000000000..2840deb5d4f1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/aerospike-amc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-admin/aerospike-amc-community
+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/aerospike-amc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1ef3ff95c753d8651f21f796755d11b1
diff --git a/metadata/md5-cache/acct-user/airdcppd-0-r2 b/metadata/md5-cache/acct-user/airdcppd-0-r2
deleted file mode 100644
index 7970642a279b..000000000000
--- a/metadata/md5-cache/acct-user/airdcppd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a1041dca20ed8a959fe97e7347c44378
diff --git a/metadata/md5-cache/acct-user/airdcppd-0-r3 b/metadata/md5-cache/acct-user/airdcppd-0-r3
new file mode 100644
index 000000000000..c19ea0f0addf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/airdcppd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/airdcpp-webclient
+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/airdcppd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c5975241ff88ff0c3009d43bd4554199
diff --git a/metadata/md5-cache/acct-user/alertmanager-0-r1 b/metadata/md5-cache/acct-user/alertmanager-0-r1
deleted file mode 100644
index 8664b6364791..000000000000
--- a/metadata/md5-cache/acct-user/alertmanager-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c4ba3090553cc64dd50381369d574dbd
diff --git a/metadata/md5-cache/acct-user/alertmanager-0-r2 b/metadata/md5-cache/acct-user/alertmanager-0-r2
new file mode 100644
index 000000000000..cefdf130d283
--- /dev/null
+++ b/metadata/md5-cache/acct-user/alertmanager-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for alertmanager
+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/alertmanager
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c6860c87fd7e04ab17519b2b1f72b817
diff --git a/metadata/md5-cache/acct-user/alias-0-r2 b/metadata/md5-cache/acct-user/alias-0-r2
deleted file mode 100644
index 78e10c9f8a44..000000000000
--- a/metadata/md5-cache/acct-user/alias-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1b8e51170ec98417e03df7b46671bf05
diff --git a/metadata/md5-cache/acct-user/alias-0-r3 b/metadata/md5-cache/acct-user/alias-0-r3
new file mode 100644
index 000000000000..d71c7319bc3d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/alias-0-r3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/qmail
+DESCRIPTION=alias user for qmail mail delivery
+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/nofiles acct-group/qmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=109b6cfc1d0bcc868716371c5850a10e
diff --git a/metadata/md5-cache/acct-user/amanda-0-r1 b/metadata/md5-cache/acct-user/amanda-0-r1
deleted file mode 100644
index 307cd291225c..000000000000
--- a/metadata/md5-cache/acct-user/amanda-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=128ceb53c4348bdf9101058c5583135b
diff --git a/metadata/md5-cache/acct-user/amanda-0-r2 b/metadata/md5-cache/acct-user/amanda-0-r2
new file mode 100644
index 000000000000..b5ea90053a1a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/amanda-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: amanda
+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/amanda
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c5a3f4ebf49544ca9008f3d531aa62b7
diff --git a/metadata/md5-cache/acct-user/amavis-0-r2 b/metadata/md5-cache/acct-user/amavis-0-r2
deleted file mode 100644
index ccb0b3169fbf..000000000000
--- a/metadata/md5-cache/acct-user/amavis-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f79c4d9e157b9315ef0d3255d27dd56a
diff --git a/metadata/md5-cache/acct-user/amavis-0-r3 b/metadata/md5-cache/acct-user/amavis-0-r3
new file mode 100644
index 000000000000..8504477112bc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/amavis-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/amavisd-new
+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/amavis
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=398b4e249de1ec491175df02166821bd
diff --git a/metadata/md5-cache/acct-user/apt-cacher-ng-0-r1 b/metadata/md5-cache/acct-user/apt-cacher-ng-0-r1
deleted file mode 100644
index 29733aefd06a..000000000000
--- a/metadata/md5-cache/acct-user/apt-cacher-ng-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=df969aae282cb28dfa7dbe7d5a209f42
diff --git a/metadata/md5-cache/acct-user/apt-cacher-ng-0-r2 b/metadata/md5-cache/acct-user/apt-cacher-ng-0-r2
new file mode 100644
index 000000000000..9090d706ac70
--- /dev/null
+++ b/metadata/md5-cache/acct-user/apt-cacher-ng-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for apt-cacher-ng
+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/apt-cacher-ng
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a4d8d7161d0c6e9be9ba72b16611186c
diff --git a/metadata/md5-cache/acct-user/argus-0-r1 b/metadata/md5-cache/acct-user/argus-0-r1
deleted file mode 100644
index 7babdb7d1c7c..000000000000
--- a/metadata/md5-cache/acct-user/argus-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c1d399c72f9e04602d511ec00feea88c
diff --git a/metadata/md5-cache/acct-user/argus-0-r2 b/metadata/md5-cache/acct-user/argus-0-r2
new file mode 100644
index 000000000000..39457c9fcede
--- /dev/null
+++ b/metadata/md5-cache/acct-user/argus-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/argus
+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/argus
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bf27080e87d56220bdb5154c968da808
diff --git a/metadata/md5-cache/acct-user/arpwatch-0-r1 b/metadata/md5-cache/acct-user/arpwatch-0-r1
deleted file mode 100644
index edc7eb338570..000000000000
--- a/metadata/md5-cache/acct-user/arpwatch-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=561ab1d3aa94546f4f5ed14a0f2afc96
diff --git a/metadata/md5-cache/acct-user/arpwatch-0-r2 b/metadata/md5-cache/acct-user/arpwatch-0-r2
new file mode 100644
index 000000000000..e5c099accba4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/arpwatch-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/arpwatch
+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/arpwatch
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5b7601b59c0dc4739efe80fd37282313
diff --git a/metadata/md5-cache/acct-user/aspnet-0-r1 b/metadata/md5-cache/acct-user/aspnet-0-r1
deleted file mode 100644
index 282f87e15072..000000000000
--- a/metadata/md5-cache/acct-user/aspnet-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3772741e7fc0022be7968a0844fa4eb5
diff --git a/metadata/md5-cache/acct-user/aspnet-0-r2 b/metadata/md5-cache/acct-user/aspnet-0-r2
new file mode 100644
index 000000000000..ee058cf0a4aa
--- /dev/null
+++ b/metadata/md5-cache/acct-user/aspnet-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the www-servers/xsp dotnet 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/aspnet
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=30c2a93420bbb333c6fb1b6c9575c604
diff --git a/metadata/md5-cache/acct-user/asterisk-0-r2 b/metadata/md5-cache/acct-user/asterisk-0-r2
deleted file mode 100644
index e5ba3cb7ffc6..000000000000
--- a/metadata/md5-cache/acct-user/asterisk-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=317818ec52f8557e19eb3692f3824c6f
diff --git a/metadata/md5-cache/acct-user/asterisk-0-r3 b/metadata/md5-cache/acct-user/asterisk-0-r3
new file mode 100644
index 000000000000..add121a4c31d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/asterisk-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for asterisk
+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/asterisk acct-group/dialout
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b85aecedc57af935b195c7b437b53de4
diff --git a/metadata/md5-cache/acct-user/at-0-r1 b/metadata/md5-cache/acct-user/at-0-r1
deleted file mode 100644
index f8aa7e5b1591..000000000000
--- a/metadata/md5-cache/acct-user/at-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=84cafb5886499882fb16e15d4fd57794
diff --git a/metadata/md5-cache/acct-user/at-0-r2 b/metadata/md5-cache/acct-user/at-0-r2
new file mode 100644
index 000000000000..0adfe3a9a74c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/at-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for at 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/at
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=530fd6d65762450dd8198aaf81780601
diff --git a/metadata/md5-cache/acct-user/atheme-services-0-r2 b/metadata/md5-cache/acct-user/atheme-services-0-r2
deleted file mode 100644
index 00c26ed34dfa..000000000000
--- a/metadata/md5-cache/acct-user/atheme-services-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8e0180b2b87481583fe5b9097bfa7019
diff --git a/metadata/md5-cache/acct-user/atheme-services-0-r3 b/metadata/md5-cache/acct-user/atheme-services-0-r3
new file mode 100644
index 000000000000..e897271d4da8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/atheme-services-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Atheme 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/atheme-services
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d953d678a0b0ae0a5df1ae6d23c28614
diff --git a/metadata/md5-cache/acct-user/automatic-0-r1 b/metadata/md5-cache/acct-user/automatic-0-r1
deleted file mode 100644
index 788848739f41..000000000000
--- a/metadata/md5-cache/acct-user/automatic-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b0a9766f073fa4740019dbd5f533ddba
diff --git a/metadata/md5-cache/acct-user/automatic-0-r2 b/metadata/md5-cache/acct-user/automatic-0-r2
new file mode 100644
index 000000000000..df94a30fc438
--- /dev/null
+++ b/metadata/md5-cache/acct-user/automatic-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: automatic
+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/automatic
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=252f3186746d622f557bbe4fcbf78df8
diff --git a/metadata/md5-cache/acct-user/automx2-0-r2 b/metadata/md5-cache/acct-user/automx2-0-r2
deleted file mode 100644
index 008d2f1dbc06..000000000000
--- a/metadata/md5-cache/acct-user/automx2-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=273be6a76a268498a0065a9b6879b4a8
diff --git a/metadata/md5-cache/acct-user/automx2-0-r3 b/metadata/md5-cache/acct-user/automx2-0-r3
new file mode 100644
index 000000000000..4b4208e62527
--- /dev/null
+++ b/metadata/md5-cache/acct-user/automx2-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/automx2
+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/automx2
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c9a67cdbcd54bd036fa9b9413ec3534a
diff --git a/metadata/md5-cache/acct-user/avahi-0-r2 b/metadata/md5-cache/acct-user/avahi-0-r2
deleted file mode 100644
index dda0afbe448e..000000000000
--- a/metadata/md5-cache/acct-user/avahi-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1e68685c1f600766c3cddebf345270e7
diff --git a/metadata/md5-cache/acct-user/avahi-0-r3 b/metadata/md5-cache/acct-user/avahi-0-r3
new file mode 100644
index 000000000000..4fe4c4dbf761
--- /dev/null
+++ b/metadata/md5-cache/acct-user/avahi-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for avahi
+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/avahi
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=81904e3592cf296722638a984d2d9b9d
diff --git a/metadata/md5-cache/acct-user/avahi-autoipd-0-r2 b/metadata/md5-cache/acct-user/avahi-autoipd-0-r2
deleted file mode 100644
index 7d5c2faf6bd0..000000000000
--- a/metadata/md5-cache/acct-user/avahi-autoipd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5ec561c7bbebd60f12b0b6608a37a0b0
diff --git a/metadata/md5-cache/acct-user/avahi-autoipd-0-r3 b/metadata/md5-cache/acct-user/avahi-autoipd-0-r3
new file mode 100644
index 000000000000..9ae6fad4c560
--- /dev/null
+++ b/metadata/md5-cache/acct-user/avahi-autoipd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for avahi-autoipd
+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/avahi-autoipd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a024ccac044c2950c2d9612af9f515f5
diff --git a/metadata/md5-cache/acct-user/axtls-0-r1 b/metadata/md5-cache/acct-user/axtls-0-r1
deleted file mode 100644
index 289096ecab10..000000000000
--- a/metadata/md5-cache/acct-user/axtls-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=52dea4c5bcc787f67a3837e829d1e1fb
diff --git a/metadata/md5-cache/acct-user/axtls-0-r2 b/metadata/md5-cache/acct-user/axtls-0-r2
new file mode 100644
index 000000000000..f24b67103c86
--- /dev/null
+++ b/metadata/md5-cache/acct-user/axtls-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-libs/axtls
+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/axtls
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=401843ae5b3151038318858779acf5cb
diff --git a/metadata/md5-cache/acct-user/backuppc-0-r1 b/metadata/md5-cache/acct-user/backuppc-0-r1
deleted file mode 100644
index 0d98c2e5d9e3..000000000000
--- a/metadata/md5-cache/acct-user/backuppc-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=492ed0fe6d4bd3364564da3da937f534
diff --git a/metadata/md5-cache/acct-user/backuppc-0-r2 b/metadata/md5-cache/acct-user/backuppc-0-r2
new file mode 100644
index 000000000000..a0c35cd2aba6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/backuppc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-backup/backuppc
+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/backuppc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8b08aa21379f32037bed7a3aa8c8908a
diff --git a/metadata/md5-cache/acct-user/bacula-0-r2 b/metadata/md5-cache/acct-user/bacula-0-r2
deleted file mode 100644
index 6e485e835bc4..000000000000
--- a/metadata/md5-cache/acct-user/bacula-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=797094fc972a08c232dd6914a79f7ba0
diff --git a/metadata/md5-cache/acct-user/bacula-0-r3 b/metadata/md5-cache/acct-user/bacula-0-r3
new file mode 100644
index 000000000000..c86be2dcf600
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bacula-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A group for the bacula backup system
+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/bacula acct-group/disk acct-group/tape acct-group/cdrom
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6bd0c917f7eba0cb069a7d0a45120745
diff --git a/metadata/md5-cache/acct-user/bareos-0-r2 b/metadata/md5-cache/acct-user/bareos-0-r2
deleted file mode 100644
index 6209c725ef14..000000000000
--- a/metadata/md5-cache/acct-user/bareos-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ac1f389deede73add344d5a920359f0a
diff --git a/metadata/md5-cache/acct-user/bareos-0-r3 b/metadata/md5-cache/acct-user/bareos-0-r3
new file mode 100644
index 000000000000..a58f13f0c746
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bareos-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the bareos network backup suite
+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/bareos acct-group/disk acct-group/tape acct-group/cdrom
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=53371f2fdb309d5a03a44a58bdc8554f
diff --git a/metadata/md5-cache/acct-user/beanstalk-0-r1 b/metadata/md5-cache/acct-user/beanstalk-0-r1
deleted file mode 100644
index d93121cf8e76..000000000000
--- a/metadata/md5-cache/acct-user/beanstalk-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5e13b202cd49ea9f6eb3d404bc904760
diff --git a/metadata/md5-cache/acct-user/beanstalk-0-r2 b/metadata/md5-cache/acct-user/beanstalk-0-r2
new file mode 100644
index 000000000000..8f8122a9cfe8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/beanstalk-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-misc/beanstalkd
+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/beanstalk
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c9b26c1a76f332f2325c925be3384f37
diff --git a/metadata/md5-cache/acct-user/bedrock-0-r2 b/metadata/md5-cache/acct-user/bedrock-0-r2
deleted file mode 100644
index efdb19243539..000000000000
--- a/metadata/md5-cache/acct-user/bedrock-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=34863b96c65b4f0108a8c372f4d8c6f1
diff --git a/metadata/md5-cache/acct-user/bedrock-0-r3 b/metadata/md5-cache/acct-user/bedrock-0-r3
new file mode 100644
index 000000000000..9c1baeaf2f4e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bedrock-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Minecraft Bedrock 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/bedrock
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=982c1c7a7ca88309cc72a6a6bd433834
diff --git a/metadata/md5-cache/acct-user/bind_exporter-0-r2 b/metadata/md5-cache/acct-user/bind_exporter-0-r2
deleted file mode 100644
index 6d5868dfc548..000000000000
--- a/metadata/md5-cache/acct-user/bind_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4ebc71282a2fde6bc3c9de8f2448db5c
diff --git a/metadata/md5-cache/acct-user/bind_exporter-0-r3 b/metadata/md5-cache/acct-user/bind_exporter-0-r3
new file mode 100644
index 000000000000..bacb2b399afa
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bind_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for bind_exporter
+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/bind_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c650bd9deebdb7a3530ebe72ebb70a0b
diff --git a/metadata/md5-cache/acct-user/bird-0-r1 b/metadata/md5-cache/acct-user/bird-0-r1
deleted file mode 100644
index 78cc1852ce97..000000000000
--- a/metadata/md5-cache/acct-user/bird-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2c0c1d2a803bff6d6f66fc69ad34cb50
diff --git a/metadata/md5-cache/acct-user/bird-0-r2 b/metadata/md5-cache/acct-user/bird-0-r2
new file mode 100644
index 000000000000..332d2a81bdae
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bird-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for BIRD
+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/bird
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7dc0719261d7af2db4a07ee4e8ee727a
diff --git a/metadata/md5-cache/acct-user/bitcoin-0-r2 b/metadata/md5-cache/acct-user/bitcoin-0-r2
deleted file mode 100644
index 8bf182b5086c..000000000000
--- a/metadata/md5-cache/acct-user/bitcoin-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=80690fe50db140379a1b1050c4e4609f
diff --git a/metadata/md5-cache/acct-user/bitcoin-0-r3 b/metadata/md5-cache/acct-user/bitcoin-0-r3
new file mode 100644
index 000000000000..e49c1b92e0f8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bitcoin-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System-wide Bitcoin services 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/bitcoin
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5bcde63ce6f04abc4856a1d9c5564882
diff --git a/metadata/md5-cache/acct-user/bitflu-0-r1 b/metadata/md5-cache/acct-user/bitflu-0-r1
deleted file mode 100644
index 124caeff2399..000000000000
--- a/metadata/md5-cache/acct-user/bitflu-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4ccdb8385cbcf2157a783fd75ed940a6
diff --git a/metadata/md5-cache/acct-user/bitflu-0-r2 b/metadata/md5-cache/acct-user/bitflu-0-r2
new file mode 100644
index 000000000000..ec7c124970f3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bitflu-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-p2p/bitflu
+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/bitflu
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=41aa7b353f4837091f2a4d572c6aa550
diff --git a/metadata/md5-cache/acct-user/bitlbee-0-r2 b/metadata/md5-cache/acct-user/bitlbee-0-r2
deleted file mode 100644
index 0d132387994d..000000000000
--- a/metadata/md5-cache/acct-user/bitlbee-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=08b3317f5944f8906c74350aae1c91ca
diff --git a/metadata/md5-cache/acct-user/bitlbee-0-r3 b/metadata/md5-cache/acct-user/bitlbee-0-r3
new file mode 100644
index 000000000000..6e7135acdb6d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bitlbee-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for biltbee
+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/bitlbee
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=abee16144a9fcf98ded993bbe6c0a7c3
diff --git a/metadata/md5-cache/acct-user/blackbox_exporter-0-r1 b/metadata/md5-cache/acct-user/blackbox_exporter-0-r1
deleted file mode 100644
index 35520db54761..000000000000
--- a/metadata/md5-cache/acct-user/blackbox_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5d1dc810f8fa7385a2136caad6a32eb4
diff --git a/metadata/md5-cache/acct-user/blackbox_exporter-0-r2 b/metadata/md5-cache/acct-user/blackbox_exporter-0-r2
new file mode 100644
index 000000000000..9236bdfef2bd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/blackbox_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for blackbox_exporter
+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/blackbox_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=238d52be93ab5af54e17b36056a42c82
diff --git a/metadata/md5-cache/acct-user/boinc-0-r1 b/metadata/md5-cache/acct-user/boinc-0-r1
deleted file mode 100644
index 9e5eb339f541..000000000000
--- a/metadata/md5-cache/acct-user/boinc-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b97658ff3eb88cf2dab1cb4d6c447032
diff --git a/metadata/md5-cache/acct-user/boinc-0-r2 b/metadata/md5-cache/acct-user/boinc-0-r2
new file mode 100644
index 000000000000..d3c48e402f29
--- /dev/null
+++ b/metadata/md5-cache/acct-user/boinc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for sci-misc/boinc
+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/boinc acct-group/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=99d930849e51b5f03a455a79f224d9bf
diff --git a/metadata/md5-cache/acct-user/brltty-0-r1 b/metadata/md5-cache/acct-user/brltty-0-r1
deleted file mode 100644
index 5ec0039fc6c6..000000000000
--- a/metadata/md5-cache/acct-user/brltty-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b0e5d4d1a291c6ac5fb4a14991d33a1e
diff --git a/metadata/md5-cache/acct-user/brltty-0-r2 b/metadata/md5-cache/acct-user/brltty-0-r2
new file mode 100644
index 000000000000..ae9c5bde1396
--- /dev/null
+++ b/metadata/md5-cache/acct-user/brltty-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for brltty
+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/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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4250fd66a7553607348de00124cd2a39
diff --git a/metadata/md5-cache/acct-user/buildbot-0-r2 b/metadata/md5-cache/acct-user/buildbot-0-r2
deleted file mode 100644
index da23b80dba2d..000000000000
--- a/metadata/md5-cache/acct-user/buildbot-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=609b89e78c13b832a7f51a93bcd43196
diff --git a/metadata/md5-cache/acct-user/buildbot-0-r3 b/metadata/md5-cache/acct-user/buildbot-0-r3
new file mode 100644
index 000000000000..ecc75c6b006d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/buildbot-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Buildbot 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/buildbot
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=16493c050051125375e0e2052fd13e3f
diff --git a/metadata/md5-cache/acct-user/burp-0-r2 b/metadata/md5-cache/acct-user/burp-0-r2
deleted file mode 100644
index e2a65f3ffda2..000000000000
--- a/metadata/md5-cache/acct-user/burp-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d8bac1e536412b421442bb9db95e433e
diff --git a/metadata/md5-cache/acct-user/burp-0-r3 b/metadata/md5-cache/acct-user/burp-0-r3
new file mode 100644
index 000000000000..7a3658d3bbca
--- /dev/null
+++ b/metadata/md5-cache/acct-user/burp-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the app-backup/burp 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/burp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2be962c4710891a4ebccd70d958a15ec
diff --git a/metadata/md5-cache/acct-user/burrow_exporter-0-r2 b/metadata/md5-cache/acct-user/burrow_exporter-0-r2
deleted file mode 100644
index e33b3861d606..000000000000
--- a/metadata/md5-cache/acct-user/burrow_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c175456c6dfd0728f29ae59a2a1b220c
diff --git a/metadata/md5-cache/acct-user/burrow_exporter-0-r3 b/metadata/md5-cache/acct-user/burrow_exporter-0-r3
new file mode 100644
index 000000000000..a7e44cf01b05
--- /dev/null
+++ b/metadata/md5-cache/acct-user/burrow_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/burrow_exporter
+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/burrow_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=19c834078aaf3c8eced60db86d900a3e
diff --git a/metadata/md5-cache/acct-user/cadvisor-0-r2 b/metadata/md5-cache/acct-user/cadvisor-0-r2
deleted file mode 100644
index 25729ed53a70..000000000000
--- a/metadata/md5-cache/acct-user/cadvisor-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=77e99571a02d872ad3c2932039617e37
diff --git a/metadata/md5-cache/acct-user/cadvisor-0-r3 b/metadata/md5-cache/acct-user/cadvisor-0-r3
new file mode 100644
index 000000000000..eea461dc8dff
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cadvisor-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for cadvisor
+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/cadvisor
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5eab5e72f2ab45649078addb43fb8dbf
diff --git a/metadata/md5-cache/acct-user/cancd-0-r2 b/metadata/md5-cache/acct-user/cancd-0-r2
deleted file mode 100644
index 0692bae65325..000000000000
--- a/metadata/md5-cache/acct-user/cancd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9e21b7ed42017fcbdd6f89eeae677109
diff --git a/metadata/md5-cache/acct-user/cancd-0-r3 b/metadata/md5-cache/acct-user/cancd-0-r3
new file mode 100644
index 000000000000..144217fcc48b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cancd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the CA NetConsole 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/cancd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=af54d3ee99ffcdd81cac1d0702312fa4
diff --git a/metadata/md5-cache/acct-user/carbon-0-r2 b/metadata/md5-cache/acct-user/carbon-0-r2
deleted file mode 100644
index a1a71e558841..000000000000
--- a/metadata/md5-cache/acct-user/carbon-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=226eeb1edbc68f05e76c8bf8d1b2f60d
diff --git a/metadata/md5-cache/acct-user/carbon-0-r3 b/metadata/md5-cache/acct-user/carbon-0-r3
new file mode 100644
index 000000000000..a144368537cc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/carbon-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for graphite/carbon suite
+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/carbon
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=886d267bf68424a89e40385a740ded5a
diff --git a/metadata/md5-cache/acct-user/ceph-0-r2 b/metadata/md5-cache/acct-user/ceph-0-r2
deleted file mode 100644
index 5e13684118ae..000000000000
--- a/metadata/md5-cache/acct-user/ceph-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=46c57a11397816f3786b4c9b94fbb6b6
diff --git a/metadata/md5-cache/acct-user/ceph-0-r3 b/metadata/md5-cache/acct-user/ceph-0-r3
new file mode 100644
index 000000000000..c43c0ce94c36
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ceph-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ceph
+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/ceph
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b6060be6adf15e8b0f97431c204a3ad9
diff --git a/metadata/md5-cache/acct-user/cgit-0-r1 b/metadata/md5-cache/acct-user/cgit-0-r1
deleted file mode 100644
index 5b266e69f6e4..000000000000
--- a/metadata/md5-cache/acct-user/cgit-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b08a7d5f6e91f6fa77f6c82c9534a036
diff --git a/metadata/md5-cache/acct-user/cgit-0-r2 b/metadata/md5-cache/acct-user/cgit-0-r2
new file mode 100644
index 000000000000..456f14c6db4f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cgit-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=a fast web-interface for git repositories
+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/cgit
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=809fd42d4da3eb8e12cd43651d1eb6a6
diff --git a/metadata/md5-cache/acct-user/chronograf-0-r2 b/metadata/md5-cache/acct-user/chronograf-0-r2
deleted file mode 100644
index abbaeb74213f..000000000000
--- a/metadata/md5-cache/acct-user/chronograf-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d1672643005d026bdba94b4783890e69
diff --git a/metadata/md5-cache/acct-user/chronograf-0-r3 b/metadata/md5-cache/acct-user/chronograf-0-r3
new file mode 100644
index 000000000000..57f87b22754a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/chronograf-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for chronograf
+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/chronograf
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c946fd638ffa46ad0efc62e2e4dd7aff
diff --git a/metadata/md5-cache/acct-user/clair-0-r2 b/metadata/md5-cache/acct-user/clair-0-r2
deleted file mode 100644
index 6d1420b6983e..000000000000
--- a/metadata/md5-cache/acct-user/clair-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=28488465a495fb0309352e37c55689df
diff --git a/metadata/md5-cache/acct-user/clair-0-r3 b/metadata/md5-cache/acct-user/clair-0-r3
new file mode 100644
index 000000000000..e2462876a84c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/clair-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for clair
+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/clair
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=acc5b82abb9a96b6fecf9d06f64fe29f
diff --git a/metadata/md5-cache/acct-user/clamav-0-r2 b/metadata/md5-cache/acct-user/clamav-0-r2
deleted file mode 100644
index 8892e06940a3..000000000000
--- a/metadata/md5-cache/acct-user/clamav-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d7e4f6fde918d234daff074dc17885df
diff --git a/metadata/md5-cache/acct-user/clamav-0-r3 b/metadata/md5-cache/acct-user/clamav-0-r3
new file mode 100644
index 000000000000..7f26860daf94
--- /dev/null
+++ b/metadata/md5-cache/acct-user/clamav-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: clamav
+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/clamav
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a41d401acbb048956d194bb7a04a4e5c
diff --git a/metadata/md5-cache/acct-user/cntlm-0-r1 b/metadata/md5-cache/acct-user/cntlm-0-r1
deleted file mode 100644
index 19e3e8a21bf4..000000000000
--- a/metadata/md5-cache/acct-user/cntlm-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=64b4cbea6a1c433fa9f4dbba275f9f54
diff --git a/metadata/md5-cache/acct-user/cntlm-0-r2 b/metadata/md5-cache/acct-user/cntlm-0-r2
new file mode 100644
index 000000000000..c6a146e51fb9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cntlm-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-proxy/cntlm
+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/cntlm
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9a7680743597fb93f5c00ad40c5eb1a5
diff --git a/metadata/md5-cache/acct-user/cockroach-0-r1 b/metadata/md5-cache/acct-user/cockroach-0-r1
deleted file mode 100644
index 77f3abd8d1e3..000000000000
--- a/metadata/md5-cache/acct-user/cockroach-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8daa45a7af7fbc347c5553375e26108a
diff --git a/metadata/md5-cache/acct-user/cockroach-0-r2 b/metadata/md5-cache/acct-user/cockroach-0-r2
new file mode 100644
index 000000000000..d9eff71bea38
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cockroach-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-db/cockroach
+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/cockroach
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2a25800f35d2d9a327f7841a619be67d
diff --git a/metadata/md5-cache/acct-user/collectd-0-r1 b/metadata/md5-cache/acct-user/collectd-0-r1
deleted file mode 100644
index 95e2bab97b84..000000000000
--- a/metadata/md5-cache/acct-user/collectd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e6041ecd2b9b9ae7f816e9bba3d58932
diff --git a/metadata/md5-cache/acct-user/collectd-0-r2 b/metadata/md5-cache/acct-user/collectd-0-r2
new file mode 100644
index 000000000000..ece0497b4fe1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/collectd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=collectd 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/collectd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=60e1028d8c7328073721544ba3a9bff7
diff --git a/metadata/md5-cache/acct-user/colord-0-r1 b/metadata/md5-cache/acct-user/colord-0-r1
deleted file mode 100644
index 35596c324ae9..000000000000
--- a/metadata/md5-cache/acct-user/colord-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f0ee334cbaa6645908a6cfb884013f41
diff --git a/metadata/md5-cache/acct-user/colord-0-r2 b/metadata/md5-cache/acct-user/colord-0-r2
new file mode 100644
index 000000000000..ae3003769ab6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/colord-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running the colord 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/colord
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=707c9b4a5a1b3cd722b4cee8b3165dd9
diff --git a/metadata/md5-cache/acct-user/consul-0-r2 b/metadata/md5-cache/acct-user/consul-0-r2
deleted file mode 100644
index 1edb5e015dbf..000000000000
--- a/metadata/md5-cache/acct-user/consul-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6a6ed770c7e65351b0a3f0a9dc3eae2c
diff --git a/metadata/md5-cache/acct-user/consul-0-r3 b/metadata/md5-cache/acct-user/consul-0-r3
new file mode 100644
index 000000000000..c65dc48ec88e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/consul-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for consul
+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/consul
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b3d3e1b609e4190343d00e2c91404071
diff --git a/metadata/md5-cache/acct-user/consul-template-0-r2 b/metadata/md5-cache/acct-user/consul-template-0-r2
deleted file mode 100644
index 85f791a7bb46..000000000000
--- a/metadata/md5-cache/acct-user/consul-template-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=add00cae9a610312cb376db294f24f25
diff --git a/metadata/md5-cache/acct-user/consul-template-0-r3 b/metadata/md5-cache/acct-user/consul-template-0-r3
new file mode 100644
index 000000000000..f504401bc55f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/consul-template-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for consul-template
+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/consul-template
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=edd2651161865332510e80df9d9e5844
diff --git a/metadata/md5-cache/acct-user/consul_exporter-0-r1 b/metadata/md5-cache/acct-user/consul_exporter-0-r1
deleted file mode 100644
index 9e91ee6bdfbb..000000000000
--- a/metadata/md5-cache/acct-user/consul_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5e2a152d249164210984575df66c1506
diff --git a/metadata/md5-cache/acct-user/consul_exporter-0-r2 b/metadata/md5-cache/acct-user/consul_exporter-0-r2
new file mode 100644
index 000000000000..b0f296d117ba
--- /dev/null
+++ b/metadata/md5-cache/acct-user/consul_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for consul_exporter
+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/consul_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=230928c6f925dc065dfc87456f9feb95
diff --git a/metadata/md5-cache/acct-user/coredns-0-r1 b/metadata/md5-cache/acct-user/coredns-0-r1
deleted file mode 100644
index 20ce931cf8bf..000000000000
--- a/metadata/md5-cache/acct-user/coredns-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dc1f586bb3728a0fbc8836153042da98
diff --git a/metadata/md5-cache/acct-user/coredns-0-r2 b/metadata/md5-cache/acct-user/coredns-0-r2
new file mode 100644
index 000000000000..968054723aa8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/coredns-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/coredns
+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/coredns
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=42838109c8fd14b9a0fbaf42ebdfb18f
diff --git a/metadata/md5-cache/acct-user/cron-0-r2 b/metadata/md5-cache/acct-user/cron-0-r2
deleted file mode 100644
index 38e56bb91f2c..000000000000
--- a/metadata/md5-cache/acct-user/cron-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=30996fd0f5a8a5bfe14fce0ab6396b02
diff --git a/metadata/md5-cache/acct-user/cron-0-r3 b/metadata/md5-cache/acct-user/cron-0-r3
new file mode 100644
index 000000000000..8d24a3560ffe
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cron-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-process/cronbase
+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
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=666c3cdeba5bbb9e8c5469ea0b9cbb67
diff --git a/metadata/md5-cache/acct-user/cvmfs-0-r2 b/metadata/md5-cache/acct-user/cvmfs-0-r2
deleted file mode 100644
index 21e2d09c39a0..000000000000
--- a/metadata/md5-cache/acct-user/cvmfs-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=45378ccb212f72eac3a198b7edda1e76
diff --git a/metadata/md5-cache/acct-user/cvmfs-0-r3 b/metadata/md5-cache/acct-user/cvmfs-0-r3
new file mode 100644
index 000000000000..64a1a7509945
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cvmfs-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the CernVM-FS network file system
+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/cvmfs
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=951aa5faa6ef44ce528f72e0b4e6b0d1
diff --git a/metadata/md5-cache/acct-user/cyrus-0-r3 b/metadata/md5-cache/acct-user/cyrus-0-r3
deleted file mode 100644
index 603318ba4768..000000000000
--- a/metadata/md5-cache/acct-user/cyrus-0-r3
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e6c21daf8b84c01cb212bba08b46b8cc
diff --git a/metadata/md5-cache/acct-user/cyrus-0-r4 b/metadata/md5-cache/acct-user/cyrus-0-r4
new file mode 100644
index 000000000000..5325bc26c039
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cyrus-0-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for cyrus-imapd 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/mail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d7e152844317f1a318a094da4a21306e
diff --git a/metadata/md5-cache/acct-user/darkstat-0-r1 b/metadata/md5-cache/acct-user/darkstat-0-r1
deleted file mode 100644
index 995450ca8ddd..000000000000
--- a/metadata/md5-cache/acct-user/darkstat-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fbece9403a56f6081e0f22565096705b
diff --git a/metadata/md5-cache/acct-user/darkstat-0-r2 b/metadata/md5-cache/acct-user/darkstat-0-r2
new file mode 100644
index 000000000000..d024d6434df6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/darkstat-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/darkstat
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8305ca6d1156704f5cf6ed1e4f8250e1
diff --git a/metadata/md5-cache/acct-user/davfs2-0-r2 b/metadata/md5-cache/acct-user/davfs2-0-r2
deleted file mode 100644
index af41b3f78512..000000000000
--- a/metadata/md5-cache/acct-user/davfs2-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a1c126be292351eb562a33fac5d39ef8
diff --git a/metadata/md5-cache/acct-user/davfs2-0-r3 b/metadata/md5-cache/acct-user/davfs2-0-r3
new file mode 100644
index 000000000000..0cdab8eba6ec
--- /dev/null
+++ b/metadata/md5-cache/acct-user/davfs2-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: davfs2
+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/davfs2
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d528f74aa72141180c809556b2585388
diff --git a/metadata/md5-cache/acct-user/dbmail-0-r1 b/metadata/md5-cache/acct-user/dbmail-0-r1
deleted file mode 100644
index ea8294dc0f76..000000000000
--- a/metadata/md5-cache/acct-user/dbmail-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a16f1d73c6d88733e52a5bdc1af51594
diff --git a/metadata/md5-cache/acct-user/dbmail-0-r2 b/metadata/md5-cache/acct-user/dbmail-0-r2
new file mode 100644
index 000000000000..34ef606ecfef
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dbmail-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: dbmail
+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/dbmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f82a0eefde1ceae9816bf38dc759139b
diff --git a/metadata/md5-cache/acct-user/dbskkd-0-r1 b/metadata/md5-cache/acct-user/dbskkd-0-r1
deleted file mode 100644
index c7472ac843ce..000000000000
--- a/metadata/md5-cache/acct-user/dbskkd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4965d3299b47c3f34a1acee11153d1d1
diff --git a/metadata/md5-cache/acct-user/dbskkd-0-r2 b/metadata/md5-cache/acct-user/dbskkd-0-r2
new file mode 100644
index 000000000000..165f7591f7a5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dbskkd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-i18n/dbskkd-cdb
+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/dbskkd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a9edbe12192807128b03f00efbfd9cb8
diff --git a/metadata/md5-cache/acct-user/ddclient-0-r2 b/metadata/md5-cache/acct-user/ddclient-0-r2
deleted file mode 100644
index c02737ed229a..000000000000
--- a/metadata/md5-cache/acct-user/ddclient-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3e6dcd959df32d6315932ad4e00effcf
diff --git a/metadata/md5-cache/acct-user/ddclient-0-r3 b/metadata/md5-cache/acct-user/ddclient-0-r3
new file mode 100644
index 000000000000..63e5a71ed483
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ddclient-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the dynamic DNS client
+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/ddclient
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0d2e46865931cb82080a38a840b600d6
diff --git a/metadata/md5-cache/acct-user/defang-0-r1 b/metadata/md5-cache/acct-user/defang-0-r1
deleted file mode 100644
index 655db346ead7..000000000000
--- a/metadata/md5-cache/acct-user/defang-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=31b985fe980663f033a7e20f59afb6ca
diff --git a/metadata/md5-cache/acct-user/defang-0-r2 b/metadata/md5-cache/acct-user/defang-0-r2
new file mode 100644
index 000000000000..fd80496361a0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/defang-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for mail-filter/mimedefang
+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/defang
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=038bc3d2798b4aeeea154df99f7a28c3
diff --git a/metadata/md5-cache/acct-user/dehydrated-0-r1 b/metadata/md5-cache/acct-user/dehydrated-0-r1
deleted file mode 100644
index 2f93aec4fb89..000000000000
--- a/metadata/md5-cache/acct-user/dehydrated-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=51bf19e5618a3efd5009961ecdab51ed
diff --git a/metadata/md5-cache/acct-user/dehydrated-0-r2 b/metadata/md5-cache/acct-user/dehydrated-0-r2
new file mode 100644
index 000000000000..3634a8971736
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dehydrated-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=dehydrated 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/dehydrated
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=68edb45bab24a29def1bb78581b611c8
diff --git a/metadata/md5-cache/acct-user/deluge-0-r2 b/metadata/md5-cache/acct-user/deluge-0-r2
deleted file mode 100644
index fba6c4a8576e..000000000000
--- a/metadata/md5-cache/acct-user/deluge-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=99267a68f305416a767b97ccff954d43
diff --git a/metadata/md5-cache/acct-user/deluge-0-r3 b/metadata/md5-cache/acct-user/deluge-0-r3
new file mode 100644
index 000000000000..f123dd056512
--- /dev/null
+++ b/metadata/md5-cache/acct-user/deluge-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for deluge
+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/deluge
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cd835de1ad3b7d92f15d2f79c666235a
diff --git a/metadata/md5-cache/acct-user/dhcp-0-r2 b/metadata/md5-cache/acct-user/dhcp-0-r2
deleted file mode 100644
index b804f8080b40..000000000000
--- a/metadata/md5-cache/acct-user/dhcp-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0defccd8494ed81ee2071f2d7bf36a32
diff --git a/metadata/md5-cache/acct-user/dhcp-0-r3 b/metadata/md5-cache/acct-user/dhcp-0-r3
new file mode 100644
index 000000000000..a33edca6cf3d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dhcp-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dhcp 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/dhcp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6fa872a45b27aa1c98c2d0979cb4f61b
diff --git a/metadata/md5-cache/acct-user/dhcpcd-0-r2 b/metadata/md5-cache/acct-user/dhcpcd-0-r2
deleted file mode 100644
index 6aaaacd52753..000000000000
--- a/metadata/md5-cache/acct-user/dhcpcd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fbc64120e0ccdf5145fe76d8b92cc569
diff --git a/metadata/md5-cache/acct-user/dhcpcd-0-r3 b/metadata/md5-cache/acct-user/dhcpcd-0-r3
new file mode 100644
index 000000000000..2732489e9bfb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dhcpcd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dhcpcd client
+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/dhcpcd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d186921859c15dc30e679e539459c37f
diff --git a/metadata/md5-cache/acct-user/dictd-0-r1 b/metadata/md5-cache/acct-user/dictd-0-r1
deleted file mode 100644
index 89cd50a2b0f4..000000000000
--- a/metadata/md5-cache/acct-user/dictd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=509fa0f05a9f6561bf6042e27d4cea7d
diff --git a/metadata/md5-cache/acct-user/dictd-0-r2 b/metadata/md5-cache/acct-user/dictd-0-r2
new file mode 100644
index 000000000000..e4a15fc64765
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dictd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for app-text/dictd
+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/dictd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f97e975553d3c580df054fecba4d245e
diff --git a/metadata/md5-cache/acct-user/dirsrv-0-r1 b/metadata/md5-cache/acct-user/dirsrv-0-r1
deleted file mode 100644
index ee845c1d56cf..000000000000
--- a/metadata/md5-cache/acct-user/dirsrv-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=32a186651bdf6e46e87a7402c55ad068
diff --git a/metadata/md5-cache/acct-user/dirsrv-0-r2 b/metadata/md5-cache/acct-user/dirsrv-0-r2
new file mode 100644
index 000000000000..f5a087a04f75
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dirsrv-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-nds/389-ds-base
+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/dirsrv
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9a1bce62290737e7a3036e22f11e0c98
diff --git a/metadata/md5-cache/acct-user/distcc-1-r1 b/metadata/md5-cache/acct-user/distcc-1-r1
deleted file mode 100644
index 782105e71a7c..000000000000
--- a/metadata/md5-cache/acct-user/distcc-1-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bb576de378d4efeadd19ee183f39cb53
diff --git a/metadata/md5-cache/acct-user/distcc-1-r2 b/metadata/md5-cache/acct-user/distcc-1-r2
new file mode 100644
index 000000000000..5e8be5b78f7f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/distcc-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User used to run distcc 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/distcc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0513c10e9aee8e33801621c8dff0a670
diff --git a/metadata/md5-cache/acct-user/dnrd-0-r1 b/metadata/md5-cache/acct-user/dnrd-0-r1
deleted file mode 100644
index 84f714baa681..000000000000
--- a/metadata/md5-cache/acct-user/dnrd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=419db02eaf1338657846af6a7d46265b
diff --git a/metadata/md5-cache/acct-user/dnrd-0-r2 b/metadata/md5-cache/acct-user/dnrd-0-r2
new file mode 100644
index 000000000000..1d39c9cdec3d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnrd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/dnrd
+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/dnrd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c3422dca3e92dde421c9675ff568db42
diff --git a/metadata/md5-cache/acct-user/dnscache-0-r1 b/metadata/md5-cache/acct-user/dnscache-0-r1
deleted file mode 100644
index dbe87f48a083..000000000000
--- a/metadata/md5-cache/acct-user/dnscache-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b9f2e1cf6a2bf872f750171e393a5562
diff --git a/metadata/md5-cache/acct-user/dnscache-0-r2 b/metadata/md5-cache/acct-user/dnscache-0-r2
new file mode 100644
index 000000000000..010cd509c20d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnscache-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: dnscache
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a2fd4812d1271c6bc462db5c88d9e93e
diff --git a/metadata/md5-cache/acct-user/dnsdist-0-r2 b/metadata/md5-cache/acct-user/dnsdist-0-r2
deleted file mode 100644
index 069376aacd4e..000000000000
--- a/metadata/md5-cache/acct-user/dnsdist-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4a19790f7fda1064976564a57af321a0
diff --git a/metadata/md5-cache/acct-user/dnsdist-0-r3 b/metadata/md5-cache/acct-user/dnsdist-0-r3
new file mode 100644
index 000000000000..df1a7c12b69f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnsdist-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/dnsdist
+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/dnsdist
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d49394e5c6f21e0ac7b906b7afb3ae6f
diff --git a/metadata/md5-cache/acct-user/dnslog-0-r1 b/metadata/md5-cache/acct-user/dnslog-0-r1
deleted file mode 100644
index 3a043fa44a6d..000000000000
--- a/metadata/md5-cache/acct-user/dnslog-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1ea9a2397bb7c7398f372d0b24fc5f93
diff --git a/metadata/md5-cache/acct-user/dnslog-0-r2 b/metadata/md5-cache/acct-user/dnslog-0-r2
new file mode 100644
index 000000000000..f8a7ce9032d9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnslog-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: dnslog
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bb1fcebdedeaaa7f9606fe368b468926
diff --git a/metadata/md5-cache/acct-user/dnsmasq-0-r2 b/metadata/md5-cache/acct-user/dnsmasq-0-r2
deleted file mode 100644
index 00a073b0d889..000000000000
--- a/metadata/md5-cache/acct-user/dnsmasq-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a3244cd3ba7057f91acd72d798aa1f02
diff --git a/metadata/md5-cache/acct-user/dnsmasq-0-r3 b/metadata/md5-cache/acct-user/dnsmasq-0-r3
new file mode 100644
index 000000000000..3ef0acd3639e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnsmasq-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/dnsmasq
+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/dnsmasq
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8ccf43222a4de01d7f3bd4da137d04cb
diff --git a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r2 b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r2
deleted file mode 100644
index a09bdf07b540..000000000000
--- a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d840821dd87b229ed71ca87a26920675
diff --git a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r3 b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r3
new file mode 100644
index 000000000000..2c8bade447dd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dnsmasq_exporter
+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/dnsmasq_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5a04a45d8952e25a3efa415788ad77c1
diff --git a/metadata/md5-cache/acct-user/docker_auth-0-r2 b/metadata/md5-cache/acct-user/docker_auth-0-r2
deleted file mode 100644
index 2a3785d6bfc8..000000000000
--- a/metadata/md5-cache/acct-user/docker_auth-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c8a3f2a12ed513a6b46e15eff8f1d930
diff --git a/metadata/md5-cache/acct-user/docker_auth-0-r3 b/metadata/md5-cache/acct-user/docker_auth-0-r3
new file mode 100644
index 000000000000..b3370aa5a128
--- /dev/null
+++ b/metadata/md5-cache/acct-user/docker_auth-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for docker_auth
+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/docker_auth
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4e68a7900d57596cd6a02faf0e1d11dc
diff --git a/metadata/md5-cache/acct-user/dovecot-0-r2 b/metadata/md5-cache/acct-user/dovecot-0-r2
deleted file mode 100644
index 7957554c9231..000000000000
--- a/metadata/md5-cache/acct-user/dovecot-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=45aef79d43bb198ef00d84fb475e8a6d
diff --git a/metadata/md5-cache/acct-user/dovecot-0-r3 b/metadata/md5-cache/acct-user/dovecot-0-r3
new file mode 100644
index 000000000000..467f93c6d624
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dovecot-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dovecot 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/dovecot
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=701f290e5f69cdac7a323c3d1d3ec7e3
diff --git a/metadata/md5-cache/acct-user/dovenull-0-r2 b/metadata/md5-cache/acct-user/dovenull-0-r2
deleted file mode 100644
index 775172571381..000000000000
--- a/metadata/md5-cache/acct-user/dovenull-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8e20d29d818a7a2770cedfe5e75cf59e
diff --git a/metadata/md5-cache/acct-user/dovenull-0-r3 b/metadata/md5-cache/acct-user/dovenull-0-r3
new file mode 100644
index 000000000000..51f9eb42b6de
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dovenull-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dovecot 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/dovenull
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2c714c401332c2ac3c74cf342df54acf
diff --git a/metadata/md5-cache/acct-user/drone-0-r1 b/metadata/md5-cache/acct-user/drone-0-r1
deleted file mode 100644
index 2844d4979f62..000000000000
--- a/metadata/md5-cache/acct-user/drone-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=36bd2c7c157a859ee49579ec77c217c7
diff --git a/metadata/md5-cache/acct-user/drone-0-r2 b/metadata/md5-cache/acct-user/drone-0-r2
new file mode 100644
index 000000000000..6eacb730c0d3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/drone-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-util/drone
+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/drone
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a402a75bba29f863738e828558a288cd
diff --git a/metadata/md5-cache/acct-user/duende-0-r2 b/metadata/md5-cache/acct-user/duende-0-r2
deleted file mode 100644
index ec8685670045..000000000000
--- a/metadata/md5-cache/acct-user/duende-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1aa505b6f1113b6fd96422163fed7a6a
diff --git a/metadata/md5-cache/acct-user/duende-0-r3 b/metadata/md5-cache/acct-user/duende-0-r3
new file mode 100644
index 000000000000..cdec8084f937
--- /dev/null
+++ b/metadata/md5-cache/acct-user/duende-0-r3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/maradns
+DESCRIPTION=System user: duende
+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/maradns acct-group/maradns
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=26cc204e8dc25df0e59cd8fafd063233
diff --git a/metadata/md5-cache/acct-user/elasticsearch-0-r2 b/metadata/md5-cache/acct-user/elasticsearch-0-r2
deleted file mode 100644
index c6987b19284f..000000000000
--- a/metadata/md5-cache/acct-user/elasticsearch-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ca55885d088ea11ac6e9d7dd7d88adda
diff --git a/metadata/md5-cache/acct-user/elasticsearch-0-r3 b/metadata/md5-cache/acct-user/elasticsearch-0-r3
new file mode 100644
index 000000000000..71cb2f86ed8a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/elasticsearch-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Elasticsearch 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/elasticsearch
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2b5542c151434827720b6401a6b7ed03
diff --git a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r2 b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r2
deleted file mode 100644
index ebd6d6a12398..000000000000
--- a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7a211fe29116823018d90879a4d3ac9f
diff --git a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r3 b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r3
new file mode 100644
index 000000000000..1445d8e8e047
--- /dev/null
+++ b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/elasticsearch_exporter
+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/elasticsearch_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c8126f9420e29486bf4ab7d00c0af0ee
diff --git a/metadata/md5-cache/acct-user/energi3-0-r1 b/metadata/md5-cache/acct-user/energi3-0-r1
deleted file mode 100644
index d6e53cc8ab35..000000000000
--- a/metadata/md5-cache/acct-user/energi3-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=124fa2a993145cc77836ede2c9881438
diff --git a/metadata/md5-cache/acct-user/energi3-0-r2 b/metadata/md5-cache/acct-user/energi3-0-r2
new file mode 100644
index 000000000000..92f7079ff53f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/energi3-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/energi3
+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/energi3
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f9f23a8827b8c2cbdaf6b5ffa18523bd
diff --git a/metadata/md5-cache/acct-user/epmd-0-r2 b/metadata/md5-cache/acct-user/epmd-0-r2
deleted file mode 100644
index 64de45c1a205..000000000000
--- a/metadata/md5-cache/acct-user/epmd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9dd07822fdf1a117da939d11b48c84ba
diff --git a/metadata/md5-cache/acct-user/epmd-0-r3 b/metadata/md5-cache/acct-user/epmd-0-r3
new file mode 100644
index 000000000000..941547314e27
--- /dev/null
+++ b/metadata/md5-cache/acct-user/epmd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Erlang Portmapper 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/epmd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=92bc16d1c268b10ad0bd3cf008c1f768
diff --git a/metadata/md5-cache/acct-user/err-0-r1 b/metadata/md5-cache/acct-user/err-0-r1
deleted file mode 100644
index c6ccc1828b71..000000000000
--- a/metadata/md5-cache/acct-user/err-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=06de227be2b3b26672667131aa967d6b
diff --git a/metadata/md5-cache/acct-user/err-0-r2 b/metadata/md5-cache/acct-user/err-0-r2
new file mode 100644
index 000000000000..1c2d4681866a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/err-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: err
+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/err
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=90fbb64c58cc72da0af7838af2e72b56
diff --git a/metadata/md5-cache/acct-user/etcd-0-r2 b/metadata/md5-cache/acct-user/etcd-0-r2
deleted file mode 100644
index 4f7e691fa406..000000000000
--- a/metadata/md5-cache/acct-user/etcd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=79b1cd54c4b810b305f983d71770aa95
diff --git a/metadata/md5-cache/acct-user/etcd-0-r3 b/metadata/md5-cache/acct-user/etcd-0-r3
new file mode 100644
index 000000000000..23a0f8f52ef1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/etcd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for etcd
+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/etcd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b24c70f339346580caa5ec2ec1d21577
diff --git a/metadata/md5-cache/acct-user/exabgp-0-r2 b/metadata/md5-cache/acct-user/exabgp-0-r2
deleted file mode 100644
index 1344bd2a872b..000000000000
--- a/metadata/md5-cache/acct-user/exabgp-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=421feb7f045aec00f4876396e98ff33b
diff --git a/metadata/md5-cache/acct-user/exabgp-0-r3 b/metadata/md5-cache/acct-user/exabgp-0-r3
new file mode 100644
index 000000000000..4dbd21836a92
--- /dev/null
+++ b/metadata/md5-cache/acct-user/exabgp-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/exabgp
+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/exabgp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e491e100b6bec23f4f38af93c02c8f5f
diff --git a/metadata/md5-cache/acct-user/ez-ipupd-0-r1 b/metadata/md5-cache/acct-user/ez-ipupd-0-r1
deleted file mode 100644
index 1b033d69dad2..000000000000
--- a/metadata/md5-cache/acct-user/ez-ipupd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4d0c269f45480f6bbb5c19872c3ee9ad
diff --git a/metadata/md5-cache/acct-user/ez-ipupd-0-r2 b/metadata/md5-cache/acct-user/ez-ipupd-0-r2
new file mode 100644
index 000000000000..65a3b5d87fb3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ez-ipupd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/ez-ipupdate
+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/ez-ipupd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8468784e8f277b9e80fba8ad2a500c8e
diff --git a/metadata/md5-cache/acct-user/fax-0-r1 b/metadata/md5-cache/acct-user/fax-0-r1
deleted file mode 100644
index 92c24227dc88..000000000000
--- a/metadata/md5-cache/acct-user/fax-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=101845d49afa2133cc61f3b41e55e622
diff --git a/metadata/md5-cache/acct-user/fax-0-r2 b/metadata/md5-cache/acct-user/fax-0-r2
new file mode 100644
index 000000000000..90d28c88d0aa
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fax-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dialup/mgetty
+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/fax
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cd103d33c67c97f5573c1ca7b292061a
diff --git a/metadata/md5-cache/acct-user/fcron-0-r1 b/metadata/md5-cache/acct-user/fcron-0-r1
deleted file mode 100644
index ba2befe23ed7..000000000000
--- a/metadata/md5-cache/acct-user/fcron-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=92b260010edfaed65d70c8f63141aed5
diff --git a/metadata/md5-cache/acct-user/fcron-0-r2 b/metadata/md5-cache/acct-user/fcron-0-r2
new file mode 100644
index 000000000000..7180d47a3c1d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fcron-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-process/fcron
+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/fcron
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=57ab8a3c653f322dc915ccf1f5b3b004
diff --git a/metadata/md5-cache/acct-user/fdm-0-r1 b/metadata/md5-cache/acct-user/fdm-0-r1
deleted file mode 100644
index fad2f4ec1a69..000000000000
--- a/metadata/md5-cache/acct-user/fdm-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=97075f0b7a44b33e2e5a12fcc3ec7637
diff --git a/metadata/md5-cache/acct-user/fdm-0-r2 b/metadata/md5-cache/acct-user/fdm-0-r2
new file mode 100644
index 000000000000..3871c62ad011
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fdm-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/fdm
+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/fdm
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0f12e320c4ecb5c37554ec2549c13a6d
diff --git a/metadata/md5-cache/acct-user/fetchmail-0-r2 b/metadata/md5-cache/acct-user/fetchmail-0-r2
deleted file mode 100644
index fca0947619ec..000000000000
--- a/metadata/md5-cache/acct-user/fetchmail-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d54fc9d161c93a2a5c6f124eea193950
diff --git a/metadata/md5-cache/acct-user/fetchmail-0-r3 b/metadata/md5-cache/acct-user/fetchmail-0-r3
new file mode 100644
index 000000000000..201c4c20fdb6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fetchmail-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/fetchmail
+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/fetchmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=64a6e964693a0c4f6c9262f14e7354ad
diff --git a/metadata/md5-cache/acct-user/fhem-0-r2 b/metadata/md5-cache/acct-user/fhem-0-r2
deleted file mode 100644
index 7206ae5b11ca..000000000000
--- a/metadata/md5-cache/acct-user/fhem-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b652225c7720923502562ee8debc0a05
diff --git a/metadata/md5-cache/acct-user/fhem-0-r3 b/metadata/md5-cache/acct-user/fhem-0-r3
new file mode 100644
index 000000000000..a0498ca3b025
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fhem-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the FHEM perl server for house automation
+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/fhem
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9a56909b4a6a93b5a88d001b37a34181
diff --git a/metadata/md5-cache/acct-user/flatpak-0-r1 b/metadata/md5-cache/acct-user/flatpak-0-r1
deleted file mode 100644
index bcdc0e4dbf39..000000000000
--- a/metadata/md5-cache/acct-user/flatpak-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=47974c0c9fd53604db7e4a1c3e65f8fa
diff --git a/metadata/md5-cache/acct-user/flatpak-0-r2 b/metadata/md5-cache/acct-user/flatpak-0-r2
new file mode 100644
index 000000000000..df19a621ac79
--- /dev/null
+++ b/metadata/md5-cache/acct-user/flatpak-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: flatpak
+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/flatpak
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f2557f140ef6a37a12d88b4601722495
diff --git a/metadata/md5-cache/acct-user/flows-0-r1 b/metadata/md5-cache/acct-user/flows-0-r1
deleted file mode 100644
index d008743124f6..000000000000
--- a/metadata/md5-cache/acct-user/flows-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=87deb1a84f2a322168132b3ae64d34ba
diff --git a/metadata/md5-cache/acct-user/flows-0-r2 b/metadata/md5-cache/acct-user/flows-0-r2
new file mode 100644
index 000000000000..f42ed13b1417
--- /dev/null
+++ b/metadata/md5-cache/acct-user/flows-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/flow-tools
+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/flows
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=575cd86ac2d6a5c15257cbd16f4be608
diff --git a/metadata/md5-cache/acct-user/fluentd-0-r2 b/metadata/md5-cache/acct-user/fluentd-0-r2
deleted file mode 100644
index 6a4eb0a8ad72..000000000000
--- a/metadata/md5-cache/acct-user/fluentd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a8ae10da44e5ec2ff2f817fd432d63fe
diff --git a/metadata/md5-cache/acct-user/fluentd-0-r3 b/metadata/md5-cache/acct-user/fluentd-0-r3
new file mode 100644
index 000000000000..d03009648b0d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fluentd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-admin/fluentd
+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/fluentd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cee379bfdd19dd5d161f9f1839251db9
diff --git a/metadata/md5-cache/acct-user/fnord-0-r1 b/metadata/md5-cache/acct-user/fnord-0-r1
deleted file mode 100644
index 776da527ac28..000000000000
--- a/metadata/md5-cache/acct-user/fnord-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=91c6889edcb9ba9f6ede9338182f593c
diff --git a/metadata/md5-cache/acct-user/fnord-0-r2 b/metadata/md5-cache/acct-user/fnord-0-r2
new file mode 100644
index 000000000000..4ab18b0ee5b9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fnord-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-servers/fnord
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=274c9ee433eeac316283d49d60aed7b0
diff --git a/metadata/md5-cache/acct-user/fnordlog-0-r1 b/metadata/md5-cache/acct-user/fnordlog-0-r1
deleted file mode 100644
index bbac0927931a..000000000000
--- a/metadata/md5-cache/acct-user/fnordlog-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=30ca3e6f37d9a0a8ecacbcf9cd426915
diff --git a/metadata/md5-cache/acct-user/fnordlog-0-r2 b/metadata/md5-cache/acct-user/fnordlog-0-r2
new file mode 100644
index 000000000000..877de4c865bd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fnordlog-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-servers/fnord
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3cf3d62b99a303ac2cb240563d84660d
diff --git a/metadata/md5-cache/acct-user/foldingathome-0-r1 b/metadata/md5-cache/acct-user/foldingathome-0-r1
deleted file mode 100644
index 81c86ebe06de..000000000000
--- a/metadata/md5-cache/acct-user/foldingathome-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a17502f199bd3486f83501272c17f409
diff --git a/metadata/md5-cache/acct-user/foldingathome-0-r2 b/metadata/md5-cache/acct-user/foldingathome-0-r2
new file mode 100644
index 000000000000..c2a86979dc36
--- /dev/null
+++ b/metadata/md5-cache/acct-user/foldingathome-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sci-biology/foldingathome
+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/foldingathome acct-group/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3201077ba4135b26364321ab77ed98d5
diff --git a/metadata/md5-cache/acct-user/fp-multiuser-0-r1 b/metadata/md5-cache/acct-user/fp-multiuser-0-r1
deleted file mode 100644
index 0e86fb37ffa7..000000000000
--- a/metadata/md5-cache/acct-user/fp-multiuser-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=da9e9049e3154aea12a1db5a9285182f
diff --git a/metadata/md5-cache/acct-user/fp-multiuser-0-r2 b/metadata/md5-cache/acct-user/fp-multiuser-0-r2
new file mode 100644
index 000000000000..e196a780a2dd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fp-multiuser-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-vpn/fp-multiuser
+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/fp-multiuser
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4d41b6c0c51ab2847af0019436cbcbc1
diff --git a/metadata/md5-cache/acct-user/freenet-0-r1 b/metadata/md5-cache/acct-user/freenet-0-r1
deleted file mode 100644
index 79b262fc1b4d..000000000000
--- a/metadata/md5-cache/acct-user/freenet-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cc9ec09c0cddf47ef6d515f243063b66
diff --git a/metadata/md5-cache/acct-user/freenet-0-r2 b/metadata/md5-cache/acct-user/freenet-0-r2
new file mode 100644
index 000000000000..b56e1010d4e6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/freenet-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/freenet
+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/freenet
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=014b317e8e7f75db40eb7eba687e9aba
diff --git a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r1 b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r1
deleted file mode 100644
index 812e088051ce..000000000000
--- a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=467279be65e5121ef77fab28558a58de
diff --git a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r2 b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r2
new file mode 100644
index 000000000000..9808f5854f5f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=FRITZ!Box Smart Home Exporter 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/fritzbox_smarthome_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4c11bba9377b7f178a80b2e225ce8594
diff --git a/metadata/md5-cache/acct-user/frr-0-r1 b/metadata/md5-cache/acct-user/frr-0-r1
deleted file mode 100644
index 5510570b93cb..000000000000
--- a/metadata/md5-cache/acct-user/frr-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6c6a6b6de7ed663b3cdae13b72e9e350
diff --git a/metadata/md5-cache/acct-user/frr-0-r2 b/metadata/md5-cache/acct-user/frr-0-r2
new file mode 100644
index 000000000000..b00dddc8becc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/frr-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: frr
+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/frr
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1f7eef5191242c05b640d6b638d39420
diff --git a/metadata/md5-cache/acct-user/ftp-0-r4 b/metadata/md5-cache/acct-user/ftp-0-r4
deleted file mode 100644
index 08d411b56004..000000000000
--- a/metadata/md5-cache/acct-user/ftp-0-r4
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f923db32ac401716a5eef55d699dcfb6
diff --git a/metadata/md5-cache/acct-user/ftp-0-r5 b/metadata/md5-cache/acct-user/ftp-0-r5
new file mode 100644
index 000000000000..713954a58ee6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ftp-0-r5
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=File Transfer Protocol (FTP) server 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/ftp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2a18bf856ec1cbe612f2461d7f5b34a6
diff --git a/metadata/md5-cache/acct-user/ftpproxy-0-r1 b/metadata/md5-cache/acct-user/ftpproxy-0-r1
deleted file mode 100644
index 68bc90daddf4..000000000000
--- a/metadata/md5-cache/acct-user/ftpproxy-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6b8023e3445d15bb09803780d63082f5
diff --git a/metadata/md5-cache/acct-user/ftpproxy-0-r2 b/metadata/md5-cache/acct-user/ftpproxy-0-r2
new file mode 100644
index 000000000000..983edd8b7493
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ftpproxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-ftp/frox
+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/ftpproxy
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b0c9ba22620223f67f884b92db50cb77
diff --git a/metadata/md5-cache/acct-user/gatling-0-r2 b/metadata/md5-cache/acct-user/gatling-0-r2
deleted file mode 100644
index f3936bd6dad0..000000000000
--- a/metadata/md5-cache/acct-user/gatling-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c6fffceda380466e53e8399fe0244d1c
diff --git a/metadata/md5-cache/acct-user/gatling-0-r3 b/metadata/md5-cache/acct-user/gatling-0-r3
new file mode 100644
index 000000000000..f9ce083ad4b3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gatling-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: gatling
+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/gatling
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d120c5ef72d62e2aba10d4a25cb8278a
diff --git a/metadata/md5-cache/acct-user/gauth-0-r1 b/metadata/md5-cache/acct-user/gauth-0-r1
deleted file mode 100644
index 21aa6ce09162..000000000000
--- a/metadata/md5-cache/acct-user/gauth-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5b0c48543a36d5ea9396a252198c5281
diff --git a/metadata/md5-cache/acct-user/gauth-0-r2 b/metadata/md5-cache/acct-user/gauth-0-r2
new file mode 100644
index 000000000000..dce803ff8447
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gauth-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-auth/google-authenticator-wrappers
+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/gauth
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=873cc147b6d0cabcc16705f339939c17
diff --git a/metadata/md5-cache/acct-user/gdm-0-r1 b/metadata/md5-cache/acct-user/gdm-0-r1
deleted file mode 100644
index 53f4e1265e92..000000000000
--- a/metadata/md5-cache/acct-user/gdm-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2f2714a6b03e3c5c81bfa952e8240d16
diff --git a/metadata/md5-cache/acct-user/gdm-0-r2 b/metadata/md5-cache/acct-user/gdm-0-r2
new file mode 100644
index 000000000000..8546c2d169cc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gdm-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running GDM
+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/gdm acct-group/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b5692d4f8365376844c47d4b58bda6e6
diff --git a/metadata/md5-cache/acct-user/geneweb-0-r2 b/metadata/md5-cache/acct-user/geneweb-0-r2
deleted file mode 100644
index 315b010437e3..000000000000
--- a/metadata/md5-cache/acct-user/geneweb-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c1dfed07c7f9ad42e57d39f9d345ea3e
diff --git a/metadata/md5-cache/acct-user/geneweb-0-r3 b/metadata/md5-cache/acct-user/geneweb-0-r3
new file mode 100644
index 000000000000..9f6fd6492401
--- /dev/null
+++ b/metadata/md5-cache/acct-user/geneweb-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user id for geneweb 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/geneweb
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2f0e1bdc62749ff29926e690c4a53cb2
diff --git a/metadata/md5-cache/acct-user/geoclue-0-r1 b/metadata/md5-cache/acct-user/geoclue-0-r1
deleted file mode 100644
index d1ed93012f56..000000000000
--- a/metadata/md5-cache/acct-user/geoclue-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=519a7a51cc3e907d2cff76e34413ecf9
diff --git a/metadata/md5-cache/acct-user/geoclue-0-r2 b/metadata/md5-cache/acct-user/geoclue-0-r2
new file mode 100644
index 000000000000..1469fd2daf53
--- /dev/null
+++ b/metadata/md5-cache/acct-user/geoclue-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running the GeoClue D-Bus geolocation 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/geoclue
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e9b08baea58801c15293fed46074feac
diff --git a/metadata/md5-cache/acct-user/gerbera-0-r2 b/metadata/md5-cache/acct-user/gerbera-0-r2
deleted file mode 100644
index 7a6b92a1fa4d..000000000000
--- a/metadata/md5-cache/acct-user/gerbera-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e0e0c2d47330356918db4c67e6efe88c
diff --git a/metadata/md5-cache/acct-user/gerbera-0-r3 b/metadata/md5-cache/acct-user/gerbera-0-r3
new file mode 100644
index 000000000000..8119ce966ea4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gerbera-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Gerbera UPnP Media Server 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/gerbera acct-group/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f37fe9a9c925c596372e6758611fa256
diff --git a/metadata/md5-cache/acct-user/github-exporter-0-r1 b/metadata/md5-cache/acct-user/github-exporter-0-r1
deleted file mode 100644
index 1629cfa10377..000000000000
--- a/metadata/md5-cache/acct-user/github-exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dd80dab37f690bcab55dc4988a7fb11a
diff --git a/metadata/md5-cache/acct-user/github-exporter-0-r2 b/metadata/md5-cache/acct-user/github-exporter-0-r2
new file mode 100644
index 000000000000..e4ed8a14b9c1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/github-exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for github-exporter
+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/github-exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a26fdf0a6baf9018b43ced73ddef7e44
diff --git a/metadata/md5-cache/acct-user/gitlab-runner-1-r1 b/metadata/md5-cache/acct-user/gitlab-runner-1-r1
deleted file mode 100644
index 1485691592e6..000000000000
--- a/metadata/md5-cache/acct-user/gitlab-runner-1-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e47b370fd8a732df07b99f7ea6c353f5
diff --git a/metadata/md5-cache/acct-user/gitlab-runner-1-r2 b/metadata/md5-cache/acct-user/gitlab-runner-1-r2
new file mode 100644
index 000000000000..7b1d4507463b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gitlab-runner-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Dedicated user for gitlab-runner
+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/gitlab-runner
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0cd428462e6b4b7f023abd3c783cbc9
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0-r2 b/metadata/md5-cache/acct-user/gkrellmd-0-r2
deleted file mode 100644
index 53aaa839ffef..000000000000
--- a/metadata/md5-cache/acct-user/gkrellmd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=134e09e4ebb2c47f835f560a3912eb1d
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0-r3 b/metadata/md5-cache/acct-user/gkrellmd-0-r3
new file mode 100644
index 000000000000..0819c5ce6dc2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gkrellmd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for gkrellm 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/gkrellmd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bfeb4955d9bb32ee974d97325f40e0fe
diff --git a/metadata/md5-cache/acct-user/gluster-0-r2 b/metadata/md5-cache/acct-user/gluster-0-r2
deleted file mode 100644
index 6cca14d644b5..000000000000
--- a/metadata/md5-cache/acct-user/gluster-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0e93a3e85003a9ca89491c6ec6e6a26c
diff --git a/metadata/md5-cache/acct-user/gluster-0-r3 b/metadata/md5-cache/acct-user/gluster-0-r3
new file mode 100644
index 000000000000..a82ffff39f16
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gluster-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: gluster
+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/gluster
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2dc46dd15b544f83fa19f0ea3ad77fd8
diff --git a/metadata/md5-cache/acct-user/gnump3d-0-r1 b/metadata/md5-cache/acct-user/gnump3d-0-r1
deleted file mode 100644
index 898e93f99eca..000000000000
--- a/metadata/md5-cache/acct-user/gnump3d-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=911b9eff185b17c710afd2f4844f5872
diff --git a/metadata/md5-cache/acct-user/gnump3d-0-r2 b/metadata/md5-cache/acct-user/gnump3d-0-r2
new file mode 100644
index 000000000000..2b59c80be0f0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gnump3d-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/gnump3d
+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/gnump3d
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c25a438944c83774135f9d2e217492bb
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
deleted file mode 100644
index d4ec5034d394..000000000000
--- a/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=22da69569c3832c489a6cf00ca49b031
diff --git a/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r2 b/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r2
new file mode 100644
index 000000000000..0afbdbabde22
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-crypt/gnupg-pkcs11-scd
+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/gnupg-pkcs11-scd-proxy acct-group/gnupg-pkcs11
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e13295410e7c7471ab14745ea9654b7
diff --git a/metadata/md5-cache/acct-user/gopher-0-r1 b/metadata/md5-cache/acct-user/gopher-0-r1
deleted file mode 100644
index bd94aac5dd2b..000000000000
--- a/metadata/md5-cache/acct-user/gopher-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ccef16b33ec80779dffbf8118eb78fd1
diff --git a/metadata/md5-cache/acct-user/gopher-0-r2 b/metadata/md5-cache/acct-user/gopher-0-r2
new file mode 100644
index 000000000000..e6b7e28a0762
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gopher-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for gofish
+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/gopher
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=766c2570c3702ff37554c38f73da5de3
diff --git a/metadata/md5-cache/acct-user/gopherd-0-r1 b/metadata/md5-cache/acct-user/gopherd-0-r1
deleted file mode 100644
index 16d8edb4bf8c..000000000000
--- a/metadata/md5-cache/acct-user/gopherd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6f88cb1126756ffab34dc5459d66c28b
diff --git a/metadata/md5-cache/acct-user/gopherd-0-r2 b/metadata/md5-cache/acct-user/gopherd-0-r2
new file mode 100644
index 000000000000..d882ce8c872e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gopherd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/geomyidae
+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/gopherd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c0b5963d28c6dd6bd34c1676a0b80dfd
diff --git a/metadata/md5-cache/acct-user/gpsd-0-r3 b/metadata/md5-cache/acct-user/gpsd-0-r3
deleted file mode 100644
index e66ae86ae378..000000000000
--- a/metadata/md5-cache/acct-user/gpsd-0-r3
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=08e5454b104f06c6d748517a193da7e0
diff --git a/metadata/md5-cache/acct-user/gpsd-0-r4 b/metadata/md5-cache/acct-user/gpsd-0-r4
new file mode 100644
index 000000000000..5b72255efeb6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gpsd-0-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for gpsd
+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/dialout acct-group/uucp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a16d3b4a812d68843481e32833864e15
diff --git a/metadata/md5-cache/acct-user/grafana-0-r2 b/metadata/md5-cache/acct-user/grafana-0-r2
deleted file mode 100644
index c6711b4f356f..000000000000
--- a/metadata/md5-cache/acct-user/grafana-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d6a4e19959051bf218ab3595125222dc
diff --git a/metadata/md5-cache/acct-user/grafana-0-r3 b/metadata/md5-cache/acct-user/grafana-0-r3
new file mode 100644
index 000000000000..2a924ec6d3db
--- /dev/null
+++ b/metadata/md5-cache/acct-user/grafana-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=grafana 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/grafana
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=584c4693373cdd2b7380b6544185e1e5
diff --git a/metadata/md5-cache/acct-user/graylog-0-r2 b/metadata/md5-cache/acct-user/graylog-0-r2
deleted file mode 100644
index 85de2ebcd7af..000000000000
--- a/metadata/md5-cache/acct-user/graylog-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ae202790586f576f05592134dd9b3dfd
diff --git a/metadata/md5-cache/acct-user/graylog-0-r3 b/metadata/md5-cache/acct-user/graylog-0-r3
new file mode 100644
index 000000000000..d28192ccc9ab
--- /dev/null
+++ b/metadata/md5-cache/acct-user/graylog-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Graylog 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/graylog
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e0bd1bb36797845185699b8be9dac62
diff --git a/metadata/md5-cache/acct-user/greetd-0-r2 b/metadata/md5-cache/acct-user/greetd-0-r2
deleted file mode 100644
index 85346a002040..000000000000
--- a/metadata/md5-cache/acct-user/greetd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8ebc6c1770c474019e9b280673f00104
diff --git a/metadata/md5-cache/acct-user/greetd-0-r3 b/metadata/md5-cache/acct-user/greetd-0-r3
new file mode 100644
index 000000000000..0b2c540450b9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/greetd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for gui-libs/greetd
+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/greetd acct-group/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ca0b4b5940a4af78ff76bfb9f633b958
diff --git a/metadata/md5-cache/acct-user/grok_exporter-0-r1 b/metadata/md5-cache/acct-user/grok_exporter-0-r1
deleted file mode 100644
index 493df9f1fd0d..000000000000
--- a/metadata/md5-cache/acct-user/grok_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4121feaf05fdc1ed2546364499a6ef58
diff --git a/metadata/md5-cache/acct-user/grok_exporter-0-r2 b/metadata/md5-cache/acct-user/grok_exporter-0-r2
new file mode 100644
index 000000000000..12a2b3d9df57
--- /dev/null
+++ b/metadata/md5-cache/acct-user/grok_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/grok_exporter
+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/grok_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d4a60dd7c6edb1a788fac99308d58677
diff --git a/metadata/md5-cache/acct-user/groonga-0-r1 b/metadata/md5-cache/acct-user/groonga-0-r1
deleted file mode 100644
index 5f0b7ec49efd..000000000000
--- a/metadata/md5-cache/acct-user/groonga-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=06b37f1e66e6a0cfd01b70566c5e8e2d
diff --git a/metadata/md5-cache/acct-user/groonga-0-r2 b/metadata/md5-cache/acct-user/groonga-0-r2
new file mode 100644
index 000000000000..1572d5fa3b08
--- /dev/null
+++ b/metadata/md5-cache/acct-user/groonga-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-text/groonga
+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/groonga
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2d19ddc3a754808ee2aadd63dcc46732
diff --git a/metadata/md5-cache/acct-user/gvm-0-r2 b/metadata/md5-cache/acct-user/gvm-0-r2
deleted file mode 100644
index 4c1b6361d943..000000000000
--- a/metadata/md5-cache/acct-user/gvm-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8c1f1908862d4f0265e961aac8464b91
diff --git a/metadata/md5-cache/acct-user/gvm-0-r3 b/metadata/md5-cache/acct-user/gvm-0-r3
new file mode 100644
index 000000000000..00a9cc113681
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gvm-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Greenbone vulnerability management 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/gvm
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5ed06b3e6a6fe7d76a50a31cd53b3cd0
diff --git a/metadata/md5-cache/acct-user/h2o-0-r1 b/metadata/md5-cache/acct-user/h2o-0-r1
deleted file mode 100644
index 04204be901f6..000000000000
--- a/metadata/md5-cache/acct-user/h2o-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=71275641ccd9e193887f9a3b729bf595
diff --git a/metadata/md5-cache/acct-user/h2o-0-r2 b/metadata/md5-cache/acct-user/h2o-0-r2
new file mode 100644
index 000000000000..bb4f818ed524
--- /dev/null
+++ b/metadata/md5-cache/acct-user/h2o-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-servers/h2o
+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/h2o
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c55d4b945b8c3d8b9a11941883cd8f70
diff --git a/metadata/md5-cache/acct-user/hacluster-0-r1 b/metadata/md5-cache/acct-user/hacluster-0-r1
deleted file mode 100644
index d77c85c2717a..000000000000
--- a/metadata/md5-cache/acct-user/hacluster-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6b9a8c466adb63d8ca9afb8e84c81285
diff --git a/metadata/md5-cache/acct-user/hacluster-0-r2 b/metadata/md5-cache/acct-user/hacluster-0-r2
new file mode 100644
index 000000000000..f4c2161cd1ce
--- /dev/null
+++ b/metadata/md5-cache/acct-user/hacluster-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-cluster/cluster-glue
+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/haclient
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5930d816531963cfe01ceb7f14f33cf7
diff --git a/metadata/md5-cache/acct-user/haproxy-0-r2 b/metadata/md5-cache/acct-user/haproxy-0-r2
deleted file mode 100644
index 338444344a70..000000000000
--- a/metadata/md5-cache/acct-user/haproxy-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f8d9b1864f37ca89c7d4ff8064777c5e
diff --git a/metadata/md5-cache/acct-user/haproxy-0-r3 b/metadata/md5-cache/acct-user/haproxy-0-r3
new file mode 100644
index 000000000000..7efa96823f8e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/haproxy-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: haproxy
+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/haproxy
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e676342afd5ee692616ee9bfd6a905d9
diff --git a/metadata/md5-cache/acct-user/hsqldb-0-r1 b/metadata/md5-cache/acct-user/hsqldb-0-r1
deleted file mode 100644
index a38a59b8930b..000000000000
--- a/metadata/md5-cache/acct-user/hsqldb-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=64c1d598b00a4f06cd028ede88be244d
diff --git a/metadata/md5-cache/acct-user/hsqldb-0-r2 b/metadata/md5-cache/acct-user/hsqldb-0-r2
new file mode 100644
index 000000000000..65bbb0be418f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/hsqldb-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for hsqldb
+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/hsqldb
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=15c9a25615ded6f98622548a693fc716
diff --git a/metadata/md5-cache/acct-user/http-0-r1 b/metadata/md5-cache/acct-user/http-0-r1
deleted file mode 100644
index 710ba0fa3f24..000000000000
--- a/metadata/md5-cache/acct-user/http-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a49c866633e2123fcbec7e26f949cc47
diff --git a/metadata/md5-cache/acct-user/http-0-r2 b/metadata/md5-cache/acct-user/http-0-r2
new file mode 100644
index 000000000000..eaa7acc37fbc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/http-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-servers/caddy
+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/http
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=db1a334a0ebca369ab5ea445322649a9
diff --git a/metadata/md5-cache/acct-user/i2p-0-r2 b/metadata/md5-cache/acct-user/i2p-0-r2
deleted file mode 100644
index dfffc62d335d..000000000000
--- a/metadata/md5-cache/acct-user/i2p-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ccc5bbf48a589ad6969a75d479b9bce0
diff --git a/metadata/md5-cache/acct-user/i2p-0-r3 b/metadata/md5-cache/acct-user/i2p-0-r3
new file mode 100644
index 000000000000..df7a7e01ae46
--- /dev/null
+++ b/metadata/md5-cache/acct-user/i2p-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for system-wide net-vpn/i2p
+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/i2p
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1fffc3e9a0d9ef764abd903d425cf56c
diff --git a/metadata/md5-cache/acct-user/i2pd-0-r2 b/metadata/md5-cache/acct-user/i2pd-0-r2
deleted file mode 100644
index c343df29e12a..000000000000
--- a/metadata/md5-cache/acct-user/i2pd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=15af2114c7d981d536171a58a503d015
diff --git a/metadata/md5-cache/acct-user/i2pd-0-r3 b/metadata/md5-cache/acct-user/i2pd-0-r3
new file mode 100644
index 000000000000..5a0783de5830
--- /dev/null
+++ b/metadata/md5-cache/acct-user/i2pd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the system-wide net-vpn/i2pd 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/i2pd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b3c6ea610212f170eb53c6a3c3bdb5ca
diff --git a/metadata/md5-cache/acct-user/icecast-0-r1 b/metadata/md5-cache/acct-user/icecast-0-r1
deleted file mode 100644
index f14b7d9904e1..000000000000
--- a/metadata/md5-cache/acct-user/icecast-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8e021f6785133fbe7762dff23f272046
diff --git a/metadata/md5-cache/acct-user/icecast-0-r2 b/metadata/md5-cache/acct-user/icecast-0-r2
new file mode 100644
index 000000000000..86200fe233bc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icecast-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/icecast
+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/icecast
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bc3d8128cc349a2d4b0d956f5b1c5a2f
diff --git a/metadata/md5-cache/acct-user/icecream-0-r1 b/metadata/md5-cache/acct-user/icecream-0-r1
deleted file mode 100644
index 761539e4fc10..000000000000
--- a/metadata/md5-cache/acct-user/icecream-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=eabdabf2dcf3e6f9b03aa695c8de1019
diff --git a/metadata/md5-cache/acct-user/icecream-0-r2 b/metadata/md5-cache/acct-user/icecream-0-r2
new file mode 100644
index 000000000000..2fb94c18ab58
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icecream-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-devel/icecream
+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/icecream
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=47ff8ae0859738ddaf1fd971c18c8df1
diff --git a/metadata/md5-cache/acct-user/ices-0-r1 b/metadata/md5-cache/acct-user/ices-0-r1
deleted file mode 100644
index 55dcfb79c4ba..000000000000
--- a/metadata/md5-cache/acct-user/ices-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c50abac985d206285e0751b738dc8a40
diff --git a/metadata/md5-cache/acct-user/ices-0-r2 b/metadata/md5-cache/acct-user/ices-0-r2
new file mode 100644
index 000000000000..6b073c822796
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ices-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/ices
+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/ices
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f4ffe31872f9f341c8067732ff4b28f9
diff --git a/metadata/md5-cache/acct-user/icinga-0-r2 b/metadata/md5-cache/acct-user/icinga-0-r2
deleted file mode 100644
index 8448cf9f4181..000000000000
--- a/metadata/md5-cache/acct-user/icinga-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d546bb873d86559dfdd1b3a1a61613bd
diff --git a/metadata/md5-cache/acct-user/icinga-0-r3 b/metadata/md5-cache/acct-user/icinga-0-r3
new file mode 100644
index 000000000000..0966bb74d461
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icinga-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Icinga 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/icinga acct-group/icingacmd acct-group/nagios
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=503b33aec8b34bd3449cd55c51f083c6
diff --git a/metadata/md5-cache/acct-user/influxdb-0-r2 b/metadata/md5-cache/acct-user/influxdb-0-r2
deleted file mode 100644
index 7ef36227697b..000000000000
--- a/metadata/md5-cache/acct-user/influxdb-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b7b69877888c86b7432ba6628cd47a7e
diff --git a/metadata/md5-cache/acct-user/influxdb-0-r3 b/metadata/md5-cache/acct-user/influxdb-0-r3
new file mode 100644
index 000000000000..55840b7a3a2b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/influxdb-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for influxdb
+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/influxdb
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=63db5efad3868d1fcd362728b251dd97
diff --git a/metadata/md5-cache/acct-user/inspircd-0-r2 b/metadata/md5-cache/acct-user/inspircd-0-r2
deleted file mode 100644
index b2c47a5ed0f7..000000000000
--- a/metadata/md5-cache/acct-user/inspircd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=01826ce9f8ada0143b517c1b2c69ab19
diff --git a/metadata/md5-cache/acct-user/inspircd-0-r3 b/metadata/md5-cache/acct-user/inspircd-0-r3
new file mode 100644
index 000000000000..d80dbb37ba26
--- /dev/null
+++ b/metadata/md5-cache/acct-user/inspircd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for InspIRCd server 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/inspircd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=eec8137c368a3e3e641a522e6d6bc7b3
diff --git a/metadata/md5-cache/acct-user/ipfs-0-r2 b/metadata/md5-cache/acct-user/ipfs-0-r2
deleted file mode 100644
index 0c212aea154b..000000000000
--- a/metadata/md5-cache/acct-user/ipfs-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=47997c59cf263c623edb3ccd21350e8f
diff --git a/metadata/md5-cache/acct-user/ipfs-0-r3 b/metadata/md5-cache/acct-user/ipfs-0-r3
new file mode 100644
index 000000000000..13cd1fb368e7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipfs-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the system-wide net-p2p/go-ipfs-bin 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/ipfs
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cbb86827e881e572b2dc33bb52de6547
diff --git a/metadata/md5-cache/acct-user/ippl-0-r2 b/metadata/md5-cache/acct-user/ippl-0-r2
deleted file mode 100644
index c59e27dc2ed9..000000000000
--- a/metadata/md5-cache/acct-user/ippl-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=26d27d87cb61a3220a5f0d8346d558f3
diff --git a/metadata/md5-cache/acct-user/ippl-0-r3 b/metadata/md5-cache/acct-user/ippl-0-r3
new file mode 100644
index 000000000000..0bd738d79f0c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ippl-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for net-analyzer/ippl
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5a8f9960ce5680e0ec5e5c6adc9169d3
diff --git a/metadata/md5-cache/acct-user/ipsec-0-r1 b/metadata/md5-cache/acct-user/ipsec-0-r1
deleted file mode 100644
index 54d5c984a9eb..000000000000
--- a/metadata/md5-cache/acct-user/ipsec-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b64062d9b953cb5c065099714ed9c5e4
diff --git a/metadata/md5-cache/acct-user/ipsec-0-r2 b/metadata/md5-cache/acct-user/ipsec-0-r2
new file mode 100644
index 000000000000..58380e0c270c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipsec-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=ipsec (strongswan) 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/ipsec
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9a18e83d8bbf6390eb74186a086625a4
diff --git a/metadata/md5-cache/acct-user/ipsentinel-0-r1 b/metadata/md5-cache/acct-user/ipsentinel-0-r1
deleted file mode 100644
index 53e15e087380..000000000000
--- a/metadata/md5-cache/acct-user/ipsentinel-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=86228b629656c51e104660e19fe06dc8
diff --git a/metadata/md5-cache/acct-user/ipsentinel-0-r2 b/metadata/md5-cache/acct-user/ipsentinel-0-r2
new file mode 100644
index 000000000000..7680d166885b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipsentinel-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/ip-sentinel
+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/ipsentinel
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2c4f717e10894e1080ecf321233ac7f5
diff --git a/metadata/md5-cache/acct-user/iroffer-0-r1 b/metadata/md5-cache/acct-user/iroffer-0-r1
deleted file mode 100644
index 98c6a332da67..000000000000
--- a/metadata/md5-cache/acct-user/iroffer-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=54151b4de392e1ee9dd01adee87fac19
diff --git a/metadata/md5-cache/acct-user/iroffer-0-r2 b/metadata/md5-cache/acct-user/iroffer-0-r2
new file mode 100644
index 000000000000..44e226189f62
--- /dev/null
+++ b/metadata/md5-cache/acct-user/iroffer-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: iroffer
+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/iroffer
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a3b3adad24d1a0b570013f9569d92cc2
diff --git a/metadata/md5-cache/acct-user/jenkins-0-r1 b/metadata/md5-cache/acct-user/jenkins-0-r1
deleted file mode 100644
index e3d77f3dde0a..000000000000
--- a/metadata/md5-cache/acct-user/jenkins-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4f4645e0c665238845ca859fad3b8382
diff --git a/metadata/md5-cache/acct-user/jenkins-0-r2 b/metadata/md5-cache/acct-user/jenkins-0-r2
new file mode 100644
index 000000000000..2b05bfb0db87
--- /dev/null
+++ b/metadata/md5-cache/acct-user/jenkins-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Jenkins 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/jenkins
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4d48bc3bd6b867dcdbae48c10204784d
diff --git a/metadata/md5-cache/acct-user/kafka-0-r2 b/metadata/md5-cache/acct-user/kafka-0-r2
deleted file mode 100644
index 159c1b6591e0..000000000000
--- a/metadata/md5-cache/acct-user/kafka-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8e27eb4df266b960c9521f83dd8889ad
diff --git a/metadata/md5-cache/acct-user/kafka-0-r3 b/metadata/md5-cache/acct-user/kafka-0-r3
new file mode 100644
index 000000000000..944a710cf404
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kafka-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for kafka
+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/kafka
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b1b5975df3f7dd44b2ef0c0828c3c281
diff --git a/metadata/md5-cache/acct-user/kapacitor-0-r2 b/metadata/md5-cache/acct-user/kapacitor-0-r2
deleted file mode 100644
index 315f2d088b62..000000000000
--- a/metadata/md5-cache/acct-user/kapacitor-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7c77e0609af14ebe72d1ddf935a40cea
diff --git a/metadata/md5-cache/acct-user/kapacitor-0-r3 b/metadata/md5-cache/acct-user/kapacitor-0-r3
new file mode 100644
index 000000000000..dfd8de5e4f68
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kapacitor-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for kapacitor
+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/kapacitor
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=31c9b9d6a9d6616431046978b4c953e5
diff --git a/metadata/md5-cache/acct-user/karma-0-r1 b/metadata/md5-cache/acct-user/karma-0-r1
deleted file mode 100644
index 9be81625b7bd..000000000000
--- a/metadata/md5-cache/acct-user/karma-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=04544bfca84a1959d69402e50d999eb7
diff --git a/metadata/md5-cache/acct-user/karma-0-r2 b/metadata/md5-cache/acct-user/karma-0-r2
new file mode 100644
index 000000000000..3e966ae41199
--- /dev/null
+++ b/metadata/md5-cache/acct-user/karma-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/karma-bin
+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/karma
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=65e6335daa275f1fd74696c5a90ce27c
diff --git a/metadata/md5-cache/acct-user/kibana-0-r2 b/metadata/md5-cache/acct-user/kibana-0-r2
deleted file mode 100644
index 21278b023213..000000000000
--- a/metadata/md5-cache/acct-user/kibana-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a393284492426b565a6c3d5a790a24e5
diff --git a/metadata/md5-cache/acct-user/kibana-0-r3 b/metadata/md5-cache/acct-user/kibana-0-r3
new file mode 100644
index 000000000000..13240949b900
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kibana-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Kibana 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/kibana
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6064edb28ca4bf53a53e4f16637d69dd
diff --git a/metadata/md5-cache/acct-user/kismet-0-r2 b/metadata/md5-cache/acct-user/kismet-0-r2
deleted file mode 100644
index d2f7f220560b..000000000000
--- a/metadata/md5-cache/acct-user/kismet-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b358bff68cdda5deafd2e6c2d8e22baa
diff --git a/metadata/md5-cache/acct-user/kismet-0-r3 b/metadata/md5-cache/acct-user/kismet-0-r3
new file mode 100644
index 000000000000..15bd16d41e5e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kismet-0-r3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/kismet
+DESCRIPTION=net-wireless/kismet
+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/kismet acct-group/kismet
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d4cb6414a2beef642e75c1682f20e28b
diff --git a/metadata/md5-cache/acct-user/knot-0-r2 b/metadata/md5-cache/acct-user/knot-0-r2
deleted file mode 100644
index 34e318bc7533..000000000000
--- a/metadata/md5-cache/acct-user/knot-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d53037ae9011b021df19e78b2743ab17
diff --git a/metadata/md5-cache/acct-user/knot-0-r3 b/metadata/md5-cache/acct-user/knot-0-r3
new file mode 100644
index 000000000000..0dc2a6d48948
--- /dev/null
+++ b/metadata/md5-cache/acct-user/knot-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for knot DNS 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/knot
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e262e83f6714d70bfe944d2797462980
diff --git a/metadata/md5-cache/acct-user/kube-apiserver-0-r2 b/metadata/md5-cache/acct-user/kube-apiserver-0-r2
deleted file mode 100644
index 16abe73a4b41..000000000000
--- a/metadata/md5-cache/acct-user/kube-apiserver-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=00f7a93499e35e1cc34fb088f8458e70
diff --git a/metadata/md5-cache/acct-user/kube-apiserver-0-r3 b/metadata/md5-cache/acct-user/kube-apiserver-0-r3
new file mode 100644
index 000000000000..5ba539548a52
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kube-apiserver-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for kube-apiserver
+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/kube-apiserver
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d102c56ee06e5d02747cb059c1cc6f63
diff --git a/metadata/md5-cache/acct-user/kube-controller-manager-0-r2 b/metadata/md5-cache/acct-user/kube-controller-manager-0-r2
deleted file mode 100644
index f65df8603535..000000000000
--- a/metadata/md5-cache/acct-user/kube-controller-manager-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9e9fc581bc942a6b08924d4a468fa9bf
diff --git a/metadata/md5-cache/acct-user/kube-controller-manager-0-r3 b/metadata/md5-cache/acct-user/kube-controller-manager-0-r3
new file mode 100644
index 000000000000..43c0ab0dc686
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kube-controller-manager-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for kube-controller-manager
+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/kube-controller-manager
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1202566f9b446e3d57ede262e91cd59b
diff --git a/metadata/md5-cache/acct-user/kube-scheduler-0-r2 b/metadata/md5-cache/acct-user/kube-scheduler-0-r2
deleted file mode 100644
index 7095579f6a8b..000000000000
--- a/metadata/md5-cache/acct-user/kube-scheduler-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a0a982561338e480086f1810273deab7
diff --git a/metadata/md5-cache/acct-user/kube-scheduler-0-r3 b/metadata/md5-cache/acct-user/kube-scheduler-0-r3
new file mode 100644
index 000000000000..98e666085cda
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kube-scheduler-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for kube-scheduler
+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/kube-scheduler
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=83fe88f612bc5df470ef586c800fe509
diff --git a/metadata/md5-cache/acct-user/ldap-0-r1 b/metadata/md5-cache/acct-user/ldap-0-r1
deleted file mode 100644
index 6088af730e7b..000000000000
--- a/metadata/md5-cache/acct-user/ldap-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dd86020e96648d3ef1772fd71aa98286
diff --git a/metadata/md5-cache/acct-user/ldap-0-r2 b/metadata/md5-cache/acct-user/ldap-0-r2
new file mode 100644
index 000000000000..a9b7d1d51c21
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ldap-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=A user for ldap
+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/ldap
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2268733fc6090afec3d6339cbfa344f2
diff --git a/metadata/md5-cache/acct-user/lighttpd-0-r2 b/metadata/md5-cache/acct-user/lighttpd-0-r2
deleted file mode 100644
index b417dd338314..000000000000
--- a/metadata/md5-cache/acct-user/lighttpd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a30a3df342fb7744b5e40775664897a2
diff --git a/metadata/md5-cache/acct-user/lighttpd-0-r3 b/metadata/md5-cache/acct-user/lighttpd-0-r3
new file mode 100644
index 000000000000..ad7ee779f551
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lighttpd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for lighttpd
+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/lighttpd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a8180fbfa5208ebc7625fdcded86fcff
diff --git a/metadata/md5-cache/acct-user/lldpd-0-r2 b/metadata/md5-cache/acct-user/lldpd-0-r2
deleted file mode 100644
index 881c3249bacb..000000000000
--- a/metadata/md5-cache/acct-user/lldpd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=97378f7d88e08c5d2d2d103c29105924
diff --git a/metadata/md5-cache/acct-user/lldpd-0-r3 b/metadata/md5-cache/acct-user/lldpd-0-r3
new file mode 100644
index 000000000000..f38585cf5b4f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lldpd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/lldpd
+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/lldpd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1b1590cc9788b376b00a5e09a5df4695
diff --git a/metadata/md5-cache/acct-user/logstash-0-r2 b/metadata/md5-cache/acct-user/logstash-0-r2
deleted file mode 100644
index d49a3c5ac13c..000000000000
--- a/metadata/md5-cache/acct-user/logstash-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8f1ddf00ffacb30dda81c6593e2c396e
diff --git a/metadata/md5-cache/acct-user/logstash-0-r3 b/metadata/md5-cache/acct-user/logstash-0-r3
new file mode 100644
index 000000000000..2b98506e9d12
--- /dev/null
+++ b/metadata/md5-cache/acct-user/logstash-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Logstash 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/logstash
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=80b680ed1069de6828ec9c16dba9fb91
diff --git a/metadata/md5-cache/acct-user/logsurfer-0-r1 b/metadata/md5-cache/acct-user/logsurfer-0-r1
deleted file mode 100644
index 95dd0059b8c3..000000000000
--- a/metadata/md5-cache/acct-user/logsurfer-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=21b96cfa5ea5a2923c7d11bc7afd489c
diff --git a/metadata/md5-cache/acct-user/logsurfer-0-r2 b/metadata/md5-cache/acct-user/logsurfer-0-r2
new file mode 100644
index 000000000000..d7af7ac6a1a4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/logsurfer-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-admin/logsurfer
+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/logsurfer
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=adc5630cec8d4f172a505db436c83011
diff --git a/metadata/md5-cache/acct-user/lxc-0-r1 b/metadata/md5-cache/acct-user/lxc-0-r1
deleted file mode 100644
index 357e62a097ce..000000000000
--- a/metadata/md5-cache/acct-user/lxc-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dc4ae6d532a6d8a3db729e923127e478
diff --git a/metadata/md5-cache/acct-user/lxc-0-r2 b/metadata/md5-cache/acct-user/lxc-0-r2
new file mode 100644
index 000000000000..aaa25ca06ff7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lxc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-containers/lxc
+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/lxc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1dcd110960b35e3582b82a92fa1b2eb5
diff --git a/metadata/md5-cache/acct-user/mail-0-r2 b/metadata/md5-cache/acct-user/mail-0-r2
deleted file mode 100644
index f21c0d63cef5..000000000000
--- a/metadata/md5-cache/acct-user/mail-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cf2b4cd361528e0922ce0302c4c6cf2c
diff --git a/metadata/md5-cache/acct-user/mail-0-r3 b/metadata/md5-cache/acct-user/mail-0-r3
new file mode 100644
index 000000000000..c988bbc78d14
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mail-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Mail 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/mail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3b9caf66a877994c90f124a3ca17eb47
diff --git a/metadata/md5-cache/acct-user/man-1-r2 b/metadata/md5-cache/acct-user/man-1-r2
deleted file mode 100644
index c1c29f94de16..000000000000
--- a/metadata/md5-cache/acct-user/man-1-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2f02d83de526170b15842ffe8e9126f5
diff --git a/metadata/md5-cache/acct-user/man-1-r3 b/metadata/md5-cache/acct-user/man-1-r3
new file mode 100644
index 000000000000..a51a2421b545
--- /dev/null
+++ b/metadata/md5-cache/acct-user/man-1-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: man
+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/man
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=60140717201f776f3037e9e59bfb4ee1
diff --git a/metadata/md5-cache/acct-user/maradns-0-r2 b/metadata/md5-cache/acct-user/maradns-0-r2
deleted file mode 100644
index 9c35b1029972..000000000000
--- a/metadata/md5-cache/acct-user/maradns-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8c227f3988e635c6ea0680f5d4750b94
diff --git a/metadata/md5-cache/acct-user/maradns-0-r3 b/metadata/md5-cache/acct-user/maradns-0-r3
new file mode 100644
index 000000000000..a47248c44173
--- /dev/null
+++ b/metadata/md5-cache/acct-user/maradns-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: maradns
+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/maradns
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=880d5bb891b431a3bae565435da05d67
diff --git a/metadata/md5-cache/acct-user/memcached-0-r2 b/metadata/md5-cache/acct-user/memcached-0-r2
deleted file mode 100644
index 2ddde51f80ac..000000000000
--- a/metadata/md5-cache/acct-user/memcached-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e7c9ac8c69c5c91156cafcf4e9af95d8
diff --git a/metadata/md5-cache/acct-user/memcached-0-r3 b/metadata/md5-cache/acct-user/memcached-0-r3
new file mode 100644
index 000000000000..3116bbfca33b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/memcached-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the memcached 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/memcached
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a7db941d279c6068d563f2183c2d6d4e
diff --git a/metadata/md5-cache/acct-user/memcached_exporter-0-r1 b/metadata/md5-cache/acct-user/memcached_exporter-0-r1
deleted file mode 100644
index da6278dc34d2..000000000000
--- a/metadata/md5-cache/acct-user/memcached_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4876bf4c0bb6330f6da6fd0aefedc3fa
diff --git a/metadata/md5-cache/acct-user/memcached_exporter-0-r2 b/metadata/md5-cache/acct-user/memcached_exporter-0-r2
new file mode 100644
index 000000000000..37ae30d84056
--- /dev/null
+++ b/metadata/md5-cache/acct-user/memcached_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for memcached_exporter
+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/memcached_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0f1ad9480dac7b5f04418b376513db2
diff --git a/metadata/md5-cache/acct-user/messagebus-0-r2 b/metadata/md5-cache/acct-user/messagebus-0-r2
deleted file mode 100644
index 0c5dc4fdd347..000000000000
--- a/metadata/md5-cache/acct-user/messagebus-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a573995077242e3b8db7f6acf4dc8a59
diff --git a/metadata/md5-cache/acct-user/messagebus-0-r3 b/metadata/md5-cache/acct-user/messagebus-0-r3
new file mode 100644
index 000000000000..2915a964e20c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/messagebus-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: messagebus
+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/messagebus
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7722e34b096c4c047cbed28a14711443
diff --git a/metadata/md5-cache/acct-user/mgraph-0-r1 b/metadata/md5-cache/acct-user/mgraph-0-r1
deleted file mode 100644
index 21bb032c7ab8..000000000000
--- a/metadata/md5-cache/acct-user/mgraph-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7d62f9377052b0b89ee16f4592186940
diff --git a/metadata/md5-cache/acct-user/mgraph-0-r2 b/metadata/md5-cache/acct-user/mgraph-0-r2
new file mode 100644
index 000000000000..5c404cda959b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mgraph-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/mailgraph
+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/mgraph acct-group/adm
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=102c1e713578ddc3581b1ac39966226e
diff --git a/metadata/md5-cache/acct-user/milter-regex-0-r2 b/metadata/md5-cache/acct-user/milter-regex-0-r2
deleted file mode 100644
index 887490282b26..000000000000
--- a/metadata/md5-cache/acct-user/milter-regex-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2c31f9eaa89ccb74e6e69b2e4bb55f41
diff --git a/metadata/md5-cache/acct-user/milter-regex-0-r3 b/metadata/md5-cache/acct-user/milter-regex-0-r3
new file mode 100644
index 000000000000..076fc2e92fef
--- /dev/null
+++ b/metadata/md5-cache/acct-user/milter-regex-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/milter-regex
+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/milter-regex
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e556f426c98b5d83ab074bebefff5769
diff --git a/metadata/md5-cache/acct-user/minecraft-0-r2 b/metadata/md5-cache/acct-user/minecraft-0-r2
deleted file mode 100644
index 639a06b83870..000000000000
--- a/metadata/md5-cache/acct-user/minecraft-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=db59205fd8abe92daf1ec41bcb8db7fd
diff --git a/metadata/md5-cache/acct-user/minecraft-0-r3 b/metadata/md5-cache/acct-user/minecraft-0-r3
new file mode 100644
index 000000000000..244eca1350f5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minecraft-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Minecraft 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/minecraft
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4a26c994dea4e89af2560fed0c770c2d
diff --git a/metadata/md5-cache/acct-user/minetest-1-r2 b/metadata/md5-cache/acct-user/minetest-1-r2
deleted file mode 100644
index e909cad56571..000000000000
--- a/metadata/md5-cache/acct-user/minetest-1-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=695f415e96d602499f3961562b144175
diff --git a/metadata/md5-cache/acct-user/minetest-1-r3 b/metadata/md5-cache/acct-user/minetest-1-r3
new file mode 100644
index 000000000000..d378a42825c4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minetest-1-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Minetest 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/minetest
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a7109286b3b7bf4ec9fbcae059feff85
diff --git a/metadata/md5-cache/acct-user/minidlna-0-r1 b/metadata/md5-cache/acct-user/minidlna-0-r1
deleted file mode 100644
index e9237a2967d9..000000000000
--- a/metadata/md5-cache/acct-user/minidlna-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c15e07e3af0707d64bf61c92bad1e56b
diff --git a/metadata/md5-cache/acct-user/minidlna-0-r2 b/metadata/md5-cache/acct-user/minidlna-0-r2
new file mode 100644
index 000000000000..d0fbebf02c31
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minidlna-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: minidlna
+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/minidlna
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e0fc61a800aabb4cd77bb18f98d40867
diff --git a/metadata/md5-cache/acct-user/mogile-0-r1 b/metadata/md5-cache/acct-user/mogile-0-r1
deleted file mode 100644
index 6f948f518a04..000000000000
--- a/metadata/md5-cache/acct-user/mogile-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=af3d3573e3daa281abc981f310bddd2b
diff --git a/metadata/md5-cache/acct-user/mogile-0-r2 b/metadata/md5-cache/acct-user/mogile-0-r2
new file mode 100644
index 000000000000..99c308fe36fe
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mogile-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=MogileFS 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/mogile
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=933f4523222eea340b491628a4384519
diff --git a/metadata/md5-cache/acct-user/mongodb-0-r2 b/metadata/md5-cache/acct-user/mongodb-0-r2
deleted file mode 100644
index c0c83e2eab09..000000000000
--- a/metadata/md5-cache/acct-user/mongodb-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=48a9f81dd42a788194750e3d41a79010
diff --git a/metadata/md5-cache/acct-user/mongodb-0-r3 b/metadata/md5-cache/acct-user/mongodb-0-r3
new file mode 100644
index 000000000000..82384f622059
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mongodb-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=MongoDB 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/mongodb
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6c023d9dc885148a591d0dee216c1304
diff --git a/metadata/md5-cache/acct-user/mongodb_exporter-0-r1 b/metadata/md5-cache/acct-user/mongodb_exporter-0-r1
deleted file mode 100644
index fad6c959a533..000000000000
--- a/metadata/md5-cache/acct-user/mongodb_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2d87ed26605791b8271feeb2759ec47d
diff --git a/metadata/md5-cache/acct-user/mongodb_exporter-0-r2 b/metadata/md5-cache/acct-user/mongodb_exporter-0-r2
new file mode 100644
index 000000000000..358651c6eb2e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mongodb_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for mongodb_exporter
+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/mongodb_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d1fb1ed1ff1fcc4adb5a7877862bc1cf
diff --git a/metadata/md5-cache/acct-user/monitorix-0-r2 b/metadata/md5-cache/acct-user/monitorix-0-r2
deleted file mode 100644
index 6ce131b50e2a..000000000000
--- a/metadata/md5-cache/acct-user/monitorix-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5bfe21a2d816970ff30848815bf54eb5
diff --git a/metadata/md5-cache/acct-user/monitorix-0-r3 b/metadata/md5-cache/acct-user/monitorix-0-r3
new file mode 100644
index 000000000000..b570e6f1e4cd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monitorix-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Monitorix system tool 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/monitorix
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=41d3678ffae2ae0a8e342f4b24e1c78f
diff --git a/metadata/md5-cache/acct-user/monkeyd-0-r1 b/metadata/md5-cache/acct-user/monkeyd-0-r1
deleted file mode 100644
index fed5e07ea0c8..000000000000
--- a/metadata/md5-cache/acct-user/monkeyd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=09319fa2a5095bfe9f64c91f77b964fc
diff --git a/metadata/md5-cache/acct-user/monkeyd-0-r2 b/metadata/md5-cache/acct-user/monkeyd-0-r2
new file mode 100644
index 000000000000..82eb399c01ee
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monkeyd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-servers/monkeyd
+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/monkeyd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=31850271ef82f81896100c25494919d9
diff --git a/metadata/md5-cache/acct-user/monkeysphere-0-r2 b/metadata/md5-cache/acct-user/monkeysphere-0-r2
deleted file mode 100644
index ba9f46148298..000000000000
--- a/metadata/md5-cache/acct-user/monkeysphere-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d9b4b2e3ddca33962da4dc867d905f18
diff --git a/metadata/md5-cache/acct-user/monkeysphere-0-r3 b/metadata/md5-cache/acct-user/monkeysphere-0-r3
new file mode 100644
index 000000000000..872e0b3e4530
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monkeysphere-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=monkeysphere 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/monkeysphere
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8a4a75c4898aaff55fd6d6bbc095cb5d
diff --git a/metadata/md5-cache/acct-user/mosquitto-0-r2 b/metadata/md5-cache/acct-user/mosquitto-0-r2
deleted file mode 100644
index 3096d0b14eb3..000000000000
--- a/metadata/md5-cache/acct-user/mosquitto-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1c8e3665b90c9c3a2360681b810fa1cf
diff --git a/metadata/md5-cache/acct-user/mosquitto-0-r3 b/metadata/md5-cache/acct-user/mosquitto-0-r3
new file mode 100644
index 000000000000..d02eec59b404
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mosquitto-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the mosquitto MQTT broker
+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/mosquitto
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bc8faa9f23402642bc40b92e8a4b3474
diff --git a/metadata/md5-cache/acct-user/motion-0-r2 b/metadata/md5-cache/acct-user/motion-0-r2
deleted file mode 100644
index f2e152469341..000000000000
--- a/metadata/md5-cache/acct-user/motion-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6b2cd938892f7a8c7aafbe32ade0df37
diff --git a/metadata/md5-cache/acct-user/motion-0-r3 b/metadata/md5-cache/acct-user/motion-0-r3
new file mode 100644
index 000000000000..dffe99ac55c3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/motion-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=added by portage for motion, a software motion detector
+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/motion acct-group/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=98adafd91c990f12a6f9c76349fddc71
diff --git a/metadata/md5-cache/acct-user/mpd-0-r2 b/metadata/md5-cache/acct-user/mpd-0-r2
deleted file mode 100644
index ece44f57f467..000000000000
--- a/metadata/md5-cache/acct-user/mpd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=281c2ae65b61744dd4aff8ed1bd49339
diff --git a/metadata/md5-cache/acct-user/mpd-0-r3 b/metadata/md5-cache/acct-user/mpd-0-r3
new file mode 100644
index 000000000000..882e3a256823
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mpd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for music player daemon (mpd)
+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/audio
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dbc76b9b852bfb5ef7c1c39140f2a6b9
diff --git a/metadata/md5-cache/acct-user/msmtpd-0-r2 b/metadata/md5-cache/acct-user/msmtpd-0-r2
deleted file mode 100644
index a6c91528ea5a..000000000000
--- a/metadata/md5-cache/acct-user/msmtpd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8b569d5dacf389d53c8aa45ea9751889
diff --git a/metadata/md5-cache/acct-user/msmtpd-0-r3 b/metadata/md5-cache/acct-user/msmtpd-0-r3
new file mode 100644
index 000000000000..88ad7a1a8441
--- /dev/null
+++ b/metadata/md5-cache/acct-user/msmtpd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for msmtp 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/msmtpd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a1a7fd861317a9f80d11aa379668dbd5
diff --git a/metadata/md5-cache/acct-user/munge-0-r1 b/metadata/md5-cache/acct-user/munge-0-r1
deleted file mode 100644
index e115816d7b55..000000000000
--- a/metadata/md5-cache/acct-user/munge-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=274063a29121ca43f12632d391507ccc
diff --git a/metadata/md5-cache/acct-user/munge-0-r2 b/metadata/md5-cache/acct-user/munge-0-r2
new file mode 100644
index 000000000000..397472043d68
--- /dev/null
+++ b/metadata/md5-cache/acct-user/munge-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-auth/munge
+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/munge
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=50f4de8119e4ca18fd118ef63e08e63f
diff --git a/metadata/md5-cache/acct-user/munin-0-r2 b/metadata/md5-cache/acct-user/munin-0-r2
deleted file mode 100644
index 0f0391078a8d..000000000000
--- a/metadata/md5-cache/acct-user/munin-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8866c1d2740e0953df9d8206a0e5f69f
diff --git a/metadata/md5-cache/acct-user/munin-0-r3 b/metadata/md5-cache/acct-user/munin-0-r3
new file mode 100644
index 000000000000..876c0fd299bc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/munin-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for munin
+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/munin
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8a4be50526ba7755e77171f6aca1bc24
diff --git a/metadata/md5-cache/acct-user/munin-async-0-r2 b/metadata/md5-cache/acct-user/munin-async-0-r2
deleted file mode 100644
index 61315b84194b..000000000000
--- a/metadata/md5-cache/acct-user/munin-async-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=20c0d6d602d40a393e8b7ff595d358b8
diff --git a/metadata/md5-cache/acct-user/munin-async-0-r3 b/metadata/md5-cache/acct-user/munin-async-0-r3
new file mode 100644
index 000000000000..b2ebc7ad66f7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/munin-async-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for munin async proxy node
+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/munin
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cf2c8eacf85d1dcd94bb791d30b3846d
diff --git a/metadata/md5-cache/acct-user/murmur-0-r2 b/metadata/md5-cache/acct-user/murmur-0-r2
deleted file mode 100644
index f6b08a3ec65c..000000000000
--- a/metadata/md5-cache/acct-user/murmur-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=35eb3f7c77390818aa6c6d4301c0f5a8
diff --git a/metadata/md5-cache/acct-user/murmur-0-r3 b/metadata/md5-cache/acct-user/murmur-0-r3
new file mode 100644
index 000000000000..39bb55c50808
--- /dev/null
+++ b/metadata/md5-cache/acct-user/murmur-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for murmur 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/murmur
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4f31c2ae8503eeef92cd7e33f9755769
diff --git a/metadata/md5-cache/acct-user/mysql-0-r2 b/metadata/md5-cache/acct-user/mysql-0-r2
deleted file mode 100644
index c21aa7e1639f..000000000000
--- a/metadata/md5-cache/acct-user/mysql-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d245d1a554695e3d3993077dba285084
diff --git a/metadata/md5-cache/acct-user/mysql-0-r3 b/metadata/md5-cache/acct-user/mysql-0-r3
new file mode 100644
index 000000000000..2fe24a2a6e83
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mysql-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=MySQL 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/mysql
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=da81b120480f9414827ef3c4ab9f214b
diff --git a/metadata/md5-cache/acct-user/mysqld_exporter-0-r2 b/metadata/md5-cache/acct-user/mysqld_exporter-0-r2
deleted file mode 100644
index 50f9807c9ffa..000000000000
--- a/metadata/md5-cache/acct-user/mysqld_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1a9204939f2c674eed7195245bbbc105
diff --git a/metadata/md5-cache/acct-user/mysqld_exporter-0-r3 b/metadata/md5-cache/acct-user/mysqld_exporter-0-r3
new file mode 100644
index 000000000000..95487bfa234f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mysqld_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=mysqld_exporter 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/mysqld_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=65e3d102dc58e9ea133ccd2663d156e2
diff --git a/metadata/md5-cache/acct-user/mythtv-0-r2 b/metadata/md5-cache/acct-user/mythtv-0-r2
deleted file mode 100644
index 5fbb809608ab..000000000000
--- a/metadata/md5-cache/acct-user/mythtv-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=528ca4e9192344f634728b82912e9398
diff --git a/metadata/md5-cache/acct-user/mythtv-0-r3 b/metadata/md5-cache/acct-user/mythtv-0-r3
new file mode 100644
index 000000000000..961b7b842514
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mythtv-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Mythtv mythbackend server/daemon 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/mythtv acct-group/video acct-group/audio acct-group/cdrom acct-group/tty
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ba3239cd8f244655ee2bce25d34d8201
diff --git a/metadata/md5-cache/acct-user/nagios-0-r2 b/metadata/md5-cache/acct-user/nagios-0-r2
deleted file mode 100644
index 049c08f8f2d8..000000000000
--- a/metadata/md5-cache/acct-user/nagios-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=54e3eb560846edcb5fe6a5be5e093ce1
diff --git a/metadata/md5-cache/acct-user/nagios-0-r3 b/metadata/md5-cache/acct-user/nagios-0-r3
new file mode 100644
index 000000000000..00c62417cb1c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nagios-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: nagios
+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/nagios
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3089b604d6643fbd77e751f865630827
diff --git a/metadata/md5-cache/acct-user/named-0-r2 b/metadata/md5-cache/acct-user/named-0-r2
deleted file mode 100644
index d5c66e6482b3..000000000000
--- a/metadata/md5-cache/acct-user/named-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=adc9d9642e78068c8f906ce02a7775f2
diff --git a/metadata/md5-cache/acct-user/named-0-r3 b/metadata/md5-cache/acct-user/named-0-r3
new file mode 100644
index 000000000000..e4c846354efd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/named-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/bind
+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/named
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e9b73d4c8f4f3b297bf37ef17fac35d4
diff --git a/metadata/md5-cache/acct-user/netdata-1-r1 b/metadata/md5-cache/acct-user/netdata-1-r1
deleted file mode 100644
index df8a017fb479..000000000000
--- a/metadata/md5-cache/acct-user/netdata-1-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9c4c0fe8488cc989b78d48f5b83d2d04
diff --git a/metadata/md5-cache/acct-user/netdata-1-r2 b/metadata/md5-cache/acct-user/netdata-1-r2
new file mode 100644
index 000000000000..8f2a3b14392f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/netdata-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for netdata
+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/netdata
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b691aa702c80f2147c09d932de1f3421
diff --git a/metadata/md5-cache/acct-user/netperf-0-r1 b/metadata/md5-cache/acct-user/netperf-0-r1
deleted file mode 100644
index 58e2c2fca454..000000000000
--- a/metadata/md5-cache/acct-user/netperf-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7de39916b8e41a514a4d13a3ce96d0b5
diff --git a/metadata/md5-cache/acct-user/netperf-0-r2 b/metadata/md5-cache/acct-user/netperf-0-r2
new file mode 100644
index 000000000000..25f648f5192c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/netperf-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/netperf
+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/netperf
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a426424bf9afad7ced5ff67abef90cc1
diff --git a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r2 b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r2
deleted file mode 100644
index a9307f2fa99f..000000000000
--- a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=33c6beb7b6e3a694dcce3f155d277f1a
diff --git a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r3 b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r3
new file mode 100644
index 000000000000..5ba9b2e76ecd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for nginx-vts-exporter
+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-vts-exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5a8b60011163586c2acd7c3e422c0b04
diff --git a/metadata/md5-cache/acct-user/ngrep-0-r2 b/metadata/md5-cache/acct-user/ngrep-0-r2
deleted file mode 100644
index f6b94c6b552f..000000000000
--- a/metadata/md5-cache/acct-user/ngrep-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a06018fffb26720eaa9bd2630f21aa41
diff --git a/metadata/md5-cache/acct-user/ngrep-0-r3 b/metadata/md5-cache/acct-user/ngrep-0-r3
new file mode 100644
index 000000000000..b7552230771f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ngrep-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/ngrep
+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/ngrep
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d3fbabbbaf5e864288ad39d1adbb8da4
diff --git a/metadata/md5-cache/acct-user/nm-openconnect-0-r1 b/metadata/md5-cache/acct-user/nm-openconnect-0-r1
deleted file mode 100644
index 1c67add02197..000000000000
--- a/metadata/md5-cache/acct-user/nm-openconnect-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9db7f1fcc8446f190a5ff47384a2bb2a
diff --git a/metadata/md5-cache/acct-user/nm-openconnect-0-r2 b/metadata/md5-cache/acct-user/nm-openconnect-0-r2
new file mode 100644
index 000000000000..ef1c84887fc2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nm-openconnect-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-vpn/networkmanager-openconnect
+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/nm-openconnect
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4c11b6f0a6ba6fa12c72118af6149ef3
diff --git a/metadata/md5-cache/acct-user/nm-openvpn-0-r1 b/metadata/md5-cache/acct-user/nm-openvpn-0-r1
deleted file mode 100644
index e239b37ca194..000000000000
--- a/metadata/md5-cache/acct-user/nm-openvpn-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8afd431b78de38ac0384ab5d129f1984
diff --git a/metadata/md5-cache/acct-user/nm-openvpn-0-r2 b/metadata/md5-cache/acct-user/nm-openvpn-0-r2
new file mode 100644
index 000000000000..aec6d34eac3b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nm-openvpn-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-vpn/networkmanager-openvpn
+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/nm-openvpn
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a7b6be4c2bba541b5abebd2c085396a5
diff --git a/metadata/md5-cache/acct-user/nobody-0-r1 b/metadata/md5-cache/acct-user/nobody-0-r1
deleted file mode 100644
index 8b16951c7e35..000000000000
--- a/metadata/md5-cache/acct-user/nobody-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cfaca877556e8623b96abf9ee3941d1a
diff --git a/metadata/md5-cache/acct-user/nobody-0-r2 b/metadata/md5-cache/acct-user/nobody-0-r2
new file mode 100644
index 000000000000..ebd9907f54f6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nobody-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: nobody
+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 acct-user/root
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0955038457d9ec59703598e2db2db688
diff --git a/metadata/md5-cache/acct-user/node_exporter-0-r2 b/metadata/md5-cache/acct-user/node_exporter-0-r2
deleted file mode 100644
index 48ae62c7e427..000000000000
--- a/metadata/md5-cache/acct-user/node_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9153f9c0e8c311fc943130ae86ab1f1f
diff --git a/metadata/md5-cache/acct-user/node_exporter-0-r3 b/metadata/md5-cache/acct-user/node_exporter-0-r3
new file mode 100644
index 000000000000..2e8ec339b894
--- /dev/null
+++ b/metadata/md5-cache/acct-user/node_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=node_exporter 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/node_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0ef3509f1c065451949e45ef51e0ba07
diff --git a/metadata/md5-cache/acct-user/notary-0-r1 b/metadata/md5-cache/acct-user/notary-0-r1
deleted file mode 100644
index 5cc3e4a5bacb..000000000000
--- a/metadata/md5-cache/acct-user/notary-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=574881f5f3b0a6290404d98f6ecf341b
diff --git a/metadata/md5-cache/acct-user/notary-0-r2 b/metadata/md5-cache/acct-user/notary-0-r2
new file mode 100644
index 000000000000..fb6da852b9fa
--- /dev/null
+++ b/metadata/md5-cache/acct-user/notary-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-misc/notary
+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/notary
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4ba5cc41bc369810b7566073b9e28d17
diff --git a/metadata/md5-cache/acct-user/nsd-0-r2 b/metadata/md5-cache/acct-user/nsd-0-r2
deleted file mode 100644
index 226f6829fc85..000000000000
--- a/metadata/md5-cache/acct-user/nsd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=481b8b95b4c9a66bef57f9fdf98acbf1
diff --git a/metadata/md5-cache/acct-user/nsd-0-r3 b/metadata/md5-cache/acct-user/nsd-0-r3
new file mode 100644
index 000000000000..31bef796421a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nsd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for nsd 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/nsd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e111fbafe80b1651e496b4b75448c49d
diff --git a/metadata/md5-cache/acct-user/nslcd-0-r2 b/metadata/md5-cache/acct-user/nslcd-0-r2
deleted file mode 100644
index 070bfff65352..000000000000
--- a/metadata/md5-cache/acct-user/nslcd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3715a9c87be36c1b2f1951404c71464b
diff --git a/metadata/md5-cache/acct-user/nslcd-0-r3 b/metadata/md5-cache/acct-user/nslcd-0-r3
new file mode 100644
index 000000000000..d7db6bcf6307
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nslcd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for nss-pam-ldapd
+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/nslcd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e82966726fc22c54991a7ce50e04e3ac
diff --git a/metadata/md5-cache/acct-user/ntopng-0-r1 b/metadata/md5-cache/acct-user/ntopng-0-r1
deleted file mode 100644
index d8f595b206a8..000000000000
--- a/metadata/md5-cache/acct-user/ntopng-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=22e18220fc3ae9b882cffeae2f7f12de
diff --git a/metadata/md5-cache/acct-user/ntopng-0-r2 b/metadata/md5-cache/acct-user/ntopng-0-r2
new file mode 100644
index 000000000000..c8098b351ded
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ntopng-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ntopng
+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/ntopng
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9feb5b409c9bdcb0a037db10ac4a38a1
diff --git a/metadata/md5-cache/acct-user/ntp-0-r2 b/metadata/md5-cache/acct-user/ntp-0-r2
deleted file mode 100644
index 91879f244c93..000000000000
--- a/metadata/md5-cache/acct-user/ntp-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bd702e5839404e5d821922a7dd8b34c5
diff --git a/metadata/md5-cache/acct-user/ntp-0-r3 b/metadata/md5-cache/acct-user/ntp-0-r3
new file mode 100644
index 000000000000..1a6503b21fb7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ntp-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for ntp 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/ntp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9f89f203448bac49c0fcbab56208338d
diff --git a/metadata/md5-cache/acct-user/nullmail-0-r1 b/metadata/md5-cache/acct-user/nullmail-0-r1
deleted file mode 100644
index 77c1f0b82877..000000000000
--- a/metadata/md5-cache/acct-user/nullmail-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=07c4ba734b4a7f513db385d58b4c8049
diff --git a/metadata/md5-cache/acct-user/nullmail-0-r2 b/metadata/md5-cache/acct-user/nullmail-0-r2
new file mode 100644
index 000000000000..22f76ecb8641
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nullmail-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the nullmailer
+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/nullmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aca0da3b72b82bc4acba8a0826ae6a26
diff --git a/metadata/md5-cache/acct-user/nut-0-r2 b/metadata/md5-cache/acct-user/nut-0-r2
deleted file mode 100644
index 1c40b32fa71d..000000000000
--- a/metadata/md5-cache/acct-user/nut-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=75395ce3fd8e7a7208622d95b50be4b4
diff --git a/metadata/md5-cache/acct-user/nut-0-r3 b/metadata/md5-cache/acct-user/nut-0-r3
new file mode 100644
index 000000000000..03824457794d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nut-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Network-UPS Tools
+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/nut acct-group/uucp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dc2977b25e0ea1865d30ca76aa4e6571
diff --git a/metadata/md5-cache/acct-user/nvpd-0-r1 b/metadata/md5-cache/acct-user/nvpd-0-r1
deleted file mode 100644
index b60f5e099d93..000000000000
--- a/metadata/md5-cache/acct-user/nvpd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5bd42beec60f2f7deaf6c6444d8b9004
diff --git a/metadata/md5-cache/acct-user/nvpd-0-r2 b/metadata/md5-cache/acct-user/nvpd-0-r2
new file mode 100644
index 000000000000..d1ccc9304c3d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nvpd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for nvidia-persistenced
+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/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5904c4e47f7289c0400bc7469485ee15
diff --git a/metadata/md5-cache/acct-user/nzbget-0-r1 b/metadata/md5-cache/acct-user/nzbget-0-r1
deleted file mode 100644
index 1cfb48eaebec..000000000000
--- a/metadata/md5-cache/acct-user/nzbget-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e276854664c6262ffb520786348725c7
diff --git a/metadata/md5-cache/acct-user/nzbget-0-r2 b/metadata/md5-cache/acct-user/nzbget-0-r2
new file mode 100644
index 000000000000..cde9fe3cadb3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nzbget-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-nntp/nzbget
+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/nzbget
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=36739fe391cc736f66b448daf90c5f74
diff --git a/metadata/md5-cache/acct-user/oidentd-0-r2 b/metadata/md5-cache/acct-user/oidentd-0-r2
deleted file mode 100644
index 2cff54310618..000000000000
--- a/metadata/md5-cache/acct-user/oidentd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7f491639c385b0d1516dddb770acd7c3
diff --git a/metadata/md5-cache/acct-user/oidentd-0-r3 b/metadata/md5-cache/acct-user/oidentd-0-r3
new file mode 100644
index 000000000000..0f28503636b0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/oidentd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: oidentd
+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/oidentd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f10916d107871670814f2fa00847bbf8
diff --git a/metadata/md5-cache/acct-user/openctd-0-r1 b/metadata/md5-cache/acct-user/openctd-0-r1
deleted file mode 100644
index f010ceec3264..000000000000
--- a/metadata/md5-cache/acct-user/openctd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ca004a1a170ff54bcb577212c6af9885
diff --git a/metadata/md5-cache/acct-user/openctd-0-r2 b/metadata/md5-cache/acct-user/openctd-0-r2
new file mode 100644
index 000000000000..0d2e51eaf41d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openctd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for dev-libs/openct
+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/openct
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=421fcb7177c2b0528d0d628149c04410
diff --git a/metadata/md5-cache/acct-user/opendkim-0-r2 b/metadata/md5-cache/acct-user/opendkim-0-r2
deleted file mode 100644
index 96b278cd1cfd..000000000000
--- a/metadata/md5-cache/acct-user/opendkim-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e6d83c15ca4a6005a6cf2062f9651009
diff --git a/metadata/md5-cache/acct-user/opendkim-0-r3 b/metadata/md5-cache/acct-user/opendkim-0-r3
new file mode 100644
index 000000000000..1854aaa55337
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opendkim-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for OpenDKIM
+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/opendkim
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=04a90ec42f8e3f95c9711168ba93c774
diff --git a/metadata/md5-cache/acct-user/opendmarc-0-r1 b/metadata/md5-cache/acct-user/opendmarc-0-r1
deleted file mode 100644
index 539828af3ac0..000000000000
--- a/metadata/md5-cache/acct-user/opendmarc-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=aac927e4bf719856e1185ac85ad02a6f
diff --git a/metadata/md5-cache/acct-user/opendmarc-0-r2 b/metadata/md5-cache/acct-user/opendmarc-0-r2
new file mode 100644
index 000000000000..16c792a6a061
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opendmarc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/opendmarc
+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/opendmarc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=18be02236d200568be1dc61aad1f6af4
diff --git a/metadata/md5-cache/acct-user/opendnssec-0-r1 b/metadata/md5-cache/acct-user/opendnssec-0-r1
deleted file mode 100644
index e90a74e37a32..000000000000
--- a/metadata/md5-cache/acct-user/opendnssec-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8d55040b913141a9baa15a3266ab56cc
diff --git a/metadata/md5-cache/acct-user/opendnssec-0-r2 b/metadata/md5-cache/acct-user/opendnssec-0-r2
new file mode 100644
index 000000000000..6b177cd7e604
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opendnssec-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/opendnssec
+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/opendnssec
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=af95be17f0d1e01aeb824bca620f1581
diff --git a/metadata/md5-cache/acct-user/openntpd-0-r2 b/metadata/md5-cache/acct-user/openntpd-0-r2
deleted file mode 100644
index 298221b71d06..000000000000
--- a/metadata/md5-cache/acct-user/openntpd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9c73adb6be33daac353ebf927de6da39
diff --git a/metadata/md5-cache/acct-user/openntpd-0-r3 b/metadata/md5-cache/acct-user/openntpd-0-r3
new file mode 100644
index 000000000000..7b4e89868d1f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openntpd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for openntpd 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/openntpd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1f6c3944756565436f6e54e01d0c973a
diff --git a/metadata/md5-cache/acct-user/openrct2-0-r2 b/metadata/md5-cache/acct-user/openrct2-0-r2
deleted file mode 100644
index d1bfe7bf4245..000000000000
--- a/metadata/md5-cache/acct-user/openrct2-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4ca971d09ae5415e8be23fec2e31f6a0
diff --git a/metadata/md5-cache/acct-user/openrct2-0-r3 b/metadata/md5-cache/acct-user/openrct2-0-r3
new file mode 100644
index 000000000000..3626166eafb1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openrct2-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the OpenRCT2 dedicated 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/openrct2
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c33e58322ed9d505d9e7cbbd796fa33b
diff --git a/metadata/md5-cache/acct-user/openvpn-0-r2 b/metadata/md5-cache/acct-user/openvpn-0-r2
deleted file mode 100644
index 289b0dff0de1..000000000000
--- a/metadata/md5-cache/acct-user/openvpn-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=697ec47821cc48eced1a4ac8838186db
diff --git a/metadata/md5-cache/acct-user/openvpn-0-r3 b/metadata/md5-cache/acct-user/openvpn-0-r3
new file mode 100644
index 000000000000..20015e560332
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openvpn-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-vpn/openvpn
+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/openvpn
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=228ade651edec5d6a56226b5008e042f
diff --git a/metadata/md5-cache/acct-user/openvpn_exporter-0-r2 b/metadata/md5-cache/acct-user/openvpn_exporter-0-r2
deleted file mode 100644
index ed98786d6b5e..000000000000
--- a/metadata/md5-cache/acct-user/openvpn_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cda17d6a39606bd4a71e6840389294a6
diff --git a/metadata/md5-cache/acct-user/openvpn_exporter-0-r3 b/metadata/md5-cache/acct-user/openvpn_exporter-0-r3
new file mode 100644
index 000000000000..3ee5f9f19e0d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openvpn_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for openvpn_exporter
+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/openvpn_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5f83c52ac6e95e80270f4fa6481a721b
diff --git a/metadata/md5-cache/acct-user/oprofile-0-r2 b/metadata/md5-cache/acct-user/oprofile-0-r2
deleted file mode 100644
index 93ae28c31e5e..000000000000
--- a/metadata/md5-cache/acct-user/oprofile-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1a6d8079478e6487d807503ad6975c15
diff --git a/metadata/md5-cache/acct-user/oprofile-0-r3 b/metadata/md5-cache/acct-user/oprofile-0-r3
new file mode 100644
index 000000000000..b104e0379a34
--- /dev/null
+++ b/metadata/md5-cache/acct-user/oprofile-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-util/oprofile JIT code processing
+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/oprofile
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5a73344afe2fa2f6ca56edf1f3629d57
diff --git a/metadata/md5-cache/acct-user/ossec-0-r2 b/metadata/md5-cache/acct-user/ossec-0-r2
deleted file mode 100644
index dd9cf5939f79..000000000000
--- a/metadata/md5-cache/acct-user/ossec-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=44d6d50468aedd24ade965bd27532886
diff --git a/metadata/md5-cache/acct-user/ossec-0-r3 b/metadata/md5-cache/acct-user/ossec-0-r3
new file mode 100644
index 000000000000..4a112fa4d105
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ossec-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=net-analyzer/ossec-hids (agentlessd, analysisd, monitord)
+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/ossec
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=08cdf5a338a74a898c5d0f34bfc1158d
diff --git a/metadata/md5-cache/acct-user/ossecm-0-r2 b/metadata/md5-cache/acct-user/ossecm-0-r2
deleted file mode 100644
index f83cf8d496c2..000000000000
--- a/metadata/md5-cache/acct-user/ossecm-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=656df67d33cf45e0a75fe2333e253598
diff --git a/metadata/md5-cache/acct-user/ossecm-0-r3 b/metadata/md5-cache/acct-user/ossecm-0-r3
new file mode 100644
index 000000000000..1ace7240c6fd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ossecm-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=net-analyzer/ossec-hids (csyslogd, maild)
+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/ossec
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=76586c1348af5c5f1e9e8dc9a53b43ea
diff --git a/metadata/md5-cache/acct-user/ossecr-0-r2 b/metadata/md5-cache/acct-user/ossecr-0-r2
deleted file mode 100644
index e1185f5d9c49..000000000000
--- a/metadata/md5-cache/acct-user/ossecr-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bf6c26a80bc1908014360bdf6d9aa037
diff --git a/metadata/md5-cache/acct-user/ossecr-0-r3 b/metadata/md5-cache/acct-user/ossecr-0-r3
new file mode 100644
index 000000000000..50627e288713
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ossecr-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=net-analyzer/ossec-hids (remoted)
+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/ossec
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1463540da30ecc542603c5cffca8a7da
diff --git a/metadata/md5-cache/acct-user/p2p-0-r1 b/metadata/md5-cache/acct-user/p2p-0-r1
deleted file mode 100644
index 764365a5fad7..000000000000
--- a/metadata/md5-cache/acct-user/p2p-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=875858a07de4fcbd19d1f9351a9e8234
diff --git a/metadata/md5-cache/acct-user/p2p-0-r2 b/metadata/md5-cache/acct-user/p2p-0-r2
new file mode 100644
index 000000000000..fbde38298a68
--- /dev/null
+++ b/metadata/md5-cache/acct-user/p2p-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mldonkey
+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/p2p
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a922e2a966b8a4a7fea9044d895f0073
diff --git a/metadata/md5-cache/acct-user/pcscd-0-r2 b/metadata/md5-cache/acct-user/pcscd-0-r2
deleted file mode 100644
index 2175a3470c06..000000000000
--- a/metadata/md5-cache/acct-user/pcscd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e05b9fa505169ec7ea6807ba1b55e66f
diff --git a/metadata/md5-cache/acct-user/pcscd-0-r3 b/metadata/md5-cache/acct-user/pcscd-0-r3
new file mode 100644
index 000000000000..97e8310e8b08
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pcscd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for pcsc-lite
+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/pcscd acct-group/openct acct-group/usb
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cf715891205cbf8704b77f6f494705c2
diff --git a/metadata/md5-cache/acct-user/pdns-0-r2 b/metadata/md5-cache/acct-user/pdns-0-r2
deleted file mode 100644
index d3dfe5c6a7ed..000000000000
--- a/metadata/md5-cache/acct-user/pdns-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c64a4ec210c9bc8a8d45462c4e9ab4b4
diff --git a/metadata/md5-cache/acct-user/pdns-0-r3 b/metadata/md5-cache/acct-user/pdns-0-r3
new file mode 100644
index 000000000000..8259a8c4d5e8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pdns-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: pdns
+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/pdns
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6cbd297bf09d68b7d152a272fd52579c
diff --git a/metadata/md5-cache/acct-user/pdnsd-0-r2 b/metadata/md5-cache/acct-user/pdnsd-0-r2
deleted file mode 100644
index 1ef8677c5a0b..000000000000
--- a/metadata/md5-cache/acct-user/pdnsd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f0ae8f14e1ccc9f3511e65e7932aaeda
diff --git a/metadata/md5-cache/acct-user/pdnsd-0-r3 b/metadata/md5-cache/acct-user/pdnsd-0-r3
new file mode 100644
index 000000000000..98543b11f08b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pdnsd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for pdns 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/pdnsd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d518b8dce6b14291ac079aa79c5029bc
diff --git a/metadata/md5-cache/acct-user/pgbouncer-0-r1 b/metadata/md5-cache/acct-user/pgbouncer-0-r1
deleted file mode 100644
index 2d1a6f15202c..000000000000
--- a/metadata/md5-cache/acct-user/pgbouncer-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2ea93bac90d2c21d70ad6e9765da3839
diff --git a/metadata/md5-cache/acct-user/pgbouncer-0-r2 b/metadata/md5-cache/acct-user/pgbouncer-0-r2
new file mode 100644
index 000000000000..81008901ffbf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pgbouncer-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=PgBouncer 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/postgres
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=18055bd2b8557054e095d1ad2572fe94
diff --git a/metadata/md5-cache/acct-user/pipewire-0-r1 b/metadata/md5-cache/acct-user/pipewire-0-r1
deleted file mode 100644
index 7d20e3503bf0..000000000000
--- a/metadata/md5-cache/acct-user/pipewire-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c676559f41fa9e060b7fc455b5232026
diff --git a/metadata/md5-cache/acct-user/pipewire-1-r1 b/metadata/md5-cache/acct-user/pipewire-1-r1
deleted file mode 100644
index 31fa2dbe48a9..000000000000
--- a/metadata/md5-cache/acct-user/pipewire-1-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6e22dbdd2ee3bc310947e1db36482fae
diff --git a/metadata/md5-cache/acct-user/pipewire-1-r2 b/metadata/md5-cache/acct-user/pipewire-1-r2
new file mode 100644
index 000000000000..63ab62c38955
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pipewire-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running PipeWire as a system-wide instance
+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/pipewire acct-group/audio
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=841d83612bb564a2859c58f25bafc045
diff --git a/metadata/md5-cache/acct-user/plex-0-r2 b/metadata/md5-cache/acct-user/plex-0-r2
deleted file mode 100644
index fca8c6e9d33f..000000000000
--- a/metadata/md5-cache/acct-user/plex-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4cf068483c2b33c3048a114374f867de
diff --git a/metadata/md5-cache/acct-user/plex-0-r3 b/metadata/md5-cache/acct-user/plex-0-r3
new file mode 100644
index 000000000000..c68bb7bacd04
--- /dev/null
+++ b/metadata/md5-cache/acct-user/plex-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Plex Media Server 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/plex acct-group/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b56304e79b99bdb5839c7aed6cf865b3
diff --git a/metadata/md5-cache/acct-user/polkitd-0-r2 b/metadata/md5-cache/acct-user/polkitd-0-r2
deleted file mode 100644
index 2e7a55e90210..000000000000
--- a/metadata/md5-cache/acct-user/polkitd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=27e4ab9b2a8f04c09ef6b6ccd3bd1fd6
diff --git a/metadata/md5-cache/acct-user/polkitd-0-r3 b/metadata/md5-cache/acct-user/polkitd-0-r3
new file mode 100644
index 000000000000..f627c7bc762f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/polkitd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: polkitd
+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/polkitd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=da18ea33c0c19e3badd1bcd57aa180ce
diff --git a/metadata/md5-cache/acct-user/polw-0-r1 b/metadata/md5-cache/acct-user/polw-0-r1
deleted file mode 100644
index 7677c9c34828..000000000000
--- a/metadata/md5-cache/acct-user/polw-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=33d44d9199d178454090659cf6e09555
diff --git a/metadata/md5-cache/acct-user/polw-0-r2 b/metadata/md5-cache/acct-user/polw-0-r2
new file mode 100644
index 000000000000..0708261ad0b7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/polw-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/policyd-weight
+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/polw
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e5ab1535ffdf98d422ce7539d5c385ac
diff --git a/metadata/md5-cache/acct-user/popa3d-0-r1 b/metadata/md5-cache/acct-user/popa3d-0-r1
deleted file mode 100644
index 2887632b4e2f..000000000000
--- a/metadata/md5-cache/acct-user/popa3d-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1606fc6b1940b94574e884f47e3c0747
diff --git a/metadata/md5-cache/acct-user/popa3d-0-r2 b/metadata/md5-cache/acct-user/popa3d-0-r2
new file mode 100644
index 000000000000..0a77f9994be8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/popa3d-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/popa3d
+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/popa3d
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=52f7322f752e26e39f4577bf745cbd83
diff --git a/metadata/md5-cache/acct-user/portage-0-r2 b/metadata/md5-cache/acct-user/portage-0-r2
deleted file mode 100644
index 5e28a2648162..000000000000
--- a/metadata/md5-cache/acct-user/portage-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=73be6261319ecb76cfcb5f0d443b0f42
diff --git a/metadata/md5-cache/acct-user/portage-0-r3 b/metadata/md5-cache/acct-user/portage-0-r3
new file mode 100644
index 000000000000..39ca25206fc6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/portage-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: portage
+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/portage
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=031aef0925ce664c12df9d04f84c1712
diff --git a/metadata/md5-cache/acct-user/postfix-0-r2 b/metadata/md5-cache/acct-user/postfix-0-r2
deleted file mode 100644
index 5407416c1ca2..000000000000
--- a/metadata/md5-cache/acct-user/postfix-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=63e239fc4320530350fc8e99723ee753
diff --git a/metadata/md5-cache/acct-user/postfix-0-r3 b/metadata/md5-cache/acct-user/postfix-0-r3
new file mode 100644
index 000000000000..2f0c34934bbd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postfix-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for postfix 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/postfix acct-group/mail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b6a23a6938959924eb8facd444c63e46
diff --git a/metadata/md5-cache/acct-user/postfix_exporter-0-r2 b/metadata/md5-cache/acct-user/postfix_exporter-0-r2
deleted file mode 100644
index e96debd47d56..000000000000
--- a/metadata/md5-cache/acct-user/postfix_exporter-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ab4708a3cd5a0cf9c518fe01b5e3170b
diff --git a/metadata/md5-cache/acct-user/postfix_exporter-0-r3 b/metadata/md5-cache/acct-user/postfix_exporter-0-r3
new file mode 100644
index 000000000000..441cf0c846a6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postfix_exporter-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for postfix_exporter
+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/postfix_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8b271fddb1eee3b85ffa3df3291fe6ab
diff --git a/metadata/md5-cache/acct-user/postfwd-0-r1 b/metadata/md5-cache/acct-user/postfwd-0-r1
deleted file mode 100644
index 37bc1bd3603e..000000000000
--- a/metadata/md5-cache/acct-user/postfwd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=64ae852135fa57c7e0d2a34b25810e1b
diff --git a/metadata/md5-cache/acct-user/postfwd-0-r2 b/metadata/md5-cache/acct-user/postfwd-0-r2
new file mode 100644
index 000000000000..bf9901bff346
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postfwd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for mail-filter/postfwd
+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/postfwd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=754841215bbc501daf5710d34bbba009
diff --git a/metadata/md5-cache/acct-user/postgres-0-r2 b/metadata/md5-cache/acct-user/postgres-0-r2
deleted file mode 100644
index d6ede1bb2e19..000000000000
--- a/metadata/md5-cache/acct-user/postgres-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ac12ee14657fdf492bb9732d18ccd54a
diff --git a/metadata/md5-cache/acct-user/postgres-0-r3 b/metadata/md5-cache/acct-user/postgres-0-r3
new file mode 100644
index 000000000000..98a862b1e780
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postgres-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=PostgreSQL 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/postgres
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f67977092919734787ab35a537010efb
diff --git a/metadata/md5-cache/acct-user/postgres_exporter-0-r1 b/metadata/md5-cache/acct-user/postgres_exporter-0-r1
deleted file mode 100644
index 748b5b10ce4c..000000000000
--- a/metadata/md5-cache/acct-user/postgres_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0695e1e1baf9a907aae6cfbb4f426147
diff --git a/metadata/md5-cache/acct-user/postgres_exporter-0-r2 b/metadata/md5-cache/acct-user/postgres_exporter-0-r2
new file mode 100644
index 000000000000..caa88f8a0ac0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postgres_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for postgres_exporter
+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_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3fc31496ca3d2bbd2190176e7171be4a
diff --git a/metadata/md5-cache/acct-user/postmaster-0-r2 b/metadata/md5-cache/acct-user/postmaster-0-r2
deleted file mode 100644
index f547144b2740..000000000000
--- a/metadata/md5-cache/acct-user/postmaster-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bca4266995c12fba6a7e70dd55f0d0ef
diff --git a/metadata/md5-cache/acct-user/postmaster-0-r3 b/metadata/md5-cache/acct-user/postmaster-0-r3
new file mode 100644
index 000000000000..8c25c207348b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postmaster-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Postmaster 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/mail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f3f8b7c5f0e3de94127f634d8b526cc4
diff --git a/metadata/md5-cache/acct-user/privoxy-0-r2 b/metadata/md5-cache/acct-user/privoxy-0-r2
deleted file mode 100644
index c9b7bd6ed8c9..000000000000
--- a/metadata/md5-cache/acct-user/privoxy-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6074eb40a9e163fa4799d1a2dfbe66ee
diff --git a/metadata/md5-cache/acct-user/privoxy-0-r3 b/metadata/md5-cache/acct-user/privoxy-0-r3
new file mode 100644
index 000000000000..4046f9d4c331
--- /dev/null
+++ b/metadata/md5-cache/acct-user/privoxy-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A privoxy: privacy oriented web proxy 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/privoxy
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=526342cdf637e43907b0fe9d38142f4c
diff --git a/metadata/md5-cache/acct-user/prometheus-0-r2 b/metadata/md5-cache/acct-user/prometheus-0-r2
deleted file mode 100644
index a6d7f9218a20..000000000000
--- a/metadata/md5-cache/acct-user/prometheus-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7068b8729f1bd54599246e096cae436d
diff --git a/metadata/md5-cache/acct-user/prometheus-0-r3 b/metadata/md5-cache/acct-user/prometheus-0-r3
new file mode 100644
index 000000000000..b7468a52d725
--- /dev/null
+++ b/metadata/md5-cache/acct-user/prometheus-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for prometheus
+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/prometheus
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=515c35bf67ecdbcd3bed9d78c1435678
diff --git a/metadata/md5-cache/acct-user/psybnc-0-r1 b/metadata/md5-cache/acct-user/psybnc-0-r1
deleted file mode 100644
index b8fdfa66e1d5..000000000000
--- a/metadata/md5-cache/acct-user/psybnc-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5988d909ef3c724f58d028ce42fdecd8
diff --git a/metadata/md5-cache/acct-user/psybnc-0-r2 b/metadata/md5-cache/acct-user/psybnc-0-r2
new file mode 100644
index 000000000000..723dc6d70bb0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/psybnc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-irc/psybnc
+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/psybnc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e902c474b44c1654b27cdaf92b9deaad
diff --git a/metadata/md5-cache/acct-user/pulse-0-r1 b/metadata/md5-cache/acct-user/pulse-0-r1
deleted file mode 100644
index d6c2d1de3564..000000000000
--- a/metadata/md5-cache/acct-user/pulse-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4c216620ed8578e8960654cb8ca22de5
diff --git a/metadata/md5-cache/acct-user/pulse-0-r2 b/metadata/md5-cache/acct-user/pulse-0-r2
new file mode 100644
index 000000000000..a998bb33d888
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pulse-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running the PulseAudio daemon as a system-wide instance
+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/pulse acct-group/audio
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7e5eaee45cab7a264d87c93e2c86a558
diff --git a/metadata/md5-cache/acct-user/puppet-0-r2 b/metadata/md5-cache/acct-user/puppet-0-r2
deleted file mode 100644
index 8caa5d7744fd..000000000000
--- a/metadata/md5-cache/acct-user/puppet-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2ec9760504e4db82d8b87acb46dd0874
diff --git a/metadata/md5-cache/acct-user/puppet-0-r3 b/metadata/md5-cache/acct-user/puppet-0-r3
new file mode 100644
index 000000000000..a58c08c7e532
--- /dev/null
+++ b/metadata/md5-cache/acct-user/puppet-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for puppet 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/puppet
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3d456b81bea5d6785ff0640a1bf15a23
diff --git a/metadata/md5-cache/acct-user/puppetdb-0-r2 b/metadata/md5-cache/acct-user/puppetdb-0-r2
deleted file mode 100644
index f81a0d372be4..000000000000
--- a/metadata/md5-cache/acct-user/puppetdb-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=133f523e4750c99319ca41ee97219016
diff --git a/metadata/md5-cache/acct-user/puppetdb-0-r3 b/metadata/md5-cache/acct-user/puppetdb-0-r3
new file mode 100644
index 000000000000..aa2a9627d2d3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/puppetdb-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the puppetdb 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/puppetdb
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0efe2191576eee13deb201f4b2caa6b9
diff --git a/metadata/md5-cache/acct-user/pushgateway-0-r1 b/metadata/md5-cache/acct-user/pushgateway-0-r1
deleted file mode 100644
index c5512c6858a9..000000000000
--- a/metadata/md5-cache/acct-user/pushgateway-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a7e614ca75e46f44ef532e2b34aa2ae1
diff --git a/metadata/md5-cache/acct-user/pushgateway-0-r2 b/metadata/md5-cache/acct-user/pushgateway-0-r2
new file mode 100644
index 000000000000..24318087e14b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pushgateway-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/pushgateway
+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/pushgateway
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8c3c1eaed9bc5e1ea8491d8d0c241edd
diff --git a/metadata/md5-cache/acct-user/pvpgn-0-r1 b/metadata/md5-cache/acct-user/pvpgn-0-r1
deleted file mode 100644
index b3082c725f0b..000000000000
--- a/metadata/md5-cache/acct-user/pvpgn-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=75358d4338e492c6f531053d1f55b4c5
diff --git a/metadata/md5-cache/acct-user/pvpgn-0-r2 b/metadata/md5-cache/acct-user/pvpgn-0-r2
new file mode 100644
index 000000000000..02df5c7d39eb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pvpgn-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for pvpgn (gaming server for Battle.Net compatible clients)
+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/pvpgn
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2dbb2a879eaa0d186f9fa8cdf43a1d16
diff --git a/metadata/md5-cache/acct-user/qemu-0-r2 b/metadata/md5-cache/acct-user/qemu-0-r2
deleted file mode 100644
index e5631e3554d8..000000000000
--- a/metadata/md5-cache/acct-user/qemu-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7952496e680259d1bc80a02dc6fb492f
diff --git a/metadata/md5-cache/acct-user/qemu-0-r3 b/metadata/md5-cache/acct-user/qemu-0-r3
new file mode 100644
index 000000000000..7614d089fd18
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qemu-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: qemu
+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/qemu acct-group/kvm
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b934ea8184067a94ba507ff4fbc0fb97
diff --git a/metadata/md5-cache/acct-user/qmaild-0-r2 b/metadata/md5-cache/acct-user/qmaild-0-r2
deleted file mode 100644
index daa1f44e0c91..000000000000
--- a/metadata/md5-cache/acct-user/qmaild-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=88d6cf8e0262010b484d51ba92806924
diff --git a/metadata/md5-cache/acct-user/qmaild-0-r3 b/metadata/md5-cache/acct-user/qmaild-0-r3
new file mode 100644
index 000000000000..ee52994e1416
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmaild-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-smtpd
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8746fea264dfa2726113d232e9a3af92
diff --git a/metadata/md5-cache/acct-user/qmaill-0-r2 b/metadata/md5-cache/acct-user/qmaill-0-r2
deleted file mode 100644
index 407e21d7d8d1..000000000000
--- a/metadata/md5-cache/acct-user/qmaill-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8a9e5471db3d0269656261c0793446ee
diff --git a/metadata/md5-cache/acct-user/qmaill-0-r3 b/metadata/md5-cache/acct-user/qmaill-0-r3
new file mode 100644
index 000000000000..770bb208c711
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmaill-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail logging
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9906a10c5bc0e98bf400dd3a3637dfda
diff --git a/metadata/md5-cache/acct-user/qmailp-0-r2 b/metadata/md5-cache/acct-user/qmailp-0-r2
deleted file mode 100644
index 5a7df425284e..000000000000
--- a/metadata/md5-cache/acct-user/qmailp-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cf5ca68abb5219fd94eef9fed978840b
diff --git a/metadata/md5-cache/acct-user/qmailp-0-r3 b/metadata/md5-cache/acct-user/qmailp-0-r3
new file mode 100644
index 000000000000..2abea660d6ba
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmailp-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-getpw
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fb0517593cb0c91bdec4a52fba11f379
diff --git a/metadata/md5-cache/acct-user/qmailq-0-r2 b/metadata/md5-cache/acct-user/qmailq-0-r2
deleted file mode 100644
index ec4b2dd78c3b..000000000000
--- a/metadata/md5-cache/acct-user/qmailq-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c21437243a55b2fca2ccae6d57db1549
diff --git a/metadata/md5-cache/acct-user/qmailq-0-r3 b/metadata/md5-cache/acct-user/qmailq-0-r3
new file mode 100644
index 000000000000..be3524cb3b41
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmailq-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail queue
+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/qmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a50f17af96602d75b68f57d79c72ff79
diff --git a/metadata/md5-cache/acct-user/qmailr-0-r2 b/metadata/md5-cache/acct-user/qmailr-0-r2
deleted file mode 100644
index 174d22c49c9b..000000000000
--- a/metadata/md5-cache/acct-user/qmailr-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7377a2e0d8e46006fd73e6542eba240f
diff --git a/metadata/md5-cache/acct-user/qmailr-0-r3 b/metadata/md5-cache/acct-user/qmailr-0-r3
new file mode 100644
index 000000000000..d3557f5e7ce4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmailr-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-rspawn and qmail-remote
+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/qmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ab9ebe1c96bf368de67ff59d6402ad7f
diff --git a/metadata/md5-cache/acct-user/qmails-0-r2 b/metadata/md5-cache/acct-user/qmails-0-r2
deleted file mode 100644
index bb3211d3f3b3..000000000000
--- a/metadata/md5-cache/acct-user/qmails-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2b5c52b24742b57ee35807cc8e517966
diff --git a/metadata/md5-cache/acct-user/qmails-0-r3 b/metadata/md5-cache/acct-user/qmails-0-r3
new file mode 100644
index 000000000000..3c69ed769c52
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmails-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-smtpd
+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/qmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=86f96dd8c6744f5919d699a15016e25d
diff --git a/metadata/md5-cache/acct-user/rabbitmq-0-r1 b/metadata/md5-cache/acct-user/rabbitmq-0-r1
deleted file mode 100644
index 96db2877f0ed..000000000000
--- a/metadata/md5-cache/acct-user/rabbitmq-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ddefc0a2e1fffc5b73239d1a9ff69b9e
diff --git a/metadata/md5-cache/acct-user/rabbitmq-0-r2 b/metadata/md5-cache/acct-user/rabbitmq-0-r2
new file mode 100644
index 000000000000..4d241dd114a2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rabbitmq-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/rabbitmq-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/rabbitmq
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=55199be6e698d4192e6cfb32ea7f5d61
diff --git a/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r1 b/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r1
deleted file mode 100644
index 376ec0a5d222..000000000000
--- a/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e279ebf4253bedb07518a8261315bdcd
diff --git a/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r2 b/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r2
new file mode 100644
index 000000000000..540ac21108f6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/rabbitmq_exporter
+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/rabbitmq_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0f8ce8412a393bbcd7b8b89e8762078c
diff --git a/metadata/md5-cache/acct-user/radicale-0-r3 b/metadata/md5-cache/acct-user/radicale-0-r3
deleted file mode 100644
index 751e36c37c34..000000000000
--- a/metadata/md5-cache/acct-user/radicale-0-r3
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3bb7d569ffe623df1e80813c66718687
diff --git a/metadata/md5-cache/acct-user/radicale-0-r4 b/metadata/md5-cache/acct-user/radicale-0-r4
new file mode 100644
index 000000000000..ca9d1c908eaa
--- /dev/null
+++ b/metadata/md5-cache/acct-user/radicale-0-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-apps/radicale
+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/radicale
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7f829e4271bdd6101130d40a62b42893
diff --git a/metadata/md5-cache/acct-user/radius-0-r2 b/metadata/md5-cache/acct-user/radius-0-r2
deleted file mode 100644
index c764e9e88ccd..000000000000
--- a/metadata/md5-cache/acct-user/radius-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ceb989efd234e0c02c6467b438467981
diff --git a/metadata/md5-cache/acct-user/radius-0-r3 b/metadata/md5-cache/acct-user/radius-0-r3
new file mode 100644
index 000000000000..23fb5e125ab6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/radius-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=FreeRadius 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/radius
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=91e65f103cff7ed79bebf9e842d96088
diff --git a/metadata/md5-cache/acct-user/radvd-0-r1 b/metadata/md5-cache/acct-user/radvd-0-r1
deleted file mode 100644
index 934ab293a2dd..000000000000
--- a/metadata/md5-cache/acct-user/radvd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d835c4dc93fac9ff284c6fc9ce1c8df7
diff --git a/metadata/md5-cache/acct-user/radvd-0-r2 b/metadata/md5-cache/acct-user/radvd-0-r2
new file mode 100644
index 000000000000..2a45cc7f4892
--- /dev/null
+++ b/metadata/md5-cache/acct-user/radvd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Router Advertisement 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/radvd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9f054596193c48dee7b32e180d73dbdd
diff --git a/metadata/md5-cache/acct-user/rbldns-0-r2 b/metadata/md5-cache/acct-user/rbldns-0-r2
deleted file mode 100644
index b102f240039c..000000000000
--- a/metadata/md5-cache/acct-user/rbldns-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5009e74672c06dd835b446b024ce71d7
diff --git a/metadata/md5-cache/acct-user/rbldns-0-r3 b/metadata/md5-cache/acct-user/rbldns-0-r3
new file mode 100644
index 000000000000..6df6bb58ddc6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rbldns-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: rbldns
+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/rbldns
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7ba655d2521d0413b2557621342438e3
diff --git a/metadata/md5-cache/acct-user/rbot-0-r1 b/metadata/md5-cache/acct-user/rbot-0-r1
deleted file mode 100644
index f592cd4d9399..000000000000
--- a/metadata/md5-cache/acct-user/rbot-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5102b57562fd16fcbb21159f22effe9d
diff --git a/metadata/md5-cache/acct-user/rbot-0-r2 b/metadata/md5-cache/acct-user/rbot-0-r2
new file mode 100644
index 000000000000..0dfcde4bec0d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rbot-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-irc/rbot
+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/rbot
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e3dceb95983b752dfc7f88b4afd4c45
diff --git a/metadata/md5-cache/acct-user/redis_exporter-0-r1 b/metadata/md5-cache/acct-user/redis_exporter-0-r1
deleted file mode 100644
index 2e1115337e82..000000000000
--- a/metadata/md5-cache/acct-user/redis_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=95b112dd79b5e31416c1dc08ac006e0c
diff --git a/metadata/md5-cache/acct-user/redis_exporter-0-r2 b/metadata/md5-cache/acct-user/redis_exporter-0-r2
new file mode 100644
index 000000000000..146968c9bff8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redis_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/redis_exporter
+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_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=eeeea287ecd520b0d5a3ae56e7ead551
diff --git a/metadata/md5-cache/acct-user/redmine-0-r2 b/metadata/md5-cache/acct-user/redmine-0-r2
deleted file mode 100644
index 180e44ac37cc..000000000000
--- a/metadata/md5-cache/acct-user/redmine-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6f477fb88192634800413940208a341f
diff --git a/metadata/md5-cache/acct-user/redmine-0-r3 b/metadata/md5-cache/acct-user/redmine-0-r3
new file mode 100644
index 000000000000..0eadba96ed94
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redmine-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Redmine application 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/redmine
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=02f955933286684fa219a34f6eaa33b9
diff --git a/metadata/md5-cache/acct-user/redsocks-0-r2 b/metadata/md5-cache/acct-user/redsocks-0-r2
deleted file mode 100644
index b9639142360b..000000000000
--- a/metadata/md5-cache/acct-user/redsocks-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f6c8520af564be4a260f0b700a280aa8
diff --git a/metadata/md5-cache/acct-user/redsocks-0-r3 b/metadata/md5-cache/acct-user/redsocks-0-r3
new file mode 100644
index 000000000000..64cd9f4f870a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redsocks-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-proxy/redsocks
+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/redsocks
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4cb0b73682dc3b93927147f6754d9978
diff --git a/metadata/md5-cache/acct-user/reg-0-r2 b/metadata/md5-cache/acct-user/reg-0-r2
deleted file mode 100644
index f07b2cbf5242..000000000000
--- a/metadata/md5-cache/acct-user/reg-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6008057bd6e65aad3163581cf0099c49
diff --git a/metadata/md5-cache/acct-user/reg-0-r3 b/metadata/md5-cache/acct-user/reg-0-r3
new file mode 100644
index 000000000000..0d91be9e72d2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/reg-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-containers/reg
+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/reg
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=83b33c0d3ee62a897be12c765b5e2fe2
diff --git a/metadata/md5-cache/acct-user/registry-0-r1 b/metadata/md5-cache/acct-user/registry-0-r1
deleted file mode 100644
index 4787e4c99fb1..000000000000
--- a/metadata/md5-cache/acct-user/registry-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=603b0c0f3757405256ca40df9c89eb00
diff --git a/metadata/md5-cache/acct-user/registry-0-r2 b/metadata/md5-cache/acct-user/registry-0-r2
new file mode 100644
index 000000000000..07612b860e00
--- /dev/null
+++ b/metadata/md5-cache/acct-user/registry-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-containers/docker-registry
+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/registry
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9f41d6a34c053b382aea68d9ed80b865
diff --git a/metadata/md5-cache/acct-user/root-0-r2 b/metadata/md5-cache/acct-user/root-0-r2
deleted file mode 100644
index b2fd37bea2bc..000000000000
--- a/metadata/md5-cache/acct-user/root-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=46cd14cc4c6ac52ce469ffd16b6793bf
diff --git a/metadata/md5-cache/acct-user/root-0-r3 b/metadata/md5-cache/acct-user/root-0-r3
new file mode 100644
index 000000000000..4170af4d4c71
--- /dev/null
+++ b/metadata/md5-cache/acct-user/root-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: root
+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/root
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=823bf7b77de0031e21254661a517da0c
diff --git a/metadata/md5-cache/acct-user/rslsync-0-r1 b/metadata/md5-cache/acct-user/rslsync-0-r1
deleted file mode 100644
index 9c6106697e0d..000000000000
--- a/metadata/md5-cache/acct-user/rslsync-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4977e1c17be3ebeee18ce1f475e18902
diff --git a/metadata/md5-cache/acct-user/rslsync-0-r2 b/metadata/md5-cache/acct-user/rslsync-0-r2
new file mode 100644
index 000000000000..e6a8790f68c5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rslsync-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-p2p/resilio-sync
+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/rslsync
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d5164d13ca28af3256363646364e9238
diff --git a/metadata/md5-cache/acct-user/rspamd-0-r2 b/metadata/md5-cache/acct-user/rspamd-0-r2
deleted file mode 100644
index 87b78880b6f0..000000000000
--- a/metadata/md5-cache/acct-user/rspamd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1b919ec023cf2a78f8c735e55869abca
diff --git a/metadata/md5-cache/acct-user/rspamd-0-r3 b/metadata/md5-cache/acct-user/rspamd-0-r3
new file mode 100644
index 000000000000..909357448a3f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rspamd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for rspamd - Rapid spam filtering system
+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/rspamd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=27b45c8aa78ce9445550144650a5a740
diff --git a/metadata/md5-cache/acct-user/rtkit-0-r2 b/metadata/md5-cache/acct-user/rtkit-0-r2
deleted file mode 100644
index 6b6d93c9be0e..000000000000
--- a/metadata/md5-cache/acct-user/rtkit-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0cb0b7df70977c5762306900a6e3b589
diff --git a/metadata/md5-cache/acct-user/rtkit-0-r3 b/metadata/md5-cache/acct-user/rtkit-0-r3
new file mode 100644
index 000000000000..53ee72a74be5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rtkit-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the Realtime Policy and Watchdog 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/rtkit
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f50a49c01f73125553434743b38febd9
diff --git a/metadata/md5-cache/acct-user/rwhoisd-0-r1 b/metadata/md5-cache/acct-user/rwhoisd-0-r1
deleted file mode 100644
index 88e39db8d9da..000000000000
--- a/metadata/md5-cache/acct-user/rwhoisd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b569f6ae35e31608e861d5afd5be0a66
diff --git a/metadata/md5-cache/acct-user/rwhoisd-0-r2 b/metadata/md5-cache/acct-user/rwhoisd-0-r2
new file mode 100644
index 000000000000..58e0a7474d87
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rwhoisd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/rwhoisd
+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/rwhoisd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=db6928e34f26580cd2a46dd6f453b016
diff --git a/metadata/md5-cache/acct-user/sabnzbd-0-r2 b/metadata/md5-cache/acct-user/sabnzbd-0-r2
deleted file mode 100644
index 37c9136a93e3..000000000000
--- a/metadata/md5-cache/acct-user/sabnzbd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=922c8b6d503583060113f82299fefda5
diff --git a/metadata/md5-cache/acct-user/sabnzbd-0-r3 b/metadata/md5-cache/acct-user/sabnzbd-0-r3
new file mode 100644
index 000000000000..845572c4e1a4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sabnzbd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=SABnzbd 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/sabnzbd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b1c29fad5e8b99ba4d2f59d50b141c56
diff --git a/metadata/md5-cache/acct-user/sagan-0-r2 b/metadata/md5-cache/acct-user/sagan-0-r2
deleted file mode 100644
index 7ba8c48af687..000000000000
--- a/metadata/md5-cache/acct-user/sagan-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=aaf51f797c4fef703916b6c3f643d342
diff --git a/metadata/md5-cache/acct-user/sagan-0-r3 b/metadata/md5-cache/acct-user/sagan-0-r3
new file mode 100644
index 000000000000..5ee0083349d3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sagan-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the Sagan log monitoring system
+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/sagan
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a662df163257ad572d7c006179a9904e
diff --git a/metadata/md5-cache/acct-user/samplicator-0-r1 b/metadata/md5-cache/acct-user/samplicator-0-r1
deleted file mode 100644
index 2d59caa76069..000000000000
--- a/metadata/md5-cache/acct-user/samplicator-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5248a07d9bb788960d07a3b0b3bb0951
diff --git a/metadata/md5-cache/acct-user/samplicator-0-r2 b/metadata/md5-cache/acct-user/samplicator-0-r2
new file mode 100644
index 000000000000..94a8cc475dc6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/samplicator-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/samplicator
+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/samplicator
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e46056a69b235c390ba7d79348b36d30
diff --git a/metadata/md5-cache/acct-user/sancp-0-r1 b/metadata/md5-cache/acct-user/sancp-0-r1
deleted file mode 100644
index 93b040fcc3a0..000000000000
--- a/metadata/md5-cache/acct-user/sancp-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c886dbbf8c5fd08bf8033d394057a003
diff --git a/metadata/md5-cache/acct-user/sancp-0-r2 b/metadata/md5-cache/acct-user/sancp-0-r2
new file mode 100644
index 000000000000..6e9d98739bc7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sancp-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/sancp
+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/sancp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5053180acfb42d9cff73c188871537d0
diff --git a/metadata/md5-cache/acct-user/saned-0-r1 b/metadata/md5-cache/acct-user/saned-0-r1
deleted file mode 100644
index 404a337c0222..000000000000
--- a/metadata/md5-cache/acct-user/saned-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=38b927afee1e1ea9e56c60bfcfbe614c
diff --git a/metadata/md5-cache/acct-user/saned-0-r2 b/metadata/md5-cache/acct-user/saned-0-r2
new file mode 100644
index 000000000000..0555dd48d00d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/saned-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for media-gfx/sane-backends
+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/scanner
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=678c3e40955a05dc2245ad912a535bec
diff --git a/metadata/md5-cache/acct-user/sanlock-0-r2 b/metadata/md5-cache/acct-user/sanlock-0-r2
deleted file mode 100644
index 0ab537a0ac22..000000000000
--- a/metadata/md5-cache/acct-user/sanlock-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=421bacb4f699ceb9f166192ceff1f785
diff --git a/metadata/md5-cache/acct-user/sanlock-0-r3 b/metadata/md5-cache/acct-user/sanlock-0-r3
new file mode 100644
index 000000000000..320639510077
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sanlock-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=shared storage lock manager
+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/sanlock acct-group/disk
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dac700e1a4a8a231366ed80e65297581
diff --git a/metadata/md5-cache/acct-user/sauerbraten-0-r2 b/metadata/md5-cache/acct-user/sauerbraten-0-r2
deleted file mode 100644
index d6ee6ba719c2..000000000000
--- a/metadata/md5-cache/acct-user/sauerbraten-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f0abce63df484bc4d78581b637ffc519
diff --git a/metadata/md5-cache/acct-user/sauerbraten-0-r3 b/metadata/md5-cache/acct-user/sauerbraten-0-r3
new file mode 100644
index 000000000000..6e871c95bda1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sauerbraten-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Group for Sauerbraten (FOSS game engine (Cube 2))
+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/sauerbraten
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=41ca172cb99e3e82833eb15d8ec639b0
diff --git a/metadata/md5-cache/acct-user/scanlogd-0-r1 b/metadata/md5-cache/acct-user/scanlogd-0-r1
deleted file mode 100644
index 64741d2a33c7..000000000000
--- a/metadata/md5-cache/acct-user/scanlogd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c70aeffa3edb2785a2a0066227362e4d
diff --git a/metadata/md5-cache/acct-user/scanlogd-0-r2 b/metadata/md5-cache/acct-user/scanlogd-0-r2
new file mode 100644
index 000000000000..312041a167bb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/scanlogd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/scanlogd
+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/scanlogd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=62712620b22cc35d86cf48dab735958e
diff --git a/metadata/md5-cache/acct-user/scponly-0-r2 b/metadata/md5-cache/acct-user/scponly-0-r2
deleted file mode 100644
index 54a94a09cb16..000000000000
--- a/metadata/md5-cache/acct-user/scponly-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5669ab1302559c47ec86b3996c658ebd
diff --git a/metadata/md5-cache/acct-user/scponly-0-r3 b/metadata/md5-cache/acct-user/scponly-0-r3
new file mode 100644
index 000000000000..bb85304ef00b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/scponly-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for chrooted scponly
+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/scponly
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=86d0c7818fc1775bf294df1d82779fda
diff --git a/metadata/md5-cache/acct-user/sendpage-0-r1 b/metadata/md5-cache/acct-user/sendpage-0-r1
deleted file mode 100644
index 2a0b9c778912..000000000000
--- a/metadata/md5-cache/acct-user/sendpage-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6456bbb257f3b012d17d9a14c419c9d1
diff --git a/metadata/md5-cache/acct-user/sendpage-0-r2 b/metadata/md5-cache/acct-user/sendpage-0-r2
new file mode 100644
index 000000000000..93381a99a84f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sendpage-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dialup/sendpage
+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/sms
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c0416f9458a0779e037a907343823295
diff --git a/metadata/md5-cache/acct-user/serf-0-r1 b/metadata/md5-cache/acct-user/serf-0-r1
deleted file mode 100644
index 1bf4566470f4..000000000000
--- a/metadata/md5-cache/acct-user/serf-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d11c203be362088060a9c80ee87c5939
diff --git a/metadata/md5-cache/acct-user/serf-0-r2 b/metadata/md5-cache/acct-user/serf-0-r2
new file mode 100644
index 000000000000..c355f0641495
--- /dev/null
+++ b/metadata/md5-cache/acct-user/serf-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-admin/serf
+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/serf
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1fba345af87e3fbcdf74df36cd8815e7
diff --git a/metadata/md5-cache/acct-user/sks-0-r1 b/metadata/md5-cache/acct-user/sks-0-r1
deleted file mode 100644
index 455d8b77709f..000000000000
--- a/metadata/md5-cache/acct-user/sks-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e7b6d244052f36ce4f7eeea472788638
diff --git a/metadata/md5-cache/acct-user/sks-0-r2 b/metadata/md5-cache/acct-user/sks-0-r2
new file mode 100644
index 000000000000..3dcb3e9ea90e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sks-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the SKS OpenPGP keyserver
+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/sks
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4a28453265fd19d97dad709ca9b372b0
diff --git a/metadata/md5-cache/acct-user/slurm-0-r2 b/metadata/md5-cache/acct-user/slurm-0-r2
deleted file mode 100644
index 8f09f6214bf8..000000000000
--- a/metadata/md5-cache/acct-user/slurm-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ad68b1c90126a55ab8ba625f36fb662f
diff --git a/metadata/md5-cache/acct-user/slurm-0-r3 b/metadata/md5-cache/acct-user/slurm-0-r3
new file mode 100644
index 000000000000..fb9c09c47dd1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/slurm-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the slurm - Highly Scalable Resource Manager
+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/slurm
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=39a34c0f13252c77e61812b6dcf1e519
diff --git a/metadata/md5-cache/acct-user/smmsp-0-r3 b/metadata/md5-cache/acct-user/smmsp-0-r3
deleted file mode 100644
index 0b3636641844..000000000000
--- a/metadata/md5-cache/acct-user/smmsp-0-r3
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2125de4631fa62d0320ca8c2df527fb4
diff --git a/metadata/md5-cache/acct-user/smmsp-0-r4 b/metadata/md5-cache/acct-user/smmsp-0-r4
new file mode 100644
index 000000000000..e51c04de9867
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smmsp-0-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for sendmail 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/smmsp
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ab54ff3bcd21fb7d2d06df23007c3ad8
diff --git a/metadata/md5-cache/acct-user/smsd-0-r1 b/metadata/md5-cache/acct-user/smsd-0-r1
deleted file mode 100644
index 1c41230e9f6d..000000000000
--- a/metadata/md5-cache/acct-user/smsd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dab5787c1e2c053b3a1f58c291dda7ea
diff --git a/metadata/md5-cache/acct-user/smsd-0-r2 b/metadata/md5-cache/acct-user/smsd-0-r2
new file mode 100644
index 000000000000..d36390f13733
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smsd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: smsd
+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/sms
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=02711318a4d5877603d201fb74775093
diff --git a/metadata/md5-cache/acct-user/smtpd-0-r2 b/metadata/md5-cache/acct-user/smtpd-0-r2
deleted file mode 100644
index cd31ed593aba..000000000000
--- a/metadata/md5-cache/acct-user/smtpd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ba0a5c0a88bf22746212d76902ac733a
diff --git a/metadata/md5-cache/acct-user/smtpd-0-r3 b/metadata/md5-cache/acct-user/smtpd-0-r3
new file mode 100644
index 000000000000..cd4ce78fe1f7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smtpd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=daemon user for smtpd
+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/smtpd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=adbc0501cd2cb7195ef3513def2cd0a1
diff --git a/metadata/md5-cache/acct-user/smtpq-0-r2 b/metadata/md5-cache/acct-user/smtpq-0-r2
deleted file mode 100644
index 2582f93c0712..000000000000
--- a/metadata/md5-cache/acct-user/smtpq-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9013b2def6216a4aab066633de1c97e2
diff --git a/metadata/md5-cache/acct-user/smtpq-0-r3 b/metadata/md5-cache/acct-user/smtpq-0-r3
new file mode 100644
index 000000000000..dd041d003aca
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smtpq-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=queue user for smtpd
+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/smtpq
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f3d817085b7da969a7182cdee565b772
diff --git a/metadata/md5-cache/acct-user/snapclient-0-r1 b/metadata/md5-cache/acct-user/snapclient-0-r1
deleted file mode 100644
index aa833a7fae8d..000000000000
--- a/metadata/md5-cache/acct-user/snapclient-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=8987d588309a3894cd9d95bfec1c01d1
diff --git a/metadata/md5-cache/acct-user/snapclient-0-r2 b/metadata/md5-cache/acct-user/snapclient-0-r2
new file mode 100644
index 000000000000..34d3a15c1561
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snapclient-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Client user for media-sound/snapcast
+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/audio
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1b8435b3c9c39e22574274ce8dee2042
diff --git a/metadata/md5-cache/acct-user/snapserver-0-r1 b/metadata/md5-cache/acct-user/snapserver-0-r1
deleted file mode 100644
index 4704751dcc37..000000000000
--- a/metadata/md5-cache/acct-user/snapserver-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=57a823e748e2fc852feed70444b52bdc
diff --git a/metadata/md5-cache/acct-user/snapserver-0-r2 b/metadata/md5-cache/acct-user/snapserver-0-r2
new file mode 100644
index 000000000000..fe9aa601233d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snapserver-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Server user for media-sound/snapcast
+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/snapserver
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a362cf845c9963d4db3295de24a8ee36
diff --git a/metadata/md5-cache/acct-user/sndiod-0-r1 b/metadata/md5-cache/acct-user/sndiod-0-r1
deleted file mode 100644
index 49c0f08553e1..000000000000
--- a/metadata/md5-cache/acct-user/sndiod-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3c66d9ea389bcd096adeb45c602cb27f
diff --git a/metadata/md5-cache/acct-user/sndiod-0-r2 b/metadata/md5-cache/acct-user/sndiod-0-r2
new file mode 100644
index 000000000000..65d01a87bab2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sndiod-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Daemon user for sndio
+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/audio
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=771a94535dedb4ae91b0b81d762cd781
diff --git a/metadata/md5-cache/acct-user/sniproxy-0-r1 b/metadata/md5-cache/acct-user/sniproxy-0-r1
deleted file mode 100644
index 36a8fa6a1260..000000000000
--- a/metadata/md5-cache/acct-user/sniproxy-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9c429f00165f852ab05ef0d7d5c90e40
diff --git a/metadata/md5-cache/acct-user/sniproxy-0-r2 b/metadata/md5-cache/acct-user/sniproxy-0-r2
new file mode 100644
index 000000000000..d2c4bb95c1bf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sniproxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: sniproxy
+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/sniproxy
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1f0388cead04a74c208c4f220eee2331
diff --git a/metadata/md5-cache/acct-user/snmp_exporter-0-r1 b/metadata/md5-cache/acct-user/snmp_exporter-0-r1
deleted file mode 100644
index 26de32f94a61..000000000000
--- a/metadata/md5-cache/acct-user/snmp_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=521f83022a7560720fb3c10ad9fff16d
diff --git a/metadata/md5-cache/acct-user/snmp_exporter-0-r2 b/metadata/md5-cache/acct-user/snmp_exporter-0-r2
new file mode 100644
index 000000000000..8e8425321cc6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snmp_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/snmp_exporter
+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/snmp_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4f4e0a9ce30c90545f67c749ab3954dc
diff --git a/metadata/md5-cache/acct-user/snort-0-r1 b/metadata/md5-cache/acct-user/snort-0-r1
deleted file mode 100644
index 75220693b4c6..000000000000
--- a/metadata/md5-cache/acct-user/snort-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=13a035fa6e25740c892336d9cb8d44b9
diff --git a/metadata/md5-cache/acct-user/snort-0-r2 b/metadata/md5-cache/acct-user/snort-0-r2
new file mode 100644
index 000000000000..084578b1e697
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snort-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for snort
+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/snort
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4c9a4cfadc599e590301173d2fa3d9b3
diff --git a/metadata/md5-cache/acct-user/sobexsrv-0-r1 b/metadata/md5-cache/acct-user/sobexsrv-0-r1
deleted file mode 100644
index 549e74306976..000000000000
--- a/metadata/md5-cache/acct-user/sobexsrv-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=224359ad7cb5966e02cbb7626a87b306
diff --git a/metadata/md5-cache/acct-user/sobexsrv-0-r2 b/metadata/md5-cache/acct-user/sobexsrv-0-r2
new file mode 100644
index 000000000000..b6168519c77b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sobexsrv-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sobexsrv: a secure OBEX 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/sobexsrv
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=38e183eec42b23ef2ab8c8b266c2c5eb
diff --git a/metadata/md5-cache/acct-user/sockd-0-r2 b/metadata/md5-cache/acct-user/sockd-0-r2
deleted file mode 100644
index 8bc9914ddf0a..000000000000
--- a/metadata/md5-cache/acct-user/sockd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0a94c922edf0fef67c2767a03cf86796
diff --git a/metadata/md5-cache/acct-user/sockd-0-r3 b/metadata/md5-cache/acct-user/sockd-0-r3
new file mode 100644
index 000000000000..7fda969e32cd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sockd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-proxy/dante
+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/sockd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dc6eb60b2e9191d0619dbacad643068f
diff --git a/metadata/md5-cache/acct-user/sogo-0-r2 b/metadata/md5-cache/acct-user/sogo-0-r2
deleted file mode 100644
index 58fa795e7b6f..000000000000
--- a/metadata/md5-cache/acct-user/sogo-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5fc855241427994bc88043f3590d2971
diff --git a/metadata/md5-cache/acct-user/sogo-0-r3 b/metadata/md5-cache/acct-user/sogo-0-r3
new file mode 100644
index 000000000000..435c5d088c8c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sogo-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for gnustep-apps/sogo
+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/sogo
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=556118159939b63cb10e0c0400f4d01f
diff --git a/metadata/md5-cache/acct-user/spamd-0-r2 b/metadata/md5-cache/acct-user/spamd-0-r2
deleted file mode 100644
index 4d850aa6ecf6..000000000000
--- a/metadata/md5-cache/acct-user/spamd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dc0e60380f0213d82912e0dd49f7d8f4
diff --git a/metadata/md5-cache/acct-user/spamd-0-r3 b/metadata/md5-cache/acct-user/spamd-0-r3
new file mode 100644
index 000000000000..3e506556860d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spamd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the SpamAssassin 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/spamd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8eb6fbcd3989ac36eb573c3324213022
diff --git a/metadata/md5-cache/acct-user/spectrum-0-r2 b/metadata/md5-cache/acct-user/spectrum-0-r2
deleted file mode 100644
index a50bcebe329e..000000000000
--- a/metadata/md5-cache/acct-user/spectrum-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1e04d4209109f2f32bbeeef78f24478f
diff --git a/metadata/md5-cache/acct-user/spectrum-0-r3 b/metadata/md5-cache/acct-user/spectrum-0-r3
new file mode 100644
index 000000000000..ed93f0e0b4ae
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spectrum-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Spectrum messaging transport
+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/spectrum
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e6fb7e79266f15641028c6cc4150b164
diff --git a/metadata/md5-cache/acct-user/spire-0-r2 b/metadata/md5-cache/acct-user/spire-0-r2
deleted file mode 100644
index cd77a83bffcd..000000000000
--- a/metadata/md5-cache/acct-user/spire-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ed83a2b335b6cbfde753e7d849664260
diff --git a/metadata/md5-cache/acct-user/spire-0-r3 b/metadata/md5-cache/acct-user/spire-0-r3
new file mode 100644
index 000000000000..8d90292b7518
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spire-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for spiffe runtime environment
+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/spire
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=acaad52315f5dd27d886f88095686ac2
diff --git a/metadata/md5-cache/acct-user/sqlgrey-0-r2 b/metadata/md5-cache/acct-user/sqlgrey-0-r2
deleted file mode 100644
index cc09f982dfd0..000000000000
--- a/metadata/md5-cache/acct-user/sqlgrey-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ace0580bdcfe588307ea6ef08849b0bd
diff --git a/metadata/md5-cache/acct-user/sqlgrey-0-r3 b/metadata/md5-cache/acct-user/sqlgrey-0-r3
new file mode 100644
index 000000000000..fd2880dfd0f0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sqlgrey-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for SQLGrey
+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/sqlgrey
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=883d2f254b84c9885629b5ad110ac6b5
diff --git a/metadata/md5-cache/acct-user/squid-0-r2 b/metadata/md5-cache/acct-user/squid-0-r2
deleted file mode 100644
index 4e9514e5471b..000000000000
--- a/metadata/md5-cache/acct-user/squid-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=01b9fd1f9af07ff4e9eed0bd10f50939
diff --git a/metadata/md5-cache/acct-user/squid-0-r3 b/metadata/md5-cache/acct-user/squid-0-r3
new file mode 100644
index 000000000000..f9afc3f838e6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/squid-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for squid web proxy cache
+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/squid
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f9702c5ebc9cfaf5264fec83ea898b2a
diff --git a/metadata/md5-cache/acct-user/sshd-0-r2 b/metadata/md5-cache/acct-user/sshd-0-r2
deleted file mode 100644
index 568ecd0b3960..000000000000
--- a/metadata/md5-cache/acct-user/sshd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=22655a7302a780f4afdb027779de689a
diff --git a/metadata/md5-cache/acct-user/sshd-0-r3 b/metadata/md5-cache/acct-user/sshd-0-r3
new file mode 100644
index 000000000000..130e41bc708f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sshd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ssh
+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/sshd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a03d36acba01ec04f5c37f3bea409c89
diff --git a/metadata/md5-cache/acct-user/sstpc-0-r1 b/metadata/md5-cache/acct-user/sstpc-0-r1
deleted file mode 100644
index cffc3d49454f..000000000000
--- a/metadata/md5-cache/acct-user/sstpc-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d65b236c5d9b510334a4aaac3e8c0d39
diff --git a/metadata/md5-cache/acct-user/sstpc-0-r2 b/metadata/md5-cache/acct-user/sstpc-0-r2
new file mode 100644
index 000000000000..48740149d2b6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sstpc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/sstp-client
+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/sstpc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=365f8c1d19e5172a56513981a982e83d
diff --git a/metadata/md5-cache/acct-user/steamcmd-0-r2 b/metadata/md5-cache/acct-user/steamcmd-0-r2
deleted file mode 100644
index d3ac26291cf5..000000000000
--- a/metadata/md5-cache/acct-user/steamcmd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3c54cb6e3b224418f16918b418753685
diff --git a/metadata/md5-cache/acct-user/steamcmd-0-r3 b/metadata/md5-cache/acct-user/steamcmd-0-r3
new file mode 100644
index 000000000000..624cd90f6180
--- /dev/null
+++ b/metadata/md5-cache/acct-user/steamcmd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the SteamCMD 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/steamcmd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=82e16b9545e11363d07f65ce01163456
diff --git a/metadata/md5-cache/acct-user/stubby-0-r2 b/metadata/md5-cache/acct-user/stubby-0-r2
deleted file mode 100644
index c61ddf4b8951..000000000000
--- a/metadata/md5-cache/acct-user/stubby-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ebe23ad900e57e1b231237ac0e3baa2a
diff --git a/metadata/md5-cache/acct-user/stubby-0-r3 b/metadata/md5-cache/acct-user/stubby-0-r3
new file mode 100644
index 000000000000..3be0515cc8d5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/stubby-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Stubby program user (from net-dns/getdns)
+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/stubby
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dee25b1a22d71d1bb06b0942bf123f25
diff --git a/metadata/md5-cache/acct-user/stunnel-0-r2 b/metadata/md5-cache/acct-user/stunnel-0-r2
deleted file mode 100644
index bbb175c96755..000000000000
--- a/metadata/md5-cache/acct-user/stunnel-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=88b1f27a4ee7f3fdb5e56a8ae15c81ef
diff --git a/metadata/md5-cache/acct-user/stunnel-0-r3 b/metadata/md5-cache/acct-user/stunnel-0-r3
new file mode 100644
index 000000000000..9ee824a5ca4d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/stunnel-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for stunnel
+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/stunnel
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0740dcdd50c18e0c0fb5bb3df172ff2d
diff --git a/metadata/md5-cache/acct-user/subsonic-0-r2 b/metadata/md5-cache/acct-user/subsonic-0-r2
deleted file mode 100644
index d81a5b60c122..000000000000
--- a/metadata/md5-cache/acct-user/subsonic-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=20dda63029ce2968c5b12f90324baf5f
diff --git a/metadata/md5-cache/acct-user/subsonic-0-r3 b/metadata/md5-cache/acct-user/subsonic-0-r3
new file mode 100644
index 000000000000..74c863f1c8bb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/subsonic-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/subsonic-bin
+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/subsonic
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6ece2704a7b338297e83f3dd630ffca8
diff --git a/metadata/md5-cache/acct-user/suricata-0-r2 b/metadata/md5-cache/acct-user/suricata-0-r2
deleted file mode 100644
index 2f66872d5d8f..000000000000
--- a/metadata/md5-cache/acct-user/suricata-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b82346e3c9d98b6efad67b42a1d49c81
diff --git a/metadata/md5-cache/acct-user/suricata-0-r3 b/metadata/md5-cache/acct-user/suricata-0-r3
new file mode 100644
index 000000000000..948f5e2514e0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/suricata-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Suricata IDS
+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/suricata
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d7da7e0fd447cabbb36ce7bfea229a2a
diff --git a/metadata/md5-cache/acct-user/svn-0-r2 b/metadata/md5-cache/acct-user/svn-0-r2
deleted file mode 100644
index 7b998729e5d5..000000000000
--- a/metadata/md5-cache/acct-user/svn-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b5baf01ce08942ff0792666dd6a795f6
diff --git a/metadata/md5-cache/acct-user/svn-0-r3 b/metadata/md5-cache/acct-user/svn-0-r3
new file mode 100644
index 000000000000..4a3577f8ad79
--- /dev/null
+++ b/metadata/md5-cache/acct-user/svn-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: svn
+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/svnusers
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4e77efc603c5808471dc62e2148df822
diff --git a/metadata/md5-cache/acct-user/svxlink-0-r1 b/metadata/md5-cache/acct-user/svxlink-0-r1
deleted file mode 100644
index 9c98a2430131..000000000000
--- a/metadata/md5-cache/acct-user/svxlink-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5feca89df572c1522c8b820133754a42
diff --git a/metadata/md5-cache/acct-user/svxlink-0-r2 b/metadata/md5-cache/acct-user/svxlink-0-r2
new file mode 100644
index 000000000000..6891e3c83a46
--- /dev/null
+++ b/metadata/md5-cache/acct-user/svxlink-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the svxlink 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/svxlink
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=58985dcb37b91f5b5532c93005bf3f8a
diff --git a/metadata/md5-cache/acct-user/syncthing-0-r2 b/metadata/md5-cache/acct-user/syncthing-0-r2
deleted file mode 100644
index c035ff44b6d5..000000000000
--- a/metadata/md5-cache/acct-user/syncthing-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=59cb5f9c512edd632e3a861968aa41a5
diff --git a/metadata/md5-cache/acct-user/syncthing-0-r3 b/metadata/md5-cache/acct-user/syncthing-0-r3
new file mode 100644
index 000000000000..5e72dc588451
--- /dev/null
+++ b/metadata/md5-cache/acct-user/syncthing-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the system-wide net-p2p/syncthing 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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d4ac723feb5fcbdfe5ef566ee3b2bc9e
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0-r2 b/metadata/md5-cache/acct-user/systemd-coredump-0-r2
deleted file mode 100644
index 1866a41b3e50..000000000000
--- a/metadata/md5-cache/acct-user/systemd-coredump-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b14c716c71026ed3cd9e5824378f4b6d
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0-r3 b/metadata/md5-cache/acct-user/systemd-coredump-0-r3
new file mode 100644
index 000000000000..c2bcc64fa5c2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-coredump-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-coredump
+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/systemd-coredump
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=af5ced0f504b97602fbf1c94c3d58d01
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r2 b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r2
deleted file mode 100644
index fb7905e25f04..000000000000
--- a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d2520186e3ffce0dca975f7b2058f854
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r3 b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r3
new file mode 100644
index 000000000000..7fae81dc5b8d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-journal-remote
+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/systemd-journal-remote
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=92f11d4401285ff77825a33cd8b09040
diff --git a/metadata/md5-cache/acct-user/systemd-network-0-r2 b/metadata/md5-cache/acct-user/systemd-network-0-r2
deleted file mode 100644
index 77e53c63176c..000000000000
--- a/metadata/md5-cache/acct-user/systemd-network-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=9d46997e180c48b430a0749505923823
diff --git a/metadata/md5-cache/acct-user/systemd-network-0-r3 b/metadata/md5-cache/acct-user/systemd-network-0-r3
new file mode 100644
index 000000000000..89ae7205058e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-network-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-network
+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/systemd-network
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b9bae7f8ffd6cf7661620dfa9543b063
diff --git a/metadata/md5-cache/acct-user/systemd-oom-0-r1 b/metadata/md5-cache/acct-user/systemd-oom-0-r1
deleted file mode 100644
index 23959956eb19..000000000000
--- a/metadata/md5-cache/acct-user/systemd-oom-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c5962b120acd016f0dbd4b862bb6e58a
diff --git a/metadata/md5-cache/acct-user/systemd-oom-0-r2 b/metadata/md5-cache/acct-user/systemd-oom-0-r2
new file mode 100644
index 000000000000..cc644ebf8869
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-oom-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-oom
+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/systemd-oom
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3f95bb8ddd3b7505d845f9c62e87b370
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0-r2 b/metadata/md5-cache/acct-user/systemd-resolve-0-r2
deleted file mode 100644
index fea0eedc3b3a..000000000000
--- a/metadata/md5-cache/acct-user/systemd-resolve-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=83e17c212bb1752314cc8225956ca4ad
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0-r3 b/metadata/md5-cache/acct-user/systemd-resolve-0-r3
new file mode 100644
index 000000000000..531471e7c3dd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-resolve-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-resolve
+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/systemd-resolve
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dbda89cae329dada91cb45a97b425bf7
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0-r2 b/metadata/md5-cache/acct-user/systemd-timesync-0-r2
deleted file mode 100644
index 06e841944c57..000000000000
--- a/metadata/md5-cache/acct-user/systemd-timesync-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e931f2d239999cd545825aadc78cbdf3
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0-r3 b/metadata/md5-cache/acct-user/systemd-timesync-0-r3
new file mode 100644
index 000000000000..9afdb4b03d46
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-timesync-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-timesync
+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/systemd-timesync
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8e084f7b237010758398cec6c24bfda7
diff --git a/metadata/md5-cache/acct-user/taskd-0-r1 b/metadata/md5-cache/acct-user/taskd-0-r1
deleted file mode 100644
index b847b3708c49..000000000000
--- a/metadata/md5-cache/acct-user/taskd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=e1d98fa071bf90bbb9ff3e1521d69dc3
diff --git a/metadata/md5-cache/acct-user/taskd-0-r2 b/metadata/md5-cache/acct-user/taskd-0-r2
new file mode 100644
index 000000000000..4c41fa029428
--- /dev/null
+++ b/metadata/md5-cache/acct-user/taskd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-misc/taskd
+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/taskd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2be3e95a392e52b95cca39d5109187fc
diff --git a/metadata/md5-cache/acct-user/teamspeak-0-r2 b/metadata/md5-cache/acct-user/teamspeak-0-r2
deleted file mode 100644
index 943c0fe1c635..000000000000
--- a/metadata/md5-cache/acct-user/teamspeak-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5536c7aa600645b03dccad773ca52ab3
diff --git a/metadata/md5-cache/acct-user/teamspeak-0-r3 b/metadata/md5-cache/acct-user/teamspeak-0-r3
new file mode 100644
index 000000000000..69d1624c11f4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/teamspeak-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the TeamSpeak 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/teamspeak
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=efd691761260e6ef74a6f9b6a07bb15f
diff --git a/metadata/md5-cache/acct-user/telegraf-0-r2 b/metadata/md5-cache/acct-user/telegraf-0-r2
deleted file mode 100644
index aafe776104a6..000000000000
--- a/metadata/md5-cache/acct-user/telegraf-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b6ab92558410af4e9631e2b86569ee57
diff --git a/metadata/md5-cache/acct-user/telegraf-0-r3 b/metadata/md5-cache/acct-user/telegraf-0-r3
new file mode 100644
index 000000000000..5509fc133006
--- /dev/null
+++ b/metadata/md5-cache/acct-user/telegraf-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for telegraf
+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/telegraf
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=67fc4755ea6e4aebe39cce2fc5c6f789
diff --git a/metadata/md5-cache/acct-user/tenshi-0-r1 b/metadata/md5-cache/acct-user/tenshi-0-r1
deleted file mode 100644
index 173645a37d0c..000000000000
--- a/metadata/md5-cache/acct-user/tenshi-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=50006eb69af26e8ce2f8bd01d0cd67ba
diff --git a/metadata/md5-cache/acct-user/tenshi-0-r2 b/metadata/md5-cache/acct-user/tenshi-0-r2
new file mode 100644
index 000000000000..92fca399317e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tenshi-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-admin/tenshi
+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/tenshi
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a45a1071cbedae4dc9a585a6d604285f
diff --git a/metadata/md5-cache/acct-user/timidity-0-r1 b/metadata/md5-cache/acct-user/timidity-0-r1
deleted file mode 100644
index c8198378ab4d..000000000000
--- a/metadata/md5-cache/acct-user/timidity-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6ce523f243bea3c99522901145ff7862
diff --git a/metadata/md5-cache/acct-user/timidity-0-r2 b/metadata/md5-cache/acct-user/timidity-0-r2
new file mode 100644
index 000000000000..4f39ea86047d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/timidity-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/timidity++
+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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ae1338d73aeaea5439f01548fc1cbbf8
diff --git a/metadata/md5-cache/acct-user/tinydns-0-r1 b/metadata/md5-cache/acct-user/tinydns-0-r1
deleted file mode 100644
index 8222deeaf44a..000000000000
--- a/metadata/md5-cache/acct-user/tinydns-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=0c937e23d9a04f5d6d90bbb4a56f20d6
diff --git a/metadata/md5-cache/acct-user/tinydns-0-r2 b/metadata/md5-cache/acct-user/tinydns-0-r2
new file mode 100644
index 000000000000..5a086752e883
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tinydns-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: tinydns
+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/nofiles
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=295d8b92c3f9861be3bcdd91ffab7c50
diff --git a/metadata/md5-cache/acct-user/tinyproxy-0-r1 b/metadata/md5-cache/acct-user/tinyproxy-0-r1
deleted file mode 100644
index b0e9b727076d..000000000000
--- a/metadata/md5-cache/acct-user/tinyproxy-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=cf08585af6ed10ffe0f29a6a7fec883b
diff --git a/metadata/md5-cache/acct-user/tinyproxy-0-r2 b/metadata/md5-cache/acct-user/tinyproxy-0-r2
new file mode 100644
index 000000000000..825429e3056e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tinyproxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-proxy/tinyproxy
+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/tinyproxy
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b4d216d82069f3e956946a92df124fcd
diff --git a/metadata/md5-cache/acct-user/tomcat-0-r1 b/metadata/md5-cache/acct-user/tomcat-0-r1
deleted file mode 100644
index aa4a98b54c4c..000000000000
--- a/metadata/md5-cache/acct-user/tomcat-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c03b970aa5e312ad053d9d7042bc9f81
diff --git a/metadata/md5-cache/acct-user/tomcat-0-r2 b/metadata/md5-cache/acct-user/tomcat-0-r2
new file mode 100644
index 000000000000..1fec185f3acc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tomcat-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Apache Tomcat
+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/tomcat
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ef8db9f2f11e950b60df7df2356016f5
diff --git a/metadata/md5-cache/acct-user/tor-0-r2 b/metadata/md5-cache/acct-user/tor-0-r2
deleted file mode 100644
index 4613eda80a39..000000000000
--- a/metadata/md5-cache/acct-user/tor-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=763d5a4316de083c8a818331d4cd60ee
diff --git a/metadata/md5-cache/acct-user/tor-0-r3 b/metadata/md5-cache/acct-user/tor-0-r3
new file mode 100644
index 000000000000..306a2c2f5b8c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tor-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for tor 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/tor
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=565767667c9b57186cdae16fe16e30af
diff --git a/metadata/md5-cache/acct-user/tox-0-r2 b/metadata/md5-cache/acct-user/tox-0-r2
deleted file mode 100644
index da23d07083c3..000000000000
--- a/metadata/md5-cache/acct-user/tox-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5a68c92369d8b35c1c0621dc3635dc27
diff --git a/metadata/md5-cache/acct-user/tox-0-r3 b/metadata/md5-cache/acct-user/tox-0-r3
new file mode 100644
index 000000000000..967852da992b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tox-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for package net-libs/tox
+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/tox
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=53fb8a9cf126367389d6bdf4f2918a6a
diff --git a/metadata/md5-cache/acct-user/transmission-1-r2 b/metadata/md5-cache/acct-user/transmission-1-r2
deleted file mode 100644
index 7b202280dc74..000000000000
--- a/metadata/md5-cache/acct-user/transmission-1-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=71d5c89a0539229ebd2a56253cf8b9e1
diff --git a/metadata/md5-cache/acct-user/transmission-1-r3 b/metadata/md5-cache/acct-user/transmission-1-r3
new file mode 100644
index 000000000000..a7bbe201290b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/transmission-1-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: transmission
+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/transmission
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fdb39d805512ffd5bee3abaa5f434ad2
diff --git a/metadata/md5-cache/acct-user/trickster-0-r1 b/metadata/md5-cache/acct-user/trickster-0-r1
deleted file mode 100644
index c36da59d781a..000000000000
--- a/metadata/md5-cache/acct-user/trickster-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ee08b086a58679311b139285ac4b95c2
diff --git a/metadata/md5-cache/acct-user/trickster-0-r2 b/metadata/md5-cache/acct-user/trickster-0-r2
new file mode 100644
index 000000000000..349048441424
--- /dev/null
+++ b/metadata/md5-cache/acct-user/trickster-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/trickster
+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/trickster
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=738b222f148a911f95eb8b4ce37f9782
diff --git a/metadata/md5-cache/acct-user/trojan-0-r1 b/metadata/md5-cache/acct-user/trojan-0-r1
deleted file mode 100644
index a549930733f1..000000000000
--- a/metadata/md5-cache/acct-user/trojan-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fcbc08bf02771f0fe33052802c6a946e
diff --git a/metadata/md5-cache/acct-user/trojan-0-r2 b/metadata/md5-cache/acct-user/trojan-0-r2
new file mode 100644
index 000000000000..0dec4b713790
--- /dev/null
+++ b/metadata/md5-cache/acct-user/trojan-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-proxy/trojan
+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/trojan
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9f03ebf8f916a96a6c5d3ef606c1632b
diff --git a/metadata/md5-cache/acct-user/tss-0-r2 b/metadata/md5-cache/acct-user/tss-0-r2
deleted file mode 100644
index 13876ec36e1e..000000000000
--- a/metadata/md5-cache/acct-user/tss-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=a0da971d2c9378980e7c4f7afd9e952b
diff --git a/metadata/md5-cache/acct-user/tss-0-r3 b/metadata/md5-cache/acct-user/tss-0-r3
new file mode 100644
index 000000000000..34a043395970
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tss-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Trusted Software Stack for TPMs 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/tss
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a7b4a809a2e36cf5206d1c80379cd7aa
diff --git a/metadata/md5-cache/acct-user/ttrssd-0-r1 b/metadata/md5-cache/acct-user/ttrssd-0-r1
deleted file mode 100644
index f0d5b06679e5..000000000000
--- a/metadata/md5-cache/acct-user/ttrssd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2afd8110b4c65a266a0e325be3e49d6f
diff --git a/metadata/md5-cache/acct-user/ttrssd-0-r2 b/metadata/md5-cache/acct-user/ttrssd-0-r2
new file mode 100644
index 000000000000..4b011a3626e4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ttrssd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-apps/tt-rss
+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/ttrssd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9c5387af7b92c03cd1c6251b94b6fc6c
diff --git a/metadata/md5-cache/acct-user/turnserver-0-r2 b/metadata/md5-cache/acct-user/turnserver-0-r2
deleted file mode 100644
index 96e11adf3af0..000000000000
--- a/metadata/md5-cache/acct-user/turnserver-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=aa6d3ef7d3dde357cc7a70f77ec000e5
diff --git a/metadata/md5-cache/acct-user/turnserver-0-r3 b/metadata/md5-cache/acct-user/turnserver-0-r3
new file mode 100644
index 000000000000..ec04bafb04c5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/turnserver-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for a turn server like coturn
+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/turnserver
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5dd05c26f98df7391a61d02e5a02d57d
diff --git a/metadata/md5-cache/acct-user/tvheadend-0-r2 b/metadata/md5-cache/acct-user/tvheadend-0-r2
deleted file mode 100644
index b1785a455b39..000000000000
--- a/metadata/md5-cache/acct-user/tvheadend-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=af77e6dc96586845c76bed88cb78e39f
diff --git a/metadata/md5-cache/acct-user/tvheadend-0-r3 b/metadata/md5-cache/acct-user/tvheadend-0-r3
new file mode 100644
index 000000000000..5faf3e1ce810
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tvheadend-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for tvheadend
+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/video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ad5d03f7987af575a2c45f7c83b71f75
diff --git a/metadata/md5-cache/acct-user/ulogd-0-r1 b/metadata/md5-cache/acct-user/ulogd-0-r1
deleted file mode 100644
index 4c1669ce002b..000000000000
--- a/metadata/md5-cache/acct-user/ulogd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5a774143f06c26bc6d3b96f7c7351b09
diff --git a/metadata/md5-cache/acct-user/ulogd-0-r2 b/metadata/md5-cache/acct-user/ulogd-0-r2
new file mode 100644
index 000000000000..72c4d7622878
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ulogd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ulogd
+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/ulogd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=88ff207e955521b619b2c642c0b11670
diff --git a/metadata/md5-cache/acct-user/unbound-0-r2 b/metadata/md5-cache/acct-user/unbound-0-r2
deleted file mode 100644
index be2db70c2c07..000000000000
--- a/metadata/md5-cache/acct-user/unbound-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f29b20036f66bde4000d833bf0b712c6
diff --git a/metadata/md5-cache/acct-user/unbound-0-r3 b/metadata/md5-cache/acct-user/unbound-0-r3
new file mode 100644
index 000000000000..1835325508ab
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unbound-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=unbound 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/unbound
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a5efc3aef4a16b69c5c6c234c934bbe7
diff --git a/metadata/md5-cache/acct-user/unbound-telemetry-1-r1 b/metadata/md5-cache/acct-user/unbound-telemetry-1-r1
deleted file mode 100644
index a4a3893cec08..000000000000
--- a/metadata/md5-cache/acct-user/unbound-telemetry-1-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f6d46b829efe849080dd4af0ef8a54f8
diff --git a/metadata/md5-cache/acct-user/unbound-telemetry-1-r2 b/metadata/md5-cache/acct-user/unbound-telemetry-1-r2
new file mode 100644
index 000000000000..cbded892597c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unbound-telemetry-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for unbound-telemetry
+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/unbound-telemetry acct-group/unbound
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b79120c53ffa91f81e4a1f180448e709
diff --git a/metadata/md5-cache/acct-user/unifi-0-r2 b/metadata/md5-cache/acct-user/unifi-0-r2
deleted file mode 100644
index d6cc9a9a35e8..000000000000
--- a/metadata/md5-cache/acct-user/unifi-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=140aee447d2e30b63cb43eb64449884b
diff --git a/metadata/md5-cache/acct-user/unifi-0-r3 b/metadata/md5-cache/acct-user/unifi-0-r3
new file mode 100644
index 000000000000..9cc9abb3cf5f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unifi-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the UniFi Controller
+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/unifi
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3c684ae903eb334c18de90ab2dbe628d
diff --git a/metadata/md5-cache/acct-user/unifi-video-0-r1 b/metadata/md5-cache/acct-user/unifi-video-0-r1
deleted file mode 100644
index 86ce4d735a23..000000000000
--- a/metadata/md5-cache/acct-user/unifi-video-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=da1741c8634bb302c2ce34e0cb20ca32
diff --git a/metadata/md5-cache/acct-user/unifi-video-0-r2 b/metadata/md5-cache/acct-user/unifi-video-0-r2
new file mode 100644
index 000000000000..169778e62c79
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unifi-video-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Unifi Video
+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/unifi-video
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8d7407e3038f88e921e6785489424679
diff --git a/metadata/md5-cache/acct-user/upmpdcli-0-r1 b/metadata/md5-cache/acct-user/upmpdcli-0-r1
deleted file mode 100644
index cfee76217227..000000000000
--- a/metadata/md5-cache/acct-user/upmpdcli-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c6a393235eb8362dbd52fb2e7652f54f
diff --git a/metadata/md5-cache/acct-user/upmpdcli-0-r2 b/metadata/md5-cache/acct-user/upmpdcli-0-r2
new file mode 100644
index 000000000000..b3751e0ea8a3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/upmpdcli-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for upmpdcli
+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/upmpdcli
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=032384185920ff2637afa4d907573966
diff --git a/metadata/md5-cache/acct-user/usbmux-0-r2 b/metadata/md5-cache/acct-user/usbmux-0-r2
deleted file mode 100644
index ea83716ba061..000000000000
--- a/metadata/md5-cache/acct-user/usbmux-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=23247dfab740bfe8f1fc9906a471fa88
diff --git a/metadata/md5-cache/acct-user/usbmux-0-r3 b/metadata/md5-cache/acct-user/usbmux-0-r3
new file mode 100644
index 000000000000..93bd5264988a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/usbmux-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the usbmuxd 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/usb acct-group/plugdev
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8f3941d598091f32ea188fa9f66c2f2c
diff --git a/metadata/md5-cache/acct-user/ushare-0-r1 b/metadata/md5-cache/acct-user/ushare-0-r1
deleted file mode 100644
index 99b123b62af3..000000000000
--- a/metadata/md5-cache/acct-user/ushare-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=22da19d63f09c2ff740fb72f275609e7
diff --git a/metadata/md5-cache/acct-user/ushare-0-r2 b/metadata/md5-cache/acct-user/ushare-0-r2
new file mode 100644
index 000000000000..a5a3dc9dc2b2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ushare-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for uShare
+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/ushare
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=579ad4c6caaeea6404e3549778107747
diff --git a/metadata/md5-cache/acct-user/uwsgi_exporter-0-r1 b/metadata/md5-cache/acct-user/uwsgi_exporter-0-r1
deleted file mode 100644
index 79d81ff93237..000000000000
--- a/metadata/md5-cache/acct-user/uwsgi_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=fb9e355333b0018d37d27eef81698c03
diff --git a/metadata/md5-cache/acct-user/uwsgi_exporter-0-r2 b/metadata/md5-cache/acct-user/uwsgi_exporter-0-r2
new file mode 100644
index 000000000000..19e2736fd82a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/uwsgi_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/uwsgi_exporter
+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/uwsgi_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d424a68dd2e876db4c757913271177a3
diff --git a/metadata/md5-cache/acct-user/vacation-0-r1 b/metadata/md5-cache/acct-user/vacation-0-r1
deleted file mode 100644
index 88784ae509c2..000000000000
--- a/metadata/md5-cache/acct-user/vacation-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dcea25862e075f4690e7f90bc9f5cea5
diff --git a/metadata/md5-cache/acct-user/vacation-0-r2 b/metadata/md5-cache/acct-user/vacation-0-r2
new file mode 100644
index 000000000000..e358c1c1b9b7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vacation-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/postfixadmin
+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/vacation
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d0d63dfb8e2f5a158d4fcb9d997bb08d
diff --git a/metadata/md5-cache/acct-user/varnish-0-r2 b/metadata/md5-cache/acct-user/varnish-0-r2
deleted file mode 100644
index 5572a9b0f5c4..000000000000
--- a/metadata/md5-cache/acct-user/varnish-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5145b8674a7b955c85d5dec8e10ad474
diff --git a/metadata/md5-cache/acct-user/varnish-0-r3 b/metadata/md5-cache/acct-user/varnish-0-r3
new file mode 100644
index 000000000000..643c19b40d94
--- /dev/null
+++ b/metadata/md5-cache/acct-user/varnish-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for varnish
+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/varnish
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f60ccd06c27c04c9960b80ac8b080453
diff --git a/metadata/md5-cache/acct-user/vault-0-r2 b/metadata/md5-cache/acct-user/vault-0-r2
deleted file mode 100644
index 986cf52043db..000000000000
--- a/metadata/md5-cache/acct-user/vault-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2f9661756b47baa0310680389c4420cd
diff --git a/metadata/md5-cache/acct-user/vault-0-r3 b/metadata/md5-cache/acct-user/vault-0-r3
new file mode 100644
index 000000000000..dba80ea6dc75
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vault-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for vault
+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/vault
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b8967ec86f76000d3cc39ed512595176
diff --git a/metadata/md5-cache/acct-user/vault_exporter-0-r1 b/metadata/md5-cache/acct-user/vault_exporter-0-r1
deleted file mode 100644
index 992194b00ff1..000000000000
--- a/metadata/md5-cache/acct-user/vault_exporter-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=052f4d5a9171f01205bfb9368e7d05fb
diff --git a/metadata/md5-cache/acct-user/vault_exporter-0-r2 b/metadata/md5-cache/acct-user/vault_exporter-0-r2
new file mode 100644
index 000000000000..e053e8338760
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vault_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/vault_exporter
+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/vault_exporter
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=48ea04831204e9041712d328294b0ef1
diff --git a/metadata/md5-cache/acct-user/vboxguest-0-r2 b/metadata/md5-cache/acct-user/vboxguest-0-r2
deleted file mode 100644
index 630d035a78d4..000000000000
--- a/metadata/md5-cache/acct-user/vboxguest-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c13666a3cab89c6198a2b225352cb10f
diff --git a/metadata/md5-cache/acct-user/vboxguest-0-r3 b/metadata/md5-cache/acct-user/vboxguest-0-r3
new file mode 100644
index 000000000000..10fff925040d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vboxguest-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for virtualbox-guest-additions
+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/vboxguest
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d0ede3379f135861ed6c7b84c30695f6
diff --git a/metadata/md5-cache/acct-user/vdradmin-0-r2 b/metadata/md5-cache/acct-user/vdradmin-0-r2
deleted file mode 100644
index 4c51206a8d56..000000000000
--- a/metadata/md5-cache/acct-user/vdradmin-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3a173db2c9f6bf7fe2bf061aa7c307c2
diff --git a/metadata/md5-cache/acct-user/vdradmin-0-r3 b/metadata/md5-cache/acct-user/vdradmin-0-r3
new file mode 100644
index 000000000000..462ae76ba0af
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vdradmin-0-r3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/vdradmin
+DESCRIPTION=User for www-misc/vdradmin-am
+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/vdradmin acct-group/vdradmin
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4f71a6116844bed54944337c6adf5f50
diff --git a/metadata/md5-cache/acct-user/vpopmail-0-r2 b/metadata/md5-cache/acct-user/vpopmail-0-r2
deleted file mode 100644
index 9e5f701a891f..000000000000
--- a/metadata/md5-cache/acct-user/vpopmail-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ab7bd8975f8f5fc89a533389b3b54229
diff --git a/metadata/md5-cache/acct-user/vpopmail-0-r3 b/metadata/md5-cache/acct-user/vpopmail-0-r3
new file mode 100644
index 000000000000..ad10854e5dea
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vpopmail-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for vpopmail
+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/vpopmail
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4bd7009f30d1eea66bb2d3c18875facb
diff --git a/metadata/md5-cache/acct-user/wesnoth-0-r2 b/metadata/md5-cache/acct-user/wesnoth-0-r2
deleted file mode 100644
index c0421c89ba3e..000000000000
--- a/metadata/md5-cache/acct-user/wesnoth-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b63868288e6b308dd6e6fe4ea0e8dd70
diff --git a/metadata/md5-cache/acct-user/wesnoth-0-r3 b/metadata/md5-cache/acct-user/wesnoth-0-r3
new file mode 100644
index 000000000000..8ec0da5313c5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/wesnoth-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for games-strategy/wesnoth
+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/wesnoth
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=69a8b596e7560b52d91a929351d7f732
diff --git a/metadata/md5-cache/acct-user/wwwoffle-0-r1 b/metadata/md5-cache/acct-user/wwwoffle-0-r1
deleted file mode 100644
index fe1e43493b85..000000000000
--- a/metadata/md5-cache/acct-user/wwwoffle-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=b986db4854c770831eb3e97e2ed9355e
diff --git a/metadata/md5-cache/acct-user/wwwoffle-0-r2 b/metadata/md5-cache/acct-user/wwwoffle-0-r2
new file mode 100644
index 000000000000..6e6cffe8605f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/wwwoffle-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-proxy/wwwoffle
+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/wwwoffle
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0e0a93dfed2049658ab103a99a9adf65
diff --git a/metadata/md5-cache/acct-user/x2goprint-0-r2 b/metadata/md5-cache/acct-user/x2goprint-0-r2
deleted file mode 100644
index f31b66a147f5..000000000000
--- a/metadata/md5-cache/acct-user/x2goprint-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=4ee03528c03db56c230dd18226911063
diff --git a/metadata/md5-cache/acct-user/x2goprint-0-r3 b/metadata/md5-cache/acct-user/x2goprint-0-r3
new file mode 100644
index 000000000000..ba2be42febb8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/x2goprint-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/x2goserver
+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/x2goprint
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d4dd75d4d37b572f456527039faa08c0
diff --git a/metadata/md5-cache/acct-user/x2gouser-0-r2 b/metadata/md5-cache/acct-user/x2gouser-0-r2
deleted file mode 100644
index e2d02acdfdd5..000000000000
--- a/metadata/md5-cache/acct-user/x2gouser-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=33f25b080d070a2b8631d395f41168cc
diff --git a/metadata/md5-cache/acct-user/x2gouser-0-r3 b/metadata/md5-cache/acct-user/x2gouser-0-r3
new file mode 100644
index 000000000000..297f8bc57ca9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/x2gouser-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/x2goserver
+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/x2gouser
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ae7ead7e856da436fef42e70a5b1f2f4
diff --git a/metadata/md5-cache/acct-user/xrootd-0-r2 b/metadata/md5-cache/acct-user/xrootd-0-r2
deleted file mode 100644
index 25ad85520500..000000000000
--- a/metadata/md5-cache/acct-user/xrootd-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=00171db0618e2d74ce7b3d22f0afe318
diff --git a/metadata/md5-cache/acct-user/xrootd-0-r3 b/metadata/md5-cache/acct-user/xrootd-0-r3
new file mode 100644
index 000000000000..838eef7b4091
--- /dev/null
+++ b/metadata/md5-cache/acct-user/xrootd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the XRootD 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/xrootd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=42a65806c06a81c113897a5d4f43e9df
diff --git a/metadata/md5-cache/acct-user/zabbix-0-r1 b/metadata/md5-cache/acct-user/zabbix-0-r1
deleted file mode 100644
index c66b321fcbec..000000000000
--- a/metadata/md5-cache/acct-user/zabbix-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=706d7c48795f2a49df5f30c1f8c89d40
diff --git a/metadata/md5-cache/acct-user/zabbix-0-r2 b/metadata/md5-cache/acct-user/zabbix-0-r2
new file mode 100644
index 000000000000..c37c88e9cc69
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zabbix-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Zabbix
+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/zabbix
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=23991350e52f22006d20f057b1a03f99
diff --git a/metadata/md5-cache/acct-user/zeppelin-0-r2 b/metadata/md5-cache/acct-user/zeppelin-0-r2
deleted file mode 100644
index 71ed274c8780..000000000000
--- a/metadata/md5-cache/acct-user/zeppelin-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=90ad99b6fee751c9db82f5512ef53134
diff --git a/metadata/md5-cache/acct-user/zeppelin-0-r3 b/metadata/md5-cache/acct-user/zeppelin-0-r3
new file mode 100644
index 000000000000..47daa2a7a5c6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zeppelin-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for system-wide www-apps/zeppelin-bin
+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/zeppelin
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e9695bce66b18a73d4a8bf40dfa7fa2
diff --git a/metadata/md5-cache/acct-user/zetcd-0-r1 b/metadata/md5-cache/acct-user/zetcd-0-r1
deleted file mode 100644
index ae03efb77942..000000000000
--- a/metadata/md5-cache/acct-user/zetcd-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=13dcf097e5a16623be7e14f59b6f2662
diff --git a/metadata/md5-cache/acct-user/zetcd-0-r2 b/metadata/md5-cache/acct-user/zetcd-0-r2
new file mode 100644
index 000000000000..6efde7ed63f6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zetcd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for sys-cluster/zetcd
+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/zetcd
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1223944038693c1703205d1127f60f43
diff --git a/metadata/md5-cache/acct-user/ziproxy-0-r1 b/metadata/md5-cache/acct-user/ziproxy-0-r1
deleted file mode 100644
index 3a8f6c01539a..000000000000
--- a/metadata/md5-cache/acct-user/ziproxy-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=28698ec7166ce563f5465040dca3152f
diff --git a/metadata/md5-cache/acct-user/ziproxy-0-r2 b/metadata/md5-cache/acct-user/ziproxy-0-r2
new file mode 100644
index 000000000000..46874deeee40
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ziproxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: ziproxy
+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/ziproxy
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4512435bd5224f9aa5d0242975a23f3d
diff --git a/metadata/md5-cache/acct-user/znc-0-r2 b/metadata/md5-cache/acct-user/znc-0-r2
deleted file mode 100644
index 4c6f4e3836cd..000000000000
--- a/metadata/md5-cache/acct-user/znc-0-r2
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6a54bac3032ea6e364a898f029f839b7
diff --git a/metadata/md5-cache/acct-user/znc-0-r3 b/metadata/md5-cache/acct-user/znc-0-r3
new file mode 100644
index 000000000000..84d7b75633a4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/znc-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-irc/znc
+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/znc
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f939dcdf352aa3f22661e305100dc71a
diff --git a/metadata/md5-cache/acct-user/zookeeper-0-r1 b/metadata/md5-cache/acct-user/zookeeper-0-r1
deleted file mode 100644
index acb043d4e8ba..000000000000
--- a/metadata/md5-cache/acct-user/zookeeper-0-r1
+++ /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 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c2106a0056784aee456fa63c2c99b1c2
diff --git a/metadata/md5-cache/acct-user/zookeeper-0-r2 b/metadata/md5-cache/acct-user/zookeeper-0-r2
new file mode 100644
index 000000000000..237c317aa117
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zookeeper-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-cluster/zookeeper-bin
+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/zookeeper
+SLOT=0
+_eclasses_=acct-user 485d9a6aa1311a8ca9da380d8a8c6c76 user-info 9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=799e4c67b339e780caa4468639133aea
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a3312279a176..4bbdea79bbf1 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-admin/salt-3007.0 b/metadata/md5-cache/app-admin/salt-3007.0
deleted file mode 100644
index 313ad0193ae9..000000000000
--- a/metadata/md5-cache/app-admin/salt-3007.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/findutils dev-python/build[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( sys-apps/pciutils dev-libs/openssl:0=[-bindist(-)] dev-python/aiohttp[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cherrypy-18.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cryptography-42.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distro-1.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/libnacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/looseversion[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycryptodome-3.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyopenssl-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setproctitle[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(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tornado[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/watchdog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] libcloud? ( >=dev-python/aiohttp-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/aiosignal[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/async-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_10? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) neutron? ( python_targets_python3_10? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) app-arch/zip dev-python/apache-libcloud[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/certifi-2023.07.22[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/cherrypy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mock-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/moto-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/moto-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/passlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygit2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyinotify[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyopenssl-23.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-salt-factories-1.0.0_rc29[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-subtests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-shell-utilities[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-custom-exit-code[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-dns/bind-tools >=dev-python/virtualenv-20.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-util/yamllint[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !x86? ( >=dev-python/boto3-1.21.46[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) virtual/pkgconfig python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=8
-HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
-INHERIT=systemd distutils-r1 pypi
-IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-libs/openssl:0=[-bindist(-)] dev-python/aiohttp[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cherrypy-18.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cryptography-42.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distro-1.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/libnacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/looseversion[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycryptodome-3.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyopenssl-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setproctitle[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(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tornado[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/watchdog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] libcloud? ( >=dev-python/aiohttp-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/aiosignal[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/async-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_10? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) neutron? ( python_targets_python3_10? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test ) x86? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/salt/salt-3007.0.tar.gz
-_eclasses_=distutils-r1 8262de2e5a28df8624b96e031d8d0f2b flag-o-matic 24c947ff5f858625cf0b33c15eed4425 multibuild d67e78a235f541871c7dfe4cf7931489 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 2eecb475512bc76e5ea9192a681b9e6b python-r1 8a28fa6d3e3bc96ff8a7eff2badbe71f python-utils-r1 8904b60325f22500b0c3ad4b68a42448 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=27ff3c7eb111b55ae72306efc919bcb2
diff --git a/metadata/md5-cache/app-admin/salt-3007.0-r1 b/metadata/md5-cache/app-admin/salt-3007.0-r1
new file mode 100644
index 000000000000..441e740987b3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/salt-3007.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/findutils dev-python/build[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( sys-apps/pciutils dev-libs/openssl:0=[-bindist(-)] dev-python/aiohttp[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cherrypy-18.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cryptography-42.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distro-1.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/libnacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/looseversion[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycryptodome-3.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyopenssl-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setproctitle[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(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tornado[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/watchdog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] libcloud? ( >=dev-python/aiohttp-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/aiosignal[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/async-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_10? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) neutron? ( python_targets_python3_10? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) app-arch/zip dev-python/apache-libcloud[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/certifi-2023.07.22[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/cherrypy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mock-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/moto-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/moto-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/passlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygit2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyinotify[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyopenssl-23.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-salt-factories-1.0.0_rc29[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-subtests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-shell-utilities[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-custom-exit-code[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-dns/bind-tools >=dev-python/virtualenv-20.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-util/yamllint[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !x86? ( >=dev-python/boto3-1.21.46[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) virtual/pkgconfig python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Salt is a remote execution and configuration manager
+EAPI=8
+HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
+INHERIT=systemd distutils-r1 pypi
+IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/pciutils dev-libs/openssl:0=[-bindist(-)] dev-python/aiohttp[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cherrypy-18.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cryptography-42.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distro-1.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/importlib-metadata[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/libnacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/looseversion[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycryptodome-3.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyopenssl-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setproctitle[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(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tornado[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/watchdog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] libcloud? ( >=dev-python/aiohttp-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/aiosignal[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/async-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_10? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) neutron? ( python_targets_python3_10? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test ) x86? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/salt/salt-3007.0.tar.gz
+_eclasses_=distutils-r1 8262de2e5a28df8624b96e031d8d0f2b flag-o-matic 24c947ff5f858625cf0b33c15eed4425 multibuild d67e78a235f541871c7dfe4cf7931489 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 2eecb475512bc76e5ea9192a681b9e6b python-r1 8a28fa6d3e3bc96ff8a7eff2badbe71f python-utils-r1 8904b60325f22500b0c3ad4b68a42448 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_md5_=a2852b2e200b8116352783708ae998ea
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 1120e80aa40d..1434deb05998 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.3 b/metadata/md5-cache/app-containers/earthly-0.8.3
index cf525bbf35fd..e3a3c5efe2bd 100644
--- a/metadata/md5-cache/app-containers/earthly-0.8.3
+++ b/metadata/md5-cache/app-containers/earthly-0.8.3
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/earthly/earthly/archive/v0.8.3.tar.gz -> earthly-0.8.3.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.3-deps.tar.xz
_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 go-env 14f8f70fe58c14d7ab44fff15a05ac47 go-module 83fd3ed1657cfc316c93d6a37018290d multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=7a2152db8af7350f46f8cf02de789f77
+_md5_=2aa86fa87a04d776316aac9ffb4b6140
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.4 b/metadata/md5-cache/app-containers/earthly-0.8.4
index a35eda28516f..40833524a0f0 100644
--- a/metadata/md5-cache/app-containers/earthly-0.8.4
+++ b/metadata/md5-cache/app-containers/earthly-0.8.4
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/earthly/earthly/archive/v0.8.4.tar.gz -> earthly-0.8.4.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.4-deps.tar.xz
_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 go-env 14f8f70fe58c14d7ab44fff15a05ac47 go-module 83fd3ed1657cfc316c93d6a37018290d multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=27443e078d30e50f96e64c5e07431285
+_md5_=fd4e66f574480d331bd12347074e96dc
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.5 b/metadata/md5-cache/app-containers/earthly-0.8.5
index 8cd1c5d89027..f5378a9bf83c 100644
--- a/metadata/md5-cache/app-containers/earthly-0.8.5
+++ b/metadata/md5-cache/app-containers/earthly-0.8.5
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/earthly/earthly/archive/v0.8.5.tar.gz -> earthly-0.8.5.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.5-deps.tar.xz
_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 go-env 14f8f70fe58c14d7ab44fff15a05ac47 go-module 83fd3ed1657cfc316c93d6a37018290d multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=f29d97ebd8f5c4088ee5cf9b54d94bdb
+_md5_=cc7b27b6e3502a9a52940da03c28e5cf
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.6 b/metadata/md5-cache/app-containers/earthly-0.8.6
new file mode 100644
index 000000000000..5ba9f8a9039d
--- /dev/null
+++ b/metadata/md5-cache/app-containers/earthly-0.8.6
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Build automation tool that executes in containers
+EAPI=8
+HOMEPAGE=https://earthly.dev/ https://github.com/earthly/earthly/
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=|| ( app-containers/docker app-containers/podman )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/earthly/earthly/archive/v0.8.6.tar.gz -> earthly-0.8.6.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.6-deps.tar.xz
+_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 go-env 14f8f70fe58c14d7ab44fff15a05ac47 go-module 83fd3ed1657cfc316c93d6a37018290d multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_md5_=b314799c44040f7354960d2a9e29cdcd
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 504aa837262b..94f056d4932e 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-editors/retext-8.0.1-r1 b/metadata/md5-cache/app-editors/retext-8.0.1-r1
new file mode 100644
index 000000000000..8ba2d74aea4b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/retext-8.0.1-r1
@@ -0,0 +1,18 @@
+BDEPEND=dev-qt/linguist-tools test? ( dev-python/PyQt6[testlib,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markups-3.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-markdown-math[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markups-3.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-markdown-math[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Simple editor for Markdown and reStructuredText
+EAPI=8
+HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop distutils-r1 optfeature qmake-utils virtualx xdg pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markups-3.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-markdown-math[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt6[dbus,gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/R/ReText/ReText-8.0.1.tar.gz
+_eclasses_=desktop 021728fdc1b03b36357dbc89489e0f0d distutils-r1 8262de2e5a28df8624b96e031d8d0f2b flag-o-matic 24c947ff5f858625cf0b33c15eed4425 multibuild d67e78a235f541871c7dfe4cf7931489 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 2eecb475512bc76e5ea9192a681b9e6b python-r1 8a28fa6d3e3bc96ff8a7eff2badbe71f python-utils-r1 8904b60325f22500b0c3ad4b68a42448 qmake-utils a8dd17b1d94586164f5e3fc12b1c6b81 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
+_md5_=5d39bf447fff5b54335d21f318ed2c1c
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index 216bb4898270..8fd051797ca7 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
_eclasses_=desktop 021728fdc1b03b36357dbc89489e0f0d distutils-r1 8262de2e5a28df8624b96e031d8d0f2b flag-o-matic 24c947ff5f858625cf0b33c15eed4425 git-r3 86fa1f157b70b9d2ff340c4633b1cf4b multibuild d67e78a235f541871c7dfe4cf7931489 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-r1 8a28fa6d3e3bc96ff8a7eff2badbe71f python-utils-r1 8904b60325f22500b0c3ad4b68a42448 qmake-utils a8dd17b1d94586164f5e3fc12b1c6b81 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=fd965e32ea4ed61228d92552ca3c4111
+_md5_=43a0e82dc477838e98c7eb53ad2dcb89
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 8fa35c8c287b..5edd82de6fa7 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-shells/irregular-0.7.8 b/metadata/md5-cache/app-shells/irregular-0.7.8
new file mode 100644
index 000000000000..fde01eb16abd
--- /dev/null
+++ b/metadata/md5-cache/app-shells/irregular-0.7.8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=PowerShell module that helps to understand, use, and build regular expressions
+EAPI=8
+HOMEPAGE=https://irregular.start-automating.com/ https://github.com/StartAutomating/Irregular/
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=virtual/pwsh:*
+SLOT=0.7.8
+SRC_URI=https://github.com/StartAutomating/Irregular/archive/refs/tags/v0.7.8.tar.gz -> irregular-0.7.8.tar.gz
+_md5_=a9a6fa7a8dbc7214b895ae42fe99d7ec
diff --git a/metadata/md5-cache/app-shells/ugit-0.4.3 b/metadata/md5-cache/app-shells/ugit-0.4.3
new file mode 100644
index 000000000000..4e0c8b52fe0d
--- /dev/null
+++ b/metadata/md5-cache/app-shells/ugit-0.4.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=PowerShell wrapper for git, automate repos and output git as objects
+EAPI=8
+HOMEPAGE=https://ugit.start-automating.com/ https://github.com/StartAutomating/ugit/
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-vcs/git virtual/pwsh:*
+SLOT=0.4.3
+SRC_URI=https://github.com/StartAutomating/ugit/archive/refs/tags/v0.4.3.tar.gz -> ugit-0.4.3.tar.gz
+_md5_=147e328dac6f02a4db8fb423134d8f16
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 54915792faf0..381e55e83468 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-ada/VSS-24.0.0 b/metadata/md5-cache/dev-ada/VSS-24.0.0
deleted file mode 100644
index 827596ac0143..000000000000
--- a/metadata/md5-cache/dev-ada/VSS-24.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-ada/gprbuild[ada_target_gcc_12(-)?,ada_target_gcc_13(-)?,-ada_target_gnat_2021(-)] test? ( app-i18n/unicode-data )
-DEFINED_PHASES=compile prepare setup test
-DEPEND=ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) ada_target_gcc_13? ( sys-devel/gcc:13[ada] ) dev-ada/xmlada[ada_target_gcc_12(-)?,ada_target_gcc_13(-)?,-ada_target_gnat_2021(-)]
-DESCRIPTION=A high level string and text processing library
-EAPI=8
-HOMEPAGE=https://github.com/AdaCore/VSS
-INHERIT=ada multiprocessing
-IUSE=test ada_target_gnat_2021 ada_target_gcc_12 ada_target_gcc_13
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 gcc-runtime-library-exception-3.1
-RDEPEND=ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) ada_target_gcc_13? ( sys-devel/gcc:13[ada] ) dev-ada/xmlada[ada_target_gcc_12(-)?,ada_target_gcc_13(-)?,-ada_target_gnat_2021(-)]
-REQUIRED_USE=^^ ( ada_target_gcc_12 ada_target_gcc_13 )
-RESTRICT=!test? ( test )
-SLOT=0/24.0.0
-SRC_URI=https://github.com/AdaCore/VSS/archive/refs/tags/v24.0.0.tar.gz -> VSS-24.0.0.tar.gz
-_eclasses_=ada f59e3151d12cf89115ffac32a03e7d31 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=00e174046d010e2e2cc8016a8a575235
diff --git a/metadata/md5-cache/dev-ada/VSS-24.0.0-r1 b/metadata/md5-cache/dev-ada/VSS-24.0.0-r1
new file mode 100644
index 000000000000..a3d526f315cb
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/VSS-24.0.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-ada/gprbuild[ada_target_gcc_12(-)?,ada_target_gcc_13(-)?,-ada_target_gnat_2021(-)] test? ( app-i18n/unicode-data )
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) ada_target_gcc_13? ( sys-devel/gcc:13[ada] ) dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gcc_12(-)?,ada_target_gcc_13(-)?,-ada_target_gnat_2021(-)]
+DESCRIPTION=A high level string and text processing library
+EAPI=8
+HOMEPAGE=https://github.com/AdaCore/VSS
+INHERIT=ada multiprocessing
+IUSE=+shared static-libs static-pic test ada_target_gnat_2021 ada_target_gcc_12 ada_target_gcc_13
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 gcc-runtime-library-exception-3.1
+RDEPEND=ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) ada_target_gcc_13? ( sys-devel/gcc:13[ada] ) dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gcc_12(-)?,ada_target_gcc_13(-)?,-ada_target_gnat_2021(-)]
+REQUIRED_USE=^^ ( ada_target_gcc_12 ada_target_gcc_13 )
+RESTRICT=!test? ( test )
+SLOT=0/24.0.0
+SRC_URI=https://github.com/AdaCore/VSS/archive/refs/tags/v24.0.0.tar.gz -> VSS-24.0.0.tar.gz
+_eclasses_=ada f59e3151d12cf89115ffac32a03e7d31 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=686486c020b617621d4d6aa3d193ee15
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 59cdf6f20df8..01c96ad378ac 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-lang/dafny-4.5.0 b/metadata/md5-cache/dev-lang/dafny-4.5.0
index e088b8868ff2..b9142640dac4 100644
--- a/metadata/md5-cache/dev-lang/dafny-4.5.0
+++ b/metadata/md5-cache/dev-lang/dafny-4.5.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) strip
SLOT=0
SRC_URI=https://github.com/dafny-lang/dafny/archive/v4.5.0.tar.gz -> dafny-4.5.0.tar.gz https://api.nuget.org/v3-flatcontainer/boogie.abstractinterpretation/3.1.3/boogie.abstractinterpretation.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.basetypes/3.1.3/boogie.basetypes.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.codecontractsextender/3.1.3/boogie.codecontractsextender.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.concurrency/3.1.3/boogie.concurrency.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.core/3.1.3/boogie.core.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.executionengine/3.1.3/boogie.executionengine.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.graph/3.1.3/boogie.graph.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.houdini/3.1.3/boogie.houdini.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.model/3.1.3/boogie.model.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.provers.smtlib/3.1.3/boogie.provers.smtlib.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.vcexpr/3.1.3/boogie.vcexpr.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.vcgeneration/3.1.3/boogie.vcgeneration.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/castle.core/4.4.0/castle.core.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/commandlineparser/2.8.0/commandlineparser.2.8.0.nupkg https://api.nuget.org/v3-flatcontainer/commandlineparser/2.9.1/commandlineparser.2.9.1.nupkg https://api.nuget.org/v3-flatcontainer/coverlet.collector/3.2.0/coverlet.collector.3.2.0.nupkg https://api.nuget.org/v3-flatcontainer/diffplex/1.7.0/diffplex.1.7.0.nupkg https://api.nuget.org/v3-flatcontainer/humanizer.core/2.2.0/humanizer.core.2.2.0.nupkg https://api.nuget.org/v3-flatcontainer/jetbrains.annotations/2021.1.0/jetbrains.annotations.2021.1.0.nupkg https://api.nuget.org/v3-flatcontainer/mediatr/8.1.0/mediatr.8.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.1/microsoft.bcl.asyncinterfaces.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/6.0.0/microsoft.bcl.asyncinterfaces.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/17.0.0/microsoft.build.framework.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/17.0.0/microsoft.build.tasks.core.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/17.0.0/microsoft.build.utilities.core.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build/17.0.0/microsoft.build.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.common/3.7.0/microsoft.codeanalysis.common.3.7.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.common/4.0.1/microsoft.codeanalysis.common.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp.workspaces/4.0.1/microsoft.codeanalysis.csharp.workspaces.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp/3.7.0/microsoft.codeanalysis.csharp.3.7.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp/4.0.1/microsoft.codeanalysis.csharp.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.visualbasic.workspaces/4.0.1/microsoft.codeanalysis.visualbasic.workspaces.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.visualbasic/4.0.1/microsoft.codeanalysis.visualbasic.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.workspaces.common/4.0.1/microsoft.codeanalysis.workspaces.common.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.workspaces.msbuild/4.0.1/microsoft.codeanalysis.workspaces.msbuild.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis/4.0.1/microsoft.codeanalysis.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/16.11.0/microsoft.codecoverage.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/16.9.4/microsoft.codecoverage.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/17.1.0/microsoft.codecoverage.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/2.0.4/microsoft.dotnet.platformabstractions.2.0.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.0.0/microsoft.extensions.configuration.abstractions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.0.0/microsoft.extensions.configuration.binder.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.0.0/microsoft.extensions.configuration.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.0.0/microsoft.extensions.dependencyinjection.abstractions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/2.0.0/microsoft.extensions.dependencyinjection.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/2.0.4/microsoft.extensions.dependencymodel.2.0.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.0.0/microsoft.extensions.logging.abstractions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.0.0/microsoft.extensions.logging.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/2.0.0/microsoft.extensions.options.configurationextensions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.0.0/microsoft.extensions.options.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.0.0/microsoft.extensions.primitives.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/16.11.0/microsoft.net.test.sdk.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/16.9.4/microsoft.net.test.sdk.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/17.1.0/microsoft.net.test.sdk.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.0.0/microsoft.netcore.platforms.3.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net452/1.0.2/microsoft.netframework.referenceassemblies.net452.1.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.2/microsoft.netframework.referenceassemblies.1.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.extensions.trxlogger/17.9.0/microsoft.testplatform.extensions.trxlogger.17.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.11.0/microsoft.testplatform.objectmodel.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.1.0/microsoft.testplatform.objectmodel.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.9.0/microsoft.testplatform.objectmodel.17.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/16.11.0/microsoft.testplatform.testhost.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/16.9.4/microsoft.testplatform.testhost.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/17.1.0/microsoft.testplatform.testhost.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/17.9.0/microsoft.testplatform.testhost.17.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.7.56/microsoft.visualstudio.threading.analyzers.16.7.56.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.7.56/microsoft.visualstudio.threading.16.7.56.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.6.0/microsoft.win32.registry.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/4.7.0/microsoft.win32.systemevents.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/6.0.0/microsoft.win32.systemevents.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/moq/4.16.1/moq.4.16.1.nupkg https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.0.0/nuget.frameworks.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.11.0/nuget.frameworks.5.11.0.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.generators/0.19.5/omnisharp.extensions.jsonrpc.generators.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.testing/0.19.5/omnisharp.extensions.jsonrpc.testing.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc/0.19.5/omnisharp.extensions.jsonrpc.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageclient/0.19.5/omnisharp.extensions.languageclient.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol.testing/0.19.5/omnisharp.extensions.languageprotocol.testing.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol/0.19.5/omnisharp.extensions.languageprotocol.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver.shared/0.19.5/omnisharp.extensions.languageserver.shared.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver/0.19.5/omnisharp.extensions.languageserver.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/rangetree/3.0.1/rangetree.3.0.1.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.console/4.3.0/runtime.unix.system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.extensions.logging/3.0.1/serilog.extensions.logging.3.0.1.nupkg https://api.nuget.org/v3-flatcontainer/serilog.settings.configuration/3.1.0/serilog.settings.configuration.3.1.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.sinks.debug/2.0.0/serilog.sinks.debug.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.sinks.file/5.0.0/serilog.sinks.file.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.sinks.inmemory/0.11.0/serilog.sinks.inmemory.0.11.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog/2.12.0/serilog.2.12.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.0/system.collections.immutable.1.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.1/system.collections.immutable.1.7.1.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.nongeneric/4.3.0/system.collections.nongeneric.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.specialized/4.3.0/system.collections.specialized.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.commandline/2.0.0-beta4.22272.1/system.commandline.2.0.0-beta4.22272.1.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.primitives/4.3.0/system.componentmodel.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.typeconverter/4.3.0/system.componentmodel.typeconverter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel/4.3.0/system.componentmodel.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/1.0.31/system.composition.attributedmodel.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.convention/1.0.31/system.composition.convention.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.hosting/1.0.31/system.composition.hosting.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.runtime/1.0.31/system.composition.runtime.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/1.0.31/system.composition.typedparts.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition/1.0.31/system.composition.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/6.0.0/system.configuration.configurationmanager.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracesource/4.3.0/system.diagnostics.tracesource.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.drawing.common/4.7.0/system.drawing.common.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.drawing.common/6.0.0/system.drawing.common.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.0.11/system.dynamic.runtime.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.pipelines/4.7.3/system.io.pipelines.4.7.3.nupkg https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.async/6.0.1/system.linq.async.6.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.caching/6.0.0/system.runtime.caching.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.4.0/system.runtime.compilerservices.unsafe.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.6.0/system.security.accesscontrol.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/6.0.0/system.security.cryptography.protecteddata.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.permissions/6.0.0/system.security.permissions.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.6.0/system.security.principal.windows.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.2/system.text.json.5.0.2.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.channels/4.7.1/system.threading.channels.4.7.1.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.3/system.threading.tasks.extensions.4.5.3.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.windows.extensions/4.7.0/system.windows.extensions.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.windows.extensions/6.0.0/system.windows.extensions.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xmldocument/4.3.0/system.xml.xmldocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/tomlyn/0.16.2/tomlyn.0.16.2.nupkg https://api.nuget.org/v3-flatcontainer/validation/2.4.18/validation.2.4.18.nupkg https://api.nuget.org/v3-flatcontainer/xunit.abstractions/2.0.2/xunit.abstractions.2.0.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.analyzers/0.10.0/xunit.analyzers.0.10.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.analyzers/1.0.0/xunit.analyzers.1.0.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assert/2.4.1/xunit.assert.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assert/2.4.2/xunit.assert.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assertmessages/2.4.0/xunit.assertmessages.2.4.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.core/2.4.1/xunit.core.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.core/2.4.2/xunit.core.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.4.0/xunit.extensibility.core.2.4.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.4.1/xunit.extensibility.core.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.4.2/xunit.extensibility.core.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.4.0/xunit.extensibility.execution.2.4.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.4.1/xunit.extensibility.execution.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.4.2/xunit.extensibility.execution.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.runner.visualstudio/2.4.3/xunit.runner.visualstudio.2.4.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.runner.visualstudio/2.5.1/xunit.runner.visualstudio.2.5.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.skippablefact/1.4.8/xunit.skippablefact.1.4.8.nupkg https://api.nuget.org/v3-flatcontainer/xunit/2.4.1/xunit.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit/2.4.2/xunit.2.4.2.nupkg test? ( https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz )
_eclasses_=check-reqs 02ac7654b64f7acc7a8b1a35ad9d6ddc dotnet-pkg 9f041be16373f3b3c2ad1ae7a7559960 dotnet-pkg-base 3e91bc4d3bc423a7b9dc30a94279901c edo c0eb9cbe6b0bd01fcb4918f12598a4d3 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe nuget e90611a22e7a711a49d37cb365b878e8 optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 python-any-r1 f5169813d1619761b459800587005fd2 python-utils-r1 8904b60325f22500b0c3ad4b68a42448 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=e42224b31eaf9c91b5739e1d7e5bf0d8
+_md5_=cffb5e8089c6f593a741f80d82d78bde
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 331835419eb8..a90a7a8aec23 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-dialup/wvdial-1.61-r1 b/metadata/md5-cache/net-dialup/wvdial-1.61-r1
new file mode 100644
index 000000000000..a0749849880c
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/wvdial-1.61-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=>=net-libs/wvstreams-4.4
+DESCRIPTION=Excellent program to automatically configure PPP sessions
+EAPI=8
+HOMEPAGE=https://code.google.com/archive/p/wvstreams/
+INHERIT=readme.gentoo-r1
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=>=net-libs/wvstreams-4.4 net-dialup/ppp:=
+SLOT=0
+SRC_URI=https://wvstreams.googlecode.com/files/wvdial-1.61.tar.gz
+_eclasses_=readme.gentoo-r1 204091a2cde6179cd9d3db26d09412d3
+_md5_=e1b2a3b61516818be5c38da0e5f308be
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index a3da5dc8d92b..4ad918a23277 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-news/liferea-1.14.5-r1 b/metadata/md5-cache/net-news/liferea-1.14.5-r1
deleted file mode 100644
index d5af6ffd63da..000000000000
--- a/metadata/md5-cache/net-news/liferea-1.14.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
-EAPI=8
-HOMEPAGE=https://lzone.de/liferea/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools gnome2-utils optfeature python-single-r1 xdg
-IUSE=python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/lwindolf/liferea/archive/refs/tags/v1.14.5.tar.gz -> liferea-1.14.5.tar.gz
-_eclasses_=autotools e4cf390b19033d5ca443765bc8537b81 gnome2-utils 30dbce54b89e77b86f366548f94419ad gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 python-single-r1 75118e916668a74c660a13b0ecb22562 python-utils-r1 8904b60325f22500b0c3ad4b68a42448 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=476c53a6c0acc71ceb2becd33ca8cad4
diff --git a/metadata/md5-cache/net-news/liferea-1.15.6 b/metadata/md5-cache/net-news/liferea-1.15.6
new file mode 100644
index 000000000000..471c6e93664e
--- /dev/null
+++ b/metadata/md5-cache/net-news/liferea-1.15.6
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:3.0 net-libs/webkit-gtk:4.1= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
+EAPI=8
+HOMEPAGE=https://lzone.de/liferea/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome2-utils optfeature python-single-r1 xdg
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:3.0 net-libs/webkit-gtk:4.1= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=https://github.com/lwindolf/liferea/archive/refs/tags/v1.15.6.tar.gz -> liferea-1.15.6.tar.gz
+_eclasses_=autotools e4cf390b19033d5ca443765bc8537b81 gnome2-utils 30dbce54b89e77b86f366548f94419ad gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 python-single-r1 75118e916668a74c660a13b0ecb22562 python-utils-r1 8904b60325f22500b0c3ad4b68a42448 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
+_md5_=74e8d70b8ac211de5a771bb8fe7499d2
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 106c3d71beb0..6dae991ac20f 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-wireless/unifi-6.5.55-r2 b/metadata/md5-cache/net-wireless/unifi-6.5.55-r2
index a622b095b449..e3224a112ea9 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.5.55-r2
+++ b/metadata/md5-cache/net-wireless/unifi-6.5.55-r2
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror
SLOT=0/6.5
SRC_URI=https://dl.ui.com/unifi/6.5.55-1d0581c00d/UniFi.unix.zip -> unifi-6.5.55.zip
_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=390eef1626e5c9cc6b1e8a0db9652321
+_md5_=beb46b553ecf105d16fb530d2933bf74
diff --git a/metadata/md5-cache/net-wireless/unifi-7.5.187 b/metadata/md5-cache/net-wireless/unifi-7.5.187
index 41f92d89bb76..5bd9497738b4 100644
--- a/metadata/md5-cache/net-wireless/unifi-7.5.187
+++ b/metadata/md5-cache/net-wireless/unifi-7.5.187
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror
SLOT=0/7.5
SRC_URI=https://dl.ui.com/unifi/7.5.187-f57f5bf7ab/UniFi.unix.zip -> unifi-7.5.187.zip
_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 readme.gentoo-r1 204091a2cde6179cd9d3db26d09412d3 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=fe2829e136810d4cc63f13e9a694abc6
+_md5_=d5bbfca2fa4ec04c6f066aa9a6581592
diff --git a/metadata/md5-cache/net-wireless/unifi-8.0.28 b/metadata/md5-cache/net-wireless/unifi-8.0.28
index 78a6aa88a145..cf18a57aca6f 100644
--- a/metadata/md5-cache/net-wireless/unifi-8.0.28
+++ b/metadata/md5-cache/net-wireless/unifi-8.0.28
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror
SLOT=0/8.0
SRC_URI=https://dl.ui.com/unifi/8.0.28/UniFi.unix.zip -> unifi-8.0.28.zip
_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 readme.gentoo-r1 204091a2cde6179cd9d3db26d09412d3 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=f997f308bbaf7d49b5c39f5889a04d92
+_md5_=31ea4d3217135116f30e8f4861e2c867
diff --git a/metadata/md5-cache/net-wireless/unifi-8.1.113 b/metadata/md5-cache/net-wireless/unifi-8.1.113
new file mode 100644
index 000000000000..68d9b478ee52
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-8.1.113
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=8
+HOMEPAGE=https://www.ubnt.com
+INHERIT=java-pkg-2 readme.gentoo-r1 systemd
+IUSE=systemd system-mongodb
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0/8.1
+SRC_URI=https://dl.ui.com/unifi/8.1.113/UniFi.unix.zip -> unifi-8.1.113.zip
+_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 readme.gentoo-r1 204091a2cde6179cd9d3db26d09412d3 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_md5_=1c21bc23d733ddcdda104b7061ececb2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 0bcb2296b7dc..fcfe309cf30b 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/smc-sum-2.13.0.20230825 b/metadata/md5-cache/sys-apps/smc-sum-2.13.0.20230825
deleted file mode 100644
index ec8402d17197..000000000000
--- a/metadata/md5-cache/sys-apps/smc-sum-2.13.0.20230825
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=module? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) )
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=module? ( virtual/linux-sources )
-DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
-EAPI=8
-HOMEPAGE=https://www.supermicro.com
-IDEPEND=module? ( sys-apps/kmod[tools] )
-INHERIT=linux-mod-r1
-IUSE=module dist-kernel modules-compress modules-sign +strip +module
-KEYWORDS=-* ~amd64
-LICENSE=supermicro
-RDEPEND=sys-libs/zlib sys-power/iasl module? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://www.supermicro.com/Bios/sw_download/633/sum_2.13.0_Linux_x86_64_20230825.tar.gz
-_eclasses_=dist-kernel-utils 145861da258122cbba5240a850f1a5e8 edo c0eb9cbe6b0bd01fcb4918f12598a4d3 linux-info 7ca3057b277f1e5978947b4cc289ce62 linux-mod-r1 137b318f89f77c2b66124fcc7790737a multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=179bb68025a3ad78275b8403e82b0252
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.14.0.20240215 b/metadata/md5-cache/sys-apps/smc-sum-2.14.0.20240215
new file mode 100644
index 000000000000..75ea0ce588f5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smc-sum-2.14.0.20240215
@@ -0,0 +1,17 @@
+BDEPEND=module? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) )
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=module? ( virtual/linux-sources )
+DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
+EAPI=8
+HOMEPAGE=https://www.supermicro.com
+IDEPEND=module? ( sys-apps/kmod[tools] )
+INHERIT=linux-mod-r1
+IUSE=module dist-kernel modules-compress modules-sign +strip +module
+KEYWORDS=-* ~amd64
+LICENSE=supermicro
+RDEPEND=sys-libs/zlib sys-power/iasl module? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://www.supermicro.com/Bios/sw_download/698/sum_2.14.0_Linux_x86_64_20240215.tar.gz
+_eclasses_=dist-kernel-utils 145861da258122cbba5240a850f1a5e8 edo c0eb9cbe6b0bd01fcb4918f12598a4d3 linux-info 7ca3057b277f1e5978947b4cc289ce62 linux-mod-r1 137b318f89f77c2b66124fcc7790737a multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_md5_=0b4c210b34ff926e89504c8e1ab31b1d
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index e808e0a36ad0..2411664f315e 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r2 b/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r2
new file mode 100644
index 000000000000..eb83365b7b49
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prerm pretend
+DESCRIPTION=Xbox boot loader precompiled binaries from xbox-linux.org
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/xbox-linux/
+INHERIT=mount-boot
+KEYWORDS=-* ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/xbox-linux/cromwell-2.40.tar.gz
+_eclasses_=mount-boot 3945d351ee3192381911f938f4ee527a
+_md5_=cf5e504e3027d644ef70df2fc59c3120
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 82965124bb30..ef30a11fbbbc 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2 b/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
deleted file mode 100644
index 2422ce0046cf..000000000000
--- a/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtsql:5 dev-qt/qtwidgets:5
-DESCRIPTION=terminal emulator which mimics the look and feel of the old cathode tube screens
-EAPI=7
-HOMEPAGE=https://github.com/Swordfish90/cool-retro-term
-INHERIT=qmake-utils xdg-utils
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtsql:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/Swordfish90/cool-retro-term/archive/1.1.1.tar.gz -> cool-retro-term-1.1.1.tar.gz https://github.com/Swordfish90/qmltermwidget/archive/0.2.0.tar.gz -> qmltermwidget-0.2.0.tar.gz
-_eclasses_=multilib c19072c3cd7ac5cb21de013f7e9832e0 qmake-utils a8dd17b1d94586164f5e3fc12b1c6b81 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=28f6c242524b6c651d3c64351db25d03
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 10761b4b957c..ffae0a6073b3 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 17133 BLAKE2B 2a963c482a240800aae14dff75bee8a97ddc976385c7a4e0f94ea2553c151ccf0ec19e6e963cc6b3ace16d67d8bbd9201583a8676b37f35dbe798a72a0d1f865 SHA512 6a519b7f4386ddcf92527d4f46f224e83347cf00e74450a2f9e14b7b972c959282cf30af1f4312300d4cf765083fe63b834f15a59f914ffd88a83769596d14db
-TIMESTAMP 2024-03-18T18:09:55Z
+TIMESTAMP 2024-03-19T00:09:57Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX4g3NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX419VfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBcFBAAjFlqtj0ecVb6fl5mOJdHfi9RJWnzXb2NhQq/S23rLQuFDHD6d2/phIyn
-OJ+P3gkWfQ1SpzxiFAS/ZEjWmEIG6nu3jqvLcHVk8eXzwfpcIJuIxcsLnMCw95Io
-hlhumPRfIEoaW7HeTXc8djcmtcaNvsEiQMR/cdL5RmZMlRUp2dsKXOvObHjR/n1p
-775aBm7K8QLjnn4PjwkVHmgGW4mlty/YtiYqHrhrSxUAAna4aqW8QqjA6EX4DgkG
-tUjiAn4a9mBAW9IznUsfAL2BuNbc9K/qEW2CuR/U8VXKzri/rniwLaJUaZILonPn
-1L1IgvsKuHqxP5ooHmA1OJOpV6KW2eJH8Gsv68DqCKv1wPGjtX5nxmZxJOqfpxTH
-nnO6pD1422ltKUZ2Dwt2snyQipLc9vnuvw8BEB8dvN3+Z0zWAtUWaQU5LlFcCFMV
-29Joz2xAvWKwOL40NKrJhva27lQd3U3Yg1ATFd4fCaK6JE7Hy0O5MjZiRckdhklq
-XOZaUe9hxbKKOOuMQ9b9G37L5iip0vhtbXbn8HnbCCH4jBFa18x0O5JUInPOyH/G
-gjZmoNUjuUGdBnaUuNwnFEiODv3n1PJjXUVV+a7E4Qqk0y0XTC+ZARwGczUvwk7n
-Q0ofh+xeG9/i7A/FrK6KTZBsN21zdrrutg0fCWkkdEGoeR4tFyY=
-=HWNg
+klCiaBAAroK6eKPY6u5C4msr62udRuxUsQG93vwmCUVS4fD7vveKudGLkeCR7p8I
+SVmwO3YrHigM516aRt+aXezQn/VDcUi8e8CM7iNrwe1qfZrKdBNjurjcVTeGtjHC
+zGkZEUv7bEn2h3rRQekbuBxQb/32xPbLxJ4HFRdbNunKrEEXhoxHIr148v6IkGQe
+YscOMZUumUXTnDa5G0DZ8nHcxbTuvJTsPgeuI7JNb9vN+OXflHFCa2e/WS9SP+S+
+THrh05zmdwkGSHdROJEkb91mUQQcN8qGb8TDua9+wJcUwC58biergwYThWra5GNw
+/xqvm7IIsQ1ch0SDUQNOpbaAMnU0Kx7J8vkYiuRE3OWtMd36Fyw49y1tYGSRSU2z
+ql4WWu+qMZCaEgKorEMPtmQ3SNnMED9Z4iRcA/o03lewyD2iA2n3nI3F5+9ezxpz
+zT/z3KIVDBsF5FAXNvaVlCg8dYdCSeg/Ycpe9P6dQT6R9qCody/hkw3NvCCeAIjw
+FdbztAuM9rRWUYLKFdnUiaD8uAOQnbFZN8DfKBj7uJBj00umBkncEsBv6ROvErkK
+AKJOjiX6Tp1O9y9y+shd8qY7Kppt34cH6ELTkODhI/Abbutmo1+wpdT5MGbukbDX
+Rj9rfxyrFQ/cgHP8s3JSfjBjtYqBdgBRVMQsBid6YTWb8R2akPc=
+=qxNr
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d899b477b2af..b587de33d56f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Mar 2024 18:09:53 +0000
+Tue, 19 Mar 2024 00:09:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 748c886f9342..af43951356fe 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Mar 18 06:09:52 PM UTC 2024
+Tue Mar 19 12:09:52 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bf8d8c26df1d..31ee3db16a1e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Mar 2024 18:15:00 +0000
+Tue, 19 Mar 2024 00:15:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 525c3b3398e6..22add98455e0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f36584ce4deac8bd39643a86a36955c92b1965c1 1710784670 2024-03-18T17:57:50+00:00
+ccd9b5f9ddb2878eb90056ef9c69cd59bbc236dd 1710805287 2024-03-18T23:41:27+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7aca46db1286..68cc578c5c7a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1710785400 Mon 18 Mar 2024 06:10:00 PM UTC
+1710807000 Tue 19 Mar 2024 12:10:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0cda4ecd2162..b587de33d56f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Mar 2024 18:09:52 +0000
+Tue, 19 Mar 2024 00:09:53 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 1524ed697cc2..73d6013ce274 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
Binary files differ
diff --git a/net-dialup/wvdial/Manifest b/net-dialup/wvdial/Manifest
index a4b195df1985..6ac04a2ad898 100644
--- a/net-dialup/wvdial/Manifest
+++ b/net-dialup/wvdial/Manifest
@@ -2,5 +2,6 @@ AUX wvdial-1.61-as-needed.patch 380 BLAKE2B 52a3c7962f3143a942855844158d55b71621
AUX wvdial-1.61-destdir.patch 782 BLAKE2B 0d514d3fa28552d02c588733aca8180af136f0f0b2846d9535ff1ae0b8e28faf16d36c49635b525222386ebca1921650875cb2b021c4a231785cc2662a64ea21 SHA512 6f1394922aa75ab97e7a589935157ac2f15ed79cf90fa4a2e3bfa0dbe60a6c3a8e072b152c292d1ff02352c2c230a692d35fe23723e3a8c98558db441f49fa22
AUX wvdial-1.61-parallel-make.patch 617 BLAKE2B 6f13a64152c6c4d2b58472768f597782e617ad87df278f7bc8a36391e06c078a31da8053119b23af53cc264552e296e23f5a7f87a97369dbd4d363af8b27b6d5 SHA512 bc8f425b0ca6511729bbe0d3b57d39bbc0fb08aa544d97ba577bc07b67bce3502fcdf86c4e298641e0d61a1432f05aa9dcc7cf3e728daa42944a50363cf2d6b6
DIST wvdial-1.61.tar.gz 94854 BLAKE2B af0649d1361d20187c4c5062926646ee5d887a431be82f978f633f007653b29defe7a1b2474bf79e14be15b86e792c1e5588c47f2c31a25e7ab2d839f89dba05 SHA512 e949632583d889ad040c284f42c46790d247fffbc2d5e926c4b5836c970002f07741d26d052489bdc9c8144dcbb62a12851a3c275a5cecd5393d2722f43bb49a
+EBUILD wvdial-1.61-r1.ebuild 951 BLAKE2B 45fa0ddc646e14d28cd580d423cac4b26128c7e57a7bbde883ad3a097d1a4388728688b6725c56f5428264930316f50dedf4f0690946271f16d2272c1096d7fb SHA512 19ce452f0257cd8cc7c045f904da48be66c9a91145b90b4d06b1d8ed6f468361e30a8c93fa988cb64f087332a91aa55f822053e6652a2efedf2ec3254b49c72a
EBUILD wvdial-1.61.ebuild 986 BLAKE2B 3c54d859aeac9c257c3c2e00c66bedc59df4a8c4104d9d79dca89e93359a5de365d6e21407c8dd642dcc0956adcd752151a3eb706b66a771059e73f42dd5abfd SHA512 ba9ab826437f0d6cc54a638aa7cdcff826308c56abbdd1f5af910592c838797252ad565e98e342a943c8ba49c52f7346279ac5cf32eb69df22096b0d0a8e672a
MISC metadata.xml 246 BLAKE2B e74d508363749d2c396e881102eede687b9d55616ef5e00034b797efc7ed7ff20aeab9b1561bdd92a3eeb2aa20069b12ffaca72692cec8d62be689f101b2d439 SHA512 85d94f129ab27dd9b5270cdf587c76eb9fe83ba7eccc91fe67b4c26e30b4766c6b7e034bd1a9cfef053fbe7d0e1ed7be4784fe952d1b7f3ec117affb9d6b9906
diff --git a/net-dialup/wvdial/wvdial-1.61-r1.ebuild b/net-dialup/wvdial/wvdial-1.61-r1.ebuild
new file mode 100644
index 000000000000..1184b267e853
--- /dev/null
+++ b/net-dialup/wvdial/wvdial-1.61-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="Excellent program to automatically configure PPP sessions"
+HOMEPAGE="https://code.google.com/archive/p/wvstreams/"
+SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DEPEND=">=net-libs/wvstreams-4.4"
+RDEPEND="${DEPEND}
+ net-dialup/ppp:=
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-destdir.patch"
+ "${FILESDIR}/${P}-as-needed.patch"
+ "${FILESDIR}/${P}-parallel-make.patch"
+)
+
+DOC_CONTENTS="
+ Use wvdialconf to automagically generate a configuration file.
+ Users have to be member of the dialout AND the uucp group to use
+ wvdial
+"
+
+src_configure() {
+ # Hand made configure...
+ ./configure || die
+}
+
+src_install() {
+ default
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 03f540aeddfd..79a990109c16 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 83b0ad11b840..512c0c28f70c 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,6 +1,3 @@
-AUX rsync-3.2.4-notpedantic.patch 1063 BLAKE2B 99ed8e887c5f3c64ff6c34e1b9dc7ca9841961547654fa35dd52b0f60d1bb61459a63d832618bf262103d75ecd3cb0574f28dc2cbd227ad3820dc02e3981bb54 SHA512 ce0c2f98b2e04b8aaef711ad73dd1125d1dbaff3fa4a62e8bc0d70d844a02296d78fedab99c353a0830d8eb59d306bff748599f58d432df49755d4f8270dfd7d
-AUX rsync-3.2.4-strlcpy.patch 1715 BLAKE2B 4159391589cc6eba7c6719b15d32d33e68ff5a15765b3377e1e53975c2d7c9413ac99e178d0e6a796d347aab4bf43b3f7a788a434ea36bc35adb916a39394ca4 SHA512 b097b253624fa67feb32f3cb6412fadbd731ec659791010310824ef0c83209a9d228706e84eca72614c0e3ce7a3ccbd4250dafad20dc2113b20d79135573fa9a
-AUX rsync-3.2.4-unsigned-char-checksum.patch 610 BLAKE2B eb6803c673bb38907738e5475e9469c07555d96769cc86baad43f806cd6a823c5aa9d890c63096b5c229402315cdd90d76d93687ddc1a7d17360ff739afc9596 SHA512 a8f8eb0568139893e2f3f36feb1cebfb5fcf3b1fd807459bce635d61f2582e960c55b0bb4c8914a6579ad0eb7e4322d2ce3480598d425e256fb6a73efbc9315e
AUX rsync-3.2.7-flist-memcmp-ub.patch 773 BLAKE2B 9a30609a0bf09298dc2b1daeae7dcf3ba173d1d2431c077d612be03a3a531bf59b16d1846a8f7c467ef2ca576e01f0fe512067a04f834a9ca3d387e389b5d6e8 SHA512 4212d704d9b4b1a0d2d2cfca48ae91d29b90111ce4256ec8f9779d0778fe2bbb4a33b95e8a32ef181e1ab0ac2d1ea330e724a46f078826b39d2e09d374be6730
AUX rsync-3.2.7-fortify-source-3.patch 1947 BLAKE2B c907e4ddc07693d8a6292f32782831953eee8711148c2e9aa5623dc5615474b59f25e309302c103a6c4a4177b18291a00983a62fa77c7faee04731114634c65d SHA512 b2bd012f318b1816a299a766c28a64cfc86307e4e1b047098f2a0334d775513f83724cdfa33ce567120c9b4fbbf9f6b8e0bbad0d434ac2444afff39fb5fa41da
AUX rsync-3.2.7-ipv6-configure-c99.patch 1001 BLAKE2B 1ddb96eecef82a056af00ae221b9f5bc26284863a1ce63ae423e0b14979cfd57eb18f966f7572315e495ae25e4762da4115def7f04e32fe90cbc2b7a522805c0 SHA512 19a10798b8460741b8a3341a210d1828e1daeae707ad8cc910e4aa003e8bba405466a6cc64465294bd4eda81f1f876410a395e5012c3872cfce025f7ed0eec94
diff --git a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch
deleted file mode 100644
index 9d081ab52c5b..000000000000
--- a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac
---- rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100
-+++ rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100
-@@ -1067,21 +1067,6 @@
- with_included_popt=yes
- fi
-
--if test x"$GCC" = x"yes"; then
-- if test x"$with_included_popt" != x"yes"; then
-- # Turn pedantic warnings into errors to ensure an array-init overflow is an error.
-- CFLAGS="$CFLAGS -pedantic-errors"
-- else
-- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to
-- # turn off pedantic warnings (which will not lose the error for array-init overflow).
-- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists
-- # -Wpedantic and use that as a flag.
-- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in
-- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;;
-- esac
-- fi
--fi
--
- AC_MSG_CHECKING([whether to use included libpopt])
- if test x"$with_included_popt" = x"yes"; then
- AC_MSG_RESULT($srcdir/popt)
diff --git a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch
deleted file mode 100644
index d5a02f0e3159..000000000000
--- a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/WayneD/rsync/issues/324
-https://github.com/WayneD/rsync/commit/3592ac3c025da23b2dd291561ec6113940b9c11b
-
-From 3592ac3c025da23b2dd291561ec6113940b9c11b Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Sun, 19 Jun 2022 10:02:51 -0700
-Subject: [PATCH] Include bsd/strings.h if it exists
-
-Some systems apparently put strlcpy() into a separate bsd/strings.h file
-without putting the function into a separate library. Thus, configure
-finds that the function exists for linking but the build does not have
-the declaration (which rsync only supplies if it is also supplying its
-own version of the function).
----
- configure.ac | 3 ++-
- rsync.h | 3 +++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 37dbb18a..37241637 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
- netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \
- sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \
- popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \
-- zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h)
-+ zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \
-+ bsd/string.h)
- AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include <netinet/in.h>]])
- AC_HEADER_MAJOR_FIXED
-
-diff --git a/rsync.h b/rsync.h
-index e5aacd25..1cc037c5 100644
---- a/rsync.h
-+++ b/rsync.h
-@@ -338,6 +338,9 @@ enum delret {
- # endif
- # include <string.h>
- #endif
-+#ifdef HAVE_BSD_STRING_H
-+# include <bsd/string.h>
-+#endif
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
diff --git a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch
deleted file mode 100644
index 18e56c31ce2a..000000000000
--- a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://lists.samba.org/archive/rsync-announce/2022/000111.html
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,7 +1117,7 @@ else
- fi
-
- AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
--AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
- if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then
- AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type])
- fi
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 289c0660842e..cb1fbb1227ee 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
Binary files differ
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 3d72447f6f04..8c0704c67656 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,6 +1,6 @@
AUX liferea-1.15.5-libxml2.patch 980 BLAKE2B 432393168bd985a9f15d6943b9384029f77aacf4c9a926cb0be4206f0ffb62f01d7929806e91bf670c063bd236d087bfc8b015c8068465016a425b9f96c3b0e2 SHA512 a4b928be09ab916fc565aa2555b8ce0663a086a4ca805d48573eaaa86c61bb7349b559b4d5dfa619c227141e0a8f81b750da9dbff12da85a4cca8c3fa65f8b78
-DIST liferea-1.14.5.tar.gz 1833641 BLAKE2B 5505e33bd113b3ea0bf7582f75aa968de2b4bbbc659f224062d735bb357177a3eec5dca26dbc22151ccb1659e740ce2068ee2933ef82eb2e3c3a96b31528e570 SHA512 866e795e31644a8546d0fd6eae2976e0c031650caf77aa87e90bc17a55f65d2c207bb295649c7b4d318fb0d628f7cae1fc0d563f59260eddfeafbe9c885f3550
DIST liferea-1.15.5.tar.gz 1878299 BLAKE2B e74c67fa1b124dabdd3abec2ecb7d42e9d3f36bdb14c5edc2f645aa9f163c71822f43e0eb44761c4be8e14e39c7cf74218e825a87a20c208601a8dcbf7629ab8 SHA512 7d3ec5dd46ccecc3879adba1daf180b05e043f256694146dad466fd8f0a7c840a4dff39d5facbbd304cbb287578c7a258cf83191dfd726077ac332b1d167db17
-EBUILD liferea-1.14.5-r1.ebuild 1693 BLAKE2B 64bb056b8035c1024eb3286834e617fdfad60609894fd8b6625a8e1fecaf7b2676d12f186992ac831ac182c28552cab2b66e5d6f252039166abee9aaeb383aa5 SHA512 48c73b19b6f680ae8152480f03de6b0decc90e47c448b59baffa04eeca4e19ef34b1e2991659b2f3b19349ca020bb70ab08f61e9ea3575effbdd49e7aa9f2dd2
+DIST liferea-1.15.6.tar.gz 1869065 BLAKE2B a3757d0aa4e3555863642c4c8e866567e559ee413fc1b23f347e20a091926306b60ce89989f3928843118b49a09ee2091ef90a05b4baf15a63d543c908771a09 SHA512 8ec13ff3bd44294ee011ad746fdfe0a9119cc66291d7a7f32f6fcd08d1a0f21ed6c43211828bde7d3d0e045054c3399afaf44d961d0340cd6495143b062798b5
EBUILD liferea-1.15.5-r1.ebuild 1789 BLAKE2B 49a6694832cc15a0f9a54a9c80f1c17404d622029c66cf3e853f76837a8c2847a768e14ceb4f006980e9ef6db9ba7088f1a37813d2a535434f9842680e9cf129 SHA512 acca6481594dce1d020d1821462a8057a4235409fbdc1f0329187ff18c75e6a2a962350d565313be3700dcd8c5445d16c184cab9d0b45ae1c391d1f93a6958ef
+EBUILD liferea-1.15.6.ebuild 1744 BLAKE2B 1f3d36135344e939a43d1f679270db0298f5822da5d0f62e78c06dad949345f00f658ecc29fe4c013d0d392b058c748b7df661191af0ce74783f4b19e8d80f2b SHA512 747ea0ce64e34ef93fe4f1720ac85b332f0ce4780c403fcbbc23b81b7bba6c302614cc258b480a7f186d9c9743b405d8e79c62ed6691b504538b239c771dcf0e
MISC metadata.xml 629 BLAKE2B 88e0018637621448c67f2b514c11f3be85a6f2a4a1a0d7af0df0bea2e2cff8651bf8d064c17c314a31da0090231e35811cd60ad8b2a25175e997dc4a2487ead1 SHA512 ae109cd972bf652d0598b660ef74bba8783d097fe87b1ed5839975c3788a905f1768176ec914b03d6e495c89ccac121ea807fd088f77d7c96e582e175a9aae13
diff --git a/net-news/liferea/liferea-1.14.5-r1.ebuild b/net-news/liferea/liferea-1.14.5-r1.ebuild
deleted file mode 100644
index 04015d323430..000000000000
--- a/net-news/liferea/liferea-1.14.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools gnome2-utils optfeature python-single-r1 xdg
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-db/sqlite:3
- dev-libs/fribidi
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-libs/json-glib
- dev-libs/libpeas:0[gtk,python,${PYTHON_SINGLE_USEDEP}]
- dev-libs/libxml2:2
- dev-libs/libxslt
- gnome-base/gsettings-desktop-schemas
- net-libs/libsoup:2.4
- net-libs/webkit-gtk:4=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
- virtual/pkgconfig"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --disable-static
-}
-
-src_compile() {
- # Workaround crash in libwebkit2gtk-4.0.so
- # https://bugs.gentoo.org/704594
- WEBKIT_DISABLE_COMPOSITING_MODE=1 \
- default
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- optfeature "Libsecret Support plugin" app-crypt/libsecret[introspection]
- optfeature "Tray Icon (GNOME Classic) plugin" "dev-python/pycairo x11-libs/gdk-pixbuf[introspection]"
- optfeature "Media Player plugin" media-libs/gstreamer[introspection]
- optfeature "monitoring network status" net-misc/networkmanager
- optfeature "Popup Notifications plugin" x11-libs/libnotify[introspection]
-}
diff --git a/net-news/liferea/liferea-1.15.6.ebuild b/net-news/liferea/liferea-1.15.6.ebuild
new file mode 100644
index 000000000000..e7c6bad358e3
--- /dev/null
+++ b/net-news/liferea/liferea-1.15.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools gnome2-utils optfeature python-single-r1 xdg
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="https://lzone.de/liferea/"
+SRC_URI="https://github.com/lwindolf/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-db/sqlite:3
+ dev-libs/fribidi
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-libs/json-glib
+ dev-libs/libpeas:0[gtk,python,${PYTHON_SINGLE_USEDEP}]
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ gnome-base/gsettings-desktop-schemas
+ net-libs/libsoup:3.0
+ net-libs/webkit-gtk:4.1=
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf --disable-static
+}
+
+src_compile() {
+ # Workaround crash in libwebkit2gtk-4.0.so
+ # https://bugs.gentoo.org/704594
+ WEBKIT_DISABLE_COMPOSITING_MODE=1 \
+ default
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ optfeature "Libsecret Support plugin" app-crypt/libsecret[introspection]
+ optfeature "Tray Icon (AppIndicator and GNOME Classic) plugin" \
+ "dev-libs/libayatana-appindicator dev-python/pycairo x11-libs/gdk-pixbuf[introspection]"
+ optfeature "Media Player plugin" media-libs/gstreamer[introspection]
+ optfeature "monitoring network status" net-misc/networkmanager
+ optfeature "Popup Notifications plugin" x11-libs/libnotify[introspection]
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 534bc6a8751b..42c88d8dc422 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
Binary files differ
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index a9f7ee023a43..fba0beae9999 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -7,7 +7,9 @@ AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60b
DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
DIST unifi-7.5.187.zip 172434106 BLAKE2B db54079f30c9f61989ceb70474ea68559189804876000534c2a0165a9ef2324f92d19e7b055eaa31cd77e7bd90db0c29aa9f20953dc17a5c54cc646a5c862990 SHA512 703e29273412c497a5bea74210e8c409c629b81fee2badd3f116bbb31a2ca82942ff0281303c0da57757a85e44f4457ba3730deaba0a1f4cc2adc1eb5ace3276
DIST unifi-8.0.28.zip 158243946 BLAKE2B 396517012acc6efae37ab1894cfa5d605b9bb5474af35a8facf19985393d7647df853e9ba3676abc482c9021a97e149f61b093c4b9b22d211907e7be582e7be1 SHA512 50ec9d56e8358e934806ef85e9635c6bf5bb3374ec4897ff4ede708073fad276a9aabdf06108a780f077612b49d2d99b2f9ae15dfa9c558c941a4af1dfa30432
-EBUILD unifi-6.5.55-r2.ebuild 2535 BLAKE2B e6e0ec4115afe6bb78a125afa8a88097bb428a77e491ca7aceaa67bfa07705e233ef5b8a37925668ebe8e2016f4626491539a7b87bf9a09da992ab8457bf74b2 SHA512 74fa22bcc3d57ab16d0549da33941219b0dd8cde988fef19e6cbaa3fa0e827dd51e84aeed81bf3e9f41f27f2ce4c18c59b6d3e061009b6833af73a1f280b34ca
-EBUILD unifi-7.5.187.ebuild 2673 BLAKE2B 054456706001f95034e122ca2fbdc499874e4ec29ef81b63ade19bebc52eac13c2cbc933ee85d2f107f500752dfbd3197410b6f7ba3c54bda2f0d3983e5e2ac3 SHA512 4ad1a45a69d11dca0994804a24d89e8c9e1a1d085ad2fd1d33b55dbcee6c4866963d5b53330a3e984b3e7169a0c65bc8415343b0bf914db3b211e1365b80a26b
-EBUILD unifi-8.0.28.ebuild 2665 BLAKE2B 2694108c392202ffd9affd5a6b6e6dd479fc1b6a3048aad6c2010d1777b3c99fa4d3ed8534bbb1282d6df36c41cf14cd238968f03c6e6d167619b8a7994259aa SHA512 c8d4831236f7ea9fb16a7541fcc2957fe42121e43ca4f37a7954bb5dd3c08dfbb79b52e917422ad45dafc3878a174cf811f2128db50a926e297c7ca1690e7f16
+DIST unifi-8.1.113.zip 169688768 BLAKE2B 458b92f495dc5f738687d64ccfd7cb02066a46d3712bb11b28c17d65dd152553bb2ed7dc46e41840bb2ce99948579af7630be5bfaa775e084ee61334a7c0ea62 SHA512 f20f028097a63246c3189567b254e2da5bb0cf42abdce9d8c4cdd438665b8db76210c9a98c2e4f00fe526cff259ddd039887082661d4b3e13089eaa797e4d404
+EBUILD unifi-6.5.55-r2.ebuild 2535 BLAKE2B 2cfa249e33c6e13be327dd416862070f087e7998ef7219b2903a397c1419676b854576d059396276c03767b90a196fda451826df401525aba19014a54fa919df SHA512 2c15b0ff1eded12d1f2b99891f274d71d6dd9527d23440f8aacef8d76ccf66f6063b2ee136b503bd7b200258c812f648661fc40e54e958fe338ff0730cd2e0e3
+EBUILD unifi-7.5.187.ebuild 2673 BLAKE2B 4248580218eb10fc588ec60fea1c41344a84be3d9e464b9b85572afe9b3bc4326a9a13cded7fc20ae6043ab11d9d5b942226b39da9688898c84a323cc43a1a09 SHA512 445193da23f62a5420205c9988baca93ff3bb4e86b4b215b98fe911365fd6a602e606dab3ed1c1e5bffe3f1dde6b2442711b7ef1b5a0e62312ecefb0d90c7404
+EBUILD unifi-8.0.28.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d
+EBUILD unifi-8.1.113.ebuild 2666 BLAKE2B 20c2e21008e49fd27c8f7ed0e26ccdf2127a9ec1b1783db350b228bf2df88112531f06d815145f4c5c79117846639f3ff0ed16a059295191992a051e383897bc SHA512 549582cffb9b5d8de9238babf45cdcdbebea04a26bf8b02d7311eb8b9603919c795837c53ff3097858ebc2bdb8122a3ef23ea8b9e6018cdaa4bb179843b1e414
MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-6.5.55-r2.ebuild b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
index b4143f5dbd3e..30feb46a0502 100644
--- a/net-wireless/unifi/unifi-6.5.55-r2.ebuild
+++ b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.ubnt.com"
SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
S="${WORKDIR}/UniFi"
-KEYWORDS="-* amd64 ~arm64"
LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* amd64 ~arm64"
IUSE="systemd"
RESTRICT="bindist mirror"
diff --git a/net-wireless/unifi/unifi-7.5.187.ebuild b/net-wireless/unifi/unifi-7.5.187.ebuild
index e69fe1615e36..9eb90b0aa930 100644
--- a/net-wireless/unifi/unifi-7.5.187.ebuild
+++ b/net-wireless/unifi/unifi-7.5.187.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.ubnt.com"
SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
S="${WORKDIR}/UniFi"
-KEYWORDS="-* amd64 ~arm64"
LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* amd64 ~arm64"
IUSE="systemd system-mongodb"
RESTRICT="bindist mirror"
diff --git a/net-wireless/unifi/unifi-8.0.28.ebuild b/net-wireless/unifi/unifi-8.0.28.ebuild
index 807b16659d5e..2f1936dc19fa 100644
--- a/net-wireless/unifi/unifi-8.0.28.ebuild
+++ b/net-wireless/unifi/unifi-8.0.28.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.ubnt.com"
SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
S="${WORKDIR}/UniFi"
-KEYWORDS="-* amd64 ~arm64"
LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* amd64 ~arm64"
IUSE="systemd system-mongodb"
RESTRICT="bindist mirror"
diff --git a/net-wireless/unifi/unifi-8.1.113.ebuild b/net-wireless/unifi/unifi-8.1.113.ebuild
new file mode 100644
index 000000000000..ed01ef5545ac
--- /dev/null
+++ b/net-wireless/unifi/unifi-8.1.113.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+# RC_SUFFIX="-"
+
+inherit java-pkg-2 readme.gentoo-r1 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+ acct-group/unifi
+ acct-user/unifi
+ dev-db/mongodb
+ virtual/jre:17
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="
+ usr/lib/unifi/lib/native/Linux/aarch64/*.so
+ usr/lib/unifi/lib/native/Linux/x86_64/*.so
+"
+
+src_prepare() {
+ if [[ ${CHOST} != aarch64* ]]; then
+ rm -r lib/native/Linux/aarch64 || die
+ fi
+ if [[ ${CHOST} != x86_64* ]]; then
+ rm -r lib/native/Linux/x86_64 || die
+ fi
+
+ if [[ ${CHOST} == aarch64* ]]; then
+ if ! use systemd; then
+ rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+ fi
+ fi
+ if [[ ${CHOST} == x86_64* ]]; then
+ if ! use systemd; then
+ rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+ fi
+ fi
+
+ default
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ insinto /usr/lib/unifi
+ doins -r dl lib webapps
+ ! use system-mongodb && doins -r bin
+
+ diropts -o unifi -g unifi
+ keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+ for symlink in conf data run tmp work; do
+ dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+ done
+ dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+ java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+ java-pkg_dolauncher \
+ unifi \
+ --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \
+ -Djava.library.path= \
+ --add-opens java.base/java.lang=ALL-UNNAMED \
+ --add-opens java.base/java.time=ALL-UNNAMED \
+ --add-opens java.base/sun.security.util=ALL-UNNAMED \
+ --add-opens java.base/java.io=ALL-UNNAMED \
+ --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \
+ --jar ace.jar \
+ --pwd '/usr/lib/unifi'
+
+ if use system-mongodb; then
+ systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+ newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+ else
+ systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+ newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+ fi
+
+ newconfd "${FILESDIR}"/unifi.confd unifi
+
+ echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+ doenvd "${T}"/99unifi
+
+ einstalldocs
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5a07e32475f8..9e6b463f4b42 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ae9654b3e59e..985eb48e8901 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -15,10 +15,6 @@ app-crypt/pinentry qt6
# https://github.com/psycopg/psycopg/issues/734
<=dev-python/psycopg-3.1.18 native-extensions
-# Sam James <sam@gentoo.org> (2024-03-17)
-# Needs masked version of salt (bug #927142).
-dev-python/pytest-salt-factories python_targets_python3_12
-
# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-03-10)
# These packages have RESTRICT="test" and depend on dev-java/ant-junit
# which is going away. Remove this mask when ebuilds are updated.
diff --git a/profiles/package.mask b/profiles/package.mask
index be45e43b9fc1..953a154bd3dc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -38,10 +38,6 @@
# https://github.com/containers/buildah/issues/5320
=app-containers/buildah-1.34.0
-# Sam James <sam@gentoo.org> (2024-03-16)
-# MIssing files (bug #927142).
-=app-admin/salt-3007.0
-
# Eli Schwartz <eschwartz93@gmail.com> (2024-03-14)
# Deprecated, doesn't work with python 3.12. Unmaintained with last
# serious release in 2019, and another release in 2024 that claims
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d0fc82702f63..318041948864 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1291,6 +1291,8 @@ app-vim/gentoo-syntax:ignore-glep31 - Remove GLEP 31 (UTF-8 file encodings) sett
app-xemacs/xemacs-packages-all:mule - Add multi-language support to XEmacs
dev-ada/AdaSAT:shared - Build shared library
dev-ada/AdaSAT:static-pic - Build static library with pic code
+dev-ada/VSS:shared - Build shared library
+dev-ada/VSS:static-pic - Build static library with pic code
dev-ada/aws:shared - Build shared library
dev-ada/aws:wsdl - Used to convert ada to wsdl
dev-ada/gnatcoll-bindings:shared - Build shared library
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f7c4fbf37eeb..4ee4234f0034 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index e650cb972a62..1551fe17c971 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,6 +1,6 @@
AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
AUX smc-sum-2.13.0.20230825-kernel-6.4.patch 503 BLAKE2B c05b6c6423d49ab2143400ee6e4e811662841368c31b9fd704e777368dba53a846e8cf6a4faa084c564127fa8882a4a1a841e5030916f156a515372625b03da0 SHA512 ca991ad2a24e7ebba2a3c17a663bd3be316f2a57319a38abe492e54902606ce9c4cba98026081276466bab91b8872e060ee4c4212abd20d8fc6bc13769d4b3af
AUX smc-sum-2.7.0.20210903-missing-include.patch 264 BLAKE2B 977008b43b91ff7ee7a1c32ac6ce4221d078c782b36479f5319818c143d99eec0ef69c787e8e170badb54c45bde4bf10f7359bf7e30e84141de816de4334f1e1 SHA512 c75b04f7c44cb273d781648e57c7339eb16c23e37b6cdfe3387444e0f5a4dcb72097d03a78d5f6ec327ba4b739444c93c378f0d2212c845873a387d30517328b
-DIST sum_2.13.0_Linux_x86_64_20230825.tar.gz 19925759 BLAKE2B ca0c0de3f8cc600b2d457f798e2d24310ec0eb52ecbc8976260dc5f84475a012bf66ec8b6a353a1477db558af82603b6ed2d0ce1bc31d3e70f98158fc52c2c19 SHA512 c05055e217d3d80a6b09a28c106e5c96640719db21617886571b1f6e527aef22cae1ddceabc09b5e9c10ef26e4fc48cad7a238457d4b503947e2f967c577d163
-EBUILD smc-sum-2.13.0.20230825.ebuild 1367 BLAKE2B 1674a041bef1e6516ab80448f8de52fd92a2f52d2ddea1ee403270bb10e0a1e9df2e32e79257e43046922c815f44854285833349d8412339833682bc6ae2dafe SHA512 c061402b5cfec747ac7f314feab88b7e821ab13bf585cdf36efe6a89e70d74d3cd67197b945980c0d2274dbf7ccc5d29ea836445301f4543426d0a920567dbe5
+DIST sum_2.14.0_Linux_x86_64_20240215.tar.gz 21137186 BLAKE2B af6ebcefd73cdf6f71bd3ea17e631845c8d873939517520ba3f7b66811011d4101907b808832f63baa442dd219da78fe6d4bb658ea8a72da2e949a717412179d SHA512 6e29bbc06cdd7369362608fc56271c72422e0a69d061c3058153fe1fcc642d643639dc8ce9d3773abf53ab4df8d409f55c00d8fd5b5096d63585e0210a2e741a
+EBUILD smc-sum-2.14.0.20240215.ebuild 1367 BLAKE2B 547effbcc3a229df0d6364e764a6598a204a787877c7219fd48effa661b495d32f996ccb67de3c61e51896fef6b4d1e8f79dfae99e10b26c8b418e3ce4b9dca5 SHA512 6e7038e74cbfc50f43c02a98dce2fed2365b38296d51184fb949f50242eba0e3c62f0c427ad82288681baa779989668291aff67917e5c1cde3dc94d6242d5476
MISC metadata.xml 1098 BLAKE2B af888334fb5709cdaf9ee12821a8d006e4343d27ae89d51683b30c32820a6250b75b762946a6c7d1f23b7c1383eb66ba4d6b450d5d366bdac42d4df350f5e5fc SHA512 aef30566e58c8781faed28eee5e8574fa7017f90c20065a13868a0c6abaa9e069f425c4826cddbbbbbb84c37b3ef83c13eb46ce1eb829dca0380a2f5ed72729c
diff --git a/sys-apps/smc-sum/smc-sum-2.13.0.20230825.ebuild b/sys-apps/smc-sum/smc-sum-2.13.0.20230825.ebuild
deleted file mode 100644
index 3efbf5931904..000000000000
--- a/sys-apps/smc-sum/smc-sum-2.13.0.20230825.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_IUSE="+module"
-
-inherit linux-mod-r1
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="${PN/smc-/}"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
-HOMEPAGE="https://www.supermicro.com"
-SRC_URI="https://www.supermicro.com/Bios/sw_download/633/${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
-S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="module"
-
-RDEPEND="
- sys-libs/zlib
- sys-power/iasl
-"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
- "PlatformFeatureSupportMatrix.pdf"
- "ReleaseNote.txt"
- "SUM_UserGuide.pdf"
- "sumrc.sample"
- "ExternalData/SMCIPID.txt"
- "ExternalData/VENID.txt"
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.7.0.20210903-missing-include.patch"
- "${FILESDIR}/${PN}-2.13.0.20230825-kernel-6.4.patch"
-)
-
-QA_PREBUILT="usr/bin/smc-sum"
-
-src_prepare() {
- default
-
- # Install new Makefile to respect users CFLAGS and LDFLAGS
- cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die
-
- linux-mod-r1_pkg_setup
-}
-
-src_compile() {
- local modargs=( KDIR="${KV_OUT_DIR}" )
- local modlist=( sum_bios="misc:driver/Source/Linux" )
-
- linux-mod-r1_src_compile
-}
-
-src_install() {
- newbin sum smc-sum
- einstalldocs
-
- linux-mod-r1_src_install
-}
diff --git a/sys-apps/smc-sum/smc-sum-2.14.0.20240215.ebuild b/sys-apps/smc-sum/smc-sum-2.14.0.20240215.ebuild
new file mode 100644
index 000000000000..02f039c2ca2b
--- /dev/null
+++ b/sys-apps/smc-sum/smc-sum-2.14.0.20240215.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE="+module"
+
+inherit linux-mod-r1
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN/smc-/}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="https://www.supermicro.com/Bios/sw_download/698/${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
+S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="module"
+
+RDEPEND="
+ sys-libs/zlib
+ sys-power/iasl
+"
+
+RESTRICT="bindist mirror"
+
+DOCS=(
+ "PlatformFeatureSupportMatrix.pdf"
+ "ReleaseNote.txt"
+ "SUM_UserGuide.pdf"
+ "sumrc.sample"
+ "ExternalData/SMCIPID.txt"
+ "ExternalData/VENID.txt"
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.7.0.20210903-missing-include.patch"
+ "${FILESDIR}/${PN}-2.13.0.20230825-kernel-6.4.patch"
+)
+
+QA_PREBUILT="usr/bin/smc-sum"
+
+src_prepare() {
+ default
+
+ # Install new Makefile to respect users CFLAGS and LDFLAGS
+ cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die
+
+ linux-mod-r1_pkg_setup
+}
+
+src_compile() {
+ local modargs=( KDIR="${KV_OUT_DIR}" )
+ local modlist=( sum_bios="misc:driver/Source/Linux" )
+
+ linux-mod-r1_src_compile
+}
+
+src_install() {
+ newbin sum smc-sum
+ einstalldocs
+
+ linux-mod-r1_src_install
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 84e607b85056..0d210efbe37c 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
Binary files differ
diff --git a/sys-boot/cromwell-bin/Manifest b/sys-boot/cromwell-bin/Manifest
index 1a5936f43869..90b5e5cdb26a 100644
--- a/sys-boot/cromwell-bin/Manifest
+++ b/sys-boot/cromwell-bin/Manifest
@@ -1,3 +1,4 @@
DIST cromwell-2.40.tar.gz 541204 BLAKE2B b10db3a636c3638aeac71747f9b217acbeab52d19733c6581c369762ff339fd1eb5e6392be9e409f6e278a72b989ba84d81f000f6e1ff2d5ade00b6ce75f7d91 SHA512 492441ea24f8b17b3de2c896b03d823d7a97eac85c07768ea4490c0351c71e80f697caf8b469852213763b8a38a058475f8b78f51523197d10a006deaf461f24
EBUILD cromwell-bin-2.40-r1.ebuild 557 BLAKE2B 1185387b5044968d412ff80eaa44178cb16885b0deabbc09cac15ca7ced757e2f379efe4b70ff4bf2cbd94a135bde6d945b76f602b1746fe13964441b6b3bcd6 SHA512 7cc27d8922b9b26a28f995a042b6b90529fbaa7c2883bb0d3c6f06a6e9efe7848df5d85ae6b6601f1189b485aeb2a9031a6eeac9f0fc7d34290ca53ede1dc789
+EBUILD cromwell-bin-2.40-r2.ebuild 510 BLAKE2B 5581f8f430adfe183e2fb6ed6ff20181e2c71966b298503262ecc2e0297c6f7abb74fc57731b08c3339fcd08a931180885c389e6c58b710397a5520ee3643778 SHA512 a5f90e5f6ffd8d1139606d2e8df281bc0f761a1d227d9f45f22213fa3588f56cfb52dbe5750504868a1d7f7b5a7edc710d20a24056ecd8805f3d1c9a4e8032ac
MISC metadata.xml 253 BLAKE2B 3452f65322822ddad4ea325513cf244d0a0cc85cdda12cd51d465fdbd587ccff4cf28abd320dfd00a0c382657876db22a96e18b5927a3dc7da186f0e63f011f8 SHA512 d935d4ffd287161680da1334f2e7aaac4ba5d6beee8b57ef8fd374eaa89875bae26438205f4dddec859203cc3b5d5d5be3b2d229850bf2755d2b4a6092e2fa38
diff --git a/sys-boot/cromwell-bin/cromwell-bin-2.40-r2.ebuild b/sys-boot/cromwell-bin/cromwell-bin-2.40-r2.ebuild
new file mode 100644
index 000000000000..62059734f721
--- /dev/null
+++ b/sys-boot/cromwell-bin/cromwell-bin-2.40-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot
+
+DESCRIPTION="Xbox boot loader precompiled binaries from xbox-linux.org"
+HOMEPAGE="https://sourceforge.net/projects/xbox-linux/"
+SRC_URI="mirror://sourceforge/xbox-linux/cromwell-${PV}.tar.gz"
+S="${WORKDIR}/cromwell-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86"
+RESTRICT="${RESTRICT} strip"
+
+src_install() {
+ insinto /boot/${PN}
+ doins cromwell{,_1024}.bin xromwell.xbe
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index bbacdc55b25d..56182152d6ba 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
Binary files differ
diff --git a/x11-terms/cool-retro-term/Manifest b/x11-terms/cool-retro-term/Manifest
index 4a6f59a9ee7d..964b0961e3c8 100644
--- a/x11-terms/cool-retro-term/Manifest
+++ b/x11-terms/cool-retro-term/Manifest
@@ -1,8 +1,4 @@
-AUX qmltermwidget-0.2.0-gcc-10.patch 1398 BLAKE2B a06fd644c64fd0b5cf549b410c28473d3ae31ec1477ee1dd60fb0108ee2af2221597d8fbeac6f3a8c33f605f3003b9a4dc2cffeb568788f606440aed9b19dc37 SHA512 fc50c4e64a8126b8586efc74939c71d43601e9a0dd4863a618fb51be46d05ac325ea3dfb96cab4a4a5b2accf0e2e8893174c1980b5b96ade8490d3a485c58ccb
-DIST cool-retro-term-1.1.1.tar.gz 1975853 BLAKE2B 54c9e5adb0879380215c390659da59266c323f12a046dafa2981d9c5e5ccbc6369e553427014e0347afcb6a1a64e188fb51f202d7c870a544fd2ecd5980f4c0c SHA512 59da4b5d18ad64b917caebbc63ea9e3d562ed2a2dc9eae00f36cf434df44d17adca084b448f860f24a74ee6b59cd083d6a81e2217df1fb5e9f2731eaf1752148
DIST cool-retro-term-1.2.0.tar.gz 1996540 BLAKE2B 3b8da2a040276fdd5ab743743ec2adc325afd521a854ccb8aaeddeb11045c692bc6ac597a5bbb5a29422be94c3fa13a182a85568872793922c699e3e7fcd69c6 SHA512 21d3551d429380b026f8003652d78d186e5ac7079d3f143fe7f8f0c57876df263e5c40f218577ef236da859e779699f766414949591ecab38921caec5fd59209
-DIST qmltermwidget-0.2.0.tar.gz 219516 BLAKE2B 452fe72f01773d3307d5f4dca4ef38ea8e35b6ee4e3255d660e94baafc83949fca943807fd4ea76e0b985032952c387b5911a65891488b399d0cb41e6be06d87 SHA512 544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43
DIST qmltermwidget-63228027e1f97c24abb907550b22ee91836929c5.tar.gz 235028 BLAKE2B 8f6cca761a3e77c2b02895315cc80f6c7cbe6e45ef15321187cf51c691fb35b8b80884514e359d3ebddf345fa59e7cb3a3919eb23aa97f0aa75c71f6035f1c7a SHA512 7b80ef2cba24d4ceaf50ebb4adc69efe54919ef9a0dfa49ce766f56c3500ad200468db76676dd048cd3e41209b3a06b3ef5505c64d683702bf181ff8ec82c07e
-EBUILD cool-retro-term-1.1.1-r2.ebuild 1322 BLAKE2B ae84eac46711396499980104c02099b746fba41846bf3dbb805966aa81d067e89a5ea59df8cc66bb099a994f1272f6137fa53c40d4bf0a7e4aff7606c537ba0a SHA512 d95a30e5c37ad0199c379960ed981d3d05f352da2dbe16152f67f2f0df1e0e1c033d78e2a4dc485da1b29f350da3efadaf2e097acf7cde38bcad3a3318135015
EBUILD cool-retro-term-1.2.0.ebuild 1387 BLAKE2B a04b4347d5ba579c532366b07224ba526b5dd4f1107b69808b285a88f99f899a85efd77b6db07299d224294130fd1af8ee7c8242b03705e028b8db1109c43749 SHA512 7411ee00b28d393c360d4724690bb6ff76b3ce076058f822f49214dfabf7f2fe01924fdfdacbe5598252a6e0c8951fa086ba13ccacf0ef39833311985f658ca2
MISC metadata.xml 1336 BLAKE2B c0ff827ddcbb7d871784f59c9dea2ca8cbf1a182e9942ccad43809bd9e498fec7e56293fcb42f77cc17b38880109f7b2033a87e1e52579e40bd55c88aa0d8aaa SHA512 af79e69f121c4c3991dc15dafa6b792fe13b51ea17726fd14d09bdff6ddb5f2647ba26b191a67da374910c19ec1f966677b5e7afc96761475d4aa3063c7eebf1
diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
deleted file mode 100644
index dd5fc7cd56d4..000000000000
--- a/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-QTW_PN=qmltermwidget
-QTW_PV=0.2.0
-QTW_P=${QTW_PN}-${QTW_PV}
-
-DESCRIPTION="terminal emulator which mimics the look and feel of the old cathode tube screens"
-HOMEPAGE="https://github.com/Swordfish90/cool-retro-term"
-SRC_URI="https://github.com/Swordfish90/cool-retro-term/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/Swordfish90/qmltermwidget/archive/${QTW_PV}.tar.gz -> ${QTW_P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- dev-qt/qtdeclarative:5[localstorage]
- dev-qt/qtgraphicaleffects:5
- dev-qt/qtquickcontrols:5[widgets]
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- rmdir qmltermwidget || die
- mv "${WORKDIR}/${QTW_P}" qmltermwidget || die
- pushd qmltermwidget || die
- eapply "${FILESDIR}"/qmltermwidget-0.2.0-gcc-10.patch
- popd || die
-}
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
- # default attempts to install directly to /usr
- emake INSTALL_ROOT="${D}" install
- doman packaging/debian/cool-retro-term.1
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch b/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch
deleted file mode 100644
index f14a269712e6..000000000000
--- a/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5cb4f9e6c86354674bd7715d947f95ac9f16a6c1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 25 Jan 2020 12:20:37 +0000
-Subject: [PATCH] TerminalCharacterDecoder.cpp: fix build failure against
- gcc-10
-
-gcc-10 fixed a few transitive includes and std::cwctype does not
-get included implicitly via other headers. This leads to the
-following build error:
-
-```
-lib/TerminalCharacterDecoder.cpp: In member function
- 'virtual void Konsole::HTMLDecoder::decodeLine(const Konsole::Character*,
- int, Konsole::LineProperty)':
-lib/TerminalCharacterDecoder.cpp:205:18:
- error: 'iswspace' is not a member of 'std'; did you mean 'isspace'?
- 205 | if (std::iswspace(ch))
- | ^~~~~~~~
- | isspace
-make: *** [Makefile:924: TerminalCharacterDecoder.o] Error 1
-```
-
-The fix is to include <cwctype> that is supposed to define 'std::iswspace'.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- lib/TerminalCharacterDecoder.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/TerminalCharacterDecoder.cpp b/lib/TerminalCharacterDecoder.cpp
-index 579dedf..5d5bfc0 100644
---- a/lib/TerminalCharacterDecoder.cpp
-+++ b/lib/TerminalCharacterDecoder.cpp
-@@ -19,6 +19,9 @@
- 02110-1301 USA.
- */
-
-+// System
-+#include <cwctype> /* std::iswspace */
-+
- // Own
- #include "TerminalCharacterDecoder.h"
-
---
-2.25.0
-