summaryrefslogtreecommitdiff
path: root/acct-group
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-07-09 22:25:44 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-07-09 22:25:44 +0100
commit796e724b5ace96ff70d918765662edf62f1d8c85 (patch)
treeb09742996db0de2a2414587542b1b91d4ae5c522 /acct-group
parentcd7ab3ad114e9777d85ced67abdd5b25d0bd4efe (diff)
gentoo auto-resync : 09:07:2023 - 22:25:43
Diffstat (limited to 'acct-group')
-rw-r--r--acct-group/Manifest.gzbin76159 -> 76056 bytes
-rw-r--r--acct-group/_cron-failure/Manifest2
-rw-r--r--acct-group/_cron-failure/_cron-failure-0-r1.ebuild10
-rw-r--r--acct-group/_cron-failure/_cron-failure-0.ebuild10
-rw-r--r--acct-group/adm/Manifest2
-rw-r--r--acct-group/adm/adm-0-r1.ebuild8
-rw-r--r--acct-group/adm/adm-0-r2.ebuild8
-rw-r--r--acct-group/aerospike-amc/Manifest2
-rw-r--r--acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild10
-rw-r--r--acct-group/aerospike-amc/aerospike-amc-0.ebuild10
-rw-r--r--acct-group/airdcppd/Manifest2
-rw-r--r--acct-group/airdcppd/airdcppd-0-r1.ebuild9
-rw-r--r--acct-group/airdcppd/airdcppd-0-r2.ebuild9
-rw-r--r--acct-group/alertmanager/Manifest2
-rw-r--r--acct-group/alertmanager/alertmanager-0-r1.ebuild8
-rw-r--r--acct-group/alertmanager/alertmanager-0.ebuild8
-rw-r--r--acct-group/amanda/Manifest2
-rw-r--r--acct-group/amanda/amanda-0-r1.ebuild8
-rw-r--r--acct-group/amanda/amanda-0.ebuild8
-rw-r--r--acct-group/amavis/Manifest2
-rw-r--r--acct-group/amavis/amavis-0-r1.ebuild9
-rw-r--r--acct-group/amavis/amavis-0-r2.ebuild9
-rw-r--r--acct-group/amule/Manifest2
-rw-r--r--acct-group/amule/amule-0-r1.ebuild9
-rw-r--r--acct-group/amule/amule-0-r2.ebuild9
-rw-r--r--acct-group/android/Manifest2
-rw-r--r--acct-group/android/android-0-r1.ebuild10
-rw-r--r--acct-group/android/android-0.ebuild10
-rw-r--r--acct-group/anope/Manifest2
-rw-r--r--acct-group/anope/anope-0-r1.ebuild9
-rw-r--r--acct-group/anope/anope-0-r2.ebuild9
-rw-r--r--acct-group/apache/Manifest2
-rw-r--r--acct-group/apache/apache-0-r2.ebuild8
-rw-r--r--acct-group/apache/apache-0-r3.ebuild8
-rw-r--r--acct-group/apt-cacher-ng/Manifest2
-rw-r--r--acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild8
-rw-r--r--acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild8
-rw-r--r--acct-group/argus/Manifest2
-rw-r--r--acct-group/argus/argus-0-r1.ebuild10
-rw-r--r--acct-group/argus/argus-0.ebuild10
-rw-r--r--acct-group/arpwatch/Manifest2
-rw-r--r--acct-group/arpwatch/arpwatch-0-r1.ebuild10
-rw-r--r--acct-group/arpwatch/arpwatch-0.ebuild10
-rw-r--r--acct-group/artifactory/Manifest2
-rw-r--r--acct-group/artifactory/artifactory-0-r1.ebuild10
-rw-r--r--acct-group/artifactory/artifactory-0.ebuild10
-rw-r--r--acct-group/aspnet/Manifest2
-rw-r--r--acct-group/aspnet/aspnet-0-r1.ebuild8
-rw-r--r--acct-group/aspnet/aspnet-0.ebuild8
-rw-r--r--acct-group/asterisk/Manifest2
-rw-r--r--acct-group/asterisk/asterisk-0-r1.ebuild9
-rw-r--r--acct-group/asterisk/asterisk-0-r2.ebuild9
-rw-r--r--acct-group/at/Manifest2
-rw-r--r--acct-group/at/at-0-r1.ebuild8
-rw-r--r--acct-group/at/at-0.ebuild8
-rw-r--r--acct-group/atheme-services/Manifest2
-rw-r--r--acct-group/atheme-services/atheme-services-0-r1.ebuild9
-rw-r--r--acct-group/atheme-services/atheme-services-0-r2.ebuild9
-rw-r--r--acct-group/audio/Manifest2
-rw-r--r--acct-group/audio/audio-0-r1.ebuild8
-rw-r--r--acct-group/audio/audio-0-r2.ebuild8
-rw-r--r--acct-group/automatic/Manifest2
-rw-r--r--acct-group/automatic/automatic-0-r1.ebuild8
-rw-r--r--acct-group/automatic/automatic-0.ebuild8
-rw-r--r--acct-group/automx2/Manifest2
-rw-r--r--acct-group/automx2/automx2-0-r1.ebuild9
-rw-r--r--acct-group/automx2/automx2-0-r2.ebuild9
-rw-r--r--acct-group/avahi-autoipd/Manifest2
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild9
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild9
-rw-r--r--acct-group/avahi/Manifest2
-rw-r--r--acct-group/avahi/avahi-0-r1.ebuild9
-rw-r--r--acct-group/avahi/avahi-0-r2.ebuild9
-rw-r--r--acct-group/axtls/Manifest2
-rw-r--r--acct-group/axtls/axtls-0-r1.ebuild10
-rw-r--r--acct-group/axtls/axtls-0.ebuild10
-rw-r--r--acct-group/backuppc/Manifest2
-rw-r--r--acct-group/backuppc/backuppc-0-r1.ebuild10
-rw-r--r--acct-group/backuppc/backuppc-0.ebuild10
-rw-r--r--acct-group/bacula/Manifest2
-rw-r--r--acct-group/bacula/bacula-0-r1.ebuild9
-rw-r--r--acct-group/bacula/bacula-0-r2.ebuild9
-rw-r--r--acct-group/bareos/Manifest2
-rw-r--r--acct-group/bareos/bareos-0-r1.ebuild9
-rw-r--r--acct-group/bareos/bareos-0-r2.ebuild9
-rw-r--r--acct-group/beanstalk/Manifest2
-rw-r--r--acct-group/beanstalk/beanstalk-0-r1.ebuild10
-rw-r--r--acct-group/beanstalk/beanstalk-0.ebuild10
-rw-r--r--acct-group/bedrock/Manifest2
-rw-r--r--acct-group/bedrock/bedrock-0-r1.ebuild10
-rw-r--r--acct-group/bedrock/bedrock-0-r2.ebuild10
-rw-r--r--acct-group/biboumi/Manifest2
-rw-r--r--acct-group/biboumi/biboumi-0-r1.ebuild8
-rw-r--r--acct-group/biboumi/biboumi-0.ebuild8
-rw-r--r--acct-group/bind_exporter/Manifest2
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r1.ebuild8
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r2.ebuild8
-rw-r--r--acct-group/bird/Manifest2
-rw-r--r--acct-group/bird/bird-0-r1.ebuild9
-rw-r--r--acct-group/bird/bird-0.ebuild9
-rw-r--r--acct-group/bitcoin/Manifest2
-rw-r--r--acct-group/bitcoin/bitcoin-0-r1.ebuild9
-rw-r--r--acct-group/bitcoin/bitcoin-0-r2.ebuild9
-rw-r--r--acct-group/bitflu/Manifest2
-rw-r--r--acct-group/bitflu/bitflu-0-r1.ebuild10
-rw-r--r--acct-group/bitflu/bitflu-0.ebuild10
-rw-r--r--acct-group/bitlbee/Manifest2
-rw-r--r--acct-group/bitlbee/bitlbee-0-r1.ebuild8
-rw-r--r--acct-group/bitlbee/bitlbee-0-r2.ebuild8
-rw-r--r--acct-group/blackbox_exporter/Manifest2
-rw-r--r--acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild8
-rw-r--r--acct-group/blackbox_exporter/blackbox_exporter-0.ebuild8
-rw-r--r--acct-group/boinc/Manifest2
-rw-r--r--acct-group/boinc/boinc-0-r1.ebuild9
-rw-r--r--acct-group/boinc/boinc-0.ebuild9
-rw-r--r--acct-group/brlapi/Manifest2
-rw-r--r--acct-group/brlapi/brlapi-0-r1.ebuild8
-rw-r--r--acct-group/brlapi/brlapi-0.ebuild8
-rw-r--r--acct-group/brltty/Manifest2
-rw-r--r--acct-group/brltty/brltty-0-r1.ebuild8
-rw-r--r--acct-group/brltty/brltty-0.ebuild8
-rw-r--r--acct-group/buildbot/Manifest2
-rw-r--r--acct-group/buildbot/buildbot-0-r1.ebuild10
-rw-r--r--acct-group/buildbot/buildbot-0-r2.ebuild10
-rw-r--r--acct-group/bumblebee/Manifest2
-rw-r--r--acct-group/bumblebee/bumblebee-0-r1.ebuild8
-rw-r--r--acct-group/bumblebee/bumblebee-0.ebuild8
-rw-r--r--acct-group/burp/Manifest2
-rw-r--r--acct-group/burp/burp-0-r1.ebuild9
-rw-r--r--acct-group/burp/burp-0-r2.ebuild9
-rw-r--r--acct-group/burrow_exporter/Manifest2
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild10
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild10
-rw-r--r--acct-group/cadvisor/Manifest2
-rw-r--r--acct-group/cadvisor/cadvisor-0-r1.ebuild8
-rw-r--r--acct-group/cadvisor/cadvisor-0-r2.ebuild8
-rw-r--r--acct-group/cancd/Manifest2
-rw-r--r--acct-group/cancd/cancd-0-r1.ebuild10
-rw-r--r--acct-group/cancd/cancd-0.ebuild10
-rw-r--r--acct-group/carbon/Manifest2
-rw-r--r--acct-group/carbon/carbon-0-r1.ebuild8
-rw-r--r--acct-group/carbon/carbon-0-r2.ebuild8
-rw-r--r--acct-group/cdrom/Manifest2
-rw-r--r--acct-group/cdrom/cdrom-0-r1.ebuild8
-rw-r--r--acct-group/cdrom/cdrom-0-r2.ebuild8
-rw-r--r--acct-group/ceph/Manifest2
-rw-r--r--acct-group/ceph/ceph-0-r1.ebuild8
-rw-r--r--acct-group/ceph/ceph-0-r2.ebuild8
-rw-r--r--acct-group/cgit/Manifest2
-rw-r--r--acct-group/cgit/cgit-0-r1.ebuild8
-rw-r--r--acct-group/cgit/cgit-0.ebuild8
-rw-r--r--acct-group/chronograf/Manifest2
-rw-r--r--acct-group/chronograf/chronograf-0-r1.ebuild8
-rw-r--r--acct-group/chronograf/chronograf-0-r2.ebuild8
-rw-r--r--acct-group/cinder/Manifest2
-rw-r--r--acct-group/cinder/cinder-0-r1.ebuild8
-rw-r--r--acct-group/cinder/cinder-0-r2.ebuild8
-rw-r--r--acct-group/clair/Manifest2
-rw-r--r--acct-group/clair/clair-0-r1.ebuild8
-rw-r--r--acct-group/clair/clair-0-r2.ebuild8
-rw-r--r--acct-group/clamav/Manifest2
-rw-r--r--acct-group/clamav/clamav-0-r1.ebuild8
-rw-r--r--acct-group/clamav/clamav-0-r2.ebuild8
-rw-r--r--acct-group/cntlm/Manifest2
-rw-r--r--acct-group/cntlm/cntlm-0-r1.ebuild10
-rw-r--r--acct-group/cntlm/cntlm-0.ebuild10
-rw-r--r--acct-group/cockroach/Manifest2
-rw-r--r--acct-group/cockroach/cockroach-0-r1.ebuild10
-rw-r--r--acct-group/cockroach/cockroach-0.ebuild10
-rw-r--r--acct-group/collectd/Manifest2
-rw-r--r--acct-group/collectd/collectd-0-r1.ebuild10
-rw-r--r--acct-group/collectd/collectd-0.ebuild10
-rw-r--r--acct-group/colord/Manifest2
-rw-r--r--acct-group/colord/colord-0-r1.ebuild8
-rw-r--r--acct-group/colord/colord-0.ebuild8
-rw-r--r--acct-group/consul-template/Manifest2
-rw-r--r--acct-group/consul-template/consul-template-0-r1.ebuild8
-rw-r--r--acct-group/consul-template/consul-template-0-r2.ebuild8
-rw-r--r--acct-group/consul/Manifest2
-rw-r--r--acct-group/consul/consul-0-r1.ebuild8
-rw-r--r--acct-group/consul/consul-0-r2.ebuild8
-rw-r--r--acct-group/consul_exporter/Manifest2
-rw-r--r--acct-group/consul_exporter/consul_exporter-0-r1.ebuild8
-rw-r--r--acct-group/consul_exporter/consul_exporter-0.ebuild8
-rw-r--r--acct-group/coredns/Manifest2
-rw-r--r--acct-group/coredns/coredns-0-r1.ebuild10
-rw-r--r--acct-group/coredns/coredns-0.ebuild10
-rw-r--r--acct-group/croc/Manifest2
-rw-r--r--acct-group/croc/croc-0-r1.ebuild9
-rw-r--r--acct-group/croc/croc-0.ebuild9
-rw-r--r--acct-group/cron/Manifest2
-rw-r--r--acct-group/cron/cron-0-r1.ebuild10
-rw-r--r--acct-group/cron/cron-0.ebuild10
-rw-r--r--acct-group/crontab/Manifest2
-rw-r--r--acct-group/crontab/crontab-0-r1.ebuild8
-rw-r--r--acct-group/crontab/crontab-0.ebuild8
-rw-r--r--acct-group/cvmfs/Manifest2
-rw-r--r--acct-group/cvmfs/cvmfs-0-r1.ebuild9
-rw-r--r--acct-group/cvmfs/cvmfs-0-r2.ebuild9
-rw-r--r--acct-group/davfs2/Manifest2
-rw-r--r--acct-group/davfs2/davfs2-0-r1.ebuild8
-rw-r--r--acct-group/davfs2/davfs2-0-r2.ebuild8
-rw-r--r--acct-group/dbmail/Manifest2
-rw-r--r--acct-group/dbmail/dbmail-0-r1.ebuild8
-rw-r--r--acct-group/dbmail/dbmail-0.ebuild8
-rw-r--r--acct-group/dbskkd/Manifest2
-rw-r--r--acct-group/dbskkd/dbskkd-0-r1.ebuild10
-rw-r--r--acct-group/dbskkd/dbskkd-0.ebuild10
-rw-r--r--acct-group/ddclient/Manifest2
-rw-r--r--acct-group/ddclient/ddclient-0-r1.ebuild10
-rw-r--r--acct-group/ddclient/ddclient-0-r2.ebuild10
-rw-r--r--acct-group/defang/Manifest2
-rw-r--r--acct-group/defang/defang-0-r1.ebuild10
-rw-r--r--acct-group/defang/defang-0.ebuild10
-rw-r--r--acct-group/dehydrated/Manifest2
-rw-r--r--acct-group/dehydrated/dehydrated-0-r1.ebuild10
-rw-r--r--acct-group/dehydrated/dehydrated-0.ebuild10
-rw-r--r--acct-group/deluge/Manifest2
-rw-r--r--acct-group/deluge/deluge-0-r1.ebuild8
-rw-r--r--acct-group/deluge/deluge-0-r2.ebuild8
-rw-r--r--acct-group/dhcp/Manifest2
-rw-r--r--acct-group/dhcp/dhcp-0-r1.ebuild8
-rw-r--r--acct-group/dhcp/dhcp-0-r2.ebuild8
-rw-r--r--acct-group/dhcpcd/Manifest2
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r1.ebuild8
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r2.ebuild8
-rw-r--r--acct-group/dialout/Manifest2
-rw-r--r--acct-group/dialout/dialout-0-r1.ebuild8
-rw-r--r--acct-group/dialout/dialout-0-r2.ebuild8
-rw-r--r--acct-group/dictd/Manifest2
-rw-r--r--acct-group/dictd/dictd-0-r1.ebuild10
-rw-r--r--acct-group/dictd/dictd-0.ebuild10
-rw-r--r--acct-group/dirsrv/Manifest2
-rw-r--r--acct-group/dirsrv/dirsrv-0-r1.ebuild9
-rw-r--r--acct-group/dirsrv/dirsrv-0.ebuild9
-rw-r--r--acct-group/disk/Manifest2
-rw-r--r--acct-group/disk/disk-0-r1.ebuild8
-rw-r--r--acct-group/disk/disk-0-r2.ebuild8
-rw-r--r--acct-group/distcc/Manifest2
-rw-r--r--acct-group/distcc/distcc-1-r1.ebuild8
-rw-r--r--acct-group/distcc/distcc-1.ebuild8
-rw-r--r--acct-group/dnrd/Manifest2
-rw-r--r--acct-group/dnrd/dnrd-0-r1.ebuild10
-rw-r--r--acct-group/dnrd/dnrd-0.ebuild10
-rw-r--r--acct-group/dnscrypt-proxy/Manifest2
-rw-r--r--acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild9
-rw-r--r--acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild9
-rw-r--r--acct-group/dnsdist/Manifest2
-rw-r--r--acct-group/dnsdist/dnsdist-0-r1.ebuild10
-rw-r--r--acct-group/dnsdist/dnsdist-0-r2.ebuild10
-rw-r--r--acct-group/dnsmasq/Manifest2
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r1.ebuild8
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r2.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/Manifest2
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild8
-rw-r--r--acct-group/docker/Manifest2
-rw-r--r--acct-group/docker/docker-0-r1.ebuild8
-rw-r--r--acct-group/docker/docker-0-r2.ebuild8
-rw-r--r--acct-group/docker_auth/Manifest2
-rw-r--r--acct-group/docker_auth/docker_auth-0-r1.ebuild8
-rw-r--r--acct-group/docker_auth/docker_auth-0-r2.ebuild8
-rw-r--r--acct-group/dovecot/Manifest2
-rw-r--r--acct-group/dovecot/dovecot-0-r1.ebuild8
-rw-r--r--acct-group/dovecot/dovecot-0-r2.ebuild8
-rw-r--r--acct-group/dovenull/Manifest2
-rw-r--r--acct-group/dovenull/dovenull-0-r1.ebuild8
-rw-r--r--acct-group/dovenull/dovenull-0-r2.ebuild8
-rw-r--r--acct-group/drone/Manifest2
-rw-r--r--acct-group/drone/drone-0-r1.ebuild10
-rw-r--r--acct-group/drone/drone-0.ebuild10
-rw-r--r--acct-group/ejabberd/Manifest2
-rw-r--r--acct-group/ejabberd/ejabberd-0-r1.ebuild10
-rw-r--r--acct-group/ejabberd/ejabberd-0.ebuild10
-rw-r--r--acct-group/elasticsearch/Manifest2
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r1.ebuild9
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r2.ebuild9
-rw-r--r--acct-group/elasticsearch_exporter/Manifest2
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild10
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild10
-rw-r--r--acct-group/energi3/Manifest2
-rw-r--r--acct-group/energi3/energi3-0-r1.ebuild9
-rw-r--r--acct-group/energi3/energi3-0.ebuild9
-rw-r--r--acct-group/epam/Manifest2
-rw-r--r--acct-group/epam/epam-0-r1.ebuild9
-rw-r--r--acct-group/epam/epam-0.ebuild9
-rw-r--r--acct-group/epmd/Manifest2
-rw-r--r--acct-group/epmd/epmd-0-r1.ebuild9
-rw-r--r--acct-group/epmd/epmd-0-r2.ebuild9
-rw-r--r--acct-group/err/Manifest2
-rw-r--r--acct-group/err/err-0-r1.ebuild8
-rw-r--r--acct-group/err/err-0.ebuild8
-rw-r--r--acct-group/etcd/Manifest2
-rw-r--r--acct-group/etcd/etcd-0-r1.ebuild8
-rw-r--r--acct-group/etcd/etcd-0-r2.ebuild8
-rw-r--r--acct-group/exabgp/Manifest2
-rw-r--r--acct-group/exabgp/exabgp-0-r1.ebuild8
-rw-r--r--acct-group/exabgp/exabgp-0-r2.ebuild8
-rw-r--r--acct-group/ez-ipupd/Manifest2
-rw-r--r--acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild10
-rw-r--r--acct-group/ez-ipupd/ez-ipupd-0.ebuild10
-rw-r--r--acct-group/fax/Manifest2
-rw-r--r--acct-group/fax/fax-0-r1.ebuild10
-rw-r--r--acct-group/fax/fax-0.ebuild10
-rw-r--r--acct-group/fcron/Manifest2
-rw-r--r--acct-group/fcron/fcron-0-r1.ebuild10
-rw-r--r--acct-group/fcron/fcron-0.ebuild10
-rw-r--r--acct-group/fdm/Manifest2
-rw-r--r--acct-group/fdm/fdm-0-r1.ebuild10
-rw-r--r--acct-group/fdm/fdm-0.ebuild10
-rw-r--r--acct-group/fetchmail/Manifest2
-rw-r--r--acct-group/fetchmail/fetchmail-0-r1.ebuild9
-rw-r--r--acct-group/fetchmail/fetchmail-0-r2.ebuild9
-rw-r--r--acct-group/fhem/Manifest2
-rw-r--r--acct-group/fhem/fhem-0-r1.ebuild10
-rw-r--r--acct-group/fhem/fhem-0-r2.ebuild10
-rw-r--r--acct-group/fingerprint/Manifest2
-rw-r--r--acct-group/fingerprint/fingerprint-0-r1.ebuild8
-rw-r--r--acct-group/fingerprint/fingerprint-0-r2.ebuild8
-rw-r--r--acct-group/firebird/Manifest2
-rw-r--r--acct-group/firebird/firebird-0-r1.ebuild10
-rw-r--r--acct-group/firebird/firebird-0-r2.ebuild10
-rw-r--r--acct-group/flatpak/Manifest2
-rw-r--r--acct-group/flatpak/flatpak-0-r1.ebuild8
-rw-r--r--acct-group/flatpak/flatpak-0.ebuild8
-rw-r--r--acct-group/floppy/Manifest2
-rw-r--r--acct-group/floppy/floppy-0-r1.ebuild (renamed from acct-group/floppy/floppy-0.ebuild)0
-rw-r--r--acct-group/flows/Manifest2
-rw-r--r--acct-group/flows/flows-0-r1.ebuild10
-rw-r--r--acct-group/flows/flows-0.ebuild10
-rw-r--r--acct-group/fluentd/Manifest2
-rw-r--r--acct-group/fluentd/fluentd-0-r1.ebuild10
-rw-r--r--acct-group/fluentd/fluentd-0-r2.ebuild10
-rw-r--r--acct-group/foldingathome/Manifest2
-rw-r--r--acct-group/foldingathome/foldingathome-0-r1.ebuild10
-rw-r--r--acct-group/foldingathome/foldingathome-0.ebuild10
-rw-r--r--acct-group/fp-multiuser/Manifest2
-rw-r--r--acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild10
-rw-r--r--acct-group/fp-multiuser/fp-multiuser-0.ebuild10
-rw-r--r--acct-group/freenet/Manifest2
-rw-r--r--acct-group/freenet/freenet-0-r1.ebuild9
-rw-r--r--acct-group/freenet/freenet-0.ebuild9
-rw-r--r--acct-group/fritzbox_smarthome_exporter/Manifest2
-rw-r--r--acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild8
-rw-r--r--acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild8
-rw-r--r--acct-group/frr/Manifest2
-rw-r--r--acct-group/frr/frr-0-r1.ebuild8
-rw-r--r--acct-group/frr/frr-0.ebuild8
-rw-r--r--acct-group/ftp/Manifest2
-rw-r--r--acct-group/ftp/ftp-0-r1.ebuild9
-rw-r--r--acct-group/ftp/ftp-0-r2.ebuild9
-rw-r--r--acct-group/ftpproxy/Manifest2
-rw-r--r--acct-group/ftpproxy/ftpproxy-0-r1.ebuild10
-rw-r--r--acct-group/ftpproxy/ftpproxy-0.ebuild10
-rw-r--r--acct-group/fvwm-crystal/Manifest2
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild8
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild8
-rw-r--r--acct-group/gamemode/Manifest2
-rw-r--r--acct-group/gamemode/gamemode-0-r1.ebuild9
-rw-r--r--acct-group/gamemode/gamemode-0.ebuild9
-rw-r--r--acct-group/gamestat/Manifest2
-rw-r--r--acct-group/gamestat/gamestat-0-r1.ebuild9
-rw-r--r--acct-group/gamestat/gamestat-0-r2.ebuild9
-rw-r--r--acct-group/gatling/Manifest2
-rw-r--r--acct-group/gatling/gatling-0-r1.ebuild8
-rw-r--r--acct-group/gatling/gatling-0-r2.ebuild8
-rw-r--r--acct-group/gauth/Manifest2
-rw-r--r--acct-group/gauth/gauth-0-r1.ebuild10
-rw-r--r--acct-group/gauth/gauth-0.ebuild10
-rw-r--r--acct-group/gdm/Manifest2
-rw-r--r--acct-group/gdm/gdm-0-r1.ebuild8
-rw-r--r--acct-group/gdm/gdm-0.ebuild8
-rw-r--r--acct-group/geneweb/Manifest2
-rw-r--r--acct-group/geneweb/geneweb-0-r1.ebuild10
-rw-r--r--acct-group/geneweb/geneweb-0-r2.ebuild10
-rw-r--r--acct-group/geoclue/Manifest2
-rw-r--r--acct-group/geoclue/geoclue-0-r1.ebuild8
-rw-r--r--acct-group/geoclue/geoclue-0.ebuild8
-rw-r--r--acct-group/gerbera/Manifest2
-rw-r--r--acct-group/gerbera/gerbera-0-r1.ebuild9
-rw-r--r--acct-group/gerbera/gerbera-0-r2.ebuild9
-rw-r--r--acct-group/git/Manifest2
-rw-r--r--acct-group/git/git-0-r1.ebuild8
-rw-r--r--acct-group/git/git-0-r2.ebuild8
-rw-r--r--acct-group/github-exporter/Manifest2
-rw-r--r--acct-group/github-exporter/github-exporter-0-r1.ebuild8
-rw-r--r--acct-group/github-exporter/github-exporter-0.ebuild8
-rw-r--r--acct-group/gitlab-runner/Manifest2
-rw-r--r--acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild8
-rw-r--r--acct-group/gitlab-runner/gitlab-runner-1.ebuild8
-rw-r--r--acct-group/gkrellmd/Manifest2
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r1.ebuild8
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r2.ebuild8
-rw-r--r--acct-group/glance/Manifest2
-rw-r--r--acct-group/glance/glance-0-r1.ebuild8
-rw-r--r--acct-group/glance/glance-0-r2.ebuild8
-rw-r--r--acct-group/gluster/Manifest2
-rw-r--r--acct-group/gluster/gluster-0-r1.ebuild8
-rw-r--r--acct-group/gluster/gluster-0-r2.ebuild8
-rw-r--r--acct-group/gns3/Manifest2
-rw-r--r--acct-group/gns3/gns3-0-r1.ebuild8
-rw-r--r--acct-group/gns3/gns3-0.ebuild8
-rw-r--r--acct-group/gnump3d/Manifest2
-rw-r--r--acct-group/gnump3d/gnump3d-0-r1.ebuild10
-rw-r--r--acct-group/gnump3d/gnump3d-0.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/Manifest2
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11/Manifest2
-rw-r--r--acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild10
-rw-r--r--acct-group/goaccess/Manifest2
-rw-r--r--acct-group/goaccess/goaccess-0-r1.ebuild8
-rw-r--r--acct-group/goaccess/goaccess-0.ebuild8
-rw-r--r--acct-group/gopher/Manifest2
-rw-r--r--acct-group/gopher/gopher-0-r1.ebuild8
-rw-r--r--acct-group/gopher/gopher-0.ebuild8
-rw-r--r--acct-group/gopherd/Manifest2
-rw-r--r--acct-group/gopherd/gopherd-0-r1.ebuild10
-rw-r--r--acct-group/gopherd/gopherd-0.ebuild10
-rw-r--r--acct-group/gpib/Manifest2
-rw-r--r--acct-group/gpib/gpib-0-r1.ebuild8
-rw-r--r--acct-group/gpib/gpib-0-r2.ebuild8
-rw-r--r--acct-group/gpio/Manifest2
-rw-r--r--acct-group/gpio/gpio-0-r1.ebuild8
-rw-r--r--acct-group/gpio/gpio-0.ebuild8
-rw-r--r--acct-group/grafana/Manifest2
-rw-r--r--acct-group/grafana/grafana-0-r1.ebuild10
-rw-r--r--acct-group/grafana/grafana-0-r2.ebuild10
-rw-r--r--acct-group/graylog/Manifest2
-rw-r--r--acct-group/graylog/graylog-0-r1.ebuild9
-rw-r--r--acct-group/graylog/graylog-0-r2.ebuild9
-rw-r--r--acct-group/greetd/Manifest2
-rw-r--r--acct-group/greetd/greetd-0-r1.ebuild9
-rw-r--r--acct-group/greetd/greetd-0-r2.ebuild9
-rw-r--r--acct-group/grok_exporter/Manifest2
-rw-r--r--acct-group/grok_exporter/grok_exporter-0-r1.ebuild10
-rw-r--r--acct-group/grok_exporter/grok_exporter-0.ebuild10
-rw-r--r--acct-group/groonga/Manifest2
-rw-r--r--acct-group/groonga/groonga-0-r1.ebuild10
-rw-r--r--acct-group/groonga/groonga-0.ebuild10
-rw-r--r--acct-group/gvm/Manifest2
-rw-r--r--acct-group/gvm/gvm-0-r1.ebuild9
-rw-r--r--acct-group/gvm/gvm-0-r2.ebuild9
-rw-r--r--acct-group/h2o/Manifest2
-rw-r--r--acct-group/h2o/h2o-0-r1.ebuild10
-rw-r--r--acct-group/h2o/h2o-0.ebuild10
-rw-r--r--acct-group/haclient/Manifest2
-rw-r--r--acct-group/haclient/haclient-0-r1.ebuild10
-rw-r--r--acct-group/haclient/haclient-0.ebuild10
-rw-r--r--acct-group/haproxy/Manifest2
-rw-r--r--acct-group/haproxy/haproxy-0-r1.ebuild8
-rw-r--r--acct-group/haproxy/haproxy-0-r2.ebuild8
-rw-r--r--acct-group/havp/Manifest2
-rw-r--r--acct-group/havp/havp-0-r2.ebuild (renamed from acct-group/havp/havp-0-r1.ebuild)0
-rw-r--r--acct-group/headscale/Manifest2
-rw-r--r--acct-group/headscale/headscale-0-r1.ebuild8
-rw-r--r--acct-group/headscale/headscale-0.ebuild8
-rw-r--r--acct-group/heat/Manifest2
-rw-r--r--acct-group/heat/heat-0-r1.ebuild8
-rw-r--r--acct-group/heat/heat-0-r2.ebuild8
-rw-r--r--acct-group/hsqldb/Manifest2
-rw-r--r--acct-group/hsqldb/hsqldb-0-r1.ebuild9
-rw-r--r--acct-group/hsqldb/hsqldb-0.ebuild9
-rw-r--r--acct-group/http/Manifest2
-rw-r--r--acct-group/http/http-0-r1.ebuild8
-rw-r--r--acct-group/http/http-0.ebuild8
-rw-r--r--acct-group/i2c/Manifest2
-rw-r--r--acct-group/i2c/i2c-0-r1.ebuild8
-rw-r--r--acct-group/i2c/i2c-0.ebuild8
-rw-r--r--acct-group/i2p/Manifest2
-rw-r--r--acct-group/i2p/i2p-0-r1.ebuild9
-rw-r--r--acct-group/i2p/i2p-0-r2.ebuild9
-rw-r--r--acct-group/i2pd/Manifest2
-rw-r--r--acct-group/i2pd/i2pd-0-r1.ebuild9
-rw-r--r--acct-group/i2pd/i2pd-0-r2.ebuild9
-rw-r--r--acct-group/icecast/Manifest2
-rw-r--r--acct-group/icecast/icecast-0-r1.ebuild10
-rw-r--r--acct-group/icecast/icecast-0.ebuild10
-rw-r--r--acct-group/icecream/Manifest2
-rw-r--r--acct-group/icecream/icecream-0-r1.ebuild10
-rw-r--r--acct-group/icecream/icecream-0.ebuild10
-rw-r--r--acct-group/ices/Manifest2
-rw-r--r--acct-group/ices/ices-0-r1.ebuild10
-rw-r--r--acct-group/ices/ices-0.ebuild10
-rw-r--r--acct-group/icinga/Manifest2
-rw-r--r--acct-group/icinga/icinga-0-r1.ebuild8
-rw-r--r--acct-group/icinga/icinga-0-r2.ebuild8
-rw-r--r--acct-group/icingacmd/Manifest2
-rw-r--r--acct-group/icingacmd/icingacmd-0-r1.ebuild8
-rw-r--r--acct-group/icingacmd/icingacmd-0-r2.ebuild8
-rw-r--r--acct-group/icingaweb2/Manifest2
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r1.ebuild8
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r2.ebuild8
-rw-r--r--acct-group/inadyn/Manifest2
-rw-r--r--acct-group/inadyn/inadyn-0-r1.ebuild (renamed from acct-group/inadyn/inadyn-0.ebuild)0
-rw-r--r--acct-group/influxdb/Manifest2
-rw-r--r--acct-group/influxdb/influxdb-0-r1.ebuild8
-rw-r--r--acct-group/influxdb/influxdb-0-r2.ebuild8
-rw-r--r--acct-group/input/Manifest2
-rw-r--r--acct-group/input/input-0-r1.ebuild8
-rw-r--r--acct-group/input/input-0-r2.ebuild8
-rw-r--r--acct-group/inspircd/Manifest2
-rw-r--r--acct-group/inspircd/inspircd-0-r1.ebuild9
-rw-r--r--acct-group/inspircd/inspircd-0-r2.ebuild9
-rw-r--r--acct-group/ipfs/Manifest2
-rw-r--r--acct-group/ipfs/ipfs-0-r1.ebuild9
-rw-r--r--acct-group/ipfs/ipfs-0-r2.ebuild9
-rw-r--r--acct-group/ipsec/Manifest2
-rw-r--r--acct-group/ipsec/ipsec-0-r1.ebuild10
-rw-r--r--acct-group/ipsec/ipsec-0.ebuild10
-rw-r--r--acct-group/ipsentinel/Manifest2
-rw-r--r--acct-group/ipsentinel/ipsentinel-0-r1.ebuild10
-rw-r--r--acct-group/ipsentinel/ipsentinel-0.ebuild10
-rw-r--r--acct-group/iroffer/Manifest2
-rw-r--r--acct-group/iroffer/iroffer-0-r1.ebuild8
-rw-r--r--acct-group/iroffer/iroffer-0.ebuild8
-rw-r--r--acct-group/jellyfin/Manifest2
-rw-r--r--acct-group/jellyfin/jellyfin-0-r1.ebuild8
-rw-r--r--acct-group/jellyfin/jellyfin-0.ebuild8
-rw-r--r--acct-group/jenkins/Manifest2
-rw-r--r--acct-group/jenkins/jenkins-0-r1.ebuild10
-rw-r--r--acct-group/jenkins/jenkins-0.ebuild10
-rw-r--r--acct-group/kafka/Manifest2
-rw-r--r--acct-group/kafka/kafka-0-r1.ebuild8
-rw-r--r--acct-group/kafka/kafka-0-r2.ebuild8
-rw-r--r--acct-group/kapacitor/Manifest2
-rw-r--r--acct-group/kapacitor/kapacitor-0-r1.ebuild8
-rw-r--r--acct-group/kapacitor/kapacitor-0-r2.ebuild8
-rw-r--r--acct-group/karma/Manifest2
-rw-r--r--acct-group/karma/karma-0-r1.ebuild10
-rw-r--r--acct-group/karma/karma-0.ebuild10
-rw-r--r--acct-group/keystone/Manifest2
-rw-r--r--acct-group/keystone/keystone-0-r1.ebuild8
-rw-r--r--acct-group/keystone/keystone-0-r2.ebuild8
-rw-r--r--acct-group/kibana/Manifest2
-rw-r--r--acct-group/kibana/kibana-0-r1.ebuild9
-rw-r--r--acct-group/kibana/kibana-0-r2.ebuild9
-rw-r--r--acct-group/kismet/Manifest2
-rw-r--r--acct-group/kismet/kismet-0-r1.ebuild9
-rw-r--r--acct-group/kismet/kismet-0-r2.ebuild9
-rw-r--r--acct-group/kmem/Manifest2
-rw-r--r--acct-group/kmem/kmem-0-r1.ebuild8
-rw-r--r--acct-group/kmem/kmem-0-r2.ebuild8
-rw-r--r--acct-group/knot-resolver/Manifest2
-rw-r--r--acct-group/knot-resolver/knot-resolver-0-r1.ebuild8
-rw-r--r--acct-group/knot-resolver/knot-resolver-0.ebuild8
-rw-r--r--acct-group/knot/Manifest2
-rw-r--r--acct-group/knot/knot-0-r1.ebuild8
-rw-r--r--acct-group/knot/knot-0-r2.ebuild8
-rw-r--r--acct-group/kube-apiserver/Manifest2
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild8
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild8
-rw-r--r--acct-group/kube-controller-manager/Manifest2
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild8
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild8
-rw-r--r--acct-group/kube-scheduler/Manifest2
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild8
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild8
-rw-r--r--acct-group/kvm/Manifest2
-rw-r--r--acct-group/kvm/kvm-0-r1.ebuild8
-rw-r--r--acct-group/kvm/kvm-0-r2.ebuild8
-rw-r--r--acct-group/ldap/Manifest2
-rw-r--r--acct-group/ldap/ldap-0-r1.ebuild8
-rw-r--r--acct-group/ldap/ldap-0.ebuild8
-rw-r--r--acct-group/libreoffice/Manifest2
-rw-r--r--acct-group/libreoffice/libreoffice-0-r1.ebuild8
-rw-r--r--acct-group/libreoffice/libreoffice-0.ebuild8
-rw-r--r--acct-group/libvirt/Manifest2
-rw-r--r--acct-group/libvirt/libvirt-0-r1.ebuild8
-rw-r--r--acct-group/libvirt/libvirt-0-r2.ebuild8
-rw-r--r--acct-group/lightdm/Manifest2
-rw-r--r--acct-group/lightdm/lightdm-0-r1.ebuild10
-rw-r--r--acct-group/lightdm/lightdm-0-r2.ebuild10
-rw-r--r--acct-group/lighttpd/Manifest2
-rw-r--r--acct-group/lighttpd/lighttpd-0-r1.ebuild8
-rw-r--r--acct-group/lighttpd/lighttpd-0-r2.ebuild8
-rw-r--r--acct-group/litecoin/Manifest2
-rw-r--r--acct-group/litecoin/litecoin-0-r1.ebuild10
-rw-r--r--acct-group/litecoin/litecoin-0.ebuild10
-rw-r--r--acct-group/lldpd/Manifest2
-rw-r--r--acct-group/lldpd/lldpd-0-r1.ebuild8
-rw-r--r--acct-group/lldpd/lldpd-0-r2.ebuild8
-rw-r--r--acct-group/locate/Manifest2
-rw-r--r--acct-group/locate/locate-0-r1.ebuild8
-rw-r--r--acct-group/locate/locate-0-r2.ebuild8
-rw-r--r--acct-group/logcheck/Manifest2
-rw-r--r--acct-group/logcheck/logcheck-0-r1.ebuild10
-rw-r--r--acct-group/logcheck/logcheck-0.ebuild10
-rw-r--r--acct-group/logstash/Manifest2
-rw-r--r--acct-group/logstash/logstash-0-r1.ebuild9
-rw-r--r--acct-group/logstash/logstash-0-r2.ebuild9
-rw-r--r--acct-group/logsurfer/Manifest2
-rw-r--r--acct-group/logsurfer/logsurfer-0-r1.ebuild10
-rw-r--r--acct-group/logsurfer/logsurfer-0.ebuild10
-rw-r--r--acct-group/lp/Manifest2
-rw-r--r--acct-group/lp/lp-0-r1.ebuild8
-rw-r--r--acct-group/lp/lp-0-r2.ebuild8
-rw-r--r--acct-group/lpadmin/Manifest2
-rw-r--r--acct-group/lpadmin/lpadmin-0-r1.ebuild8
-rw-r--r--acct-group/lpadmin/lpadmin-0-r2.ebuild8
-rw-r--r--acct-group/lxc/Manifest2
-rw-r--r--acct-group/lxc/lxc-0-r1.ebuild9
-rw-r--r--acct-group/lxc/lxc-0.ebuild9
-rw-r--r--acct-group/lxd/Manifest2
-rw-r--r--acct-group/lxd/lxd-0-r1.ebuild9
-rw-r--r--acct-group/lxd/lxd-0-r2.ebuild9
-rw-r--r--acct-group/mail/Manifest2
-rw-r--r--acct-group/mail/mail-0-r1.ebuild9
-rw-r--r--acct-group/mail/mail-0-r2.ebuild9
-rw-r--r--acct-group/man/Manifest2
-rw-r--r--acct-group/man/man-0-r1.ebuild8
-rw-r--r--acct-group/man/man-0-r2.ebuild8
-rw-r--r--acct-group/maradns/Manifest2
-rw-r--r--acct-group/maradns/maradns-0-r1.ebuild8
-rw-r--r--acct-group/maradns/maradns-0-r2.ebuild8
-rw-r--r--acct-group/memcached/Manifest2
-rw-r--r--acct-group/memcached/memcached-0-r1.ebuild8
-rw-r--r--acct-group/memcached/memcached-0-r2.ebuild8
-rw-r--r--acct-group/memcached_exporter/Manifest2
-rw-r--r--acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild8
-rw-r--r--acct-group/memcached_exporter/memcached_exporter-0.ebuild8
-rw-r--r--acct-group/messagebus/Manifest2
-rw-r--r--acct-group/messagebus/messagebus-0-r1.ebuild8
-rw-r--r--acct-group/messagebus/messagebus-0-r2.ebuild8
-rw-r--r--acct-group/mgraph/Manifest2
-rw-r--r--acct-group/mgraph/mgraph-0-r1.ebuild9
-rw-r--r--acct-group/mgraph/mgraph-0.ebuild9
-rw-r--r--acct-group/milter-regex/Manifest2
-rw-r--r--acct-group/milter-regex/milter-regex-0-r1.ebuild9
-rw-r--r--acct-group/milter-regex/milter-regex-0-r2.ebuild9
-rw-r--r--acct-group/minbif/Manifest2
-rw-r--r--acct-group/minbif/minbif-0-r1.ebuild10
-rw-r--r--acct-group/minbif/minbif-0.ebuild10
-rw-r--r--acct-group/minecraft/Manifest2
-rw-r--r--acct-group/minecraft/minecraft-0-r1.ebuild10
-rw-r--r--acct-group/minecraft/minecraft-0-r2.ebuild10
-rw-r--r--acct-group/minetest/Manifest2
-rw-r--r--acct-group/minetest/minetest-0-r1.ebuild10
-rw-r--r--acct-group/minetest/minetest-0-r2.ebuild10
-rw-r--r--acct-group/minidlna/Manifest2
-rw-r--r--acct-group/minidlna/minidlna-0-r1.ebuild8
-rw-r--r--acct-group/minidlna/minidlna-0.ebuild8
-rw-r--r--acct-group/minio/Manifest2
-rw-r--r--acct-group/minio/minio-0-r1.ebuild8
-rw-r--r--acct-group/minio/minio-0.ebuild8
-rw-r--r--acct-group/mogile/Manifest2
-rw-r--r--acct-group/mogile/mogile-0-r1.ebuild9
-rw-r--r--acct-group/mogile/mogile-0.ebuild9
-rw-r--r--acct-group/mongodb/Manifest2
-rw-r--r--acct-group/mongodb/mongodb-0-r1.ebuild9
-rw-r--r--acct-group/mongodb/mongodb-0-r2.ebuild9
-rw-r--r--acct-group/mongodb_exporter/Manifest2
-rw-r--r--acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild8
-rw-r--r--acct-group/mongodb_exporter/mongodb_exporter-0.ebuild8
-rw-r--r--acct-group/monitorix/Manifest2
-rw-r--r--acct-group/monitorix/monitorix-0-r1.ebuild9
-rw-r--r--acct-group/monitorix/monitorix-0-r2.ebuild9
-rw-r--r--acct-group/monkeyd/Manifest2
-rw-r--r--acct-group/monkeyd/monkeyd-0-r1.ebuild10
-rw-r--r--acct-group/monkeyd/monkeyd-0.ebuild10
-rw-r--r--acct-group/monkeysphere/Manifest2
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r1.ebuild10
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r2.ebuild10
-rw-r--r--acct-group/mosquitto/Manifest2
-rw-r--r--acct-group/mosquitto/mosquitto-0-r1.ebuild9
-rw-r--r--acct-group/mosquitto/mosquitto-0-r2.ebuild9
-rw-r--r--acct-group/motion/Manifest2
-rw-r--r--acct-group/motion/motion-0-r1.ebuild8
-rw-r--r--acct-group/motion/motion-0-r2.ebuild8
-rw-r--r--acct-group/msmtpd/Manifest2
-rw-r--r--acct-group/msmtpd/msmtpd-0-r1.ebuild8
-rw-r--r--acct-group/msmtpd/msmtpd-0-r2.ebuild8
-rw-r--r--acct-group/munge/Manifest2
-rw-r--r--acct-group/munge/munge-0-r1.ebuild10
-rw-r--r--acct-group/munge/munge-0.ebuild10
-rw-r--r--acct-group/munin/Manifest2
-rw-r--r--acct-group/munin/munin-0-r1.ebuild8
-rw-r--r--acct-group/munin/munin-0-r2.ebuild8
-rw-r--r--acct-group/murmur/Manifest2
-rw-r--r--acct-group/murmur/murmur-0-r1.ebuild8
-rw-r--r--acct-group/murmur/murmur-0-r2.ebuild8
-rw-r--r--acct-group/mysql/Manifest2
-rw-r--r--acct-group/mysql/mysql-0-r1.ebuild10
-rw-r--r--acct-group/mysql/mysql-0-r2.ebuild10
-rw-r--r--acct-group/mysqld_exporter/Manifest2
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild8
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild8
-rw-r--r--acct-group/mythtv/Manifest2
-rw-r--r--acct-group/mythtv/mythtv-0-r1.ebuild10
-rw-r--r--acct-group/mythtv/mythtv-0-r2.ebuild10
-rw-r--r--acct-group/nagios/Manifest2
-rw-r--r--acct-group/nagios/nagios-0-r1.ebuild8
-rw-r--r--acct-group/nagios/nagios-0-r2.ebuild8
-rw-r--r--acct-group/named/Manifest2
-rw-r--r--acct-group/named/named-0-r1.ebuild8
-rw-r--r--acct-group/named/named-0-r2.ebuild8
-rw-r--r--acct-group/netbox/Manifest2
-rw-r--r--acct-group/netbox/netbox-0-r1.ebuild8
-rw-r--r--acct-group/netbox/netbox-0-r2.ebuild8
-rw-r--r--acct-group/netdata/Manifest2
-rw-r--r--acct-group/netdata/netdata-0-r1.ebuild8
-rw-r--r--acct-group/netdata/netdata-0-r2.ebuild8
-rw-r--r--acct-group/netdev/Manifest2
-rw-r--r--acct-group/netdev/netdev-0-r1.ebuild9
-rw-r--r--acct-group/netdev/netdev-0-r2.ebuild9
-rw-r--r--acct-group/netperf/Manifest2
-rw-r--r--acct-group/netperf/netperf-0-r1.ebuild10
-rw-r--r--acct-group/netperf/netperf-0.ebuild10
-rw-r--r--acct-group/neutron/Manifest2
-rw-r--r--acct-group/neutron/neutron-0-r1.ebuild8
-rw-r--r--acct-group/neutron/neutron-0-r2.ebuild8
-rw-r--r--acct-group/nginx-unit/Manifest2
-rw-r--r--acct-group/nginx-unit/nginx-unit-0-r1.ebuild (renamed from acct-group/nginx-unit/nginx-unit-0.ebuild)0
-rw-r--r--acct-group/nginx-vts-exporter/Manifest2
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild8
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild8
-rw-r--r--acct-group/nginx/Manifest2
-rw-r--r--acct-group/nginx/nginx-0-r1.ebuild10
-rw-r--r--acct-group/nginx/nginx-0-r2.ebuild10
-rw-r--r--acct-group/ngircd/Manifest2
-rw-r--r--acct-group/ngircd/ngircd-0-r1.ebuild9
-rw-r--r--acct-group/ngircd/ngircd-0-r2.ebuild9
-rw-r--r--acct-group/ngrep/Manifest2
-rw-r--r--acct-group/ngrep/ngrep-0-r1.ebuild10
-rw-r--r--acct-group/ngrep/ngrep-0-r2.ebuild10
-rw-r--r--acct-group/nm-openconnect/Manifest2
-rw-r--r--acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild10
-rw-r--r--acct-group/nm-openconnect/nm-openconnect-0.ebuild10
-rw-r--r--acct-group/nm-openvpn/Manifest2
-rw-r--r--acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild10
-rw-r--r--acct-group/nm-openvpn/nm-openvpn-0.ebuild10
-rw-r--r--acct-group/nobody/Manifest2
-rw-r--r--acct-group/nobody/nobody-0-r1.ebuild9
-rw-r--r--acct-group/nobody/nobody-0.ebuild9
-rw-r--r--acct-group/node_exporter/Manifest2
-rw-r--r--acct-group/node_exporter/node_exporter-0-r1.ebuild8
-rw-r--r--acct-group/node_exporter/node_exporter-0-r2.ebuild8
-rw-r--r--acct-group/nofiles/Manifest2
-rw-r--r--acct-group/nofiles/nofiles-0-r1.ebuild8
-rw-r--r--acct-group/nofiles/nofiles-0-r2.ebuild8
-rw-r--r--acct-group/notary/Manifest2
-rw-r--r--acct-group/notary/notary-0-r1.ebuild10
-rw-r--r--acct-group/notary/notary-0.ebuild10
-rw-r--r--acct-group/nova/Manifest2
-rw-r--r--acct-group/nova/nova-0-r1.ebuild8
-rw-r--r--acct-group/nova/nova-0-r2.ebuild8
-rw-r--r--acct-group/nsd/Manifest2
-rw-r--r--acct-group/nsd/nsd-0-r1.ebuild8
-rw-r--r--acct-group/nsd/nsd-0-r2.ebuild8
-rw-r--r--acct-group/nslcd/Manifest2
-rw-r--r--acct-group/nslcd/nslcd-0-r1.ebuild8
-rw-r--r--acct-group/nslcd/nslcd-0-r2.ebuild8
-rw-r--r--acct-group/ntopng/Manifest2
-rw-r--r--acct-group/ntopng/ntopng-0-r1.ebuild8
-rw-r--r--acct-group/ntopng/ntopng-0.ebuild8
-rw-r--r--acct-group/ntp/Manifest2
-rw-r--r--acct-group/ntp/ntp-0-r1.ebuild8
-rw-r--r--acct-group/ntp/ntp-0-r2.ebuild8
-rw-r--r--acct-group/nullmail/Manifest2
-rw-r--r--acct-group/nullmail/nullmail-0-r1.ebuild10
-rw-r--r--acct-group/nullmail/nullmail-0.ebuild10
-rw-r--r--acct-group/nut/Manifest2
-rw-r--r--acct-group/nut/nut-0-r1.ebuild10
-rw-r--r--acct-group/nut/nut-0.ebuild10
-rw-r--r--acct-group/nzbget/Manifest2
-rw-r--r--acct-group/nzbget/nzbget-0-r1.ebuild9
-rw-r--r--acct-group/nzbget/nzbget-0.ebuild9
-rw-r--r--acct-group/oidentd/Manifest2
-rw-r--r--acct-group/oidentd/oidentd-0-r1.ebuild8
-rw-r--r--acct-group/oidentd/oidentd-0-r2.ebuild8
-rw-r--r--acct-group/openct/Manifest2
-rw-r--r--acct-group/openct/openct-0-r1.ebuild8
-rw-r--r--acct-group/openct/openct-0-r2.ebuild8
-rw-r--r--acct-group/opendkim/Manifest2
-rw-r--r--acct-group/opendkim/opendkim-0-r1.ebuild9
-rw-r--r--acct-group/opendkim/opendkim-0-r2.ebuild9
-rw-r--r--acct-group/opendmarc/Manifest2
-rw-r--r--acct-group/opendmarc/opendmarc-1-r1.ebuild9
-rw-r--r--acct-group/opendmarc/opendmarc-1.ebuild9
-rw-r--r--acct-group/opendnssec/Manifest2
-rw-r--r--acct-group/opendnssec/opendnssec-0-r1.ebuild10
-rw-r--r--acct-group/opendnssec/opendnssec-0.ebuild10
-rw-r--r--acct-group/openntpd/Manifest2
-rw-r--r--acct-group/openntpd/openntpd-0-r1.ebuild8
-rw-r--r--acct-group/openntpd/openntpd-0-r2.ebuild8
-rw-r--r--acct-group/openrct2/Manifest2
-rw-r--r--acct-group/openrct2/openrct2-0-r1.ebuild10
-rw-r--r--acct-group/openrct2/openrct2-0-r2.ebuild10
-rw-r--r--acct-group/openttd/Manifest2
-rw-r--r--acct-group/openttd/openttd-0-r1.ebuild10
-rw-r--r--acct-group/openttd/openttd-0.ebuild10
-rw-r--r--acct-group/openvpn/Manifest2
-rw-r--r--acct-group/openvpn/openvpn-0-r1.ebuild8
-rw-r--r--acct-group/openvpn/openvpn-0-r2.ebuild8
-rw-r--r--acct-group/openvpn_exporter/Manifest2
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild8
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild8
-rw-r--r--acct-group/opm/Manifest2
-rw-r--r--acct-group/opm/opm-0-r1.ebuild9
-rw-r--r--acct-group/opm/opm-0.ebuild9
-rw-r--r--acct-group/oprofile/Manifest2
-rw-r--r--acct-group/oprofile/oprofile-0-r1.ebuild9
-rw-r--r--acct-group/oprofile/oprofile-0-r2.ebuild9
-rw-r--r--acct-group/oragono/Manifest2
-rw-r--r--acct-group/oragono/oragono-0-r1.ebuild9
-rw-r--r--acct-group/oragono/oragono-0.ebuild9
-rw-r--r--acct-group/ossec/Manifest2
-rw-r--r--acct-group/ossec/ossec-0-r1.ebuild9
-rw-r--r--acct-group/ossec/ossec-0-r2.ebuild9
-rw-r--r--acct-group/owntracks/Manifest2
-rw-r--r--acct-group/owntracks/owntracks-0-r1.ebuild9
-rw-r--r--acct-group/owntracks/owntracks-0.ebuild9
-rw-r--r--acct-group/p2p/Manifest2
-rw-r--r--acct-group/p2p/p2p-0-r1.ebuild9
-rw-r--r--acct-group/p2p/p2p-0.ebuild9
-rw-r--r--acct-group/partimag/Manifest2
-rw-r--r--acct-group/partimag/partimag-0-r1.ebuild10
-rw-r--r--acct-group/partimag/partimag-0-r2.ebuild10
-rw-r--r--acct-group/pcap/Manifest2
-rw-r--r--acct-group/pcap/pcap-0-r1.ebuild9
-rw-r--r--acct-group/pcap/pcap-0.ebuild9
-rw-r--r--acct-group/pcscd/Manifest2
-rw-r--r--acct-group/pcscd/pcscd-0-r1.ebuild8
-rw-r--r--acct-group/pcscd/pcscd-0-r2.ebuild8
-rw-r--r--acct-group/pdns/Manifest2
-rw-r--r--acct-group/pdns/pdns-0-r1.ebuild8
-rw-r--r--acct-group/pdns/pdns-0-r2.ebuild8
-rw-r--r--acct-group/pdnsd/Manifest2
-rw-r--r--acct-group/pdnsd/pdnsd-0-r1.ebuild8
-rw-r--r--acct-group/pdnsd/pdnsd-0-r2.ebuild8
-rw-r--r--acct-group/pgagent/Manifest2
-rw-r--r--acct-group/pgagent/pgagent-0-r1.ebuild10
-rw-r--r--acct-group/pgagent/pgagent-0.ebuild10
-rw-r--r--acct-group/pipewire/Manifest2
-rw-r--r--acct-group/pipewire/pipewire-0-r1.ebuild8
-rw-r--r--acct-group/pipewire/pipewire-0.ebuild8
-rw-r--r--acct-group/pkcs11/Manifest2
-rw-r--r--acct-group/pkcs11/pkcs11-0-r1.ebuild10
-rw-r--r--acct-group/pkcs11/pkcs11-0.ebuild10
-rw-r--r--acct-group/placement/Manifest2
-rw-r--r--acct-group/placement/placement-0-r1.ebuild8
-rw-r--r--acct-group/placement/placement-0-r2.ebuild8
-rw-r--r--acct-group/plex/Manifest2
-rw-r--r--acct-group/plex/plex-0-r1.ebuild9
-rw-r--r--acct-group/plex/plex-0-r2.ebuild9
-rw-r--r--acct-group/plugdev/Manifest2
-rw-r--r--acct-group/plugdev/plugdev-0-r1.ebuild9
-rw-r--r--acct-group/plugdev/plugdev-0-r2.ebuild9
-rw-r--r--acct-group/polkitd/Manifest2
-rw-r--r--acct-group/polkitd/polkitd-0-r1.ebuild8
-rw-r--r--acct-group/polkitd/polkitd-0-r2.ebuild8
-rw-r--r--acct-group/polw/Manifest2
-rw-r--r--acct-group/polw/polw-0-r1.ebuild10
-rw-r--r--acct-group/polw/polw-0.ebuild10
-rw-r--r--acct-group/popa3d/Manifest2
-rw-r--r--acct-group/popa3d/popa3d-0-r1.ebuild9
-rw-r--r--acct-group/popa3d/popa3d-0.ebuild9
-rw-r--r--acct-group/portage/Manifest2
-rw-r--r--acct-group/portage/portage-0-r1.ebuild8
-rw-r--r--acct-group/portage/portage-0.ebuild8
-rw-r--r--acct-group/postdrop/Manifest2
-rw-r--r--acct-group/postdrop/postdrop-0-r1.ebuild8
-rw-r--r--acct-group/postdrop/postdrop-0-r2.ebuild8
-rw-r--r--acct-group/postfix/Manifest2
-rw-r--r--acct-group/postfix/postfix-0-r1.ebuild8
-rw-r--r--acct-group/postfix/postfix-0-r2.ebuild8
-rw-r--r--acct-group/postfix_exporter/Manifest2
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild8
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild8
-rw-r--r--acct-group/postfwd/Manifest2
-rw-r--r--acct-group/postfwd/postfwd-0-r1.ebuild10
-rw-r--r--acct-group/postfwd/postfwd-0.ebuild10
-rw-r--r--acct-group/postgres/Manifest2
-rw-r--r--acct-group/postgres/postgres-0-r1.ebuild10
-rw-r--r--acct-group/postgres/postgres-0-r2.ebuild10
-rw-r--r--acct-group/postgres_exporter/Manifest2
-rw-r--r--acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild8
-rw-r--r--acct-group/postgres_exporter/postgres_exporter-0.ebuild8
-rw-r--r--acct-group/postgrey/Manifest2
-rw-r--r--acct-group/postgrey/postgrey-0-r1.ebuild9
-rw-r--r--acct-group/postgrey/postgrey-0.ebuild9
-rw-r--r--acct-group/privoxy/Manifest2
-rw-r--r--acct-group/privoxy/privoxy-0-r1.ebuild9
-rw-r--r--acct-group/privoxy/privoxy-0-r2.ebuild9
-rw-r--r--acct-group/prometheus/Manifest2
-rw-r--r--acct-group/prometheus/prometheus-0-r1.ebuild8
-rw-r--r--acct-group/prometheus/prometheus-0-r2.ebuild8
-rw-r--r--acct-group/prosody/Manifest2
-rw-r--r--acct-group/prosody/prosody-0-r1.ebuild10
-rw-r--r--acct-group/prosody/prosody-0.ebuild10
-rw-r--r--acct-group/prowlarr/Manifest2
-rw-r--r--acct-group/prowlarr/prowlarr-0-r1.ebuild8
-rw-r--r--acct-group/prowlarr/prowlarr-0.ebuild8
-rw-r--r--acct-group/psybnc/Manifest2
-rw-r--r--acct-group/psybnc/psybnc-0-r1.ebuild10
-rw-r--r--acct-group/psybnc/psybnc-0.ebuild10
-rw-r--r--acct-group/pulse-access/Manifest2
-rw-r--r--acct-group/pulse-access/pulse-access-0-r1.ebuild8
-rw-r--r--acct-group/pulse-access/pulse-access-0.ebuild8
-rw-r--r--acct-group/pulse/Manifest2
-rw-r--r--acct-group/pulse/pulse-0-r1.ebuild8
-rw-r--r--acct-group/pulse/pulse-0.ebuild8
-rw-r--r--acct-group/puppet/Manifest2
-rw-r--r--acct-group/puppet/puppet-0-r1.ebuild8
-rw-r--r--acct-group/puppet/puppet-0-r2.ebuild8
-rw-r--r--acct-group/puppetdb/Manifest2
-rw-r--r--acct-group/puppetdb/puppetdb-0-r1.ebuild8
-rw-r--r--acct-group/puppetdb/puppetdb-0-r2.ebuild8
-rw-r--r--acct-group/pushgateway/Manifest2
-rw-r--r--acct-group/pushgateway/pushgateway-0-r1.ebuild10
-rw-r--r--acct-group/pushgateway/pushgateway-0.ebuild10
-rw-r--r--acct-group/pvpgn/Manifest2
-rw-r--r--acct-group/pvpgn/pvpgn-0-r1.ebuild9
-rw-r--r--acct-group/pvpgn/pvpgn-0.ebuild9
-rw-r--r--acct-group/qemu/Manifest2
-rw-r--r--acct-group/qemu/qemu-0-r1.ebuild8
-rw-r--r--acct-group/qemu/qemu-0-r2.ebuild8
-rw-r--r--acct-group/qmail/Manifest2
-rw-r--r--acct-group/qmail/qmail-0-r1.ebuild8
-rw-r--r--acct-group/qmail/qmail-0-r2.ebuild8
-rw-r--r--acct-group/quagga/Manifest2
-rw-r--r--acct-group/quagga/quagga-0-r1.ebuild8
-rw-r--r--acct-group/quagga/quagga-0-r2.ebuild8
-rw-r--r--acct-group/quassel/Manifest2
-rw-r--r--acct-group/quassel/quassel-0-r1.ebuild8
-rw-r--r--acct-group/quassel/quassel-0-r2.ebuild8
-rw-r--r--acct-group/rabbitmq/Manifest2
-rw-r--r--acct-group/rabbitmq/rabbitmq-0-r1.ebuild10
-rw-r--r--acct-group/rabbitmq/rabbitmq-0.ebuild10
-rw-r--r--acct-group/rabbitmq_exporter/Manifest2
-rw-r--r--acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild10
-rw-r--r--acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild10
-rw-r--r--acct-group/radarr/Manifest2
-rw-r--r--acct-group/radarr/radarr-0-r1.ebuild8
-rw-r--r--acct-group/radarr/radarr-0.ebuild8
-rw-r--r--acct-group/radicale/Manifest2
-rw-r--r--acct-group/radicale/radicale-0-r1.ebuild9
-rw-r--r--acct-group/radicale/radicale-0-r2.ebuild9
-rw-r--r--acct-group/radius/Manifest2
-rw-r--r--acct-group/radius/radius-0-r1.ebuild9
-rw-r--r--acct-group/radius/radius-0-r2.ebuild9
-rw-r--r--acct-group/radvd/Manifest2
-rw-r--r--acct-group/radvd/radvd-0-r1.ebuild10
-rw-r--r--acct-group/radvd/radvd-0.ebuild10
-rw-r--r--acct-group/rbldns/Manifest2
-rw-r--r--acct-group/rbldns/rbldns-0-r1.ebuild8
-rw-r--r--acct-group/rbldns/rbldns-0-r2.ebuild8
-rw-r--r--acct-group/rbot/Manifest2
-rw-r--r--acct-group/rbot/rbot-0-r1.ebuild10
-rw-r--r--acct-group/rbot/rbot-0.ebuild10
-rw-r--r--acct-group/readarr/Manifest2
-rw-r--r--acct-group/readarr/readarr-0-r1.ebuild8
-rw-r--r--acct-group/readarr/readarr-0.ebuild8
-rw-r--r--acct-group/realtime/Manifest2
-rw-r--r--acct-group/realtime/realtime-0-r1.ebuild10
-rw-r--r--acct-group/realtime/realtime-0.ebuild10
-rw-r--r--acct-group/redis/Manifest2
-rw-r--r--acct-group/redis/redis-0-r1.ebuild9
-rw-r--r--acct-group/redis/redis-0-r2.ebuild9
-rw-r--r--acct-group/redis_exporter/Manifest2
-rw-r--r--acct-group/redis_exporter/redis_exporter-0-r1.ebuild8
-rw-r--r--acct-group/redis_exporter/redis_exporter-0.ebuild8
-rw-r--r--acct-group/redmine/Manifest2
-rw-r--r--acct-group/redmine/redmine-0-r1.ebuild8
-rw-r--r--acct-group/redmine/redmine-0-r2.ebuild8
-rw-r--r--acct-group/redsocks/Manifest2
-rw-r--r--acct-group/redsocks/redsocks-0-r1.ebuild10
-rw-r--r--acct-group/redsocks/redsocks-0-r2.ebuild10
-rw-r--r--acct-group/reg/Manifest2
-rw-r--r--acct-group/reg/reg-0-r1.ebuild10
-rw-r--r--acct-group/reg/reg-0-r2.ebuild10
-rw-r--r--acct-group/registry/Manifest2
-rw-r--r--acct-group/registry/registry-0-r1.ebuild10
-rw-r--r--acct-group/registry/registry-0.ebuild10
-rw-r--r--acct-group/render/Manifest2
-rw-r--r--acct-group/render/render-0-r1.ebuild8
-rw-r--r--acct-group/render/render-0-r2.ebuild8
-rw-r--r--acct-group/roccat/Manifest2
-rw-r--r--acct-group/roccat/roccat-0-r1.ebuild10
-rw-r--r--acct-group/roccat/roccat-0.ebuild10
-rw-r--r--acct-group/root/Manifest2
-rw-r--r--acct-group/root/root-0-r1.ebuild9
-rw-r--r--acct-group/root/root-0.ebuild9
-rw-r--r--acct-group/rplayd/Manifest2
-rw-r--r--acct-group/rplayd/rplayd-0-r1.ebuild10
-rw-r--r--acct-group/rplayd/rplayd-0.ebuild10
-rw-r--r--acct-group/rrdcached/Manifest2
-rw-r--r--acct-group/rrdcached/rrdcached-0-r1.ebuild8
-rw-r--r--acct-group/rrdcached/rrdcached-0.ebuild8
-rw-r--r--acct-group/rslsync/Manifest2
-rw-r--r--acct-group/rslsync/rslsync-0-r1.ebuild10
-rw-r--r--acct-group/rslsync/rslsync-0.ebuild10
-rw-r--r--acct-group/rspamd/Manifest2
-rw-r--r--acct-group/rspamd/rspamd-0-r1.ebuild9
-rw-r--r--acct-group/rspamd/rspamd-0-r2.ebuild9
-rw-r--r--acct-group/rstudio-server/Manifest2
-rw-r--r--acct-group/rstudio-server/rstudio-server-0-r1.ebuild9
-rw-r--r--acct-group/rstudio-server/rstudio-server-0-r2.ebuild9
-rw-r--r--acct-group/rt/Manifest2
-rw-r--r--acct-group/rt/rt-0-r1.ebuild10
-rw-r--r--acct-group/rt/rt-0-r2.ebuild10
-rw-r--r--acct-group/rtkit/Manifest2
-rw-r--r--acct-group/rtkit/rtkit-0-r1.ebuild9
-rw-r--r--acct-group/rtkit/rtkit-0-r2.ebuild9
-rw-r--r--acct-group/rundeck/Manifest2
-rw-r--r--acct-group/rundeck/rundeck-0-r1.ebuild10
-rw-r--r--acct-group/rundeck/rundeck-0.ebuild10
-rw-r--r--acct-group/rwhoisd/Manifest2
-rw-r--r--acct-group/rwhoisd/rwhoisd-0-r1.ebuild10
-rw-r--r--acct-group/rwhoisd/rwhoisd-0.ebuild10
-rw-r--r--acct-group/sabnzbd/Manifest2
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r1.ebuild10
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r2.ebuild10
-rw-r--r--acct-group/sagan/Manifest2
-rw-r--r--acct-group/sagan/sagan-0-r1.ebuild9
-rw-r--r--acct-group/sagan/sagan-0.ebuild9
-rw-r--r--acct-group/samplicator/Manifest2
-rw-r--r--acct-group/samplicator/samplicator-0-r1.ebuild10
-rw-r--r--acct-group/samplicator/samplicator-0.ebuild10
-rw-r--r--acct-group/sancp/Manifest2
-rw-r--r--acct-group/sancp/sancp-0-r1.ebuild10
-rw-r--r--acct-group/sancp/sancp-0.ebuild10
-rw-r--r--acct-group/sanlock/Manifest2
-rw-r--r--acct-group/sanlock/sanlock-0-r1.ebuild9
-rw-r--r--acct-group/sanlock/sanlock-0-r2.ebuild9
-rw-r--r--acct-group/sauerbraten/Manifest2
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r1.ebuild9
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r2.ebuild9
-rw-r--r--acct-group/scanlogd/Manifest2
-rw-r--r--acct-group/scanlogd/scanlogd-0-r1.ebuild10
-rw-r--r--acct-group/scanlogd/scanlogd-0.ebuild10
-rw-r--r--acct-group/scanner/Manifest2
-rw-r--r--acct-group/scanner/scanner-0-r1.ebuild10
-rw-r--r--acct-group/scanner/scanner-0.ebuild10
-rw-r--r--acct-group/scponly/Manifest2
-rw-r--r--acct-group/scponly/scponly-0-r1.ebuild9
-rw-r--r--acct-group/scponly/scponly-0-r2.ebuild9
-rw-r--r--acct-group/scsi/Manifest2
-rw-r--r--acct-group/scsi/scsi-0-r1.ebuild8
-rw-r--r--acct-group/scsi/scsi-0.ebuild8
-rw-r--r--acct-group/sddm/Manifest2
-rw-r--r--acct-group/sddm/sddm-0-r1.ebuild10
-rw-r--r--acct-group/sddm/sddm-0.ebuild10
-rw-r--r--acct-group/seat/Manifest2
-rw-r--r--acct-group/seat/seat-0-r1.ebuild9
-rw-r--r--acct-group/seat/seat-0.ebuild9
-rw-r--r--acct-group/serf/Manifest2
-rw-r--r--acct-group/serf/serf-0-r1.ebuild10
-rw-r--r--acct-group/serf/serf-0.ebuild10
-rw-r--r--acct-group/sguil/Manifest2
-rw-r--r--acct-group/sguil/sguil-0-r1.ebuild10
-rw-r--r--acct-group/sguil/sguil-0.ebuild10
-rw-r--r--acct-group/sgx/Manifest2
-rw-r--r--acct-group/sgx/sgx-0-r1.ebuild10
-rw-r--r--acct-group/sgx/sgx-0.ebuild10
-rw-r--r--acct-group/sigh/Manifest2
-rw-r--r--acct-group/sigh/sigh-0-r1.ebuild8
-rw-r--r--acct-group/sigh/sigh-0.ebuild8
-rw-r--r--acct-group/simplevirt/Manifest2
-rw-r--r--acct-group/simplevirt/simplevirt-0-r1.ebuild8
-rw-r--r--acct-group/simplevirt/simplevirt-0-r2.ebuild8
-rw-r--r--acct-group/sispmctl/Manifest2
-rw-r--r--acct-group/sispmctl/sispmctl-0-r1.ebuild10
-rw-r--r--acct-group/sispmctl/sispmctl-0.ebuild10
-rw-r--r--acct-group/sks/Manifest2
-rw-r--r--acct-group/sks/sks-0-r1.ebuild9
-rw-r--r--acct-group/sks/sks-0.ebuild9
-rw-r--r--acct-group/slurm/Manifest2
-rw-r--r--acct-group/slurm/slurm-0-r1.ebuild9
-rw-r--r--acct-group/slurm/slurm-0-r2.ebuild9
-rw-r--r--acct-group/smmsp/Manifest2
-rw-r--r--acct-group/smmsp/smmsp-0-r1.ebuild8
-rw-r--r--acct-group/smmsp/smmsp-0-r2.ebuild8
-rw-r--r--acct-group/smokeping/Manifest2
-rw-r--r--acct-group/smokeping/smokeping-0-r1.ebuild10
-rw-r--r--acct-group/smokeping/smokeping-0.ebuild10
-rw-r--r--acct-group/sms/Manifest2
-rw-r--r--acct-group/sms/sms-0-r1.ebuild8
-rw-r--r--acct-group/sms/sms-0.ebuild8
-rw-r--r--acct-group/smtpd/Manifest2
-rw-r--r--acct-group/smtpd/smtpd-0-r1.ebuild9
-rw-r--r--acct-group/smtpd/smtpd-0-r2.ebuild9
-rw-r--r--acct-group/smtpq/Manifest2
-rw-r--r--acct-group/smtpq/smtpq-0-r1.ebuild9
-rw-r--r--acct-group/smtpq/smtpq-0-r2.ebuild9
-rw-r--r--acct-group/snapserver/Manifest2
-rw-r--r--acct-group/snapserver/snapserver-0-r1.ebuild9
-rw-r--r--acct-group/snapserver/snapserver-0.ebuild9
-rw-r--r--acct-group/sniproxy/Manifest2
-rw-r--r--acct-group/sniproxy/sniproxy-0-r1.ebuild8
-rw-r--r--acct-group/sniproxy/sniproxy-0.ebuild8
-rw-r--r--acct-group/snmp_exporter/Manifest2
-rw-r--r--acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild10
-rw-r--r--acct-group/snmp_exporter/snmp_exporter-0.ebuild10
-rw-r--r--acct-group/snort/Manifest2
-rw-r--r--acct-group/snort/snort-0-r1.ebuild8
-rw-r--r--acct-group/snort/snort-0.ebuild8
-rw-r--r--acct-group/sobby/Manifest2
-rw-r--r--acct-group/sobby/sobby-0-r1.ebuild8
-rw-r--r--acct-group/sobby/sobby-0.ebuild8
-rw-r--r--acct-group/sobexsrv/Manifest2
-rw-r--r--acct-group/sobexsrv/sobexsrv-0-r1.ebuild9
-rw-r--r--acct-group/sobexsrv/sobexsrv-0.ebuild9
-rw-r--r--acct-group/sockd/Manifest2
-rw-r--r--acct-group/sockd/sockd-0-r1.ebuild10
-rw-r--r--acct-group/sockd/sockd-0.ebuild10
-rw-r--r--acct-group/sogo/Manifest2
-rw-r--r--acct-group/sogo/sogo-0-r1.ebuild9
-rw-r--r--acct-group/sogo/sogo-0-r2.ebuild9
-rw-r--r--acct-group/soju/Manifest2
-rw-r--r--acct-group/soju/soju-0-r1.ebuild9
-rw-r--r--acct-group/soju/soju-0.ebuild9
-rw-r--r--acct-group/sonarr/Manifest2
-rw-r--r--acct-group/sonarr/sonarr-0-r1.ebuild8
-rw-r--r--acct-group/sonarr/sonarr-0.ebuild8
-rw-r--r--acct-group/spamd/Manifest2
-rw-r--r--acct-group/spamd/spamd-0-r1.ebuild9
-rw-r--r--acct-group/spamd/spamd-0-r2.ebuild9
-rw-r--r--acct-group/spectrum/Manifest2
-rw-r--r--acct-group/spectrum/spectrum-0-r1.ebuild10
-rw-r--r--acct-group/spectrum/spectrum-0-r2.ebuild10
-rw-r--r--acct-group/spi/Manifest2
-rw-r--r--acct-group/spi/spi-0-r1.ebuild8
-rw-r--r--acct-group/spi/spi-0.ebuild8
-rw-r--r--acct-group/spire/Manifest2
-rw-r--r--acct-group/spire/spire-0-r1.ebuild8
-rw-r--r--acct-group/spire/spire-0-r2.ebuild8
-rw-r--r--acct-group/spread/Manifest2
-rw-r--r--acct-group/spread/spread-0-r1.ebuild10
-rw-r--r--acct-group/spread/spread-0.ebuild10
-rw-r--r--acct-group/sqlgrey/Manifest2
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r1.ebuild9
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r2.ebuild9
-rw-r--r--acct-group/squid/Manifest2
-rw-r--r--acct-group/squid/squid-0-r1.ebuild8
-rw-r--r--acct-group/squid/squid-0-r2.ebuild8
-rw-r--r--acct-group/sshd/Manifest2
-rw-r--r--acct-group/sshd/sshd-0-r1.ebuild8
-rw-r--r--acct-group/sshd/sshd-0-r2.ebuild8
-rw-r--r--acct-group/ssmtp/Manifest2
-rw-r--r--acct-group/ssmtp/ssmtp-0-r1.ebuild10
-rw-r--r--acct-group/ssmtp/ssmtp-0.ebuild10
-rw-r--r--acct-group/sstpc/Manifest2
-rw-r--r--acct-group/sstpc/sstpc-0-r1.ebuild10
-rw-r--r--acct-group/sstpc/sstpc-0.ebuild10
-rw-r--r--acct-group/stapdev/Manifest2
-rw-r--r--acct-group/stapdev/stapdev-0-r1.ebuild8
-rw-r--r--acct-group/stapdev/stapdev-0.ebuild8
-rw-r--r--acct-group/stapsys/Manifest2
-rw-r--r--acct-group/stapsys/stapsys-0-r1.ebuild8
-rw-r--r--acct-group/stapsys/stapsys-0.ebuild8
-rw-r--r--acct-group/stapusr/Manifest2
-rw-r--r--acct-group/stapusr/stapusr-0-r1.ebuild8
-rw-r--r--acct-group/stapusr/stapusr-0.ebuild8
-rw-r--r--acct-group/steamcmd/Manifest2
-rw-r--r--acct-group/steamcmd/steamcmd-0-r1.ebuild10
-rw-r--r--acct-group/steamcmd/steamcmd-0-r2.ebuild10
-rw-r--r--acct-group/stg/Manifest2
-rw-r--r--acct-group/stg/stg-0-r1.ebuild10
-rw-r--r--acct-group/stg/stg-0.ebuild10
-rw-r--r--acct-group/stubby/Manifest2
-rw-r--r--acct-group/stubby/stubby-0-r1.ebuild9
-rw-r--r--acct-group/stubby/stubby-0-r2.ebuild9
-rw-r--r--acct-group/stunnel/Manifest2
-rw-r--r--acct-group/stunnel/stunnel-0-r1.ebuild9
-rw-r--r--acct-group/stunnel/stunnel-0-r2.ebuild9
-rw-r--r--acct-group/subsonic/Manifest2
-rw-r--r--acct-group/subsonic/subsonic-0-r1.ebuild10
-rw-r--r--acct-group/subsonic/subsonic-0.ebuild10
-rw-r--r--acct-group/supervisor/Manifest2
-rw-r--r--acct-group/supervisor/supervisor-0-r1.ebuild9
-rw-r--r--acct-group/supervisor/supervisor-0-r2.ebuild9
-rw-r--r--acct-group/suricata/Manifest2
-rw-r--r--acct-group/suricata/suricata-0-r1.ebuild9
-rw-r--r--acct-group/suricata/suricata-0-r2.ebuild9
-rw-r--r--acct-group/svnusers/Manifest2
-rw-r--r--acct-group/svnusers/svnusers-0-r1.ebuild8
-rw-r--r--acct-group/svnusers/svnusers-0-r2.ebuild8
-rw-r--r--acct-group/svxlink/Manifest2
-rw-r--r--acct-group/svxlink/svxlink-0-r1.ebuild9
-rw-r--r--acct-group/svxlink/svxlink-0.ebuild9
-rw-r--r--acct-group/swift/Manifest2
-rw-r--r--acct-group/swift/swift-0-r1.ebuild8
-rw-r--r--acct-group/swift/swift-0-r2.ebuild8
-rw-r--r--acct-group/synapse/Manifest2
-rw-r--r--acct-group/synapse/synapse-0-r1.ebuild9
-rw-r--r--acct-group/synapse/synapse-0.ebuild9
-rw-r--r--acct-group/syncthing/Manifest2
-rw-r--r--acct-group/syncthing/syncthing-0-r1.ebuild9
-rw-r--r--acct-group/syncthing/syncthing-0-r2.ebuild9
-rw-r--r--acct-group/systemd-coredump/Manifest2
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild8
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild8
-rw-r--r--acct-group/systemd-hostname/Manifest2
-rw-r--r--acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild8
-rw-r--r--acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/Manifest2
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild8
-rw-r--r--acct-group/systemd-journal/Manifest2
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r2.ebuild8
-rw-r--r--acct-group/systemd-network/Manifest2
-rw-r--r--acct-group/systemd-network/systemd-network-0-r1.ebuild8
-rw-r--r--acct-group/systemd-network/systemd-network-0-r2.ebuild8
-rw-r--r--acct-group/systemd-oom/Manifest2
-rw-r--r--acct-group/systemd-oom/systemd-oom-0-r1.ebuild8
-rw-r--r--acct-group/systemd-oom/systemd-oom-0.ebuild8
-rw-r--r--acct-group/systemd-resolve/Manifest2
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild8
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild8
-rw-r--r--acct-group/systemd-timesync/Manifest2
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild8
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild8
-rw-r--r--acct-group/tape/Manifest2
-rw-r--r--acct-group/tape/tape-0-r1.ebuild8
-rw-r--r--acct-group/tape/tape-0-r2.ebuild8
-rw-r--r--acct-group/taskd/Manifest2
-rw-r--r--acct-group/taskd/taskd-0-r1.ebuild10
-rw-r--r--acct-group/taskd/taskd-0.ebuild10
-rw-r--r--acct-group/teamspeak/Manifest2
-rw-r--r--acct-group/teamspeak/teamspeak-0-r1.ebuild10
-rw-r--r--acct-group/teamspeak/teamspeak-0-r2.ebuild10
-rw-r--r--acct-group/telegraf/Manifest2
-rw-r--r--acct-group/telegraf/telegraf-0-r1.ebuild8
-rw-r--r--acct-group/telegraf/telegraf-0-r2.ebuild8
-rw-r--r--acct-group/tenshi/Manifest2
-rw-r--r--acct-group/tenshi/tenshi-0-r1.ebuild10
-rw-r--r--acct-group/tenshi/tenshi-0.ebuild10
-rw-r--r--acct-group/thttpd/Manifest2
-rw-r--r--acct-group/thttpd/thttpd-0-r1.ebuild10
-rw-r--r--acct-group/thttpd/thttpd-0.ebuild10
-rw-r--r--acct-group/tinyproxy/Manifest2
-rw-r--r--acct-group/tinyproxy/tinyproxy-0-r1.ebuild10
-rw-r--r--acct-group/tinyproxy/tinyproxy-0.ebuild10
-rw-r--r--acct-group/tomcat/Manifest2
-rw-r--r--acct-group/tomcat/tomcat-0-r1.ebuild9
-rw-r--r--acct-group/tomcat/tomcat-0.ebuild9
-rw-r--r--acct-group/tor/Manifest2
-rw-r--r--acct-group/tor/tor-0-r1.ebuild9
-rw-r--r--acct-group/tor/tor-0-r2.ebuild9
-rw-r--r--acct-group/tox/Manifest2
-rw-r--r--acct-group/tox/tox-0-r1.ebuild7
-rw-r--r--acct-group/tox/tox-0-r2.ebuild7
-rw-r--r--acct-group/tpm/Manifest2
-rw-r--r--acct-group/tpm/tpm-0-r1.ebuild8
-rw-r--r--acct-group/tpm/tpm-0.ebuild8
-rw-r--r--acct-group/transmission/Manifest2
-rw-r--r--acct-group/transmission/transmission-0-r1.ebuild8
-rw-r--r--acct-group/transmission/transmission-0-r2.ebuild8
-rw-r--r--acct-group/trickster/Manifest2
-rw-r--r--acct-group/trickster/trickster-0-r1.ebuild10
-rw-r--r--acct-group/trickster/trickster-0.ebuild10
-rw-r--r--acct-group/trojan/Manifest2
-rw-r--r--acct-group/trojan/trojan-0-r1.ebuild8
-rw-r--r--acct-group/trojan/trojan-0.ebuild8
-rw-r--r--acct-group/tsm/Manifest2
-rw-r--r--acct-group/tsm/tsm-0-r1.ebuild8
-rw-r--r--acct-group/tsm/tsm-0-r2.ebuild8
-rw-r--r--acct-group/tss/Manifest2
-rw-r--r--acct-group/tss/tss-0-r1.ebuild9
-rw-r--r--acct-group/tss/tss-0-r2.ebuild9
-rw-r--r--acct-group/ttrssd/Manifest2
-rw-r--r--acct-group/ttrssd/ttrssd-0-r1.ebuild9
-rw-r--r--acct-group/ttrssd/ttrssd-0.ebuild9
-rw-r--r--acct-group/tty/Manifest2
-rw-r--r--acct-group/tty/tty-0-r1.ebuild8
-rw-r--r--acct-group/tty/tty-0-r2.ebuild8
-rw-r--r--acct-group/turnserver/Manifest2
-rw-r--r--acct-group/turnserver/turnserver-0-r1.ebuild10
-rw-r--r--acct-group/turnserver/turnserver-0-r2.ebuild10
-rw-r--r--acct-group/ubridge/Manifest2
-rw-r--r--acct-group/ubridge/ubridge-0-r1.ebuild9
-rw-r--r--acct-group/ubridge/ubridge-0-r2.ebuild9
-rw-r--r--acct-group/ulogd/Manifest2
-rw-r--r--acct-group/ulogd/ulogd-0-r1.ebuild9
-rw-r--r--acct-group/ulogd/ulogd-0.ebuild9
-rw-r--r--acct-group/ultimaker/Manifest2
-rw-r--r--acct-group/ultimaker/ultimaker-0-r1.ebuild9
-rw-r--r--acct-group/ultimaker/ultimaker-0-r2.ebuild9
-rw-r--r--acct-group/unbound-telemetry/Manifest2
-rw-r--r--acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild8
-rw-r--r--acct-group/unbound-telemetry/unbound-telemetry-0.ebuild8
-rw-r--r--acct-group/unbound/Manifest2
-rw-r--r--acct-group/unbound/unbound-0-r1.ebuild10
-rw-r--r--acct-group/unbound/unbound-0-r2.ebuild10
-rw-r--r--acct-group/unifi-video/Manifest2
-rw-r--r--acct-group/unifi-video/unifi-video-0-r1.ebuild9
-rw-r--r--acct-group/unifi-video/unifi-video-0.ebuild9
-rw-r--r--acct-group/unifi/Manifest2
-rw-r--r--acct-group/unifi/unifi-0-r1.ebuild10
-rw-r--r--acct-group/unifi/unifi-0-r2.ebuild10
-rw-r--r--acct-group/unrealircd/Manifest2
-rw-r--r--acct-group/unrealircd/unrealircd-0-r1.ebuild8
-rw-r--r--acct-group/unrealircd/unrealircd-0-r2.ebuild8
-rw-r--r--acct-group/upmpdcli/Manifest2
-rw-r--r--acct-group/upmpdcli/upmpdcli-0-r1.ebuild9
-rw-r--r--acct-group/upmpdcli/upmpdcli-0.ebuild9
-rw-r--r--acct-group/uptimed/Manifest2
-rw-r--r--acct-group/uptimed/uptimed-0-r2.ebuild8
-rw-r--r--acct-group/uptimed/uptimed-0-r3.ebuild8
-rw-r--r--acct-group/usb/Manifest2
-rw-r--r--acct-group/usb/usb-0-r1.ebuild8
-rw-r--r--acct-group/usb/usb-0-r2.ebuild8
-rw-r--r--acct-group/users/Manifest2
-rw-r--r--acct-group/users/users-0-r1.ebuild8
-rw-r--r--acct-group/users/users-0.ebuild8
-rw-r--r--acct-group/ushare/Manifest2
-rw-r--r--acct-group/ushare/ushare-0-r1.ebuild9
-rw-r--r--acct-group/ushare/ushare-0.ebuild9
-rw-r--r--acct-group/utmp/Manifest2
-rw-r--r--acct-group/utmp/utmp-0-r1.ebuild8
-rw-r--r--acct-group/utmp/utmp-0-r2.ebuild8
-rw-r--r--acct-group/uucp/Manifest2
-rw-r--r--acct-group/uucp/uucp-0-r1.ebuild8
-rw-r--r--acct-group/uucp/uucp-0-r2.ebuild8
-rw-r--r--acct-group/uwsgi_exporter/Manifest2
-rw-r--r--acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild10
-rw-r--r--acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild10
-rw-r--r--acct-group/vacation/Manifest2
-rw-r--r--acct-group/vacation/vacation-0-r1.ebuild10
-rw-r--r--acct-group/vacation/vacation-0.ebuild10
-rw-r--r--acct-group/varnish/Manifest2
-rw-r--r--acct-group/varnish/varnish-0-r1.ebuild9
-rw-r--r--acct-group/varnish/varnish-0-r2.ebuild9
-rw-r--r--acct-group/vault/Manifest2
-rw-r--r--acct-group/vault/vault-0-r1.ebuild8
-rw-r--r--acct-group/vault/vault-0-r2.ebuild8
-rw-r--r--acct-group/vault_exporter/Manifest2
-rw-r--r--acct-group/vault_exporter/vault_exporter-0-r1.ebuild10
-rw-r--r--acct-group/vault_exporter/vault_exporter-0.ebuild10
-rw-r--r--acct-group/vboxguest/Manifest2
-rw-r--r--acct-group/vboxguest/vboxguest-0-r1.ebuild8
-rw-r--r--acct-group/vboxguest/vboxguest-0-r2.ebuild8
-rw-r--r--acct-group/vboxsf/Manifest2
-rw-r--r--acct-group/vboxsf/vboxsf-0-r1.ebuild8
-rw-r--r--acct-group/vboxsf/vboxsf-0-r2.ebuild8
-rw-r--r--acct-group/vboxusers/Manifest2
-rw-r--r--acct-group/vboxusers/vboxusers-0-r1.ebuild8
-rw-r--r--acct-group/vboxusers/vboxusers-0-r2.ebuild8
-rw-r--r--acct-group/vdr/Manifest2
-rw-r--r--acct-group/vdr/vdr-0-r1.ebuild10
-rw-r--r--acct-group/vdr/vdr-0-r2.ebuild10
-rw-r--r--acct-group/vdradmin/Manifest2
-rw-r--r--acct-group/vdradmin/vdradmin-0-r1.ebuild10
-rw-r--r--acct-group/vdradmin/vdradmin-0-r2.ebuild10
-rw-r--r--acct-group/video/Manifest2
-rw-r--r--acct-group/video/video-0-r1.ebuild8
-rw-r--r--acct-group/video/video-0-r2.ebuild8
-rw-r--r--acct-group/vlock/Manifest2
-rw-r--r--acct-group/vlock/vlock-0-r1.ebuild10
-rw-r--r--acct-group/vlock/vlock-0.ebuild10
-rw-r--r--acct-group/vnstat/Manifest2
-rw-r--r--acct-group/vnstat/vnstat-0-r1.ebuild9
-rw-r--r--acct-group/vnstat/vnstat-0.ebuild9
-rw-r--r--acct-group/vpopmail/Manifest2
-rw-r--r--acct-group/vpopmail/vpopmail-0-r1.ebuild8
-rw-r--r--acct-group/vpopmail/vpopmail-0-r2.ebuild8
-rw-r--r--acct-group/wesnoth/Manifest2
-rw-r--r--acct-group/wesnoth/wesnoth-0-r1.ebuild8
-rw-r--r--acct-group/wesnoth/wesnoth-0-r2.ebuild8
-rw-r--r--acct-group/wheel/Manifest2
-rw-r--r--acct-group/wheel/wheel-0-r1.ebuild8
-rw-r--r--acct-group/wheel/wheel-0-r2.ebuild8
-rw-r--r--acct-group/wwwoffle/Manifest2
-rw-r--r--acct-group/wwwoffle/wwwoffle-0-r1.ebuild10
-rw-r--r--acct-group/wwwoffle/wwwoffle-0.ebuild10
-rw-r--r--acct-group/x2goprint/Manifest2
-rw-r--r--acct-group/x2goprint/x2goprint-0-r1.ebuild9
-rw-r--r--acct-group/x2goprint/x2goprint-0-r2.ebuild9
-rw-r--r--acct-group/x2gouser/Manifest2
-rw-r--r--acct-group/x2gouser/x2gouser-0-r1.ebuild9
-rw-r--r--acct-group/x2gouser/x2gouser-0-r2.ebuild9
-rw-r--r--acct-group/xpra/Manifest2
-rw-r--r--acct-group/xpra/xpra-0-r1.ebuild9
-rw-r--r--acct-group/xpra/xpra-0.ebuild9
-rw-r--r--acct-group/xrootd/Manifest2
-rw-r--r--acct-group/xrootd/xrootd-0-r1.ebuild9
-rw-r--r--acct-group/xrootd/xrootd-0-r2.ebuild9
-rw-r--r--acct-group/xwax/Manifest2
-rw-r--r--acct-group/xwax/xwax-0-r1.ebuild10
-rw-r--r--acct-group/xwax/xwax-0.ebuild10
-rw-r--r--acct-group/yubihsm-connector/Manifest2
-rw-r--r--acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild (renamed from acct-group/yubihsm-connector/yubihsm-connector-0.ebuild)0
-rw-r--r--acct-group/zabbix/Manifest2
-rw-r--r--acct-group/zabbix/zabbix-0-r1.ebuild9
-rw-r--r--acct-group/zabbix/zabbix-0.ebuild9
-rw-r--r--acct-group/zeppelin/Manifest2
-rw-r--r--acct-group/zeppelin/zeppelin-0-r1.ebuild9
-rw-r--r--acct-group/zeppelin/zeppelin-0-r2.ebuild9
-rw-r--r--acct-group/zetcd/Manifest2
-rw-r--r--acct-group/zetcd/zetcd-0-r1.ebuild10
-rw-r--r--acct-group/zetcd/zetcd-0.ebuild10
-rw-r--r--acct-group/ziproxy/Manifest2
-rw-r--r--acct-group/ziproxy/ziproxy-0-r1.ebuild8
-rw-r--r--acct-group/ziproxy/ziproxy-0.ebuild8
-rw-r--r--acct-group/znc/Manifest2
-rw-r--r--acct-group/znc/znc-0-r1.ebuild9
-rw-r--r--acct-group/znc/znc-0-r2.ebuild9
-rw-r--r--acct-group/zookeeper/Manifest2
-rw-r--r--acct-group/zookeeper/zookeeper-0-r1.ebuild10
-rw-r--r--acct-group/zookeeper/zookeeper-0.ebuild10
1403 files changed, 4582 insertions, 4582 deletions
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 10d15cb32e93..ad6eb969afe2 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
Binary files differ
diff --git a/acct-group/_cron-failure/Manifest b/acct-group/_cron-failure/Manifest
index 6d1ae84d1652..224074012588 100644
--- a/acct-group/_cron-failure/Manifest
+++ b/acct-group/_cron-failure/Manifest
@@ -1,2 +1,2 @@
-EBUILD _cron-failure-0.ebuild 220 BLAKE2B 53f8c0c0b519bdbd58f3085fc489764c54d3b5c66166dd8cde151a4175057ed68e29527beed68a3496982e600b1681bf57b09c92b4ffb1cf7661e35f4ff5d3fc SHA512 bd727548f7151de8760a7c2a0b7e0520f6caa96b14bde6fc91a48e27ebbe15d3d08114d6d3e451faeac8787a480441e44577e974b0071dac087c3d2b2538670a
+EBUILD _cron-failure-0-r1.ebuild 220 BLAKE2B da8f75363ae2b6a6494f27b7f107a0d02d5221b6705c1655d0fd0388d6fe68e60ad56c22de64479ac07273301a392c2b11027ccbfe86cfc6aa55cd9c33b93a34 SHA512 f6e45417c06879bf27df2b7e2b9ea4eccbde59b589e36aab6ed3fc48c8e3cbcd1d6317bcfa1c4b5f31b71d09cc80057274d86114bae8a39e6a438b578f962135
MISC metadata.xml 248 BLAKE2B a5a7d9bcd542fe55d50fed508ef21f6a820aee11993d27e8ffb967f55cf3f8a02846c96499f1112e1b58f4a93b8b6fce596589e653fe161bb94c1b5868bd6dd5 SHA512 a45b735f6fec1b6bbce0a559869d9ac99c13b2dceb0d2b23f6fdd32fb7b6d44a2b199f47d89418784243fafafeea56094e0e0c7a90b67cad5cefcc94bf1423d4
diff --git a/acct-group/_cron-failure/_cron-failure-0-r1.ebuild b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..037c180ae1e4
--- /dev/null
+++ b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/systemd-cron failure emails"
+
+ACCT_GROUP_ID="520"
diff --git a/acct-group/_cron-failure/_cron-failure-0.ebuild b/acct-group/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index b453d5218442..000000000000
--- a/acct-group/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/systemd-cron failure emails"
-
-ACCT_GROUP_ID="520"
diff --git a/acct-group/adm/Manifest b/acct-group/adm/Manifest
index e535c9ff1614..f4d17163300d 100644
--- a/acct-group/adm/Manifest
+++ b/acct-group/adm/Manifest
@@ -1,2 +1,2 @@
-EBUILD adm-0-r1.ebuild 149 BLAKE2B a91ae65de89b2fca21b378a077170039f6efd45b40988d6ff9ab12d920908653a0ed29be41ea83ff3c9f616b6d6a7c9bff60f0d9f2273f7af0dda6104bc69929 SHA512 549819f445f2b90d0fa5ee0aae0e32fb16110d49bddf20c645af26052aaf2fa3d97fb294452906fde26e23ea9efef2bb2b7a86c8528fa9b8a5f719728d8ce1db
+EBUILD adm-0-r2.ebuild 149 BLAKE2B 19d7c1b8d6957b4981c12264b8c44bfde053c1c5fa5f7b1bfac48332375b58f86b3f4173993326fe01fd4352be3406c8bdf58bc8b37011dc588a52a1dac182b6 SHA512 df0b166def375795229a0dbbb71936ee63615fd0993b617977f2d20d42d27b31edf64977600224caef38fce91a4dee07ef7535ad71ab286ed986dc2bb5287f07
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/adm/adm-0-r1.ebuild b/acct-group/adm/adm-0-r1.ebuild
deleted file mode 100644
index 7aecab7fd00e..000000000000
--- a/acct-group/adm/adm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=4
diff --git a/acct-group/adm/adm-0-r2.ebuild b/acct-group/adm/adm-0-r2.ebuild
new file mode 100644
index 000000000000..3e0853baca96
--- /dev/null
+++ b/acct-group/adm/adm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=4
diff --git a/acct-group/aerospike-amc/Manifest b/acct-group/aerospike-amc/Manifest
index d3070ebfaafa..0d9b18e713a7 100644
--- a/acct-group/aerospike-amc/Manifest
+++ b/acct-group/aerospike-amc/Manifest
@@ -1,2 +1,2 @@
-EBUILD aerospike-amc-0.ebuild 214 BLAKE2B f5de0174a6db82f7320b36ff0629ad7f4347e9a306fac50e07820a00f3d1cdad2e21e685484e287c5553b061266af8cb609deeb17cf4317057a3d5b96fbd76d9 SHA512 2da12d192a30d1cf66ab6b7ddd6e24da0b176ebea26f5b70abce70d5b9e3923df9a975c8a7839357e0179985ef95dafa5e423ed8fbead79891b7f10ae5cb6e63
+EBUILD aerospike-amc-0-r1.ebuild 214 BLAKE2B b7e324227796e67f846f3b3a2b21c93ab1051c26a1b12bf88ce41b4106ccf5a48d082a405f5388467638aa6a1081ffd7b5a5b8c6014f90da67c75e1b8284243e SHA512 b0f23eb44493ddd4a783ead334810583a71634ded4f0f6ab64d9b85d380972f4093a9e00c30117e721f5f3be0b208fe4d76da5f96eced4fa21614c0b722614db
MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild b/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild
new file mode 100644
index 000000000000..afe329ac705f
--- /dev/null
+++ b/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/aerospike-amc-community"
+
+ACCT_GROUP_ID="210"
diff --git a/acct-group/aerospike-amc/aerospike-amc-0.ebuild b/acct-group/aerospike-amc/aerospike-amc-0.ebuild
deleted file mode 100644
index a3028d0e5a2a..000000000000
--- a/acct-group/aerospike-amc/aerospike-amc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/aerospike-amc-community"
-
-ACCT_GROUP_ID="210"
diff --git a/acct-group/airdcppd/Manifest b/acct-group/airdcppd/Manifest
index ff967ac10480..d7b469ca99ee 100644
--- a/acct-group/airdcppd/Manifest
+++ b/acct-group/airdcppd/Manifest
@@ -1,2 +1,2 @@
-EBUILD airdcppd-0-r1.ebuild 196 BLAKE2B 9244aaa4d34e664c3ebe710afab404ad988eb74f2a7ceb6b1ea221fc49fabfd5c8c26ba96fb62efe73988501b1b6c8bee6d3aee323b54e1c508efc4dfa101c9b SHA512 9f5d5bed02d5b96cc8be8751a993da3744e545472229b39fff90071b33a3d21dcf9d2d860251925f229bcad21b8a754f9e6fcd4eb48b6cf02352e78b0143af19
+EBUILD airdcppd-0-r2.ebuild 201 BLAKE2B c59abec9bf92cd29f1558e6caaeab20b34501f53ce4989486afcbff69a9c86a82ed9ce24be69bdd57ed0c3c3c46fb79ac3331e958b53b34e0093cfe59d4d5c9c SHA512 2a2ad419f34394331456cdde5de72143caf4c5f94a5bb6c82b3faf3f661a906238f1c63f96b6c9b1ef3dd1a5eab08ae85b7d2ee29a3db47edeea0a523dc7fe08
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-group/airdcppd/airdcppd-0-r1.ebuild b/acct-group/airdcppd/airdcppd-0-r1.ebuild
deleted file mode 100644
index a88d85d58cfb..000000000000
--- a/acct-group/airdcppd/airdcppd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/airdcpp-webclient"
-ACCT_GROUP_ID=464
diff --git a/acct-group/airdcppd/airdcppd-0-r2.ebuild b/acct-group/airdcppd/airdcppd-0-r2.ebuild
new file mode 100644
index 000000000000..6021954f07fc
--- /dev/null
+++ b/acct-group/airdcppd/airdcppd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/airdcpp-webclient"
+ACCT_GROUP_ID=464
diff --git a/acct-group/alertmanager/Manifest b/acct-group/alertmanager/Manifest
index c2def7c8f5e5..dc39a75a9560 100644
--- a/acct-group/alertmanager/Manifest
+++ b/acct-group/alertmanager/Manifest
@@ -1,2 +1,2 @@
-EBUILD alertmanager-0.ebuild 146 BLAKE2B 564d0f62754dd20158bbf85908ec99086e1cb12f4c6ae09c95ba2a3d06bf8f3928276d88f2537fc8bf65d6f21423439030d8056f78b2eafe71c0036f4f46fb36 SHA512 60988af958e5c76e8961cb09b222a2e2c7146789013e36d671aae18e20020a26e7d014b9abe63da717be144c725eefbce62ee39b62183b69f43ad70933018cbd
+EBUILD alertmanager-0-r1.ebuild 151 BLAKE2B 97ede82bb42a2ee6da0306d522c10dff091374eaf1875000d6d13a79dde35786f782b2bd21edff5187e0763e8fdef5d8179e2528dd2892db8580946c42d78dca SHA512 bce247a4f0ff1f24b74aca91fab57d2a86492263809380d80e04f10e54b3c3db85e4e110ac846ee3bdb65b3de6808fdfef5715586c8f621a1f77e7bf21dd6323
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/alertmanager/alertmanager-0-r1.ebuild b/acct-group/alertmanager/alertmanager-0-r1.ebuild
new file mode 100644
index 000000000000..da84d7d1fed2
--- /dev/null
+++ b/acct-group/alertmanager/alertmanager-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=294
diff --git a/acct-group/alertmanager/alertmanager-0.ebuild b/acct-group/alertmanager/alertmanager-0.ebuild
deleted file mode 100644
index 4530d830ec25..000000000000
--- a/acct-group/alertmanager/alertmanager-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=294
diff --git a/acct-group/amanda/Manifest b/acct-group/amanda/Manifest
index 1d44fdf63461..defa15f00258 100644
--- a/acct-group/amanda/Manifest
+++ b/acct-group/amanda/Manifest
@@ -1,2 +1,2 @@
-EBUILD amanda-0.ebuild 151 BLAKE2B 7d0bda5bde34d227c754592d99bb94b066de66735d8635ee0e95e4c1928a158937eda6867c3a2d1d17550d92a7b6354143a9d0d52044abe22ba39c8e0fed9a79 SHA512 dd7d28a1c50e181632de11a36197a4d022b742c5edd54ecf7bbece0d4d1a3df536521bb4c9e75012b3a4d95673d81babac3e242aa2383fd263152fd299434db7
+EBUILD amanda-0-r1.ebuild 151 BLAKE2B c7ec000e381b37ba5c31df729e13a9917060bb7ebbec6e1160d7839ecd99b7e88c2b4b78e1bd0760ff3680c32bcc49b2ae78a69504d492fd8ba4405eb67a289d SHA512 6cbdaffaf03d30c08e2b69a2ab64b516ef70a7e266840d8ccf9fddeb6f1f26fadb90525c549e0fdf553bee09a50f26b8cf831cc0d8b9f98f2bc70a739e8d8607
MISC metadata.xml 568 BLAKE2B 27da958a42770d386d7204ee1a18b189210253e4ca7bbf150efc7f947d089bf273fa1536ef3fa7525a94c753cac43cc784f5989dc348d9a9363e38e508d495e8 SHA512 ec050ac6eafed72aff2323a015cc5a40011c7803650f26907b2787a3a53fd3943a126d7f70ac1f673dff89bbc088968fd7ae92105625abb7058d159bd9cdabc3
diff --git a/acct-group/amanda/amanda-0-r1.ebuild b/acct-group/amanda/amanda-0-r1.ebuild
new file mode 100644
index 000000000000..3eb2c5b3a0da
--- /dev/null
+++ b/acct-group/amanda/amanda-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=362
diff --git a/acct-group/amanda/amanda-0.ebuild b/acct-group/amanda/amanda-0.ebuild
deleted file mode 100644
index d8599a25ff3f..000000000000
--- a/acct-group/amanda/amanda-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=362
diff --git a/acct-group/amavis/Manifest b/acct-group/amavis/Manifest
index 09fe25b432e5..0de71543db73 100644
--- a/acct-group/amavis/Manifest
+++ b/acct-group/amavis/Manifest
@@ -1,2 +1,2 @@
-EBUILD amavis-0-r1.ebuild 194 BLAKE2B d214076083bf76e9ecdd57ae1b5b7e7b481132082c0f405434605efc4c02ec4f9337c66d269693349d5ef4c8af4764d2485337bd4ac54404aa46155bc5612048 SHA512 d39918b9c9436dadb4f4641a634a466603281ca136ca3bd07c2eabcb71eb7e732c575443d0c20f919740de04546eeb1a59b8f56f9fbd693223716e95e7920b2c
+EBUILD amavis-0-r2.ebuild 199 BLAKE2B 303dbe1c1b876db93c3f30248cad3ffaedd2feb4e7bcb43c59bc59365f0a2f16b24800fe15d531f71efa120150e5581c0ffe364a83758170bfbd21588b08471d SHA512 8acc6f8290daf74b92c5b555409af38c3b550bd25af5f224e95cffbe4f26442c65f9ee92727f3229b8e356ea9c6ead6d283e2f3acff17dd2c539a0548946154d
MISC metadata.xml 262 BLAKE2B bdf88a65e34409c3f65204337925e14be06c13ab53571f864dc58309b72d50a9968dacf93110bd97acc5ae729f55207718d4ffd6ce321210e220bc6d57fc61a7 SHA512 9836f7da275ae8424e0494ee38313d62f90a180ed9fcbf7ff6391b3a5b4c3679f566668f0acd82ad0fe5f036e70a0e0a33b95df87475e4cbf8aafe1ae6974774
diff --git a/acct-group/amavis/amavis-0-r1.ebuild b/acct-group/amavis/amavis-0-r1.ebuild
deleted file mode 100644
index cd30c60aee3e..000000000000
--- a/acct-group/amavis/amavis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=333
-DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amavis/amavis-0-r2.ebuild b/acct-group/amavis/amavis-0-r2.ebuild
new file mode 100644
index 000000000000..f34143344b41
--- /dev/null
+++ b/acct-group/amavis/amavis-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=333
+DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amule/Manifest b/acct-group/amule/Manifest
index 53ad6c361f1f..45aeb89edb8b 100644
--- a/acct-group/amule/Manifest
+++ b/acct-group/amule/Manifest
@@ -1,2 +1,2 @@
-EBUILD amule-0-r1.ebuild 184 BLAKE2B df7b0029d23909369fe0580b22d10c2014bc0552ce9f7df6066f42884bb17bec353330399b53bc28bfe6676497d22238d11199c338cd815ae3c19394f9710ac5 SHA512 aef615dcca21ad7f666863197833024dbbffff41a183376b6b2fd636453aaf864ed37a07e06e1cd5e1bc2e539b9bebbe2afdd3fd43ec27ef48c95f95e48e420f
+EBUILD amule-0-r2.ebuild 189 BLAKE2B cce95d3d3f59d3704f8c25cdb670d905155f3719dbfce93ae7278d93fc9b0c25c9dcdbf0cf19c8b804511a40be5c37f969ad88436c05b4f1c48a0aa724cc7613 SHA512 b8b0dec39e249a1fb48488db961afbb3d5d33c17b87ffe3659fadbf9986ca3add3fac9b555caeaef85053955580623eefae00edf00113734e1b53b6eee58a749
MISC metadata.xml 395 BLAKE2B 676ceaef4b63cc5fd7c0ad8b28065738adf013fa4f85cb2fa70bd1cafa8ea6b76fc6ca81e36e91c839bcc55c55a8bf24b4a325e44b0830f653adc89ee09dbfc4 SHA512 30eec216eef39513374c06cc1b0be994f53deb7054f7241a55b1ccc73d58ab0b578b92096eb56daef0e7f8d1377480a00a6bbb6e0bcbffb19d53a48f081170f3
diff --git a/acct-group/amule/amule-0-r1.ebuild b/acct-group/amule/amule-0-r1.ebuild
deleted file mode 100644
index 354dc87a1194..000000000000
--- a/acct-group/amule/amule-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/amule"
-ACCT_GROUP_ID=468
diff --git a/acct-group/amule/amule-0-r2.ebuild b/acct-group/amule/amule-0-r2.ebuild
new file mode 100644
index 000000000000..dda4974ede76
--- /dev/null
+++ b/acct-group/amule/amule-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/amule"
+ACCT_GROUP_ID=468
diff --git a/acct-group/android/Manifest b/acct-group/android/Manifest
index ab05041699f2..b364b3d238b1 100644
--- a/acct-group/android/Manifest
+++ b/acct-group/android/Manifest
@@ -1,2 +1,2 @@
-EBUILD android-0.ebuild 220 BLAKE2B cfa0e01403904bed9f69befb9f243d773b057f8ffe0277f65d345e669bcd5eb006fbc6c41b73eac75af0bf934b68b3990b3ae1ed0f43b055b133ef8c95573cef SHA512 99db7caea3504aced96993e81405cfd1c837c013b5132f60fb37c15bb84373fc0a459c2b09c2a842d3f4450dec3476fadf66d9976a68ecdafd88d2cbcb88ca0a
+EBUILD android-0-r1.ebuild 220 BLAKE2B bde8081a42646faa5461618c8f10f42bb5072def7ced8146a5ce45e5dcd33550f50f34eb038637d7c69ea76f47dbec3ef051f5cd087a9d7262672168c586a35c SHA512 e678681f83a39f8b254c14094985614f55a33f15e2a41398169f97ecd3f5c8cf6a01e04c83b35e6ddcd80e96e375c79bbc836c318937ceac30c2f1f38e8a7e76
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/android/android-0-r1.ebuild b/acct-group/android/android-0-r1.ebuild
new file mode 100644
index 000000000000..5698fc27e4ab
--- /dev/null
+++ b/acct-group/android/android-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
+
+ACCT_GROUP_ID="174"
diff --git a/acct-group/android/android-0.ebuild b/acct-group/android/android-0.ebuild
deleted file mode 100644
index 5730672b8d65..000000000000
--- a/acct-group/android/android-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
-
-ACCT_GROUP_ID="174"
diff --git a/acct-group/anope/Manifest b/acct-group/anope/Manifest
index 31fdcdfe6e36..b71b65bd0854 100644
--- a/acct-group/anope/Manifest
+++ b/acct-group/anope/Manifest
@@ -1,2 +1,2 @@
-EBUILD anope-0-r1.ebuild 189 BLAKE2B d8069a63714ae5ef476c44c65a44d4e0f0db6f19d2e53102bb4f2e8946a4aa2974d11e8dc047b991b9a72153d72f3a178a6dc150eaf83e4a2b21651f4987a5fa SHA512 5d25e821a65ba784a8146010d106af93e66b4acb9325574171cadd4d4f4893c84018acfec916405c0bc7a2623815bef0ad50eaaab90425b9ca5e2ed5f7c243bb
+EBUILD anope-0-r2.ebuild 194 BLAKE2B 76118adea27766a724a9441df504021ac3d56804e5b65a404f2579dad4304afb2b61d6c10ed9ba57ccd398ae710707b76a7d51f9028f374c92832e7897870c67 SHA512 31f43c2cbf54a8327aa0ebf41e699bdf9ccd4e18ea4b22d50ca6f20fe67e83bd601976a33cd24d267983f9b8b067430907fd13a8b0e6c4c74e8a978dc2a8a713
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/anope/anope-0-r1.ebuild b/acct-group/anope/anope-0-r1.ebuild
deleted file mode 100644
index 4249c83403d3..000000000000
--- a/acct-group/anope/anope-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for Anope IRC services"
-ACCT_GROUP_ID=417
diff --git a/acct-group/anope/anope-0-r2.ebuild b/acct-group/anope/anope-0-r2.ebuild
new file mode 100644
index 000000000000..42de5736718e
--- /dev/null
+++ b/acct-group/anope/anope-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Anope IRC services"
+ACCT_GROUP_ID=417
diff --git a/acct-group/apache/Manifest b/acct-group/apache/Manifest
index ce2f0937d33b..de5e3ce2bc77 100644
--- a/acct-group/apache/Manifest
+++ b/acct-group/apache/Manifest
@@ -1,2 +1,2 @@
-EBUILD apache-0-r2.ebuild 150 BLAKE2B 2f9611a0b9c7d911a12e726cf581b49b6242ee50d811f6d562b70a54cf223347ff42fbb8614df506982196752ce3d8c336031b66c7cce7aa1684370647b61933 SHA512 5d1d6da9716e2aac2a3c662e67ccab340513c6a3b3aa98a95f2f4ffc7eed7fc160d59f4d9af1c25e472a4f0873fd5147025a4eccfdb4ed47789d28e3e93c1e2f
+EBUILD apache-0-r3.ebuild 150 BLAKE2B 1eadaf28ca6f1b33dd4790a83346f883566de47727b379761469ce342a969e9bda83755201e0198007d53dfcb983738d2b3deae0bf26103d506c89cc06812b28 SHA512 3abc6d1d10b3eaa26d8a2a1f638698fbbcaa39d1ae13ba84e636ed8eb3ecb01bdad220f95693d029f2ce0d7d36d28d678d2e6d598df8ba4c9292bf6a8bc83129
MISC metadata.xml 254 BLAKE2B 309bda95de24ec4bc4d565251f6b87ce5adc08e96bcd062c6b0cb77daf48729a08b84bbd9cf20f17e917bec6636c47c51a780dff452e45946df34088a7b80da0 SHA512 4c6b588732cb314b2a0c82d476516cb1c226f737a74934831232be6b9828e8c4636589beb8872c3df0931f6dbf37e78a47309376d3480dce7683d3ead5a63e61
diff --git a/acct-group/apache/apache-0-r2.ebuild b/acct-group/apache/apache-0-r2.ebuild
deleted file mode 100644
index 90328f8c2836..000000000000
--- a/acct-group/apache/apache-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=81
diff --git a/acct-group/apache/apache-0-r3.ebuild b/acct-group/apache/apache-0-r3.ebuild
new file mode 100644
index 000000000000..1f54198838fd
--- /dev/null
+++ b/acct-group/apache/apache-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=81
diff --git a/acct-group/apt-cacher-ng/Manifest b/acct-group/apt-cacher-ng/Manifest
index d5bd6673e44b..8de4d8f58113 100644
--- a/acct-group/apt-cacher-ng/Manifest
+++ b/acct-group/apt-cacher-ng/Manifest
@@ -1,2 +1,2 @@
-EBUILD apt-cacher-ng-0.ebuild 146 BLAKE2B c875a24ae9b150b0511404bd2d3ed0e865295818ec38b987ba4c54487b27a6144074d8470ebac686ff9f43021bec238d106acba380b6b4615dd945c0b0d12b68 SHA512 c9ac759373d640e96eecdbf536e298855c44b087f8e4c7d040ea2bd28fe9027224f13f0396f72153104e12a743d01ff458247f075168f9a867cd4cf75e6192ef
+EBUILD apt-cacher-ng-0-r1.ebuild 151 BLAKE2B 1fa6ca127c3d82422e002c7d08abc8a2a4215afb801ef569b3174120cb27c99e659abec67c5fd146d19a9fe3cf871685868e1898a76972989f3ccef1de690529 SHA512 0770ccda9996188466fbb687fe2d06abd1753f35cee0654e8e12203ba960fe00ae83a6aa0808cf3e948db25acdef0295fd70b9d090e5d4ab057e1873ee4a6693
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
new file mode 100644
index 000000000000..74d54239c6fc
--- /dev/null
+++ b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=319
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
deleted file mode 100644
index ef6e2c653c52..000000000000
--- a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=319
diff --git a/acct-group/argus/Manifest b/acct-group/argus/Manifest
index 904e062de890..84ff92e7d3b3 100644
--- a/acct-group/argus/Manifest
+++ b/acct-group/argus/Manifest
@@ -1,2 +1,2 @@
-EBUILD argus-0.ebuild 188 BLAKE2B 0be937f804e7e6c84a8fd4f989c56148132651d0248f844f24900e78eb6bab6a91173fc4bab32c6f1f0c7ee065c271fc41437c1f55b2a81332602f2a6a1edd23 SHA512 d17d3012529af9ea3d60dfe482881aaf9181d5fffab820d21e9c3c117ac8b381e5fdde1f7c2b1fc78b36fdaedd7a673dd727b0dcb53417c50572a127a0a95231
+EBUILD argus-0-r1.ebuild 193 BLAKE2B 0be02daaa9ff181a446e671bde3439e1fcf2e1b4ba9c6c38b8700acd67f2c002c3c97b119e0c2c8cd7ff7630e4ef0785c395db310e14a7543d0d9e3512e8acb7 SHA512 8c79d1677a1b7ccbfec999868b8416e0c8e2708e3f8ef82a803dbd3d5a819704814eccf87471cc6955aa9c210de6fc51453b779282bb3d29da982c98bfeb61d8
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/argus/argus-0-r1.ebuild b/acct-group/argus/argus-0-r1.ebuild
new file mode 100644
index 000000000000..2a586410a682
--- /dev/null
+++ b/acct-group/argus/argus-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/argus"
+
+ACCT_GROUP_ID=383
diff --git a/acct-group/argus/argus-0.ebuild b/acct-group/argus/argus-0.ebuild
deleted file mode 100644
index 0d846593c0f3..000000000000
--- a/acct-group/argus/argus-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/argus"
-
-ACCT_GROUP_ID=383
diff --git a/acct-group/arpwatch/Manifest b/acct-group/arpwatch/Manifest
index 4f0be9d5b0a5..f260d97b2e00 100644
--- a/acct-group/arpwatch/Manifest
+++ b/acct-group/arpwatch/Manifest
@@ -1,2 +1,2 @@
-EBUILD arpwatch-0.ebuild 202 BLAKE2B 42851fd4afbaa1cc79f347c3e182e1a386bef5ffbfa05ba25dc666b4b9e3d9d0267469177b8b808eb4d5f2abe62eeb6c8c64f20022e1dfe7c31db04f8be00a33 SHA512 8f8fd154767bf076291c128a47e26ba79f5c9c3f3756c4be96397eae5a68c46c77c0724141e00b0fff79ad226b292be5b7e5a0e6c9c342ec211a8452c8027766
+EBUILD arpwatch-0-r1.ebuild 202 BLAKE2B 4bc304704b1a4c38176212f6d692b7c5ac4145569d7de81ce973f736f0a5abe6c31ab24d38240447df7f372941181dd92d05a95a2fadd210549fb8e721134625 SHA512 40484cf09cf72d4353431c62ac4634fda9f0f67045a2f46c04920d87637c6d3a4a2cc815d5662370ebcf6b4ee347229b4d3e47f0a66370359bbab9a4d1c65899
MISC metadata.xml 280 BLAKE2B c286d37bee8045783bc979f9325dd0c1684a1e63bcea60642c2ebba7b4f7c6ef2b77e5f89615e33c06d0cd12742333a2054e19f6e609d45f1c0f7de0289ca55e SHA512 6aa6da804087da932aa4223f3a8c1b26808344f28b12546e4cd7cbf91d5aed172ed298acdf08697fab96c6ed5cfb9b920801e8d56c5be439c84d4594bf02d86e
diff --git a/acct-group/arpwatch/arpwatch-0-r1.ebuild b/acct-group/arpwatch/arpwatch-0-r1.ebuild
new file mode 100644
index 000000000000..3763a50ff43b
--- /dev/null
+++ b/acct-group/arpwatch/arpwatch-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/arpwatch"
+
+ACCT_GROUP_ID="170"
diff --git a/acct-group/arpwatch/arpwatch-0.ebuild b/acct-group/arpwatch/arpwatch-0.ebuild
deleted file mode 100644
index c232fe3a362c..000000000000
--- a/acct-group/arpwatch/arpwatch-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/arpwatch"
-
-ACCT_GROUP_ID="170"
diff --git a/acct-group/artifactory/Manifest b/acct-group/artifactory/Manifest
index 679cdd322ad7..f594fbdcd82f 100644
--- a/acct-group/artifactory/Manifest
+++ b/acct-group/artifactory/Manifest
@@ -1,2 +1,2 @@
-EBUILD artifactory-0.ebuild 203 BLAKE2B b1dca4bed2a5b4d149afd5c5aa6a25c36aa8b1f26b830b446563026c91a042972ff366cfd084d18c421da5e71372d4e5d3ec0092e9de7e488904a8721aa198dd SHA512 c9dda9e547c1bf0ba28c4ca5d4758e6a494a32f78c427a054e376daec1fbe235973cbc5a50fe27abd1f1f3f80ab24e933aa8f23980e78c0b4d38d12a6a221802
+EBUILD artifactory-0-r1.ebuild 203 BLAKE2B 43251e11ab46c3692961a9f7a41a75e197aba44e75e4193f0345b7cda73fa84db6fe8a31d89a1596d8b31bb9a3ca03b75010b3bc694e61b5bccbe2772d4eae02 SHA512 612c9d3f575b56c0f000eae4a0be6b1edf1b48ffcd1570c7e26928e547700218fd4cb6d37c0f4f8503276c330633d22135a16d4425ef0770d6923920f7f1424f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/artifactory/artifactory-0-r1.ebuild b/acct-group/artifactory/artifactory-0-r1.ebuild
new file mode 100644
index 000000000000..3441d692774f
--- /dev/null
+++ b/acct-group/artifactory/artifactory-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/artifactory-bin"
+
+ACCT_GROUP_ID="264"
diff --git a/acct-group/artifactory/artifactory-0.ebuild b/acct-group/artifactory/artifactory-0.ebuild
deleted file mode 100644
index 6f1227123b88..000000000000
--- a/acct-group/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/artifactory-bin"
-
-ACCT_GROUP_ID="264"
diff --git a/acct-group/aspnet/Manifest b/acct-group/aspnet/Manifest
index 30edeabbc5c9..3400c8cc87de 100644
--- a/acct-group/aspnet/Manifest
+++ b/acct-group/aspnet/Manifest
@@ -1,2 +1,2 @@
-EBUILD aspnet-0.ebuild 151 BLAKE2B 50c68a055a3f4a15e773bbfdbf30e1b0755bd0114b504c2bd59d99ac5aa8ee7f9faed024ba8724e9e7538b573980566c562590de28830ad59b6bf092234fc23a SHA512 49eec5bd46fbd75c1e7dae60d238c664e588983f3d414fe0c3663d9fca8e238c515fca1db66e80a4144329f202f6f09a936ed89a9926bbddb8b1d157990d143b
+EBUILD aspnet-0-r1.ebuild 151 BLAKE2B 956ed665224c5a95ac8419b6dfd02f6d912689674a218c6849631f4380d77b51891e429d1479e70abc24b418f7aa215f401896f077205a4c6939ea6c3b7c63ec SHA512 096f13743d3729ed7fd7c04aa88dd77ddc56ed672f99d39a2269fa96cc10501b8d96ba825bcacc54c259d7431b3356b3bf912c31cfee2742989effeb2214cc05
MISC metadata.xml 169 BLAKE2B 4307ce25f2199f9cb772e7740a911318479c0a7c122eb2c91e5c908e1e51bde7c261d0c9681dcb5095d0c8d9dc97c5ae40787c13ca971f705c5b471bbb1ce6b1 SHA512 9d7035f8acb273b0b044a4d8d04b395ddef6d5eb62333af0c232b7bdc112d90d5fd88913a60d4e0e1206d113d5cea77b5ece4defa421af52b2bcf3bf7e35d7f1
diff --git a/acct-group/aspnet/aspnet-0-r1.ebuild b/acct-group/aspnet/aspnet-0-r1.ebuild
new file mode 100644
index 000000000000..c879ec8f038b
--- /dev/null
+++ b/acct-group/aspnet/aspnet-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=216
diff --git a/acct-group/aspnet/aspnet-0.ebuild b/acct-group/aspnet/aspnet-0.ebuild
deleted file mode 100644
index 58a850a8bb9c..000000000000
--- a/acct-group/aspnet/aspnet-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=216
diff --git a/acct-group/asterisk/Manifest b/acct-group/asterisk/Manifest
index 178f63411e7c..9f697c06f0e1 100644
--- a/acct-group/asterisk/Manifest
+++ b/acct-group/asterisk/Manifest
@@ -1,2 +1,2 @@
-EBUILD asterisk-0-r1.ebuild 184 BLAKE2B d4748e59cf5bfd1ca1b4411f53308dc13e98a3e332df342e258c4d628e0e3436df7aceb30c85101ae8e9052925e25c6c1f9e8a2062223a975059f2556244d0ac SHA512 042fad7aaa06ff750fda27df9e5d1dfe36a82a35514539e5d6e3918f861854b7194a48e36a512162d3cb228b9ee2437532736ff9820aa394d1c798a04f68fd82
+EBUILD asterisk-0-r2.ebuild 184 BLAKE2B 6031a817c9a956a91f592538d90efebbd8482bf671b8e592637142a68b4c03083ad1a99b17b0cbad4e5c1b1001250d8037b5c645ef643cf2924a71b63bf875bb SHA512 2a3969f048954ea1edee8539ae51f43d0164f72bc992069f46da721d16904bd0c71ddc098d35e4db4e4b06901110729677fe041c2b1617ae3a7430f018dee6b7
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/acct-group/asterisk/asterisk-0-r1.ebuild b/acct-group/asterisk/asterisk-0-r1.ebuild
deleted file mode 100644
index 62ec5a2f5b02..000000000000
--- a/acct-group/asterisk/asterisk-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for asterisk"
-ACCT_GROUP_ID=242
diff --git a/acct-group/asterisk/asterisk-0-r2.ebuild b/acct-group/asterisk/asterisk-0-r2.ebuild
new file mode 100644
index 000000000000..da68978223d3
--- /dev/null
+++ b/acct-group/asterisk/asterisk-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for asterisk"
+ACCT_GROUP_ID=242
diff --git a/acct-group/at/Manifest b/acct-group/at/Manifest
index b42cc85f7dc5..471ddc4af2d5 100644
--- a/acct-group/at/Manifest
+++ b/acct-group/at/Manifest
@@ -1,2 +1,2 @@
-EBUILD at-0.ebuild 151 BLAKE2B 5d78739ded29cb2acb6990703fb817e1f3ac854772262f77997e165d5bf4a42e7a7c188a71c39789c15554f2ecc43e5b3b90e51586e0ad49afd7e26a18cd4dd3 SHA512 066c2618394f139ccfd2cae1eab3ec0e50a9d6b39acbea4f0d974b9920d21c1931f6b75b98a0a2200ed4184ac1fa23d66cc2694ddd99747a082f12d85210f5fb
+EBUILD at-0-r1.ebuild 151 BLAKE2B cb344fb6001f03c5dceac0823697804b619bc12c2a938cd3d179bb88f34cbfcc6fd0e545a9bfb65bd9acc25272de512afb9b8bb6b7d6675a440025905eaf652a SHA512 e50477db660851850462f6020b0c7db55f8b1ce734332b17d8b8e1b9de1737b2a42ed47f589b399d6b257aeaf118541812cb427131837d67f54d611517e3dd9e
MISC metadata.xml 398 BLAKE2B 037f58ef9b9d372a1137066db288badda6f884013296b4ea879816f539a91b5f484148ecd3c874561d24a9a3b4e336f6a73b332b30fc666f19f213b6bb37245d SHA512 c4d6086c77a47321b33e8ecfc827b51dad5f79558f1cb8845d495326d1f002e7fc5289165735fb26d1a1020e55d85f22358d313be11f5ddfb05b6580db027833
diff --git a/acct-group/at/at-0-r1.ebuild b/acct-group/at/at-0-r1.ebuild
new file mode 100644
index 000000000000..aec9d092feb7
--- /dev/null
+++ b/acct-group/at/at-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=246
diff --git a/acct-group/at/at-0.ebuild b/acct-group/at/at-0.ebuild
deleted file mode 100644
index 1dc36b11c23b..000000000000
--- a/acct-group/at/at-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=246
diff --git a/acct-group/atheme-services/Manifest b/acct-group/atheme-services/Manifest
index 065be8493e28..7aeafd225c2c 100644
--- a/acct-group/atheme-services/Manifest
+++ b/acct-group/atheme-services/Manifest
@@ -1,2 +1,2 @@
-EBUILD atheme-services-0-r1.ebuild 190 BLAKE2B a34f872d9744c87a46a0ea9031d410cea9ab86b3f1923524895cbe89db38c52ade90edd6e758afe14636b16337e014dd0599a6b56e6f3b507993ef26a5d38492 SHA512 e22c67f3001aa23ea12d1bc37a4bf7d759819e720331c40806819073032baa1ea333dc1c403d624f6e33039bca1e4fb682805e068768559df9450e5d581dc9c5
+EBUILD atheme-services-0-r2.ebuild 195 BLAKE2B 1c42efb448a937e0df893cc5ba2b9f9647d38089e0f29e55f0b0d1d9530dc5bc4c006a250f86a65f3ce09f5ccad11fa11a946f007c7af829a7f994fb57eef66e SHA512 d5885fd937761f87cebb850faa6f006793d6fc591f1303659997fe6fed34017b4a62715a5ed7d31b4d2346a4a9245162f81dc79507d99551edbc8f0ec0cef87a
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/acct-group/atheme-services/atheme-services-0-r1.ebuild b/acct-group/atheme-services/atheme-services-0-r1.ebuild
deleted file mode 100644
index 75014bfbb485..000000000000
--- a/acct-group/atheme-services/atheme-services-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Atheme IRC services"
-ACCT_GROUP_ID=412
diff --git a/acct-group/atheme-services/atheme-services-0-r2.ebuild b/acct-group/atheme-services/atheme-services-0-r2.ebuild
new file mode 100644
index 000000000000..ff1b39f3444c
--- /dev/null
+++ b/acct-group/atheme-services/atheme-services-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Atheme IRC services"
+ACCT_GROUP_ID=412
diff --git a/acct-group/audio/Manifest b/acct-group/audio/Manifest
index a648f3ffa32d..30930840ca76 100644
--- a/acct-group/audio/Manifest
+++ b/acct-group/audio/Manifest
@@ -1,2 +1,2 @@
-EBUILD audio-0-r1.ebuild 150 BLAKE2B 98ebc78abc3b3aca75b7705a7016c823897f32355d313aa71fd4b6724e1022cb53c3640bd01f7d7fba5ebe70f83d57e23285f04fa3a0053208f2e99b3e9b9214 SHA512 1431db3a0f2c0e15091c64f33c9b09f3d634b2c9fc9935bcceea3530e0b5c25b6330455ece58487d4e78a6d76191dd22c0ddd972d20fb69d412b21ae367660c6
+EBUILD audio-0-r2.ebuild 150 BLAKE2B d328ae8d617465d40e8a4d9a4422f6a1af58dbcb88d6e291861f3f9aa53a6268e16f66e633c8163e09e085204d5658a1bed16981b835f10da7a2105cc76e553d SHA512 4104cd051a8f576e73e4646144930172fe8254ac1a1d97b1a43275e1fd95728e4ccaeacccf99e7556c88daa5bde76696053428813ca465ecff7d4615dc2c8740
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/audio/audio-0-r1.ebuild b/acct-group/audio/audio-0-r1.ebuild
deleted file mode 100644
index ee027720bf31..000000000000
--- a/acct-group/audio/audio-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=18
diff --git a/acct-group/audio/audio-0-r2.ebuild b/acct-group/audio/audio-0-r2.ebuild
new file mode 100644
index 000000000000..112b264b30ad
--- /dev/null
+++ b/acct-group/audio/audio-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=18
diff --git a/acct-group/automatic/Manifest b/acct-group/automatic/Manifest
index a127cfb2a3c8..082f05dc0c60 100644
--- a/acct-group/automatic/Manifest
+++ b/acct-group/automatic/Manifest
@@ -1,2 +1,2 @@
-EBUILD automatic-0.ebuild 151 BLAKE2B 037170834971d20853404a900d94b9609ec431c5e8479b7de9869f5c33531c063ce4640e311b088fe24fb81bea87510c895f6782a89f1a692cba3e8b50723e15 SHA512 bf6b2b457bbc9c6912518c9f103db53aa4febeadc9619e41e3c4cd4b5c12715fdf5d1e5a30ff2971064d05da3b9e28f390171a5d6e6f740ff3448da975de4e5b
+EBUILD automatic-0-r1.ebuild 151 BLAKE2B ad7475ef510d15881bb6c3b6c02cda97e16a9219c27aec23783695430d847041c7fc1479e09de79f2e89abe946b8072252279ae298fc534b0fbc6f980534d340 SHA512 7672fabaa60df72e08f3a598b9c049a0c3a2481be26d5a9a9989ed275cde88fbb7abd0378dea9d12746c3197f8467df198ce9b881919f174481f149ca07f0df0
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-group/automatic/automatic-0-r1.ebuild b/acct-group/automatic/automatic-0-r1.ebuild
new file mode 100644
index 000000000000..60432b0cf093
--- /dev/null
+++ b/acct-group/automatic/automatic-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=338
diff --git a/acct-group/automatic/automatic-0.ebuild b/acct-group/automatic/automatic-0.ebuild
deleted file mode 100644
index c8e6c5c405c5..000000000000
--- a/acct-group/automatic/automatic-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=338
diff --git a/acct-group/automx2/Manifest b/acct-group/automx2/Manifest
index 5261ae58ae19..da4a9eaac782 100644
--- a/acct-group/automx2/Manifest
+++ b/acct-group/automx2/Manifest
@@ -1,2 +1,2 @@
-EBUILD automx2-0-r1.ebuild 192 BLAKE2B 3b16574fc294388ea769db4946b567f1bb3a2e6a8d438db6afbb0c73dec33cb13a08554ca048b3a84305f7b0ed717e6a62cee6b1880dd57196ccc5a3144a0a02 SHA512 6c42f69d2c199318a7966fcbb06c0e0a30e0f9024ec827ccb7e789b19b491d5f376abe333e53a2a268ad87bfed58098305c83339c8f8173c0ec44591578f2ea5
+EBUILD automx2-0-r2.ebuild 192 BLAKE2B 413bb10a7d054d5c83406cdb8c5516bfb4ac8c5c0c337f8385895dd2234d83c387527e3a8a5f0326f300662cd30541d9066c44e6f3181ff5e631509cf57b06f9 SHA512 45eb764d89f690bedf6859d7f76dc3bcbbcdb962e4a8bf3988e030d8ccedc906a88c202fc616dfd87efb59b6947fca2139c5bfd02f0646dc75898ed8a9849dd0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/automx2/automx2-0-r1.ebuild b/acct-group/automx2/automx2-0-r1.ebuild
deleted file mode 100644
index 59c8977b5fe7..000000000000
--- a/acct-group/automx2/automx2-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/automx2"
-ACCT_GROUP_ID=437
diff --git a/acct-group/automx2/automx2-0-r2.ebuild b/acct-group/automx2/automx2-0-r2.ebuild
new file mode 100644
index 000000000000..4a38f233a8b9
--- /dev/null
+++ b/acct-group/automx2/automx2-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/automx2"
+ACCT_GROUP_ID=437
diff --git a/acct-group/avahi-autoipd/Manifest b/acct-group/avahi-autoipd/Manifest
index bd7938334ff4..b7e0541e75f3 100644
--- a/acct-group/avahi-autoipd/Manifest
+++ b/acct-group/avahi-autoipd/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-autoipd-0-r1.ebuild 188 BLAKE2B c1977008777676bb0b83108cdce5644e703daf2d4123f0ecafa0dc634e8e0f42fb97448390f9391aa5b66c47fbbea8ac596cb4b38d3d51087c5e6526a78724f0 SHA512 ef6e9372aea6b047f8e563fc5e55a24d4044272019431224ef20fec040478e1c2d1cfbf7d3830c769aa109c2f7cb223caae819476162be3cf0aad6a1b042fe78
+EBUILD avahi-autoipd-0-r2.ebuild 188 BLAKE2B befbf1838c860531800ef54004ce781e87c9f8e7fc2fe3895880733c10e73508f85e03a1269b5c4daf981b704639f02ebbd7053ccd5aab57107143aa0097526a SHA512 808483813e98f397478af82ac64fc89d26c21e5759107ca0aeef5e6cca35808eef09192a90c277a5321fbc847eb5474281504688d992e8eea4aa4f020b6e7cb4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
deleted file mode 100644
index 6d912cd47ce4..000000000000
--- a/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi-autoipd"
-ACCT_GROUP_ID=62
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
new file mode 100644
index 000000000000..02b2443648a7
--- /dev/null
+++ b/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi-autoipd"
+ACCT_GROUP_ID=62
diff --git a/acct-group/avahi/Manifest b/acct-group/avahi/Manifest
index 4fa35fe91d75..5de3da005599 100644
--- a/acct-group/avahi/Manifest
+++ b/acct-group/avahi/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-0-r1.ebuild 180 BLAKE2B 442f889f9b7fe61aa7e62ea8887ce26dc968a6f8a04206a1945d0873e8bb686f8eb09e60e789cb60e68f285ae984e0bad91adf8a6ef65794487bdf8f612c49fe SHA512 7ebdfbb4f360433cce74c18456ab8666782289d378f6331d9b3122bdd1339a665815ed0ec36811741019ec76ecd7cc9b4a22f5afc40d370a9835bd1e3c247422
+EBUILD avahi-0-r2.ebuild 180 BLAKE2B 3cfe1ed6f96b71991945aa02c81c681ea3c21e48263400867d8785ac631c903f99d3e943f5b03d1ce79173e770e46067e650831cfa6537568d9fe0b049ebd891 SHA512 bb31dfe4bb8b8c23914bb6b5e44a6e71f7d0af16be6fd3545f4644b654fbd657f68ec98bbe055d9a2ced02eb5f7bdabe87713ef38606d22861a8774e5762c454
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/avahi/avahi-0-r1.ebuild b/acct-group/avahi/avahi-0-r1.ebuild
deleted file mode 100644
index 6602136b24a2..000000000000
--- a/acct-group/avahi/avahi-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi"
-ACCT_GROUP_ID=61
diff --git a/acct-group/avahi/avahi-0-r2.ebuild b/acct-group/avahi/avahi-0-r2.ebuild
new file mode 100644
index 000000000000..0b24f601736e
--- /dev/null
+++ b/acct-group/avahi/avahi-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi"
+ACCT_GROUP_ID=61
diff --git a/acct-group/axtls/Manifest b/acct-group/axtls/Manifest
index 938ac57aa4a1..e801b97c6939 100644
--- a/acct-group/axtls/Manifest
+++ b/acct-group/axtls/Manifest
@@ -1,2 +1,2 @@
-EBUILD axtls-0.ebuild 195 BLAKE2B f35f2407ec1ce76ca312719ea2ad58e155071e63d6b3c9a8869aa4aab0d802da9265ec355c6c0b2d3c886889b22ecaac4e7a22ee899fb1f1ba03e5381b396741 SHA512 5da2aa28b7baf4dfccff5eac2b9c28aaafac780b0f3b0f6abefc06a8a38baafe9d001614533e607b61d63695696ab97d4fe6118e251c594eb48ca163425de23c
+EBUILD axtls-0-r1.ebuild 195 BLAKE2B 6039e5bd75930ff6206595e90af27cc236d08a6240f97f29030dff6556ab2c4464a27314131ded039db6799889e9ddecd4096cc2e8011206bcb0afd6e8da6076 SHA512 be7c373ad745a0fb66f80fe7cc5254ad4739f6227e856777db7a536ae26a1b8465e73f48c068c133a5451637282461b026cdee8b5db0fdd4f63d906a929d908c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/axtls/axtls-0-r1.ebuild b/acct-group/axtls/axtls-0-r1.ebuild
new file mode 100644
index 000000000000..bf1a8f22259f
--- /dev/null
+++ b/acct-group/axtls/axtls-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-libs/axtls"
+
+ACCT_GROUP_ID="147"
diff --git a/acct-group/axtls/axtls-0.ebuild b/acct-group/axtls/axtls-0.ebuild
deleted file mode 100644
index 4534ecf5b634..000000000000
--- a/acct-group/axtls/axtls-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-libs/axtls"
-
-ACCT_GROUP_ID="147"
diff --git a/acct-group/backuppc/Manifest b/acct-group/backuppc/Manifest
index db102b26687d..bc949105020e 100644
--- a/acct-group/backuppc/Manifest
+++ b/acct-group/backuppc/Manifest
@@ -1,2 +1,2 @@
-EBUILD backuppc-0.ebuild 198 BLAKE2B 75bbc8180ef2bd76a54805c05e8bd9f7fe421731cfb2bd679059c33a6c844832dfead8d2862ecf4701ae3b9bbf95dfe748f5bb0bb69a1aaf02f25d516bfb5585 SHA512 45050972766e07a80576508c2d38f2ca68c8ccddfce1115525c3f7e281cb5bd76570e3c02dd77bf1189f6cfa0948505e9c41039f60189a282ea414549a8939aa
+EBUILD backuppc-0-r1.ebuild 198 BLAKE2B 40b35990a51b867ceccb93054bfe03d7b7a7487441857cbafbdbad07799bda6881b6758afe46acaba0ffd2b6e3e69ffdc7c74ee925d1d625e05b20afcbfaf55e SHA512 7b885587ffdfd2bff2f693cb549b88137d810a8a707fe1ff96ba2669dced9dd1b5746f817016f5ab1d010ee5bccd202cb34c398b4a33ac1469b2f3fa180fdfc1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/backuppc/backuppc-0-r1.ebuild b/acct-group/backuppc/backuppc-0-r1.ebuild
new file mode 100644
index 000000000000..3297ead3270f
--- /dev/null
+++ b/acct-group/backuppc/backuppc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-backup/backuppc"
+
+ACCT_GROUP_ID="282"
diff --git a/acct-group/backuppc/backuppc-0.ebuild b/acct-group/backuppc/backuppc-0.ebuild
deleted file mode 100644
index 8adafc19f9be..000000000000
--- a/acct-group/backuppc/backuppc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-backup/backuppc"
-
-ACCT_GROUP_ID="282"
diff --git a/acct-group/bacula/Manifest b/acct-group/bacula/Manifest
index 89a8718ad156..1d8bb1341476 100644
--- a/acct-group/bacula/Manifest
+++ b/acct-group/bacula/Manifest
@@ -1,2 +1,2 @@
-EBUILD bacula-0-r1.ebuild 202 BLAKE2B 9471cb59d78dee34d13aab2ec22eaf557869da665c85f597547502653ef954418c72066778675e8880f6e38560f29371e41f8a2a431b181c86b1c3d602493101 SHA512 d4d6cccf27f9cba3527fa58b16bb0a077d438a677761d8be787484509479da7e47340d553a626fe8dc215c7a6b38124b2a326f7b9018af3559395d2eabfe3f95
+EBUILD bacula-0-r2.ebuild 202 BLAKE2B a47b25bea9be45566a529ef9aba525213dc48d8bb2b1eea1e48aa561489172ef0b12e8a014881becc893a85135d6bba875b5856ca5f6867d6aaeb801813e7649 SHA512 ca0cb37a18a4b0a48543b05314924fd5fe90295fdce78f39a82cae9854fd23d2982c7de0a8dee655c22fa37977814e4f786ccd640038ddc5d417a4e6aa00ebcd
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/acct-group/bacula/bacula-0-r1.ebuild b/acct-group/bacula/bacula-0-r1.ebuild
deleted file mode 100644
index 399d999796de..000000000000
--- a/acct-group/bacula/bacula-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the bacula backup system"
-ACCT_GROUP_ID=273
diff --git a/acct-group/bacula/bacula-0-r2.ebuild b/acct-group/bacula/bacula-0-r2.ebuild
new file mode 100644
index 000000000000..dc252476093c
--- /dev/null
+++ b/acct-group/bacula/bacula-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the bacula backup system"
+ACCT_GROUP_ID=273
diff --git a/acct-group/bareos/Manifest b/acct-group/bareos/Manifest
index 32f06ddb50f5..9b3012135911 100644
--- a/acct-group/bareos/Manifest
+++ b/acct-group/bareos/Manifest
@@ -1,2 +1,2 @@
-EBUILD bareos-0-r1.ebuild 207 BLAKE2B 862774e16d6cdd97cbd089f8fbfd26ad80cebf5f783a0e62e75e2b6e4e2752e01647c4cae903938ceb5dd401242c20fabae7f9122ed95994f78c6de1d42be543 SHA512 fe3d708bdffd7e7b89ee5ab4a1ac4f3012036e712e0e82efe4e2660c6051ac764ef7c3b09dcc307c0727f3057ff1b993ac56239d977ad22f80c2bcd476c41e7e
+EBUILD bareos-0-r2.ebuild 207 BLAKE2B e635d16d53abc82b006d6b656f121f4f444d8fb87d0e3496a17b40dfefd1147fa330b9c351eb7c0da0e2d21fb3ea10c67f343c151a438b633d7b17223d1b5b5c SHA512 ffb10b12e0efa797a8f54717720972499c3cdc7d05154aa6acc4d8b811a94999963766ed2c06b68f72b1a3afd769ce0b0085f2fbadd5c381ccc06db6d97436b8
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/bareos/bareos-0-r1.ebuild b/acct-group/bareos/bareos-0-r1.ebuild
deleted file mode 100644
index f839b3044908..000000000000
--- a/acct-group/bareos/bareos-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the bareos network backup suite"
-ACCT_GROUP_ID=403
diff --git a/acct-group/bareos/bareos-0-r2.ebuild b/acct-group/bareos/bareos-0-r2.ebuild
new file mode 100644
index 000000000000..82834b64fcac
--- /dev/null
+++ b/acct-group/bareos/bareos-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the bareos network backup suite"
+ACCT_GROUP_ID=403
diff --git a/acct-group/beanstalk/Manifest b/acct-group/beanstalk/Manifest
index 02a804bebb8a..7a3b219ff2ee 100644
--- a/acct-group/beanstalk/Manifest
+++ b/acct-group/beanstalk/Manifest
@@ -1,2 +1,2 @@
-EBUILD beanstalk-0.ebuild 200 BLAKE2B eccf77f37a2fd17d9a82c21d80f1b20161384085ef8829c4f276492389396c91da59ac91a5b0c539d522ee87637897771aa9a5e728780b7ff691f2debdbd2329 SHA512 09ebb4c311836332456f82351ded8a6fdca1a12e0c9064d96a15387e6437aafd5fd232de95b7d05702d0ff65cb465a6dc7979be6345cd5872c8c73bda1281afe
+EBUILD beanstalk-0-r1.ebuild 200 BLAKE2B c4aae3b84896712eaf769586e0ea169686a6c00b84d8583c5916d73cd14d5f5e083577b97ad92ec0e97c4dd2deeecaea17fbeacdac1729c373e54930231323a0 SHA512 f4f1ba8ffd2632560c0cbdb2a2a974baabc88eb4c6b9fe2aec8988c6b49d4feca1e5ef2ef429750651896b2692bf4ff0b5eeb54973df6f319c2404be4ffedbdd
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/beanstalk/beanstalk-0-r1.ebuild b/acct-group/beanstalk/beanstalk-0-r1.ebuild
new file mode 100644
index 000000000000..8587963e6d4a
--- /dev/null
+++ b/acct-group/beanstalk/beanstalk-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/beanstalkd"
+
+ACCT_GROUP_ID="137"
diff --git a/acct-group/beanstalk/beanstalk-0.ebuild b/acct-group/beanstalk/beanstalk-0.ebuild
deleted file mode 100644
index 2fd201660183..000000000000
--- a/acct-group/beanstalk/beanstalk-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/beanstalkd"
-
-ACCT_GROUP_ID="137"
diff --git a/acct-group/bedrock/Manifest b/acct-group/bedrock/Manifest
index 40c3e2f049a0..0aef6757381f 100644
--- a/acct-group/bedrock/Manifest
+++ b/acct-group/bedrock/Manifest
@@ -1,2 +1,2 @@
-EBUILD bedrock-0-r1.ebuild 209 BLAKE2B ea35183c2795810ef6b36433a15d934e109291acb518615da30cd8ede168c40338111dd6300a2ecbdee569e9ea7ec56df7edc486b085ee3dc451fe95f52d6a52 SHA512 352f0838fa9852c1a1fb361a210c2f5a3805604514aad1940cef32bffcd5e84acdd4fa694c21833b803a766adbc7ba8f7671fd6ae2335a726176be44305e7bf0
+EBUILD bedrock-0-r2.ebuild 209 BLAKE2B f8b5c55a70ea671fd00bd611c46999cc8c6d56c5fe4c8ea00efebb0faa6d4e3326da01304cc7bbf36436db467b7bda95ff486af6327fac16b5578974669f6dc8 SHA512 38712bff42ef9d48c877087130c179c82fa6a77c7fa4d07c65aa42d13f7c306eee4ae2c093fd087cc5c14cbc423f33334515ef76949b96c59f5698fd11816a5f
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/bedrock/bedrock-0-r1.ebuild b/acct-group/bedrock/bedrock-0-r1.ebuild
deleted file mode 100644
index 409365438231..000000000000
--- a/acct-group/bedrock/bedrock-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft Bedrock server"
-
-ACCT_GROUP_ID="485"
diff --git a/acct-group/bedrock/bedrock-0-r2.ebuild b/acct-group/bedrock/bedrock-0-r2.ebuild
new file mode 100644
index 000000000000..65b2c6db2dbb
--- /dev/null
+++ b/acct-group/bedrock/bedrock-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft Bedrock server"
+
+ACCT_GROUP_ID="485"
diff --git a/acct-group/biboumi/Manifest b/acct-group/biboumi/Manifest
index e9da58d41b55..73092c622b5d 100644
--- a/acct-group/biboumi/Manifest
+++ b/acct-group/biboumi/Manifest
@@ -1,2 +1,2 @@
-EBUILD biboumi-0.ebuild 151 BLAKE2B f87f423bcdf9f62bc0308265ffb19739b471747be382a5753d957c6e1d2017763a8c4f73e5469b92f516330a678f5f3f66b11b67e5e5f0f52c4c51e88d0d3b83 SHA512 7978756fb79cb8c100f5907237afb9f655ce4d07e6b6eb002cdc037161d4a5c8cc4181954874e2104cdeb183c03a8cded800cd5057164121cc0b4a23618908b3
+EBUILD biboumi-0-r1.ebuild 151 BLAKE2B 7adb325bcb1098b62ab860cf5b09e45fde8e6e607b78eee0cd47db71d761642b6f16148b05992b5fc732600ccc82ab87d136ea1155daa53102deba3cb16db12c SHA512 6f69629e91012a46c1b442bdedcb457ab241fbc7b3b5972bff9c090f06d51397bf6db991c17ebe8f299b7a81696e329b06e7223b524ec5a9df1404a37f69d21f
MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/acct-group/biboumi/biboumi-0-r1.ebuild b/acct-group/biboumi/biboumi-0-r1.ebuild
new file mode 100644
index 000000000000..2696a03b0ceb
--- /dev/null
+++ b/acct-group/biboumi/biboumi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=508
diff --git a/acct-group/biboumi/biboumi-0.ebuild b/acct-group/biboumi/biboumi-0.ebuild
deleted file mode 100644
index 14c409597792..000000000000
--- a/acct-group/biboumi/biboumi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=508
diff --git a/acct-group/bind_exporter/Manifest b/acct-group/bind_exporter/Manifest
index 0a13d1aadd57..9c9f1e8af275 100644
--- a/acct-group/bind_exporter/Manifest
+++ b/acct-group/bind_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD bind_exporter-0-r1.ebuild 146 BLAKE2B 57abdc52be113475f1a2bd062c39d36fba9ecd3950a959d7339267441a9419b9fe7b52bc618efc6cfc0017e995b4c3d6ba98f5ddf969591c443464ed946f2739 SHA512 d722c6d270386a7594569f0764e5f1cf2e30fa345e9d0cc52e05a572f7201fd24951b66182488ab5877255bc4e0775d656b786380c16bad909fe187d353910eb
+EBUILD bind_exporter-0-r2.ebuild 151 BLAKE2B f5050a82ec7c0e1a5e524019835126d268e45fb4d9e335311f60acc491a1c0a22f6c976568cc319690d4a04a3e8b05684faf5ba314f22a8adc5aa2a35b899e2a SHA512 d7a76601ba149d8482a669d084981b0a9dad2e45d14a09fc2d5c1341d9ae8065b908267cb0ad0adfbbeb962ad044c47951635a1d69c98fd83999c74ab1fa11b5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild b/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
deleted file mode 100644
index 94f94a51727a..000000000000
--- a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=276
diff --git a/acct-group/bind_exporter/bind_exporter-0-r2.ebuild b/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..37141abf1c02
--- /dev/null
+++ b/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=276
diff --git a/acct-group/bird/Manifest b/acct-group/bird/Manifest
index 6ba1a7c07a3b..97f7626f9dff 100644
--- a/acct-group/bird/Manifest
+++ b/acct-group/bird/Manifest
@@ -1,2 +1,2 @@
-EBUILD bird-0.ebuild 211 BLAKE2B 46d7c14f282d6175e0a779f318d0d6f91f8260f2d3da539e8aad776557de8c8b4152d5739e0c38d6afc12f85e788b78c8c62a056e6a789962528bb3dd70f737e SHA512 f13d8b15c9e57d85733d3100a9e97b03a2c1338ef58733d77193bc07ef02a7aeb55e5de1a6fd9a04b54a413dd93a2e2eb8d5cbf0d4316043b710b2cd4fb9b778
+EBUILD bird-0-r1.ebuild 211 BLAKE2B 15674bf2611a6074cc57c6c73011a4822ba8bf68693a78f387fe80ba741392a1a1d3c457677d416e412652a3e5b6cbd0b42fec5c09d4fb56b12069fb2cb1311c SHA512 1d583cfeabe0a36eaf9b1d902145ad778fe362d0e38788ff42f15ea860543f4c603bf3874860850b9eb8943530cfca0663123f2046e5a01c046244c73ffeaa0b
MISC metadata.xml 383 BLAKE2B 080fdb7b781289c93a68e25e99430c9abe12915f7567be25c3d37a7c7d8903efa0eba320b1655e77ae8d06bb22aa86ea64cef3d85190729f21bc9018cbf3b1da SHA512 52461aeddda68ed1585802d7d831c95574cce5c9ddefd16ca28c71eb50a2ed3abb5b36e5e018392f184f07ad133aa2dd6b7054f7845b27ee1cc97b3bf80ab836
diff --git a/acct-group/bird/bird-0-r1.ebuild b/acct-group/bird/bird-0-r1.ebuild
new file mode 100644
index 000000000000..d409ead353b0
--- /dev/null
+++ b/acct-group/bird/bird-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+# TCP port 179, but 179 is already used by acct-group/_bgpd
+ACCT_GROUP_ID=180
diff --git a/acct-group/bird/bird-0.ebuild b/acct-group/bird/bird-0.ebuild
deleted file mode 100644
index 174e87b87bf9..000000000000
--- a/acct-group/bird/bird-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# TCP port 179, but 179 is already used by acct-group/_bgpd
-ACCT_GROUP_ID=180
diff --git a/acct-group/bitcoin/Manifest b/acct-group/bitcoin/Manifest
index 3a252de136ea..a737508c5351 100644
--- a/acct-group/bitcoin/Manifest
+++ b/acct-group/bitcoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-0-r1.ebuild 227 BLAKE2B 65bb51a72728f881ecd1ef20e551ba599f9d2930c4c749be40b17683473aa550cf673639acadc8c11be439cdeae1d7798f9323a00edd252d75b83b62d24a9900 SHA512 5339f0303ff41df1d62a1ffc60ea2b62f318ff156a98300589cc19f931665559d7912afd00e36220b4ceae58cfe7a79b8027680cbcf2c259d1e651a036542677
+EBUILD bitcoin-0-r2.ebuild 227 BLAKE2B 97988e5b1c96cb91873e160da4b0ddfee68b3d90cc2431fc967169b6ed85201d1b166fd62bb72395f2d8a203321a5313175cb4ca99965af6e19d82f4f6ac52ad SHA512 a7f7ea535865c00b01b49b502e70fd52b9e677fa8d47e9268e4e3c5433e2c67cf4ea8dc3105bda75f078ecf2f162a3ba4055a9a3d2780eef96e5c8b22ab45f8a
MISC metadata.xml 405 BLAKE2B 3eb2845f129f9c7ece1f374a0bef8eeba29614c94e714afa75d9193c5238539d48de1c761de7568eb7a1e3497fc8afc0e876be8339292e7e020d14531b963a59 SHA512 2ef8d9eb38092901821728d198e438c169f57cb38772267e62dc352ec7e35586a578802492682705fcd1d387ef9987344ef7d501d254d2743a35c9f0692d3f75
diff --git a/acct-group/bitcoin/bitcoin-0-r1.ebuild b/acct-group/bitcoin/bitcoin-0-r1.ebuild
deleted file mode 100644
index cc0bf22ffe01..000000000000
--- a/acct-group/bitcoin/bitcoin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for users with access to system-wide Bitcoin services"
-ACCT_GROUP_ID=483
diff --git a/acct-group/bitcoin/bitcoin-0-r2.ebuild b/acct-group/bitcoin/bitcoin-0-r2.ebuild
new file mode 100644
index 000000000000..a29293fcef17
--- /dev/null
+++ b/acct-group/bitcoin/bitcoin-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for users with access to system-wide Bitcoin services"
+ACCT_GROUP_ID=483
diff --git a/acct-group/bitflu/Manifest b/acct-group/bitflu/Manifest
index f4fddc408bf8..35e4c83764ff 100644
--- a/acct-group/bitflu/Manifest
+++ b/acct-group/bitflu/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitflu-0.ebuild 195 BLAKE2B 9984ef1713787e09a397a5c24344e60de1478b603616bd4a945f8051988dfc72f285a4e9ab8b7a671887ee09b0d046d861f7d80640b5460c3da44253d3e04800 SHA512 3515dbd442f26176a8d7eea23ec2721a864e2fe95fd0bf5aeb8a91d763bc822bb7faa8458d97ac6459694d4d155b3e0829d510104c4c64f7da82cea2554f5430
+EBUILD bitflu-0-r1.ebuild 195 BLAKE2B 5ad5dbdc05539091a237190455aa3347a0ab3aa04243a1a453317073f502eee1bb04db5c1a1b8e82156e38279ba62c3354127c8012569fd53587ebcdd2c95681 SHA512 77a2439b436531dec91e99bffe1ef2819b63469943fa271588f93f0fc4a87b5e96e2d7a26fef6814fafe8b32106c3077e21dc3c983f8d38fa03aec7e9e8052e8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/bitflu/bitflu-0-r1.ebuild b/acct-group/bitflu/bitflu-0-r1.ebuild
new file mode 100644
index 000000000000..8009fbfbedcc
--- /dev/null
+++ b/acct-group/bitflu/bitflu-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/bitflu"
+
+ACCT_GROUP_ID="148"
diff --git a/acct-group/bitflu/bitflu-0.ebuild b/acct-group/bitflu/bitflu-0.ebuild
deleted file mode 100644
index b0544d2346e2..000000000000
--- a/acct-group/bitflu/bitflu-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-p2p/bitflu"
-
-ACCT_GROUP_ID="148"
diff --git a/acct-group/bitlbee/Manifest b/acct-group/bitlbee/Manifest
index e9864dec0a57..5ac0b4bf1714 100644
--- a/acct-group/bitlbee/Manifest
+++ b/acct-group/bitlbee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitlbee-0-r1.ebuild 146 BLAKE2B 45428e84c6e372bffbb76a9d1af886cbc176e6e42b4f8685e217d765f859ad1b753bb06e85c7009fa25ee4a1858ea5c91b8419519e28cc448dd5a59be79834cd SHA512 96ba1e542a55002b0e337c947111c0562f3976d5040fb6214e58f1ea9d678672336c10b12c1af892c59079d65b0f62e9c7892fd2ecfe72fbe165000519d3c9cc
+EBUILD bitlbee-0-r2.ebuild 151 BLAKE2B 8df8c1742d104abe8e7157517fbbcbb4662b8744b4826664d5d0d815a11ee28f89a237b8491ec8bd1093408344565d68bfb2e02eb8775cf679969b27db7ddcf9 SHA512 7f6595a5b74d8576a4cd85c4973c8eb0d6076fd5eea860f3a5824f653e970cb51e00e0676761ab51ec252f30b22c9982380b48cc9b2f00e44cc1b922ce673d0c
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
diff --git a/acct-group/bitlbee/bitlbee-0-r1.ebuild b/acct-group/bitlbee/bitlbee-0-r1.ebuild
deleted file mode 100644
index cfecdbf5c9ff..000000000000
--- a/acct-group/bitlbee/bitlbee-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=407
diff --git a/acct-group/bitlbee/bitlbee-0-r2.ebuild b/acct-group/bitlbee/bitlbee-0-r2.ebuild
new file mode 100644
index 000000000000..93485a39696f
--- /dev/null
+++ b/acct-group/bitlbee/bitlbee-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=407
diff --git a/acct-group/blackbox_exporter/Manifest b/acct-group/blackbox_exporter/Manifest
index 12d8b549c36f..c7c657720c51 100644
--- a/acct-group/blackbox_exporter/Manifest
+++ b/acct-group/blackbox_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD blackbox_exporter-0.ebuild 146 BLAKE2B f19d6c113985a1ee4202e3ba723a2a614bba3f8c9dc0ba7418c6f5c0ad71d1cb499d86f5ce3dea4925efd294a962241db5b62d3f77ec5235a3577b275f68fef9 SHA512 e42747231330e51829d449212373f8b45c01a06a5f86447da6fd79793be62d1fb4de37e26998c1206bdeea5a701b11f6f96f5ae2bb6ecde780c016a3911857c6
+EBUILD blackbox_exporter-0-r1.ebuild 151 BLAKE2B b1de27dfbb6020abea966efd607161d057015f55e059a781e957d04586777ad7fe6e675cce61ab3e2db04c9ea02eb640172560355ba58b4a41f3710cd739f13f SHA512 a4f82682d1f66b8d7a4e553887905bba9fa22368ec9d5b2fdce3eb949b434ee7012a0d3ed14edee8ee627aca62fefaefeb8a72e34614e9107c59c41f08fe29ba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..8e1e5e73db5f
--- /dev/null
+++ b/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=293
diff --git a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
deleted file mode 100644
index 71d2888a2d22..000000000000
--- a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=293
diff --git a/acct-group/boinc/Manifest b/acct-group/boinc/Manifest
index 93d0239792ad..d82dc73f50f8 100644
--- a/acct-group/boinc/Manifest
+++ b/acct-group/boinc/Manifest
@@ -1,2 +1,2 @@
-EBUILD boinc-0.ebuild 185 BLAKE2B 5460f7bc31d15beba86f16443aeb364fd40b207285fad0f1534878d83eded1a060aef502ebe04b830c49d2908efe6ec47840864a151cadf819a67624aab88976 SHA512 0ea549e2b4dc5ad23aecd49359e78cf294d36c3d1d4ca9099bd7c919caf991b1591699a0411e3b828c850a6263aa48a3ec6f9e6f73d744286ef6cf07dc812052
+EBUILD boinc-0-r1.ebuild 190 BLAKE2B 87ee45fa74444cd0440b56ea89b5d6d282d9f78d1eac87e936518b414f3d5db302b21eedd910f9e82f5fcdffe3ce5053392806c2e211e97bbb4e572d1d3a6340 SHA512 a310661ddad06ddacbcaa93522701e9e91c882bdc7c57c1f92c55586be91038fde4949856ae32e0f4a05cb924cd8153a5811def8444262f1085d87ff5a7b865c
MISC metadata.xml 510 BLAKE2B 80b772647185a13d46c2e56c90a473ce0752d55a9bd1aacb0847383ff73e4e4d56c5eb48554c86eabce217191ed36fa411c05fbe27edadee551808cc97aefe6a SHA512 d5d44bd410fe44f111a327b50b9f583589b749b7ff0a8ee66ec5fe54e70d6c18734e53803e2f3cfb761bb48a6d1082ee9c108d64d230a02fdaf5ffb737b7037e
diff --git a/acct-group/boinc/boinc-0-r1.ebuild b/acct-group/boinc/boinc-0-r1.ebuild
new file mode 100644
index 000000000000..cad1c8d097f6
--- /dev/null
+++ b/acct-group/boinc/boinc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-misc/boinc"
+ACCT_GROUP_ID=352
diff --git a/acct-group/boinc/boinc-0.ebuild b/acct-group/boinc/boinc-0.ebuild
deleted file mode 100644
index dc46c8eba7b2..000000000000
--- a/acct-group/boinc/boinc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-misc/boinc"
-ACCT_GROUP_ID=352
diff --git a/acct-group/brlapi/Manifest b/acct-group/brlapi/Manifest
index dc59b0d79c6d..bcd39facba89 100644
--- a/acct-group/brlapi/Manifest
+++ b/acct-group/brlapi/Manifest
@@ -1,2 +1,2 @@
-EBUILD brlapi-0.ebuild 151 BLAKE2B afae1a84783a8fed665a80b10c5aa429df69edbe6eee9d04e81bcf7db0cbb3b60c29e054dca5c95054a4e195eb91b60fbe337dae4bdc35b0624810697f981166 SHA512 a0459c60beeaabf9636dd2b7a3319794cd88b62b50005c26b6d5092a16d74ec085e09949cd953709d816d56362d1f64d2e65996e4e2a4170ab310837dfb3f8c1
+EBUILD brlapi-0-r1.ebuild 151 BLAKE2B 5235da32932170c316e874cce192b1401997aac316b06a25c26efeb2800ffb51287d4d0393f1a1f13c7523af9f8e9a702f3be201459fc65c08ffa47c6c5e54a5 SHA512 a76d52701c08c5edb7d042d1ea8999be5e69c954bb532196246bec1a9422b24d53a91bf5ae80a1657ab1d8a14be56f473d52eae033782345961116f4247a5032
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/brlapi/brlapi-0-r1.ebuild b/acct-group/brlapi/brlapi-0-r1.ebuild
new file mode 100644
index 000000000000..752469ce1198
--- /dev/null
+++ b/acct-group/brlapi/brlapi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=507
diff --git a/acct-group/brlapi/brlapi-0.ebuild b/acct-group/brlapi/brlapi-0.ebuild
deleted file mode 100644
index 07af6c150bd9..000000000000
--- a/acct-group/brlapi/brlapi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=507
diff --git a/acct-group/brltty/Manifest b/acct-group/brltty/Manifest
index 5df13956229e..79b54f5a39b7 100644
--- a/acct-group/brltty/Manifest
+++ b/acct-group/brltty/Manifest
@@ -1,2 +1,2 @@
-EBUILD brltty-0.ebuild 151 BLAKE2B 1a0c9b4c11a5117712f84c940e6624402f9a945208df3152232e7e996d5761d126f905429f930dba296cbb505929b440612f2a9272c6d006620b98502c2e03bb SHA512 f7b339e948f69c99335186ec50dbf12fd3855240e2a19eb4b1771d9a701174914b339d57fb084f732f76d039e4e8d7eb018dbcc1f7cbfe2f4cb3269f64dff0d9
+EBUILD brltty-0-r1.ebuild 151 BLAKE2B e7a433fca43ddd6a1e04a01d8bf9f495fba60cd5f2cd25afe88f0d58d3399f67ab72472e3de6105c62c5b1b3f467a109a3a26f5173bf4713ff32dd0a6aa05c27 SHA512 834a87e4cddd12d7f51c77471b0d27c702cb9e692df3b87e67d831d1b45823d588cb5162e2ff0e31808e777b79fb86c0cd3dd01d0e5a77b362ebb2c1e4c0bbca
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/brltty/brltty-0-r1.ebuild b/acct-group/brltty/brltty-0-r1.ebuild
new file mode 100644
index 000000000000..73c11e0c07cf
--- /dev/null
+++ b/acct-group/brltty/brltty-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=506
diff --git a/acct-group/brltty/brltty-0.ebuild b/acct-group/brltty/brltty-0.ebuild
deleted file mode 100644
index 5cc5694d6f9c..000000000000
--- a/acct-group/brltty/brltty-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=506
diff --git a/acct-group/buildbot/Manifest b/acct-group/buildbot/Manifest
index 3a36fdf6a622..0ee5ec5fb3d1 100644
--- a/acct-group/buildbot/Manifest
+++ b/acct-group/buildbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD buildbot-0-r1.ebuild 197 BLAKE2B a19503326f676972c2eed8a55fd767973fcf3f52a82875b7a34ef615a2feaa677c2273db53966a73812d52e6d673f8d9ffd4463e6b7d748c70bbd1732db3558d SHA512 03b45b53eb156876a7951fc140ac1139f56aaf733b1583df1036af91178c3df6065a141a59ccf1cc2fd5980000ba54dc16813ee8cf59704f19d399cfa5dfc8a3
+EBUILD buildbot-0-r2.ebuild 197 BLAKE2B ae617e87921fbfebd3d8218d987d8d15dfba56e524f60c6dd9bc37aaae492cc7f28350e1b0055ff30aa2e9c6de6a595f9cd1541ba8f6567354a7c7d12947f15a SHA512 209f0c19d77ac05ec239c7314711d244b56a7ed9111030e9cbaf26a371043f64502171d120898486b6b0df950789bccc02ede79cc950a469b71d106aacbe8996
MISC metadata.xml 252 BLAKE2B a7ff81694559e4649beaf5821bf5c155420d0170fec450c215147b27928cf668494a61f850c49c5b5fc2f2185eb5c33b283766bd3824969c6e84e8327c340c94 SHA512 dc07337dc5c47477164914f740f97763d2dfbed7a82c3b69f34ca12c5e0d290d26e4e15d126ded66d525e98567e86814cf4ec7ae42a3ebbcfca0bf723a23d31a
diff --git a/acct-group/buildbot/buildbot-0-r1.ebuild b/acct-group/buildbot/buildbot-0-r1.ebuild
deleted file mode 100644
index 850f789f93b5..000000000000
--- a/acct-group/buildbot/buildbot-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Buildbot program group"
-ACCT_GROUP_ID=393
-SLOT="0"
diff --git a/acct-group/buildbot/buildbot-0-r2.ebuild b/acct-group/buildbot/buildbot-0-r2.ebuild
new file mode 100644
index 000000000000..b58d336eef9c
--- /dev/null
+++ b/acct-group/buildbot/buildbot-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Buildbot program group"
+ACCT_GROUP_ID=393
+SLOT="0"
diff --git a/acct-group/bumblebee/Manifest b/acct-group/bumblebee/Manifest
index cfd9191dea57..d56f7de52a04 100644
--- a/acct-group/bumblebee/Manifest
+++ b/acct-group/bumblebee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bumblebee-0.ebuild 151 BLAKE2B ee49856581a6a3f9f8a136135999bbec66304d7447a151c95124229162747db99dd603cb232e99dfa40e89a6ec818a8eab336bb059288467948293f9d0bcc93f SHA512 9f3f123a47fd0cea67720eec2c0ff8485b1c088977b0f46d96ae1c40eb3d8aad2c90bb1965e172c7ab11a25723bd6ff3899099fb496864d848b9e940201876f6
+EBUILD bumblebee-0-r1.ebuild 151 BLAKE2B d5c37fffd8c26c6cd1103a063912728dd51e5fc4e071d91dba799adb0c7180c529c5ba966682b2dd42de55afa48cb885395abb19fa4ed1ba790825067c81a2ac SHA512 f63354ec194fd1e5a5a2aad4b368003c1b44923af4b4e44c6f561efd64d876c8d5929357a4094ca3a32d1b5d765fd8661000764e39ef2b549ed47c2013c757a6
MISC metadata.xml 490 BLAKE2B 8ab0a93f01ef5bc376df76380f71d77df5690f57ef6fee14d5f14eca9f3b1b2e3f5179738c2a5572469e95c36d4fe4e526d0710c70dad2be3913723af2f12d03 SHA512 74306c1c368dc7456e9b2b9556912cfbc11af299adafdcd27f011aaa23c18a814ba4a83d0551959b7edb0f6b7617f77e63eeb07818dd9e027fcb387551f0056e
diff --git a/acct-group/bumblebee/bumblebee-0-r1.ebuild b/acct-group/bumblebee/bumblebee-0-r1.ebuild
new file mode 100644
index 000000000000..316fc9ef3427
--- /dev/null
+++ b/acct-group/bumblebee/bumblebee-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=380
diff --git a/acct-group/bumblebee/bumblebee-0.ebuild b/acct-group/bumblebee/bumblebee-0.ebuild
deleted file mode 100644
index 03a72dbe9273..000000000000
--- a/acct-group/bumblebee/bumblebee-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=380
diff --git a/acct-group/burp/Manifest b/acct-group/burp/Manifest
index 5153eb6b754c..0a3bf9ef3d51 100644
--- a/acct-group/burp/Manifest
+++ b/acct-group/burp/Manifest
@@ -1,2 +1,2 @@
-EBUILD burp-0-r1.ebuild 202 BLAKE2B 9ada524404732a529917909cbc77311b8de82fe3a085b90e047e0139ec4338b349b56465ab2b29f41dca2896ced0cbebd5ce139d29876d4de50b0d24230a133d SHA512 9283479b2e764767501797f4232fee161769743843a91fdbfb6f3b8dbdfcf72f57463d2251887b632ca4607bf65ead337ff0efaac09f92c0f535bc5f44df1616
+EBUILD burp-0-r2.ebuild 202 BLAKE2B 4b04dd679b0a0c5eb84c10074345e980ea92c7fb6b28e7dfa91451dfe1c5604e322048ec7034617d608384a11c0f4bad3e506fae16a482cb9de4cff117c97e60 SHA512 7ce4081085bf78bb0ac167955b2de7fad649f369d23a5f8f5984e1d86e1a188c16e8f3d561ebeb7c4b5954cff43604951f378979cad47e4dab43d5effa50b90e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/burp/burp-0-r1.ebuild b/acct-group/burp/burp-0-r1.ebuild
deleted file mode 100644
index bd9aeb045577..000000000000
--- a/acct-group/burp/burp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the app-backup/burp server"
-ACCT_GROUP_ID=498
diff --git a/acct-group/burp/burp-0-r2.ebuild b/acct-group/burp/burp-0-r2.ebuild
new file mode 100644
index 000000000000..474fe04b5889
--- /dev/null
+++ b/acct-group/burp/burp-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the app-backup/burp server"
+ACCT_GROUP_ID=498
diff --git a/acct-group/burrow_exporter/Manifest b/acct-group/burrow_exporter/Manifest
index dc9746a7d20e..1644902b77d2 100644
--- a/acct-group/burrow_exporter/Manifest
+++ b/acct-group/burrow_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD burrow_exporter-0-r1.ebuild 208 BLAKE2B d182c60e6a5cfdd706540f2d534e0dac9e17543b3ad58f6c2fcdac5d4aa750966693fa7fbec7e7e1c99b0ea5946652614e344cd51d6902fae95e23ae2bea700b SHA512 308bd5034395abc042f626e5ee28f1b9be1d4e6b64e71e929ecd16da52680a314f1157d7c6527126e6ea255e5090a6b58d2ab76be569840bb15c0a84506e16a9
+EBUILD burrow_exporter-0-r2.ebuild 208 BLAKE2B f4d9771935ab83f8045944127d0fd02574b684ddb4b7738e3097c4476a3274bc0abaa8e37a8120cd2443a7ba2b1f65c5028c1bb0c5356a86f5afc9220cecdf59 SHA512 cfde4b94351d5484887377a2422b1fa3bcfa31d457440d76c4003f5bff92bd4e59a827bec08d881653e2d4ad237aa6cc0d9193eec86c2fcddf6892f74faf770f
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
deleted file mode 100644
index 07d9e98d095e..000000000000
--- a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/burrow_exporter"
-
-ACCT_GROUP_ID="502"
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..49197343c68a
--- /dev/null
+++ b/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/burrow_exporter"
+
+ACCT_GROUP_ID="502"
diff --git a/acct-group/cadvisor/Manifest b/acct-group/cadvisor/Manifest
index 7e014f2052d7..a5e48fc60304 100644
--- a/acct-group/cadvisor/Manifest
+++ b/acct-group/cadvisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD cadvisor-0-r1.ebuild 146 BLAKE2B 13cb2e567dbd252efe668b3c9b374b22635992797d2c5f8c03ff465a434bfdc7b96d19a92670a3159dfc96081e2d2b1314d97609cafaefe18a78c37d823ce1f2 SHA512 204f9e1c13bd44610e3564022539523b7347183258da3533f6e7804b1119ee414930f07db17641ff7dc2b5f716d84ef0e6670b30ecd49ac244d5594d90a88802
+EBUILD cadvisor-0-r2.ebuild 151 BLAKE2B d717a8ee90d77d4c564ea2930748042dc662bc671519a41dee9cdd5a1006d95b9571c9ca225e6fe85ff1f517419337029762af396305305cee2aca90d24f6efe SHA512 eeae26ffc075d8115a90c4c68d2cd606c586a4b134cf1785f2554ee1f37c2d49e43ab01367c94de2922e1634911a542fd39c19a92e0635f342d59a1c54d39992
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/cadvisor/cadvisor-0-r1.ebuild b/acct-group/cadvisor/cadvisor-0-r1.ebuild
deleted file mode 100644
index c44d82f6164a..000000000000
--- a/acct-group/cadvisor/cadvisor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=427
diff --git a/acct-group/cadvisor/cadvisor-0-r2.ebuild b/acct-group/cadvisor/cadvisor-0-r2.ebuild
new file mode 100644
index 000000000000..12ee15aed64f
--- /dev/null
+++ b/acct-group/cadvisor/cadvisor-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=427
diff --git a/acct-group/cancd/Manifest b/acct-group/cancd/Manifest
index 5acd351964fc..4d9f3ba86a86 100644
--- a/acct-group/cancd/Manifest
+++ b/acct-group/cancd/Manifest
@@ -1,2 +1,2 @@
-EBUILD cancd-0.ebuild 205 BLAKE2B 6564c5e48353a24a4267bd5c284c9d6253d63cb5d6edc557da0dffcd9bd7cf028b8b01f6847dfb26540e987e496e97b06f2cc353a4f1c8c9d55e632576d58ed4 SHA512 17d8a77ba86877ccac91bf866573ac54c84f5e46fc80b0d8c7359934ad70430ab28f73e32c721ed46f48cc383278e241f640433be5bf5277424c4429e38e857a
+EBUILD cancd-0-r1.ebuild 205 BLAKE2B 9a2d8ad8e4ad85919b99dff346f6ae1d633a50320d457a5424e94d38fd0428a01fa70362cf736a1d1d862ec9e9cc877eb0c6fa9e45cae7636fbddaa5241695c4 SHA512 973a171797f7f93e98698e202a942b361b9297455738433d6e9ace1c90d4d593a83306e211dfe183720c3292c7efd728425cfffa50167f06f73568137d791499
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-group/cancd/cancd-0-r1.ebuild b/acct-group/cancd/cancd-0-r1.ebuild
new file mode 100644
index 000000000000..46428de1cae0
--- /dev/null
+++ b/acct-group/cancd/cancd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the CA NetConsole Daemon"
+
+ACCT_GROUP_ID="213"
diff --git a/acct-group/cancd/cancd-0.ebuild b/acct-group/cancd/cancd-0.ebuild
deleted file mode 100644
index cb378da029ab..000000000000
--- a/acct-group/cancd/cancd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the CA NetConsole Daemon"
-
-ACCT_GROUP_ID="213"
diff --git a/acct-group/carbon/Manifest b/acct-group/carbon/Manifest
index 4afc886ca39d..6de860eafb97 100644
--- a/acct-group/carbon/Manifest
+++ b/acct-group/carbon/Manifest
@@ -1,2 +1,2 @@
-EBUILD carbon-0-r1.ebuild 146 BLAKE2B 2507fa2f8406587442b8deca1e304c88bb343ff0beb332cb8d585c9258629f6d5c218218d4ece4f54d0d75de8b32926c2df204b63da0b1e009adeadbd0b82efd SHA512 fa4415aeeee8a3dd29b233566ee9cb0374aa4bded8957b322f93cb3b7228fe70853ba40e795e78b2b28f6bddd07088abcfda287197ba5a88865dc5caace40806
+EBUILD carbon-0-r2.ebuild 151 BLAKE2B dd8b6d1a44ee51d0986aaaf3eb564d354423f8b08229d3f7f44d27aca82b1129908e300977f22fc09c0d0b74d762ecffea9411b445574f9567d61f12bd690d0d SHA512 5d95fd7bd439209e503e68ddbd194d80c92f560bbd314fd6a70f945c2bb8d6dab3b170e446bd4bc0b9959f01b4f56af8a9162cc77b858ea53f74bd70273d8517
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/acct-group/carbon/carbon-0-r1.ebuild b/acct-group/carbon/carbon-0-r1.ebuild
deleted file mode 100644
index 09ccc3c9f002..000000000000
--- a/acct-group/carbon/carbon-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=230
diff --git a/acct-group/carbon/carbon-0-r2.ebuild b/acct-group/carbon/carbon-0-r2.ebuild
new file mode 100644
index 000000000000..e84b103f0d05
--- /dev/null
+++ b/acct-group/carbon/carbon-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=230
diff --git a/acct-group/cdrom/Manifest b/acct-group/cdrom/Manifest
index 6a5eb330c02b..1c3e3aae758c 100644
--- a/acct-group/cdrom/Manifest
+++ b/acct-group/cdrom/Manifest
@@ -1,2 +1,2 @@
-EBUILD cdrom-0-r1.ebuild 150 BLAKE2B 77bce8dc6ffbc924ef59afbca87f6b7dc263e69ea8c082cc0e10a0692707fba52cc9691165f399080cdebdd6c41a5f2a6da0f2fe65e77053d437e40eabf62808 SHA512 1b37a7ec3e9c9bca91e7722a6e74ed4845d399f1c589110541bfba155bdaa168715cc7cbaf6fe95ac7576fa29f054d2231dd79b97657429cc07e3b239309d7fd
+EBUILD cdrom-0-r2.ebuild 150 BLAKE2B 83bf383304bc9b55d04e20e98f1f3c2c8f3c51731f83123151a2db20d2206dbe7762280fd0b8b321adc50cb0243e920ffa20d801fc7d25db144065f78f265334 SHA512 052f12098feb680aeb884b50dbb133e921322d22b9409efe5d1776d0e731c8d80bc448d148f1922022e3b29f31d8888e87e7e5439a5555347a4ed17490655eae
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/cdrom/cdrom-0-r1.ebuild b/acct-group/cdrom/cdrom-0-r1.ebuild
deleted file mode 100644
index 8d402a923a38..000000000000
--- a/acct-group/cdrom/cdrom-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=19
diff --git a/acct-group/cdrom/cdrom-0-r2.ebuild b/acct-group/cdrom/cdrom-0-r2.ebuild
new file mode 100644
index 000000000000..74979bf5d8cb
--- /dev/null
+++ b/acct-group/cdrom/cdrom-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=19
diff --git a/acct-group/ceph/Manifest b/acct-group/ceph/Manifest
index 06dbf642fefc..c02506682e5b 100644
--- a/acct-group/ceph/Manifest
+++ b/acct-group/ceph/Manifest
@@ -1,2 +1,2 @@
-EBUILD ceph-0-r1.ebuild 151 BLAKE2B 2c00b84402d1878a606d0694bb1605086406b59f5475c88092c4239c1ae0b19015c9013e857c2ed119b069626a59fab58446aa7b6a359781d789ae4d80fab268 SHA512 33fb26daf9b80c0b1b04b9655aa07e58261f929ecdfb55f74575ecb9518abbaa3b2ccf11a7fdea2736fab6d2198654bd376b1df5ababb6882d2f21cb7b63f314
+EBUILD ceph-0-r2.ebuild 151 BLAKE2B 495f0122b3e3f48b8085722a265170f61b56f889ee1dd4be040b147816aeeb7d12ffacdcb53b98a0d6c169b79a4a6ed54fad642a7563d0ea28bbbb76448ad96a SHA512 518b15570e98eccfe1360d15c4ab57f80a0399cd94595b21b903f4d1dd515313c23214afe3662f581481bd48245ddadc0031368f2ad47641aff012ed97f28d62
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/ceph/ceph-0-r1.ebuild b/acct-group/ceph/ceph-0-r1.ebuild
deleted file mode 100644
index de5898482a6f..000000000000
--- a/acct-group/ceph/ceph-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=267
diff --git a/acct-group/ceph/ceph-0-r2.ebuild b/acct-group/ceph/ceph-0-r2.ebuild
new file mode 100644
index 000000000000..5ad28791f8d9
--- /dev/null
+++ b/acct-group/ceph/ceph-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=267
diff --git a/acct-group/cgit/Manifest b/acct-group/cgit/Manifest
index f6feb65ccff5..78ce8d5c3af1 100644
--- a/acct-group/cgit/Manifest
+++ b/acct-group/cgit/Manifest
@@ -1,2 +1,2 @@
-EBUILD cgit-0.ebuild 146 BLAKE2B dad7b37c2102ac5631159d49935e904a544f0d0be77cfa057a469d310203e63e87dfcc522aeb50c6d4f102e6e043343311f3ee54005864a2df8d6ea4ad4e40c7 SHA512 9b3d4d17018670f87b472f409c4c4a56684b562e13b9123aafcdedf555138fd46fa8f78b9864a7df9e2e3e3a5b10fb87fb35d473834aeded129e89318f3deaf8
+EBUILD cgit-0-r1.ebuild 151 BLAKE2B 41937637ea053ea4ef00fa7e06a5ca874a7e43df16adcf6299bb02a69db410645c3db842b8db4e88ef4ed544e526007b78604c206f9537f29809fd5f42299dc0 SHA512 ed2cd14188f20411394b217be1f7ea358704cfbc3c80c9d29ca03ed38749f7d19632e5cfdc380b3ab6dc4f215e999c34f47282247e5118a98c1b448464c7be13
MISC metadata.xml 251 BLAKE2B f41d5969712506f1083eeb23748860a267a5cb5a66dd8b6e765f057c4ef6549bd8e314aad6f6081eacd3f11274963a46093d37a4beb95ae442fba32fe6fe5b2d SHA512 3d0c951bc2e14c38f4b3e8cf2da3fcc69e7077d4bcca59a3a48e9c69b2de759a7aca10ab736ed3d2fa96fe8254a6519f62f3f584418f0b8073281f4bdf874e3d
diff --git a/acct-group/cgit/cgit-0-r1.ebuild b/acct-group/cgit/cgit-0-r1.ebuild
new file mode 100644
index 000000000000..73dd86cc52dc
--- /dev/null
+++ b/acct-group/cgit/cgit-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=197
diff --git a/acct-group/cgit/cgit-0.ebuild b/acct-group/cgit/cgit-0.ebuild
deleted file mode 100644
index 750e7188cdb7..000000000000
--- a/acct-group/cgit/cgit-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=197
diff --git a/acct-group/chronograf/Manifest b/acct-group/chronograf/Manifest
index 4ff6332a1aba..2f8701e6d53f 100644
--- a/acct-group/chronograf/Manifest
+++ b/acct-group/chronograf/Manifest
@@ -1,2 +1,2 @@
-EBUILD chronograf-0-r1.ebuild 146 BLAKE2B a3d4a89fa7265184b1cf88c38cfb9862e426f24efa5ef165ff9f9cebabcf9cd7843545af440f974a90495985f1ec75f0f755313402ff9e1e682d63341aec775e SHA512 109f84f21b642803e8a1cd29a00530b7d2fd1efeb5fefe193bcd134accebcf00b42f9505329f95bedcb1b9880e5a8169db19c006d4a9b049a7c163ad461a78e4
+EBUILD chronograf-0-r2.ebuild 151 BLAKE2B a909c4324cb0d50b6c1b7a9691096e468dc83cae6bb000049462f092dbf42f987619f0cf6476fa7c7efbc17d1ac2ea3767b8465e6f95aec2f0703f60ba17afb8 SHA512 8547ec6aa451ab732df92782e7ee78df8ea273cbb996fbbc989ea55d65f56b42de699454dc87c5cdc403006599db7beee27626b8f1fb6d457710e2678c3cdaf6
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/chronograf/chronograf-0-r1.ebuild b/acct-group/chronograf/chronograf-0-r1.ebuild
deleted file mode 100644
index 38259347814a..000000000000
--- a/acct-group/chronograf/chronograf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=344
diff --git a/acct-group/chronograf/chronograf-0-r2.ebuild b/acct-group/chronograf/chronograf-0-r2.ebuild
new file mode 100644
index 000000000000..b653b69c5f32
--- /dev/null
+++ b/acct-group/chronograf/chronograf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=344
diff --git a/acct-group/cinder/Manifest b/acct-group/cinder/Manifest
index 9c956d8f1d0e..6a3e95fb1341 100644
--- a/acct-group/cinder/Manifest
+++ b/acct-group/cinder/Manifest
@@ -1,2 +1,2 @@
-EBUILD cinder-0-r1.ebuild 146 BLAKE2B 0e5cc4f863eec1a1676c9f476e22cea58ec8310e7505b1ce29cf149cdf00a1a15dfcd21f692b868dbfedda379b3153f3e6f17980d1cea01b20bd7978162c3fd2 SHA512 72186c25bd32a2de325350067a3cf8d1eb197283cdd1bc6b510cec7792e9dd5c049f06f71c4529a3b60a815d566a66662fb85fb197c0b6741467aca139e066f6
+EBUILD cinder-0-r2.ebuild 151 BLAKE2B c2be899e2e59d2671311b09549fad39b6464f274a7b33411fdd72ba2848a14c85d04a603b47f417adbe9947a20f8279c3c8d8c9d6342e4cd557a8ad4fe65e714 SHA512 64ec1f56a83a255c84afddc4900dbac0ced0b3197ddf1305d323bb6b68c18113d7bf37df32a166682b25d184d76d0d7551248dc2c7e900cee3302483da58bca9
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/cinder/cinder-0-r1.ebuild b/acct-group/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index d57b97378c77..000000000000
--- a/acct-group/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=442
diff --git a/acct-group/cinder/cinder-0-r2.ebuild b/acct-group/cinder/cinder-0-r2.ebuild
new file mode 100644
index 000000000000..a0016660fffe
--- /dev/null
+++ b/acct-group/cinder/cinder-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=442
diff --git a/acct-group/clair/Manifest b/acct-group/clair/Manifest
index f296a6cc81c1..1c04bbea1dc0 100644
--- a/acct-group/clair/Manifest
+++ b/acct-group/clair/Manifest
@@ -1,2 +1,2 @@
-EBUILD clair-0-r1.ebuild 146 BLAKE2B 1be3ba4cb3e2c0495032ff7d7ee8229e10889c3f59301da51d050a2d4242510c3a3279037918f8558513f96d3cdf1080c21e5112193c31c3d31a2b145c0aeacd SHA512 76b6c459aa286a18eed9916cc8a9a5af657a69b968a37fa6291518ec9d0f2dd8aab3a67ab9a3871ebc38bd9979ab4f572aaa1c19572df45faf174a92a8a480e2
+EBUILD clair-0-r2.ebuild 151 BLAKE2B 559a5f8658c85e00834a7bc60a13885bb10a72ed8a2568fad25535522da466b8b21ea367ca1258798084053ece2b3f04dd749cb73e5c5667c33d27b332f18304 SHA512 4b343a44d2c11fb85f61c9e6423b34e19fb5cae4f27d09d9cd921f5003add8cb8e1f053f0d81f67ebc08d1cd90646ab7c57e519ff46393876da2114c689b0c76
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/clair/clair-0-r1.ebuild b/acct-group/clair/clair-0-r1.ebuild
deleted file mode 100644
index 8a34e5dbb5d1..000000000000
--- a/acct-group/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=307
diff --git a/acct-group/clair/clair-0-r2.ebuild b/acct-group/clair/clair-0-r2.ebuild
new file mode 100644
index 000000000000..e9ba2bbad69a
--- /dev/null
+++ b/acct-group/clair/clair-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=307
diff --git a/acct-group/clamav/Manifest b/acct-group/clamav/Manifest
index 0c2a7e886986..a7d899b97d9c 100644
--- a/acct-group/clamav/Manifest
+++ b/acct-group/clamav/Manifest
@@ -1,2 +1,2 @@
-EBUILD clamav-0-r1.ebuild 151 BLAKE2B c59f99d3baa03f53519f153f4b2ecce857966a8f3efd7cc1c3024afd1799d60669367862d5db57e93b155a6317e1f33609e13f33970fefcde0dec3a61c8fa6bb SHA512 a283478882ef8cb69c3eaa8fd24b449edbf22699eb971de44357c83c92f34f8c3365cf5f048db48f39c346f7207f44a0bebc25306f4c31fd5498b6ea4acff106
+EBUILD clamav-0-r2.ebuild 151 BLAKE2B 09baad0b80d0c0f6729ee877d7aa9b947667847966806b9c64573178a372b89627a543b13a02b38bfc9a9d9accd30752d57722836634350f6e6ac04a291b457c SHA512 70bfdd90aee6843de9fed4afa41d7db60adc143ac58f908a2c221e128e32dd8b61a03e5595238e5d5a7d0ed6d237296c4c930c07c5db77d89a67f7623679b5ef
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-group/clamav/clamav-0-r1.ebuild b/acct-group/clamav/clamav-0-r1.ebuild
deleted file mode 100644
index 30e86e6753f4..000000000000
--- a/acct-group/clamav/clamav-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=435
diff --git a/acct-group/clamav/clamav-0-r2.ebuild b/acct-group/clamav/clamav-0-r2.ebuild
new file mode 100644
index 000000000000..b41166d96ada
--- /dev/null
+++ b/acct-group/clamav/clamav-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=435
diff --git a/acct-group/cntlm/Manifest b/acct-group/cntlm/Manifest
index 0426a1974b06..4259aa0ef6c8 100644
--- a/acct-group/cntlm/Manifest
+++ b/acct-group/cntlm/Manifest
@@ -1,2 +1,2 @@
-EBUILD cntlm-0.ebuild 194 BLAKE2B cc29110cbcc934d6803ecfdda72d45156a38c31226bde07eafc4e39203950c38b200d73b15845cc0588762214b628006b9bf2c6e281dbdc8a600415141209865 SHA512 ac6c4052b6ed3963dd594be9af244f25de244672d0895099e414a0c4b5154ba6d422a7131c4ee794ea1c8aba0987749bf0fa9de512109bd93d982ff1dd5a3a5a
+EBUILD cntlm-0-r1.ebuild 194 BLAKE2B 5934ef171699f275acb5c20d290ca52c9c9f8fdfc9b11430bebd504d4a680d1defb1e9ba887aa55ad221798304ef3e3e6b0c289a534dd20abcb053fd60c0c7e3 SHA512 77b64b394c5171dab0c4e4f37e1245c3eee832e8716fbfdea9f658ea8ef11e939761e0c2406856844b25f2b59bdbe98523f322aa8b2242e1cbfafa799ed252a1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/cntlm/cntlm-0-r1.ebuild b/acct-group/cntlm/cntlm-0-r1.ebuild
new file mode 100644
index 000000000000..745f398c94b5
--- /dev/null
+++ b/acct-group/cntlm/cntlm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/cntlm"
+
+ACCT_GROUP_ID="255"
diff --git a/acct-group/cntlm/cntlm-0.ebuild b/acct-group/cntlm/cntlm-0.ebuild
deleted file mode 100644
index 38671db40f18..000000000000
--- a/acct-group/cntlm/cntlm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/cntlm"
-
-ACCT_GROUP_ID="255"
diff --git a/acct-group/cockroach/Manifest b/acct-group/cockroach/Manifest
index 7b32502998b2..eb6f52789581 100644
--- a/acct-group/cockroach/Manifest
+++ b/acct-group/cockroach/Manifest
@@ -1,2 +1,2 @@
-EBUILD cockroach-0.ebuild 197 BLAKE2B 6da2c17141bb788c5236443e48f3eae0d09af0814ade208f9acc080e373376b13923278b612d54ff6a4b0ddcadc56cdfb290c0da89372d0564007d3d35a14c13 SHA512 c57038c2a55b265af1a4ad9b64d6abaa0142ff9f2b52c1462a64769cbf0510df6bd665e93e50c3b41d2a2011304ba01bce2d58ffd3593a32e2f958e473e9dc83
+EBUILD cockroach-0-r1.ebuild 197 BLAKE2B 826b74008c46e030a0145a75d538d42144ad4a960827587dac2d8ba0be5efb41b7611b2ac4b9b9724a4f98400075ebf474b6ac1880ab2b459adf82a64c98b981 SHA512 d0e65acc3cf53d57d1a3be0609fa157ecd1b6396d4316ff1f6089a68e821a9b960b4f104762968e27e466d1e563b0ee418437574b5993282d810f6d6c559765c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/cockroach/cockroach-0-r1.ebuild b/acct-group/cockroach/cockroach-0-r1.ebuild
new file mode 100644
index 000000000000..c0d4c9ca4dbb
--- /dev/null
+++ b/acct-group/cockroach/cockroach-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/cockroach"
+
+ACCT_GROUP_ID="110"
diff --git a/acct-group/cockroach/cockroach-0.ebuild b/acct-group/cockroach/cockroach-0.ebuild
deleted file mode 100644
index 7f9e3bf019d1..000000000000
--- a/acct-group/cockroach/cockroach-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/cockroach"
-
-ACCT_GROUP_ID="110"
diff --git a/acct-group/collectd/Manifest b/acct-group/collectd/Manifest
index f124da481be3..fe57b202b937 100644
--- a/acct-group/collectd/Manifest
+++ b/acct-group/collectd/Manifest
@@ -1,2 +1,2 @@
-EBUILD collectd-0.ebuild 184 BLAKE2B 6e09594aa2ad06bb37c9cee3156b4d99b8f44e739eca89c581e8542ba3f49fdec75bea0dc88e1be87bae90ff495b2ecc1b2f9e339b7d6ec3aeaed87f0b7bfecc SHA512 dfd9e2fe7e49290982efc33d6d78d615c0a124d379de8450d0fdcca87affb46c9f65dbf595c31b209c7f37a1b946835fcd2bddfb6f312936581f19b522a5674f
+EBUILD collectd-0-r1.ebuild 189 BLAKE2B 0050301aa22e59b49ab881a81f237fa4b21cb8040936e6403fe27c33ce5ab3edafb078058c3f3658c605bbc2779079a9db3b063766447058d1ecbd04dd3d5a5b SHA512 b37947900e4cda4fc97db3cbc22855d7b974d5cc4a70d40e090e319fca104b12fd1b07b0fd69adbea62a7d96c73c3a5c06287ee9bd66d83414bb006cc6d7c4d0
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/collectd/collectd-0-r1.ebuild b/acct-group/collectd/collectd-0-r1.ebuild
new file mode 100644
index 000000000000..8ff3458b3df8
--- /dev/null
+++ b/acct-group/collectd/collectd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="collectd program group"
+
+ACCT_GROUP_ID=440
diff --git a/acct-group/collectd/collectd-0.ebuild b/acct-group/collectd/collectd-0.ebuild
deleted file mode 100644
index 273a23b32ea2..000000000000
--- a/acct-group/collectd/collectd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="collectd program group"
-
-ACCT_GROUP_ID=440
diff --git a/acct-group/colord/Manifest b/acct-group/colord/Manifest
index 8e9e62476273..73a8b85e2d72 100644
--- a/acct-group/colord/Manifest
+++ b/acct-group/colord/Manifest
@@ -1,2 +1,2 @@
-EBUILD colord-0.ebuild 151 BLAKE2B ca20121e9e263fa0d3462cee443bb37189d59333a400c9c4ce12c31b589337ca0556effb0ac8505710f3c3b406d2a6240085eab46591a739a9b6820d951d577e SHA512 e155830328da665607b939f8d76d7e420b2d3aada13015af3493b4dfdd72521fbcf42552f0c89162e6a1f35fbc7910684fa89c173b08657443b032330056db65
+EBUILD colord-0-r1.ebuild 151 BLAKE2B 817c038c5d34173b9f39e1e07bd5901e736652247d4049de983586ad6c27edef1d54074fb1b7bc6cc31c0222d47243d67328f8236618dbe9c81e4d6f8cd69bf5 SHA512 7a11570b0e484588cf14f957d88f067c7c1ef0cf6d25368180e41e1c63f2119cc9392d1dc32274fda6b54b1666462c285e0cff46f7b3748f5e7be22ecfc076ef
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-group/colord/colord-0-r1.ebuild b/acct-group/colord/colord-0-r1.ebuild
new file mode 100644
index 000000000000..1758aa8ec47b
--- /dev/null
+++ b/acct-group/colord/colord-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=350
diff --git a/acct-group/colord/colord-0.ebuild b/acct-group/colord/colord-0.ebuild
deleted file mode 100644
index da6555c53bfa..000000000000
--- a/acct-group/colord/colord-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=350
diff --git a/acct-group/consul-template/Manifest b/acct-group/consul-template/Manifest
index 0842b52da571..239ce2c4b59b 100644
--- a/acct-group/consul-template/Manifest
+++ b/acct-group/consul-template/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-template-0-r1.ebuild 146 BLAKE2B 31e96fc30db13a5903115a3bdde334be9bf906e8472f91db9dfbfd7e1389e6201b15b71b9ba55ec4bf39fac994a5e3346949a08b0fc364f16cf49c762be9b530 SHA512 7fa3bc6e850fa236f2ab8ec907eb31d7210d217e2b627b2484407d1a1f0c36c543649952dd45641abfa00481d8931985e59525a6e51f6ed45ee9397d130a1b6f
+EBUILD consul-template-0-r2.ebuild 151 BLAKE2B 30b45f090d85188c518a5ef274e9389d8ffe4d845023408beaf16fda4afca8b58c8261330304fc1f0b56b98dd1a2ad19a0e24a68d7ed0fcbe7d62cdf6604fcce SHA512 bb0fb4fb2ca5655d2f1026f55d76cedffcbe8a12fa9077b7c5947af20efdfe2b07fe424d7fba03f4c012f1614ad2fae1e1697cde2247ffe200da943c07660746
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/consul-template/consul-template-0-r1.ebuild b/acct-group/consul-template/consul-template-0-r1.ebuild
deleted file mode 100644
index 45bea6e5f696..000000000000
--- a/acct-group/consul-template/consul-template-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=408
diff --git a/acct-group/consul-template/consul-template-0-r2.ebuild b/acct-group/consul-template/consul-template-0-r2.ebuild
new file mode 100644
index 000000000000..e8c79f811996
--- /dev/null
+++ b/acct-group/consul-template/consul-template-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=408
diff --git a/acct-group/consul/Manifest b/acct-group/consul/Manifest
index f32dbb2898a1..d392c47a6dfe 100644
--- a/acct-group/consul/Manifest
+++ b/acct-group/consul/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-0-r1.ebuild 146 BLAKE2B cf8b5c88100c5316ba506f37d13ad67ecd80f9d63b2e76eef07895d7923c11a99b110b4231a5153e3974f595d64a835cde1f192dcaa8598bb1a38abe7a66b4d6 SHA512 7bc3d0415e906003fbb2c1a13698628a6541fc0da23b247444d8b0ee5c05d8f97aa72f65d52612b9a4101799165188157aede4444d5fd66edd487f13c4ebce21
+EBUILD consul-0-r2.ebuild 151 BLAKE2B 92275d23403ef6d3374a4b8b4e05c8c72ff5b464f448ad324cd83a96aa96ba193f2eaea30e6e37f0dd5d1a8a43e1a1c92a4bda663ff2fd34e23c7015ee222040 SHA512 fbc847499aa617dd9aa8a12a89a868ec6a2c5b590f601d5d817e24fa016ab2961a5ee9f9577df85767236aaddd86f8ad17b25a11e21029f94496bce36ed3c44b
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/consul/consul-0-r1.ebuild b/acct-group/consul/consul-0-r1.ebuild
deleted file mode 100644
index 615defa305de..000000000000
--- a/acct-group/consul/consul-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=411
diff --git a/acct-group/consul/consul-0-r2.ebuild b/acct-group/consul/consul-0-r2.ebuild
new file mode 100644
index 000000000000..b7dac9bca6c3
--- /dev/null
+++ b/acct-group/consul/consul-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=411
diff --git a/acct-group/consul_exporter/Manifest b/acct-group/consul_exporter/Manifest
index 341f4ba02644..90323638f42a 100644
--- a/acct-group/consul_exporter/Manifest
+++ b/acct-group/consul_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul_exporter-0.ebuild 146 BLAKE2B 5e82e2ac385e0d8180b6ba65b19a26b51b88ebab638f444808de8ff48fd9c506ef95571814581cae0201399d90988e67973c7f7dab343851a07e363a7c0a4d6a SHA512 87b182bb1e9f049849b7f7c369d6485cfb0d48bad676a510d7e9e2a52bc0eba54bb8530430258d94aec854f8ad0f4cb97c1d7e0491cd753863cb6706252a42c2
+EBUILD consul_exporter-0-r1.ebuild 151 BLAKE2B 1746e139e362b4805480b58bec27948b803db76a8a99eaeba22029c87667b199fc005a13780ce8065f44fc2e4aa3ee2a1b866edcceeacf8b1c9417bfb2420588 SHA512 54d226b1a9f7f7cab21aa68b88dda139d3f91b3296d50a846c2ccf2ec16c4d3bb26cdaa32376858762289608ad769a56a5b5ea74540b7d62bee5e937168e1b4d
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/consul_exporter/consul_exporter-0-r1.ebuild b/acct-group/consul_exporter/consul_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..c77db8b3a594
--- /dev/null
+++ b/acct-group/consul_exporter/consul_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=278
diff --git a/acct-group/consul_exporter/consul_exporter-0.ebuild b/acct-group/consul_exporter/consul_exporter-0.ebuild
deleted file mode 100644
index b9e245ce5510..000000000000
--- a/acct-group/consul_exporter/consul_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=278
diff --git a/acct-group/coredns/Manifest b/acct-group/coredns/Manifest
index d1947eecc259..80edfe930f00 100644
--- a/acct-group/coredns/Manifest
+++ b/acct-group/coredns/Manifest
@@ -1,2 +1,2 @@
-EBUILD coredns-0.ebuild 196 BLAKE2B f69407bbf5cdfb56f314c1fb3e4608b0743879c158a86dcddc9d8bd409848df9d73b759f25e0a72d33b630768eac3d38850dd6b927cf7fd87394864f571429db SHA512 5b8620326edfc300aad6143c09d9dc918de2a8780f232dada7d4cc836109801ce3d510c9304c9fae61c16c1043192088bc04560ed4efd072e1e93ea6fcc0e1e2
+EBUILD coredns-0-r1.ebuild 196 BLAKE2B 1352a9791a56e5b68a1d04a57d18eb5d5d894e598d7970ce3a78fd5af8c47ebfe8df3fc6be9a346fee5c37f03bfaea0e2662350a20c432f12a2a63ca1939788e SHA512 07409c6514515269269efa06f3656226ae0d05403e670fee22af5133fc70afcbd74c29d99c9eb776319a3fd5ad840f64b751a187444c840aa6985e4ef5d217c2
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-group/coredns/coredns-0-r1.ebuild b/acct-group/coredns/coredns-0-r1.ebuild
new file mode 100644
index 000000000000..a182b8feb18d
--- /dev/null
+++ b/acct-group/coredns/coredns-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/coredns"
+
+ACCT_GROUP_ID="312"
diff --git a/acct-group/coredns/coredns-0.ebuild b/acct-group/coredns/coredns-0.ebuild
deleted file mode 100644
index 9d29330416d4..000000000000
--- a/acct-group/coredns/coredns-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/coredns"
-
-ACCT_GROUP_ID="312"
diff --git a/acct-group/croc/Manifest b/acct-group/croc/Manifest
index 6530ed564d51..2501288380ac 100644
--- a/acct-group/croc/Manifest
+++ b/acct-group/croc/Manifest
@@ -1,2 +1,2 @@
-EBUILD croc-0.ebuild 184 BLAKE2B 73faeff898c36af00aac87975acb1c573dab4b7c335de7fa4e44d37a13ec0fd19de6be00fbce0b78f901b7690ef09e84b729a64e72ad008d2184348880f98090 SHA512 a2c2e3b571174829075c927d0ec86e79d5135000332e3381b97d1f323790177f23abada9733dd423f85e5964c4094d593c6eacc9f708f5b3eed11498e74630df
+EBUILD croc-0-r1.ebuild 189 BLAKE2B ecfc95a4221dda93f1db520c6122d5de1795b1c3883dd8a9c4ccb82cacc92fb626a400f95e61b55b740da116c513a1de5404a50a0df6bc15a70b55af457b7c2a SHA512 664e4ed4e047d7538c2bebc6578a8ca2e5597d1502ccd90e5a1a1bf1618ee1e50f8f9267935c69d1a01da59d6723420c690a4d090d45023244fba05caed198b1
MISC metadata.xml 250 BLAKE2B e1b3331ad38b6a21cc4a5b15c11669fab651b37d69c6259fda26509a6c52422d87965ef5e60207db0f42b6e2b52e2f98e87c289f57f758eb886faa271606b67f SHA512 d7cd0a9d76d9b5d2f3c9a73da396e760fffea65055ae5b083b8f4616cb6f0620443f387a2f726c841f2d7982516dc2d87c60bd1e5cfa9625800015ad85b97c26
diff --git a/acct-group/croc/croc-0-r1.ebuild b/acct-group/croc/croc-0-r1.ebuild
new file mode 100644
index 000000000000..79aff7a7f494
--- /dev/null
+++ b/acct-group/croc/croc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/croc"
+ACCT_GROUP_ID=310
diff --git a/acct-group/croc/croc-0.ebuild b/acct-group/croc/croc-0.ebuild
deleted file mode 100644
index 544469aa859c..000000000000
--- a/acct-group/croc/croc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/croc"
-ACCT_GROUP_ID=310
diff --git a/acct-group/cron/Manifest b/acct-group/cron/Manifest
index a200549b2633..0f413d63e751 100644
--- a/acct-group/cron/Manifest
+++ b/acct-group/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0.ebuild 200 BLAKE2B 5fbf0e93ac15528e4670b06f405302cce8f8e9f29ec6d12138dc1f0384b4645a6bd5690b1c863c94dd5ee62b56f5888d01553b45ecf73a49f4f6cfabb71b06c8 SHA512 23690ab72f412d18b23a36aed6ebfd88a4608d299a5d79b18d88dc487d1cb5feaddbdc08d2bdef13e661b258d7c42b9b2c4e77612259ad99493fd3b56d316bd0
+EBUILD cron-0-r1.ebuild 200 BLAKE2B 9aa0f8eb28cb391ab6bdd6979f72e33cf39dd48e934fe74e99d356e746453c7958bd52ce058aa3c8efc79d497833eff77ddec7088e3715bb25fc5d1446079f74 SHA512 1e30c768f793babc8a79b00bf7d9c1b9f34bbac1ba37424b10c6218249a2ebab7f135d813e8ed5b54f48683122bdab283dbeae2fe41b36c9cebd353dd32de8e4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/cron/cron-0-r1.ebuild b/acct-group/cron/cron-0-r1.ebuild
new file mode 100644
index 000000000000..84142b621a23
--- /dev/null
+++ b/acct-group/cron/cron-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/cronbase"
+
+ACCT_GROUP_ID="16"
diff --git a/acct-group/cron/cron-0.ebuild b/acct-group/cron/cron-0.ebuild
deleted file mode 100644
index 84116177ac0d..000000000000
--- a/acct-group/cron/cron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/cronbase"
-
-ACCT_GROUP_ID="16"
diff --git a/acct-group/crontab/Manifest b/acct-group/crontab/Manifest
index cd81b88404ca..dccf2a648246 100644
--- a/acct-group/crontab/Manifest
+++ b/acct-group/crontab/Manifest
@@ -1,2 +1,2 @@
-EBUILD crontab-0.ebuild 151 BLAKE2B f392b8432b249a644a93bd497ffb8cc1bf0c884ff4880d0e8fdd7854772bded383b0521999c885f179f85bd9e89c75fb5b8bd11b6dd930f5148d96ab9f142b25 SHA512 d8efbdab91c6e84f2d789f5d98cf78986012867bdac0db2a72594c45278f3c83d48c5117108db376d9c89858344003af567b5650db85fafb8964780d950db514
+EBUILD crontab-0-r1.ebuild 151 BLAKE2B 0a94d546ffa0e5db213491d0e935ed6150a5d74f541aa966fa85e614782a1d691b1bdd02980907dd15d9da093925e84491f9bd1cf4a214dcb5b0ec024930189a SHA512 8d2a18ea92c8e9e9083ce335e24ae627217f63654aedcf26310d2ed81804135b2bd0cd98b60a9d673795359b61698b20079016dd2dcd919e56d37a09ff001703
MISC metadata.xml 265 BLAKE2B 2d1737d530c84aa435cda3fc4535359abec43e5233cf20b500b4561e253a470f17915f9f0c50691006160c96adcf32083cd6019399b2ac2221a2d176e012b362 SHA512 cb5f700e87b8ccb0bc883bd4c51827e5e3032b021ad995f71364d70a9d5a293ca48d2de95919130e91ac73f35c69b136fa21a482636a229d6740a1e104ef4895
diff --git a/acct-group/crontab/crontab-0-r1.ebuild b/acct-group/crontab/crontab-0-r1.ebuild
new file mode 100644
index 000000000000..d50789d7615d
--- /dev/null
+++ b/acct-group/crontab/crontab-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=460
diff --git a/acct-group/crontab/crontab-0.ebuild b/acct-group/crontab/crontab-0.ebuild
deleted file mode 100644
index d8765962fb79..000000000000
--- a/acct-group/crontab/crontab-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=460
diff --git a/acct-group/cvmfs/Manifest b/acct-group/cvmfs/Manifest
index e93976eb7ed3..714d56a337da 100644
--- a/acct-group/cvmfs/Manifest
+++ b/acct-group/cvmfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD cvmfs-0-r1.ebuild 204 BLAKE2B d90486273f1616e30a399ae7a0abc5a2cb2762dfab00374448331e11028185a434b6672ab189aba699c0da92456c3e3859b7d71976b9c8693ac9effa7540f192 SHA512 a0278844352e7e4293ef07a2693a17daa8d542c6db60c261b24df82466781e31396269a2c79c7538259099b61344e3cf6c85dcb48068c36b76038cf4d4534dfd
+EBUILD cvmfs-0-r2.ebuild 209 BLAKE2B 11008cd6d660d6962cdef3e71c2eb8a30824071142b139062b6cb62493275f7acf982cec93b0473ec64be08298a03fc06746a787dcab675efc10f339df9cdae3 SHA512 3cae32f151909ab7c0c4181382328deefdf17fb448f03e50c1a1a831e53779733d866fe3b83635770280168b998307fb85bfafa4707f8f31672841a3b531fd91
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
diff --git a/acct-group/cvmfs/cvmfs-0-r1.ebuild b/acct-group/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 1fcae7e51f98..000000000000
--- a/acct-group/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the CernVM-FS network file system"
-ACCT_GROUP_ID=268
diff --git a/acct-group/cvmfs/cvmfs-0-r2.ebuild b/acct-group/cvmfs/cvmfs-0-r2.ebuild
new file mode 100644
index 000000000000..201f3329a7b2
--- /dev/null
+++ b/acct-group/cvmfs/cvmfs-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the CernVM-FS network file system"
+ACCT_GROUP_ID=268
diff --git a/acct-group/davfs2/Manifest b/acct-group/davfs2/Manifest
index a1456b51c86f..c47bf97962da 100644
--- a/acct-group/davfs2/Manifest
+++ b/acct-group/davfs2/Manifest
@@ -1,2 +1,2 @@
-EBUILD davfs2-0-r1.ebuild 146 BLAKE2B 53c74f6df9c81b3a9b4058d3a58a0b08bb45122576018922086dc78a0fbb46397954208315510236717450f07211f8c59a439547d81e240f012c8c1f918c9c2a SHA512 4d9d0ce943d233878bd91457224a2341c650f47864994c2ce6e187bddd63934c55feb852af2a2691ce344f77e8ac1e485268b42569f16eef145ab58dea4c4648
+EBUILD davfs2-0-r2.ebuild 151 BLAKE2B 90c70265fd59f0d5767d545002f20b58d2ecd14381f34e2497674551ade6e558a993a2fa33634c7b70d8f7251fafea8cd751b1645f294c1674818fec61f85ba2 SHA512 ddbd0c954bab419ef08121727ea98e538a6917650e1f56057be80e406973b70449123e797a319188650c228ddc16a4885bf626e92d96b050ea917c149aa132e2
MISC metadata.xml 219 BLAKE2B c0192fc2c685f564929ff304a18b20facdcc8638726bfb8711803a633a109780747e98c42b14cd3e8dd674a92a7ed783a40d56e617e414b6cbc3d4fb18a63caa SHA512 f702a981fd2afe5f23c2814fdf91a540e6335e50e3cd85003e28ec2130739001ecfcfd824cfa91780c6b1d5999cdcfbb06857dada1c53b4f9580675a5491eb46
diff --git a/acct-group/davfs2/davfs2-0-r1.ebuild b/acct-group/davfs2/davfs2-0-r1.ebuild
deleted file mode 100644
index c7a375eb1319..000000000000
--- a/acct-group/davfs2/davfs2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=420
diff --git a/acct-group/davfs2/davfs2-0-r2.ebuild b/acct-group/davfs2/davfs2-0-r2.ebuild
new file mode 100644
index 000000000000..8e919d778a20
--- /dev/null
+++ b/acct-group/davfs2/davfs2-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=420
diff --git a/acct-group/dbmail/Manifest b/acct-group/dbmail/Manifest
index bea1a17d0432..f892c54c44da 100644
--- a/acct-group/dbmail/Manifest
+++ b/acct-group/dbmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbmail-0.ebuild 151 BLAKE2B 98b775b3e5970380b04fdfa1ad75b2ae2502256de930926a406a31f2f85ef821080d3471f9de3573418281f094f0a210a68513ab6947e32d37316bf1304f77d9 SHA512 0686e1ec9f45f677ec8dc6077669ffe50b932ad1d7d3fae31b308637b9cffc461058dcf45fb8f8787609f9f3da4879810aa293841c7ee97b3d8061fa4625829e
+EBUILD dbmail-0-r1.ebuild 151 BLAKE2B d53218559931b16df962818b9c19486f817d334944e977502e4c937b4ef1ff3970d70f74f228ab7c13cc5d97ce6e6d32c4549783f0bfa569c8b6cc6dd5052cc0 SHA512 23625fb7f665a6e8ad4970aaf05c5cd867e9614e8b3526ab2c42dc892fccc7c1f88da9fe1119de2668cecdd5b6477f99f98432917b74598374a665bdac589a40
MISC metadata.xml 259 BLAKE2B 3d6e2c71a67eb6eec74e229e746e4ca8c32878d251276044aeacfc21afb48be29752d2257e41ab4ffefbd061fb05929b17237905dd4fd01c65c24e61e464a681 SHA512 ceb54d3784d2abce86137f25059dba4f90ebba03e31dae56d2b8acbc515d9c0d7ed909f46c569a73e929cbe9dac2caef440e9c52b0518d37c081e03be471fa4c
diff --git a/acct-group/dbmail/dbmail-0-r1.ebuild b/acct-group/dbmail/dbmail-0-r1.ebuild
new file mode 100644
index 000000000000..98ef2242b546
--- /dev/null
+++ b/acct-group/dbmail/dbmail-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=365
diff --git a/acct-group/dbmail/dbmail-0.ebuild b/acct-group/dbmail/dbmail-0.ebuild
deleted file mode 100644
index 761317e9bd0e..000000000000
--- a/acct-group/dbmail/dbmail-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=365
diff --git a/acct-group/dbskkd/Manifest b/acct-group/dbskkd/Manifest
index d3e904d14f91..6f1ff5ca0a38 100644
--- a/acct-group/dbskkd/Manifest
+++ b/acct-group/dbskkd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbskkd-0.ebuild 200 BLAKE2B 698108f0525faf5a33527ddbd46a59459fb6cdb2d034b2780b17da94cad3c97e9e7b0336a70f68eece60b96cdc109a1737925e75bc6ceb5ddea316df6fe48e19 SHA512 37b0ab0360c4e82092944521d60f9faf1dc10b4e324bc0ce4dd9b600ab3d84f77e24e80aee56e6d824de28d476f8b34faef67cdec4519c2441b43c043ba4b164
+EBUILD dbskkd-0-r1.ebuild 200 BLAKE2B 9b7b5203d53d16ac2b7b65729ca4f9111ecda3dadf1e384de819e75989ce09cca83b9ee204416695a498d1d11afc7738f56984680db4549da149e4ed8268bf48 SHA512 abce279f501d14da1c0133b85f5615edee3c0f9aa798ef23bbae8e6ec81e9b4f2fce8f52c417c07b1316e85ac557b67d287be51c8072a6e664297ea914448fab
MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/acct-group/dbskkd/dbskkd-0-r1.ebuild b/acct-group/dbskkd/dbskkd-0-r1.ebuild
new file mode 100644
index 000000000000..b657171d9527
--- /dev/null
+++ b/acct-group/dbskkd/dbskkd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-i18n/dbskkd-cdb"
+
+ACCT_GROUP_ID="146"
diff --git a/acct-group/dbskkd/dbskkd-0.ebuild b/acct-group/dbskkd/dbskkd-0.ebuild
deleted file mode 100644
index 84040068089f..000000000000
--- a/acct-group/dbskkd/dbskkd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-i18n/dbskkd-cdb"
-
-ACCT_GROUP_ID="146"
diff --git a/acct-group/ddclient/Manifest b/acct-group/ddclient/Manifest
index 4f70ce554e5a..5913e3f97fb6 100644
--- a/acct-group/ddclient/Manifest
+++ b/acct-group/ddclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD ddclient-0-r1.ebuild 203 BLAKE2B 452d42fc9cf47b2b206435e946ad94b7ad67159273e2bc26d3fdef7dcfb347c976ee4e11fa2b789dce04d357dbfb3c375394a3b96d97d21ba4650aa48bd283ce SHA512 25e07b77cd117993cbd7113a01a09d01ee2cfd1c135f5908d0ab7faa93dd693b1223d33fe115e40b2dac04afa430b22d912dd3539738ff4b20679892c120cb9a
+EBUILD ddclient-0-r2.ebuild 203 BLAKE2B 3ef1f11a5e512419a4aad77b84f5543c5913053078879ae7a9778a6a86c099ff0dad8f231387ab75284199a15d375780e7e4b3ed1cdfa1c3a7b517d3f249b753 SHA512 e117e94f86ca12a460f25161ae8f1911d731f800aed139105f37dbaab2c3d6df747b352a03fb1a7cb1ac8b3076145bbe1818cbe81787e9f262b9e96c1d67d127
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/ddclient/ddclient-0-r1.ebuild b/acct-group/ddclient/ddclient-0-r1.ebuild
deleted file mode 100644
index 778bf4cbe572..000000000000
--- a/acct-group/ddclient/ddclient-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the dynamic DNS client"
-
-ACCT_GROUP_ID="487"
diff --git a/acct-group/ddclient/ddclient-0-r2.ebuild b/acct-group/ddclient/ddclient-0-r2.ebuild
new file mode 100644
index 000000000000..635e8d6f55ff
--- /dev/null
+++ b/acct-group/ddclient/ddclient-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the dynamic DNS client"
+
+ACCT_GROUP_ID="487"
diff --git a/acct-group/defang/Manifest b/acct-group/defang/Manifest
index 544855966eda..f443f35365be 100644
--- a/acct-group/defang/Manifest
+++ b/acct-group/defang/Manifest
@@ -1,2 +1,2 @@
-EBUILD defang-0.ebuild 203 BLAKE2B 87ff25598dc20632e298b577e0461134cd17e3d5d92bccbd4e5a1f653af0b66541c9f4abfedeafeaff4428684e5dcce8c1175fddf826245fca802739e4c6f999 SHA512 2c180a4d6f3700e84d048fbcb22fdceeacb9d9181c8ca92f3b137a7e168c445ec824a6cf6fc4d355fe2bf9287fd05fed2512f2c183deaa0060bfbe5035b27c50
+EBUILD defang-0-r1.ebuild 203 BLAKE2B 68aa63ee0cd6c6cb8f4fc5ef7eacc4222830769817b587f92e94881c122e2466d74f532e1dbcec0c5949601c34dbbc7df205eca74f1df81c99923c77dacd8a28 SHA512 07f53d72ab9dff823fc8664c8070110d74278c8e2c6c9c5506b4a76d7b1978a49f821a5d72d512783447ec1889f7b7a93631c406d99faa0a80715585f716b45a
MISC metadata.xml 397 BLAKE2B ea8573a9aa18ceef29be88a477c5fdec0a5ce15904a80395a73eb9947df371f257b285249576d1ac69158c1d6bced11f16b742c52e63715ed275d43cf960b5b9 SHA512 0af40b5fc5e6d00c9be7afdb6d2d124aa13de899b035c7f61e98c82c37e74377b10ce09f909d5f52bba93cfae069cd17bb8cf8e705155a2d221ccda184ffd343
diff --git a/acct-group/defang/defang-0-r1.ebuild b/acct-group/defang/defang-0-r1.ebuild
new file mode 100644
index 000000000000..07fb25a22c25
--- /dev/null
+++ b/acct-group/defang/defang-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/mimedefang"
+
+ACCT_GROUP_ID="181"
diff --git a/acct-group/defang/defang-0.ebuild b/acct-group/defang/defang-0.ebuild
deleted file mode 100644
index aab0765fabfa..000000000000
--- a/acct-group/defang/defang-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for mail-filter/mimedefang"
-
-ACCT_GROUP_ID="181"
diff --git a/acct-group/dehydrated/Manifest b/acct-group/dehydrated/Manifest
index b03c0a7b1684..1b815e72ff1c 100644
--- a/acct-group/dehydrated/Manifest
+++ b/acct-group/dehydrated/Manifest
@@ -1,2 +1,2 @@
-EBUILD dehydrated-0.ebuild 186 BLAKE2B 3a6d7001e2bde0eb1ac13d0d2c6c0c2dff2c1407a67cf864cfc41e56a91af5a352d2d72d6dc1b44ef80be212d186a7ab761f54f7bc82d3387feeb457ed840c0c SHA512 8c363fd226513afc25e67ba1d12a0da8c0d67241bade538d275f99115099a0fa2378f52afe0df084f5d7eee2748f317d35716d71337c66d7a0ca1dec4617292e
+EBUILD dehydrated-0-r1.ebuild 191 BLAKE2B a313bce15933ac965e1cd3dbbb4c0089affbf39c38502241a3b5e4f20855ec7c9d602556c38001b3fe3b008c01a188ab51ccc1a14efa5920b887411e7e659637 SHA512 98229252e9343ee8cbeed09e515f1ff87300ad5de22273552c7585f086b8a6180932cc6820ce8bfb7dd2e97b2a5517a96c89f2e54f4c860474e4441b73d0efb3
MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/acct-group/dehydrated/dehydrated-0-r1.ebuild b/acct-group/dehydrated/dehydrated-0-r1.ebuild
new file mode 100644
index 000000000000..bd6fc5074d0f
--- /dev/null
+++ b/acct-group/dehydrated/dehydrated-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="dehydrated program group"
+
+ACCT_GROUP_ID=361
diff --git a/acct-group/dehydrated/dehydrated-0.ebuild b/acct-group/dehydrated/dehydrated-0.ebuild
deleted file mode 100644
index 4edd9bf28a24..000000000000
--- a/acct-group/dehydrated/dehydrated-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="dehydrated program group"
-
-ACCT_GROUP_ID=361
diff --git a/acct-group/deluge/Manifest b/acct-group/deluge/Manifest
index 7066cd333013..2464855aee49 100644
--- a/acct-group/deluge/Manifest
+++ b/acct-group/deluge/Manifest
@@ -1,2 +1,2 @@
-EBUILD deluge-0-r1.ebuild 151 BLAKE2B 6ec42fd230b4181ec62a967daf16a7ed07f6eb378b7c4891c7d19cbfe1dc593dbfd4d11122497902a03a29173b3e9c9f81cb782e17e7df1d9eb37c48e54a7bab SHA512 af541474931d771efedbe5ec3f321ef2c1edb8a3f0d4e094470b2011e87f7220bf05a08f2e68bf2fa600dae468a40628a7d870988cd004a228e8c2d97ac2fefb
+EBUILD deluge-0-r2.ebuild 151 BLAKE2B d65aa03726916e276da49c0a01383101cbb36d9ff9da16568f92b77c431a96f096a0bb00c0a0f267da7d0da70dede5d62deeddd34eaff664d86b90fc61e30047 SHA512 65265fd6ceda4e339a8f12f6cb2744b6649e19ffc94aa1d8fd2bd447015fd3fc4c7054c01d8b5caba9f78a5ad40c1b8519af3cdfcefdd69b0b63258e1fe9ced0
MISC metadata.xml 521 BLAKE2B e4adb92b824153ea2e9d79164c2111a1e49049286cbe9e1662ff0ee8300031092d65b3ca97c3cf449ca7a57bcdb78f86c9988154244686879194686f0bf3048c SHA512 d37d8f08b7b7d5a5a00d1c0ecbcf27d42610df9c4a1e68dbb2f17272cbc73fe000bba406f0f9ca40aba22f081ef2de097029886af6938d1b64e63a6d25fc8bba
diff --git a/acct-group/deluge/deluge-0-r1.ebuild b/acct-group/deluge/deluge-0-r1.ebuild
deleted file mode 100644
index 7f9e1bf27888..000000000000
--- a/acct-group/deluge/deluge-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=454
diff --git a/acct-group/deluge/deluge-0-r2.ebuild b/acct-group/deluge/deluge-0-r2.ebuild
new file mode 100644
index 000000000000..b6fabbb0d9ee
--- /dev/null
+++ b/acct-group/deluge/deluge-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=454
diff --git a/acct-group/dhcp/Manifest b/acct-group/dhcp/Manifest
index cf22cec50ccb..a856c3d3fb1c 100644
--- a/acct-group/dhcp/Manifest
+++ b/acct-group/dhcp/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcp-0-r1.ebuild 151 BLAKE2B 93c98657f5316c254b8deddce973a532ccdcfe1d0b417705d73ef2c53691e0d4ae19c72a78b682d681c4748d031667a8cec6b86b9460fda75229f37b8b47cb51 SHA512 bc4b1ba5627f0f529a7f590836e3d2ed9795cd97a463b1f5ca1c0a0a321a2964ca550d8c552c75aefc8ce104e41c2c860e5adbaa95e753c72bef2b78a15b542a
+EBUILD dhcp-0-r2.ebuild 151 BLAKE2B bd2658011fdc9e8a1797f57b2447c8797d1f9f58f73a4380408ffc5f1b83eba415d45f481538a4979f50d2103bd54c76d4b34398cadd64f15622ceb7eb932ca9 SHA512 35e1527785f1d8389e4b8d66d1e21ce85f6858e4e4f295d888424dbaf0cdf4138db15c49eeb0bd2063457bdfb68d2882e5309f646469caee923e3c7a45d66904
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/dhcp/dhcp-0-r1.ebuild b/acct-group/dhcp/dhcp-0-r1.ebuild
deleted file mode 100644
index 5b54d2ecdd85..000000000000
--- a/acct-group/dhcp/dhcp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=300
diff --git a/acct-group/dhcp/dhcp-0-r2.ebuild b/acct-group/dhcp/dhcp-0-r2.ebuild
new file mode 100644
index 000000000000..ae3d106df1b4
--- /dev/null
+++ b/acct-group/dhcp/dhcp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=300
diff --git a/acct-group/dhcpcd/Manifest b/acct-group/dhcpcd/Manifest
index 7153580573a2..27c5c84f55d8 100644
--- a/acct-group/dhcpcd/Manifest
+++ b/acct-group/dhcpcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcpcd-0-r1.ebuild 151 BLAKE2B 306e0904bd08b2cc315457a6cf928609b47db968b3e70069cd47369ba3712322d17cd3ba1fa553d720e1b78bba11ddad87afadb97032338898fbe60eba99bd90 SHA512 ba1b216da075681ec6658b023bf1654067a3b04eebb8f7e8aa40f033b9fef7c5824bb436d47296d7dce74af9ddd5e53c5bc3e12c1c559fb48f98372a879f8a57
+EBUILD dhcpcd-0-r2.ebuild 151 BLAKE2B 0adfc2ba925b1a1dcfca499857406406a9010f0eeb939816f1dc9f6ec2cec0ebe003529b983c9778cf650858c30217ccbe7efbeb9c86e0593036c22208374f72 SHA512 e124bd09301cd1e2665e3cbad37ec776e8731cde06022dc6eaaec3a0e33357d23620397f02313c92d750791ffc51894713f80d37b02e7264ee0c7538919bd302
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild b/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
deleted file mode 100644
index 47af5f206833..000000000000
--- a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=303
diff --git a/acct-group/dhcpcd/dhcpcd-0-r2.ebuild b/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
new file mode 100644
index 000000000000..358823c53a84
--- /dev/null
+++ b/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=303
diff --git a/acct-group/dialout/Manifest b/acct-group/dialout/Manifest
index 107ba744b004..75ca511ff0c4 100644
--- a/acct-group/dialout/Manifest
+++ b/acct-group/dialout/Manifest
@@ -1,2 +1,2 @@
-EBUILD dialout-0-r1.ebuild 150 BLAKE2B c3d3cf780abdab60516a23ac60bb049165b18941a0dd2e9bbf03112bb9f0450548308178f84ea55f1ad36e35310fcfcf04b355a7d018c6bd74af5e6919322892 SHA512 a98f4ed38f2331720a454b3d06761df5ba86eebecd72b68466ea13fa46fdbbed62b0f8194f0a48162e1b241167cabb057de906bd9d60424a4635a1cde28ba9e2
+EBUILD dialout-0-r2.ebuild 150 BLAKE2B 6c2496da9ee4966c751839793a0a68679d500a05c17d334a846716481562a1464077ce85e8870a377ec15cd64ad6494a4b51f2e11e3e39c28af425ca56291e34 SHA512 95bfa65320b2e04d878484eb8c5335e4a8ccd64539b3adbf21f6ce76dff9925810f1bd3881c9116ccb83b30fd3c24134b9a87f0d131ea4bee591482319136ab0
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/dialout/dialout-0-r1.ebuild b/acct-group/dialout/dialout-0-r1.ebuild
deleted file mode 100644
index 3c1316aa585a..000000000000
--- a/acct-group/dialout/dialout-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=20
diff --git a/acct-group/dialout/dialout-0-r2.ebuild b/acct-group/dialout/dialout-0-r2.ebuild
new file mode 100644
index 000000000000..b83a88cc096f
--- /dev/null
+++ b/acct-group/dialout/dialout-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=20
diff --git a/acct-group/dictd/Manifest b/acct-group/dictd/Manifest
index 1cf9267117d4..38912307ee15 100644
--- a/acct-group/dictd/Manifest
+++ b/acct-group/dictd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dictd-0.ebuild 184 BLAKE2B ef5e69ed44748c3296857c5ce17c98ebf69d169d8fcf666e628a778e85118db2fb7ce1d715f9ccee2cd846bb1fec22b11775c2643122dfb2bcbbd64a5026f45b SHA512 7fb1ccedab2a83a0b678760a8375992e764a2e55702a0ef9b20c8290cc9e9890f5ba5fd1489cb82888aa36f283510aef1115c06350905472b60eb182b8a2abcd
+EBUILD dictd-0-r1.ebuild 189 BLAKE2B a677d245b8711fb45357a627c7b902f465fe13e476cfeac2e68a2c374420400219e8595b4fdef7cb8249f1b6afddcbbc6c827d651ff9825a2e47e91e14d7e624 SHA512 6a82bbe7dc5cdb1a331514365cd81d45cd0bf85ebf95bbe8dbec402a7c70f9a25ce415099c8147053160b42b416b40a8bdc52f077e4e72242c932717d0cb8f33
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/dictd/dictd-0-r1.ebuild b/acct-group/dictd/dictd-0-r1.ebuild
new file mode 100644
index 000000000000..30250bf20c3c
--- /dev/null
+++ b/acct-group/dictd/dictd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for app-text/dictd"
+
+ACCT_GROUP_ID=381
diff --git a/acct-group/dictd/dictd-0.ebuild b/acct-group/dictd/dictd-0.ebuild
deleted file mode 100644
index e20464ee6fd1..000000000000
--- a/acct-group/dictd/dictd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for app-text/dictd"
-
-ACCT_GROUP_ID=381
diff --git a/acct-group/dirsrv/Manifest b/acct-group/dirsrv/Manifest
index 8e7d4a17e28b..731e9b120a9a 100644
--- a/acct-group/dirsrv/Manifest
+++ b/acct-group/dirsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD dirsrv-0.ebuild 190 BLAKE2B 368a26f8c1f9ef3327aa8bcae45cc4c419d4719c1a82b0307ac862aed6c8941def326568aea406068ccde0bec694b37a32ac59e59ce0c5b5a75d99e4e15412bb SHA512 fd9f41d1e2f9dacae5831d3b00cb54fab6cd6c801073ee015c9685c9a4e38b9cce0b1b90a60e2ec219156ffdb26985d686531b23d4f7c25d5fbeb83bbe2636d1
+EBUILD dirsrv-0-r1.ebuild 195 BLAKE2B 9950599616e84d0ed717b4c831abe3fa026f0ea6f054a6aab08ffd62d5a52f21a902ca466073fa8a285ace87516d4e860c1b111f80cda8d5adb5b31dd3610ad9 SHA512 4f2b090a2164354d8673080c74a71ff8e564638dacf1efa00308044ab5f650c1c4cfb0a033e4be691339cc8a8e36457e7c5d77258c299abf4f466668431fa45f
MISC metadata.xml 531 BLAKE2B 9b3cdbe8aa6b5513b7b2fa5c16b4f3a3809e369420d156c9a84dbcef3b6630ab328732a81e0cd88d06004e208a3156346bc5bbadeb549ffa2adebdea758ac45c SHA512 0744c746cf418423c03e41753c82d3ff22cffcb26c763f16fd449d86ec22dd1a927ac38d8f8f062983c75962a62b1556181a8bfc1835fb7a11c60e8dffef8cc9
diff --git a/acct-group/dirsrv/dirsrv-0-r1.ebuild b/acct-group/dirsrv/dirsrv-0-r1.ebuild
new file mode 100644
index 000000000000..44e24def6561
--- /dev/null
+++ b/acct-group/dirsrv/dirsrv-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nds/389-ds-base"
+ACCT_GROUP_ID=346
diff --git a/acct-group/dirsrv/dirsrv-0.ebuild b/acct-group/dirsrv/dirsrv-0.ebuild
deleted file mode 100644
index 14eb4d7fac5b..000000000000
--- a/acct-group/dirsrv/dirsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nds/389-ds-base"
-ACCT_GROUP_ID=346
diff --git a/acct-group/disk/Manifest b/acct-group/disk/Manifest
index 69e60593e70b..0fbe0c69b1c7 100644
--- a/acct-group/disk/Manifest
+++ b/acct-group/disk/Manifest
@@ -1,2 +1,2 @@
-EBUILD disk-0-r1.ebuild 149 BLAKE2B 9de9db5716dea88d70df54b54a188f3d5a5b6b59f7dd6c76584163bc71d95e703c6d65e9cf200eb77fbd33210ae728082471c9d4d5d53b0ccbd1632286d95340 SHA512 9154bb221b84af1e5939ec292eb9d7d525ee2675aae012cb06d7c38f4c464b9e3724aefaed186cd2707c7ea657ad66cd46338df4075c149f7ef160ecce26cbce
+EBUILD disk-0-r2.ebuild 149 BLAKE2B c810342ab964f1de2c1db14abd1a1af4484efa0461da05f83e3d3ec58684bded78d457c2feb6ab9ae20a836006d94d80c75b316f860017b43816a65910acd261 SHA512 2845f3f33bed8129a046408764b0a36bc1e5c77c703bbccdf88929cf19e18c09301ac98660cdf06ff49f09f5e0e0e1dd46853c161f534dd3aa0a5664676baa9c
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/disk/disk-0-r1.ebuild b/acct-group/disk/disk-0-r1.ebuild
deleted file mode 100644
index a5568d65c049..000000000000
--- a/acct-group/disk/disk-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=6
diff --git a/acct-group/disk/disk-0-r2.ebuild b/acct-group/disk/disk-0-r2.ebuild
new file mode 100644
index 000000000000..1eb22b9bbbb5
--- /dev/null
+++ b/acct-group/disk/disk-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=6
diff --git a/acct-group/distcc/Manifest b/acct-group/distcc/Manifest
index 1f95fca93003..ea2b923dad2f 100644
--- a/acct-group/distcc/Manifest
+++ b/acct-group/distcc/Manifest
@@ -1,2 +1,2 @@
-EBUILD distcc-1.ebuild 146 BLAKE2B ab9bc3d182e718824f0d70910580a17f7c049e426c30938c8803b5e070e26b1a50169752338ed734cd03540dff02fd23fd5fb3f595d8bf442712b4d7fb00627a SHA512 9cbd35574c7727e1355ae42131258de4250b2f633da43be4a038f0dc0fe19cf67644efe789102e1c67a3b175d88bd4326de2135b30818e1ddde3be90d60928fc
+EBUILD distcc-1-r1.ebuild 151 BLAKE2B 1f95dad39f33a3fdf5aad5bae968e2c4ab69f0b42c0254573dce2aebd4acb92cb06edfbd7079abf616b440badb44bebad9961d637abe1702f96606b8f94b572f SHA512 80545347d33b9bb82f6589f45b4b33a8cdadb478dab468f012676f7560ff6b71799e798367b1135803c8f586804ae1edcf6aaba9ea3166dec646106df8c83a8b
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-group/distcc/distcc-1-r1.ebuild b/acct-group/distcc/distcc-1-r1.ebuild
new file mode 100644
index 000000000000..7c650651a234
--- /dev/null
+++ b/acct-group/distcc/distcc-1-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=240
diff --git a/acct-group/distcc/distcc-1.ebuild b/acct-group/distcc/distcc-1.ebuild
deleted file mode 100644
index d26894412994..000000000000
--- a/acct-group/distcc/distcc-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=240
diff --git a/acct-group/dnrd/Manifest b/acct-group/dnrd/Manifest
index a083fee69bf8..175931f55f57 100644
--- a/acct-group/dnrd/Manifest
+++ b/acct-group/dnrd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnrd-0.ebuild 191 BLAKE2B c432663312085e0815b16552c5ed0a7055d08f9c96c07cd1f203434959ce74354fa1beaceda62b332bc44dad4c03a4940f372a318c135444fff2dbb5182e2c88 SHA512 1c0969d58cccc7094149db7296fd20c211403f6327b3c8f1c492004b0794efc05c9fb7bc7869ea87d53d467383cf357d957bf0bda5acc7f21e3cc7fa3fc06ead
+EBUILD dnrd-0-r1.ebuild 191 BLAKE2B 7ea12f13fb51787dc36d36cb81c53276c5a022a22ead8f72c4d07910bbe1a8ec16b1a7374a2238376d12a0d962157f70d1e02243b5ee8ace56a27597eb54714d SHA512 44ea40507f90db997ed30d02fabc8574fdbf3355a46b7234d4dc354aa9ebeb69e835e13cbea3640121ad60655481feeceb730760cb50a9c45b214a02720791aa
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/dnrd/dnrd-0-r1.ebuild b/acct-group/dnrd/dnrd-0-r1.ebuild
new file mode 100644
index 000000000000..235dbfcf78c0
--- /dev/null
+++ b/acct-group/dnrd/dnrd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnrd"
+
+ACCT_GROUP_ID="262"
diff --git a/acct-group/dnrd/dnrd-0.ebuild b/acct-group/dnrd/dnrd-0.ebuild
deleted file mode 100644
index bba06a48da25..000000000000
--- a/acct-group/dnrd/dnrd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnrd"
-
-ACCT_GROUP_ID="262"
diff --git a/acct-group/dnscrypt-proxy/Manifest b/acct-group/dnscrypt-proxy/Manifest
index 6002ac56b17b..18dd7a0be7c2 100644
--- a/acct-group/dnscrypt-proxy/Manifest
+++ b/acct-group/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnscrypt-proxy-0-r1.ebuild 198 BLAKE2B 7ccf9d5d9fe0cbaaa5deede20bd01353d10c2b3ffa42c4bac59ad4dc1c02c7a452413315e19b5af976aa0c86e99723d1a86849e7e4b41274179664093137ee43 SHA512 2e5cafc8236050e3ee1ec9ecdc89513954b1e590dc93a393ff4d36508e4cc3e55a9fb54a43db432fb88970a053744fd89104b63fd90be9cdb90b8745fb4bfac2
+EBUILD dnscrypt-proxy-0-r2.ebuild 198 BLAKE2B ecab2f45be2550ee9dc5f68cb4397004b7837bf58376d10f07d1be646a6a29833c1747fc70d770c4362738b168919fb64d5371f5ce8fa2500c3bf51660e66e85 SHA512 00978a2f612bb1115d3f4f25f050db7a1e239990c2e563c00235cb608556c09dbc556013e646cbe969b4e03de25c37f0f36a66fc66ff2ec1f6ba33ff5b7fb477
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
deleted file mode 100644
index afd6951e3873..000000000000
--- a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnscrypt-proxy"
-ACCT_GROUP_ID=353
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..0d10d9fd64b4
--- /dev/null
+++ b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnscrypt-proxy"
+ACCT_GROUP_ID=353
diff --git a/acct-group/dnsdist/Manifest b/acct-group/dnsdist/Manifest
index 20565ac3b4d4..a4dd053834f0 100644
--- a/acct-group/dnsdist/Manifest
+++ b/acct-group/dnsdist/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsdist-0-r1.ebuild 191 BLAKE2B 5ee8d3d901d508150218f5e4af830fa9f58c992da305e84c4cbb845b06b083f90623685d59f354597190b1640697be09bc0756862df7d0e65570adbf2390ca28 SHA512 50d80fb8cc61c390fe1006117d07204a00b4b90232ed5e23a3e9c2ad18b0db0b55ab8851fd59560bf26df19458bcd2d2507464d85c1e1cc8e35e001ad0cfd2bb
+EBUILD dnsdist-0-r2.ebuild 196 BLAKE2B c332c82779ca0c2b16b380eef6e54515348b2c4cc1acc64b1f670e09d4edc7b272ba8551a0ca080636109535cb4f1f337784be38e7d270159bc8e614cec059dc SHA512 9bd7cfb6a3d4c91dd5c9c0bf179451b4b6611c13481871d9dcad7d75d7efefd79338a2d64b6b0e10655c0c75c595f195877fe6dcc2fba5d0edc32a320cb43900
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
diff --git a/acct-group/dnsdist/dnsdist-0-r1.ebuild b/acct-group/dnsdist/dnsdist-0-r1.ebuild
deleted file mode 100644
index df9b403bed38..000000000000
--- a/acct-group/dnsdist/dnsdist-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/dnsdist"
-
-ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsdist/dnsdist-0-r2.ebuild b/acct-group/dnsdist/dnsdist-0-r2.ebuild
new file mode 100644
index 000000000000..573f371e6d0c
--- /dev/null
+++ b/acct-group/dnsdist/dnsdist-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/dnsdist"
+
+ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsmasq/Manifest b/acct-group/dnsmasq/Manifest
index 1a6267890961..165021075924 100644
--- a/acct-group/dnsmasq/Manifest
+++ b/acct-group/dnsmasq/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq-0-r1.ebuild 151 BLAKE2B 56b9d84aea0631ef62ee7a808c03cb0d6742f86633131d94130c322a93795dffc55dc27c9838f7c0b3018f389252ce2ada75c2d9bdd793755d210043390b7d98 SHA512 c5918a7e4972c37cb7161d5c0491d0441c92944909f2b29542ab360effcc511bac696f4eaebc825ee26ddf11f712c6429bc898c6c92255aba017021e2aa9d43c
+EBUILD dnsmasq-0-r2.ebuild 151 BLAKE2B ab1a50c19482ee843f70c019f38742772f04802962600918c4f2f9586a5b09d730294dc8dfbfaea4c0eb0e74230c30738bed18a0a20c215fc9def27e388ec6c9 SHA512 33dc53a1383508b38f50d216966b5628506c8d32fae19c365abf0877c8adc92bcdbfdf517bd89b570bb757f63400897f41f72e05ebb29530b3922e97a216e697
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild b/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
deleted file mode 100644
index d765927def05..000000000000
--- a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq/dnsmasq-0-r2.ebuild b/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
new file mode 100644
index 000000000000..e41841312803
--- /dev/null
+++ b/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq_exporter/Manifest b/acct-group/dnsmasq_exporter/Manifest
index abe9407f1dc7..d42fdf8f37d0 100644
--- a/acct-group/dnsmasq_exporter/Manifest
+++ b/acct-group/dnsmasq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq_exporter-0-r1.ebuild 151 BLAKE2B 80e7aca1fe8aef356f7c90b867481e2b2e1b07f46ac0afe6c9d3689a6eab2cfb7ba5b60a028ed651fc367dc6e707cd3f44363b1fc273adc1baf0a78aff9bfe47 SHA512 6903572dc26d002bd962fb58ccf4deca5c938794d21aedf0a99d439e3528787b51286fe0630a86d72c23166705ae47439835596c4957860afa7b9676af5733cb
+EBUILD dnsmasq_exporter-0-r2.ebuild 151 BLAKE2B c5824f9bf752ae7c01fcd228ddd8465f98d77e3ff0ca9446da1d7bdd0e99be375ba26d3a66e8ddb4ec80ea0ce3b516038a7397be68b4fb41641e38bf323c0849 SHA512 24f035576ff8e4e5f6165bcb05574ed7dde1a82bc9d00748dd42d803ecc9d7a7e24afa86b28e31d996520d4d441aac470d6c62398d260f30f6484a1bdf445a78
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
deleted file mode 100644
index e075766a9c4e..000000000000
--- a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=274
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2568d8d50be2
--- /dev/null
+++ b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=274
diff --git a/acct-group/docker/Manifest b/acct-group/docker/Manifest
index c30a03991b99..d5f13b1f66d3 100644
--- a/acct-group/docker/Manifest
+++ b/acct-group/docker/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker-0-r1.ebuild 145 BLAKE2B 9e4a951d2bd6b77904803ef8a478a5b69a1e1e5ae67007234feeae2564a912f106978a0414669970ad27238a1e6ced02178cc2428becb5626a658c71bac28409 SHA512 8fa1eed96570cb9f04e50df7cee30a23b7cb4ba01760bc299f0e9e5dcdd87ac39b70c89beb6e7c914839cf91f5209f36302d3e8cf4de9b192aebdeace7be6ad7
+EBUILD docker-0-r2.ebuild 150 BLAKE2B ba4f757068cc16b68bb52e0173c9d7385a530ac241c3c97aa7d4b9c089f24267486fc3d6b61422e290a7f66a55d9285166263fbf8be09aff327510c88c97332a SHA512 2423b2073fd29d31f7039119511411d788b23ce87f7c58a38b052404dec99cf24b9cb7a076457a8db116080619d653128407a3d2b8c67b1905651bc6ee028161
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/docker/docker-0-r1.ebuild b/acct-group/docker/docker-0-r1.ebuild
deleted file mode 100644
index a448b78e40fb..000000000000
--- a/acct-group/docker/docker-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=48
diff --git a/acct-group/docker/docker-0-r2.ebuild b/acct-group/docker/docker-0-r2.ebuild
new file mode 100644
index 000000000000..e59205efc4c2
--- /dev/null
+++ b/acct-group/docker/docker-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=48
diff --git a/acct-group/docker_auth/Manifest b/acct-group/docker_auth/Manifest
index 1a82576a83bc..f87149a9d056 100644
--- a/acct-group/docker_auth/Manifest
+++ b/acct-group/docker_auth/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker_auth-0-r1.ebuild 146 BLAKE2B 18bfc521e2fdc0188b41dc1afe1abb57a6bf6ace550ee43c2f70d3a7dd852d6fae448ed114a9262817d1da26ce2177927c37f5ae85f8c7c85b82648e8eeae78a SHA512 ab0f8dc1c0a94d1ab670fb6b4e49fdb6b71623f459d36e68abcb943d53a23531236030ba95c7670d9790b927928517ac53977cfc2cb65bbae43772a467fe0f9f
+EBUILD docker_auth-0-r2.ebuild 151 BLAKE2B aac7e84f3af549f5cd37c7827f2932d7efc2d61c4a8d138702f9e338c5b7b2578639895a96d063a62738c4cd0ce33c0d698c43a6236a132303c4f6a4c28d03a9 SHA512 6a9d6f4b5d314d27bc0019203cafd9151bdeafc806d86ae707be6ffc9a9fd731625226ea209be78c25eaa2fd806591adf0ea13df00b5b52fe9076d1e3b4ae40c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/docker_auth/docker_auth-0-r1.ebuild b/acct-group/docker_auth/docker_auth-0-r1.ebuild
deleted file mode 100644
index 15cb331e003c..000000000000
--- a/acct-group/docker_auth/docker_auth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=345
diff --git a/acct-group/docker_auth/docker_auth-0-r2.ebuild b/acct-group/docker_auth/docker_auth-0-r2.ebuild
new file mode 100644
index 000000000000..d3f082ccbf0d
--- /dev/null
+++ b/acct-group/docker_auth/docker_auth-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=345
diff --git a/acct-group/dovecot/Manifest b/acct-group/dovecot/Manifest
index 4fbeeda2f422..8d158b43830c 100644
--- a/acct-group/dovecot/Manifest
+++ b/acct-group/dovecot/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovecot-0-r1.ebuild 150 BLAKE2B 4c86279b268425d51c1af2479896ab1a7658450729b136ad7a7b4a956878faea26b74c7c407dbc9bb66dcefe38e3509a178cb1b0967f69f5a898bb6f89c1dc38 SHA512 b0346b807c6d68b68e1453218160d32a4baf5d60b626203ed1b87edfe20d4cfae450034243024332847f359dafbed91439d7c7be92076941671fd2edcecca308
+EBUILD dovecot-0-r2.ebuild 150 BLAKE2B 196d19787b3ffc014b4cf34877a484969c2e1625fcb732aab934716fefbe12b5959b5d269b8799baa51a98808cf9583de8cbceb6114e259677e6e0e9c0fb438b SHA512 47fcf07792c893f5c65039f284306b63fbf578aa6502b69b9e3fbcd9b31b061238ec515d5013c8f18a98266710db1e3e2bfe4619dba427077e965fe5b184e641
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/dovecot/dovecot-0-r1.ebuild b/acct-group/dovecot/dovecot-0-r1.ebuild
deleted file mode 100644
index 3b37f1a2ebd6..000000000000
--- a/acct-group/dovecot/dovecot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=76
diff --git a/acct-group/dovecot/dovecot-0-r2.ebuild b/acct-group/dovecot/dovecot-0-r2.ebuild
new file mode 100644
index 000000000000..b79d8d933cfe
--- /dev/null
+++ b/acct-group/dovecot/dovecot-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=76
diff --git a/acct-group/dovenull/Manifest b/acct-group/dovenull/Manifest
index 1e6c9dd3a78f..baa2a12a03ee 100644
--- a/acct-group/dovenull/Manifest
+++ b/acct-group/dovenull/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovenull-0-r1.ebuild 150 BLAKE2B 983a6c3ccab5f7f39d0b1516ac2c6a6f7daaed4e594424020a7234edc1f762dee99b5a00898a97a3a22ff97327d7f37d629f55c7bda8f6abca36b072271ce3f0 SHA512 23d02ad73a8c9fb417101683e57a19168535b68ce264788c8e9213898451aacb39e0a786796d94daec7b2fa5ab0e856eb22af9af5bd4049248f9a53f01add4e8
+EBUILD dovenull-0-r2.ebuild 150 BLAKE2B 488d61dd9d9fe16763760d7cd38002ef1f9757d7689d792adefa50e96c19637955e5ebfe551d2a6be0ce2f1ec064d5d8275acde20ab4fda7a36e241319c7c992 SHA512 e8c23a4a16de2059c7744b23e2a5fe9882f558b2b74eb3b56bb48659a95211884d821d17db48866cc03cf221cf78dad8dd7fee834ba9ab87bee23b709905f9d4
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/dovenull/dovenull-0-r1.ebuild b/acct-group/dovenull/dovenull-0-r1.ebuild
deleted file mode 100644
index f6c9f1011d06..000000000000
--- a/acct-group/dovenull/dovenull-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=74
diff --git a/acct-group/dovenull/dovenull-0-r2.ebuild b/acct-group/dovenull/dovenull-0-r2.ebuild
new file mode 100644
index 000000000000..dfd9f8ee494c
--- /dev/null
+++ b/acct-group/dovenull/dovenull-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=74
diff --git a/acct-group/drone/Manifest b/acct-group/drone/Manifest
index 834783702e3f..8bd546a5a5b8 100644
--- a/acct-group/drone/Manifest
+++ b/acct-group/drone/Manifest
@@ -1,2 +1,2 @@
-EBUILD drone-0.ebuild 195 BLAKE2B d2e0f02d0bdf5f98571a955e78ba080a31da3979ceb037089685a89f796d5244595c40949174a1f19fe4c25f1f920573278395aff64880bf6a995e6688eda7b7 SHA512 5feaeb4795c1e377381e6654665bbcb9f94dd7f6d91847561a551ebf2480e0e7f3bf67fc0cfb74605715c456448470f037838a4a79bf75a4a621d06d75f815c8
+EBUILD drone-0-r1.ebuild 195 BLAKE2B 2f061770dc8358d45accb5fa09d12f4f719ac637ecbdd883042cadeae63a1642940f4526cd5ccb3d612288ab0a2662325078fc12db81a44c7960afd04a48e32f SHA512 19a95654d9bb1fd5713c8d53399e5b9f36e40cdb67c359cca58379600d2180ad0f8d7151432a321986c757116e82155e5845412bcac4e40e17298dc44b5deab3
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/drone/drone-0-r1.ebuild b/acct-group/drone/drone-0-r1.ebuild
new file mode 100644
index 000000000000..c02ad8cb13d8
--- /dev/null
+++ b/acct-group/drone/drone-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/drone"
+
+ACCT_GROUP_ID="112"
diff --git a/acct-group/drone/drone-0.ebuild b/acct-group/drone/drone-0.ebuild
deleted file mode 100644
index 7e4e2c35ad8b..000000000000
--- a/acct-group/drone/drone-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-util/drone"
-
-ACCT_GROUP_ID="112"
diff --git a/acct-group/ejabberd/Manifest b/acct-group/ejabberd/Manifest
index 0eb50fc74081..0d9479561959 100644
--- a/acct-group/ejabberd/Manifest
+++ b/acct-group/ejabberd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ejabberd-0.ebuild 192 BLAKE2B 619a3d9ba875a020796bd72c9880a57bfccc663897f1d0790fa270585a602828d5bd9a421b2b9fdb5ac8b72f85223474ac660cd23c1a447522745e438cdb9aaf SHA512 179a1a67a20b7e2a75bc19b43d4d7da39e42c69ac8510e23a8278b60dcd17e6ab161f16d34313640587a16b5d54f1c0c2a7b4955d2cde451abe4240685a07486
+EBUILD ejabberd-0-r1.ebuild 192 BLAKE2B 7766549dfbee1874ea04fdf3641bc783df6119910db1e4fcdbec75105311a559ed23abdb42af7c1f5ed61aca833fffb36a9384cdd959e508cfc22ce143075026 SHA512 2ab54546629107cd00cafdec010eafaabc858f00de01e0ab15a14854e6a61f5d6abbb533b6996c497101fbb8d9aa8f0ebc44a79c29fdfbfb909d1ad21c8383f2
MISC metadata.xml 328 BLAKE2B f5091b52d611b1b5316381dc2a1bbdb6f4bfbbcd6bb92f6e0aeb9dff2e8cc080665eed36c14e0abbe593c8d7f4074cd19df1089915441a75f57f3317d2c8b5c7 SHA512 64e578aadb702803be2ad5d4bc629c91e72cb5d6446e9c77a46198cce513e4de1ab582d527c69da62e3f86749f2a1eaec9ba0e0764627562283c29c2ba223811
diff --git a/acct-group/ejabberd/ejabberd-0-r1.ebuild b/acct-group/ejabberd/ejabberd-0-r1.ebuild
new file mode 100644
index 000000000000..ec6a736d7bb1
--- /dev/null
+++ b/acct-group/ejabberd/ejabberd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/ejabberd"
+
+ACCT_GROUP_ID=114
diff --git a/acct-group/ejabberd/ejabberd-0.ebuild b/acct-group/ejabberd/ejabberd-0.ebuild
deleted file mode 100644
index 7d4a216908f8..000000000000
--- a/acct-group/ejabberd/ejabberd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/ejabberd"
-
-ACCT_GROUP_ID=114
diff --git a/acct-group/elasticsearch/Manifest b/acct-group/elasticsearch/Manifest
index 0875047b0c4d..1a61102bc78a 100644
--- a/acct-group/elasticsearch/Manifest
+++ b/acct-group/elasticsearch/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch-0-r1.ebuild 193 BLAKE2B e3d11c3bd47b75899a6e4afbf95d867bcd975aaa9c9d90040a509329e9b8b37b29753e7a3c9a907c181ae3ecf07107f2d351c80838f9d6292daff2d53ac69ae9 SHA512 540182eb4cc6dff9552e27618f2bb36d371cdc1b28e440da9b12577444b1ab5f9c5fea69c0a32c8814ac630ea420ca34d0e12e0394e2aca07a751f51e3af4be4
+EBUILD elasticsearch-0-r2.ebuild 193 BLAKE2B 2fbce27364c96c520cb186f3ead2c715b1ce00e1d23ec15ec22b15b218f02d302aeea4de52f83b0c17a9a6628488587c84a0505efec12c3d9d6aea31724b5a58 SHA512 31ff13fde899c28045728ad5fa10c2e392f2f29878b967cc4df879ec929748a379261e87db5c9d191e7a057d73ba6cb254a33442c8e80e8843003ec68ec00003
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild b/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
deleted file mode 100644
index 7232aa799576..000000000000
--- a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Elasticsearch program group"
-ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch/elasticsearch-0-r2.ebuild b/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
new file mode 100644
index 000000000000..f9c57569df5f
--- /dev/null
+++ b/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Elasticsearch program group"
+ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch_exporter/Manifest b/acct-group/elasticsearch_exporter/Manifest
index 0c7cbe0c3bf1..0b6c14d4227e 100644
--- a/acct-group/elasticsearch_exporter/Manifest
+++ b/acct-group/elasticsearch_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch_exporter-0-r1.ebuild 215 BLAKE2B d2f21cfcc0664bf09736ecdaccd0b5c9d9449c0dbfce8c9c11ff0bef68ad8247fd6ffb4e3cab0a95449ea37be7c8bad2147acb6caa42798528424e90c20699b3 SHA512 a4f7ecfb6ce3ecdb6efc0e6a31560aace98cbd09e3861b0d2d6d758bd00b9e828f69d2b29c3ba19e70452f73a0807e746c4d208790de2028a3aade3567d950d3
+EBUILD elasticsearch_exporter-0-r2.ebuild 215 BLAKE2B 756bba51cc537d5f40aac9072f2f39fad80f03a0bf75760cf0612d564c124078653c92d0007813687dffdbe38a5152ade5b59e34ba7aded59e1d0a511efd6c7c SHA512 29c48030e85b4a070f4394d30004a709f0e445cf54ede2bef07b33096078a14f0758003e67167255cce37858b8ac86864f89d83bd31ddad29e9053e6d80c0830
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
deleted file mode 100644
index 65fdefebaf47..000000000000
--- a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
-
-ACCT_GROUP_ID="501"
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..eb80176af463
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
+
+ACCT_GROUP_ID="501"
diff --git a/acct-group/energi3/Manifest b/acct-group/energi3/Manifest
index d6fcba62e06e..5bea4cae8f06 100644
--- a/acct-group/energi3/Manifest
+++ b/acct-group/energi3/Manifest
@@ -1,2 +1,2 @@
-EBUILD energi3-0.ebuild 203 BLAKE2B c542d9ce036ce33f5c455e324665ce51000f5d9dd2b1eb36662d6cf6c78c6b31de06d9916fe9656bc6a7e29338e402092419d2c6540681451f15ee3e0b4b3cef SHA512 3449a20e739125ffce90cc3b42500197d2c4e60fe412ccafa857de09e43ab8dc742e9a33f158ced35c66f39e99c140f889dbd148b11ae38e3286dc6497c31f9f
+EBUILD energi3-0-r1.ebuild 203 BLAKE2B 60e793d8633c8a8e19eca964bb0ddbdd39fee2670ec1bd36d546abd6178437f7eb41b28ed2cb370645564f231d894cd0018e9cba42bf6e2b1f5d62ebef16b26e SHA512 dcca88177eed85416c7de3f3d9eb1bfd14662e5049ca2354813f9af98d663e5909b40f515c5e587144f4c69acd74e3c284e9773cbcb10288ef33152b00fe9b79
MISC metadata.xml 245 BLAKE2B f1fab6ac89edb8c7e0d5c3582eef178767c9e0a28ad1a59741d043cbc57c2cb9a14508be1e9ef31c9db4b74c8b265c38efca55d8b64cd30a128447862bc4550d SHA512 049bf946fa98e28b0e4b016ac2ccb4c10cb132b2b2103e1483ba0fc7351a0cbdaab6cbae460c6d9c2781a21cd1587449469516d5b23dea33418485ba5f4df8e0
diff --git a/acct-group/energi3/energi3-0-r1.ebuild b/acct-group/energi3/energi3-0-r1.ebuild
new file mode 100644
index 000000000000..0d5f2564832b
--- /dev/null
+++ b/acct-group/energi3/energi3-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-p2p/energi3"
+ACCT_GROUP_ID=218
diff --git a/acct-group/energi3/energi3-0.ebuild b/acct-group/energi3/energi3-0.ebuild
deleted file mode 100644
index d844c7679002..000000000000
--- a/acct-group/energi3/energi3-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-p2p/energi3"
-ACCT_GROUP_ID=218
diff --git a/acct-group/epam/Manifest b/acct-group/epam/Manifest
index 741f6716be0b..694b277dc884 100644
--- a/acct-group/epam/Manifest
+++ b/acct-group/epam/Manifest
@@ -1,2 +1,2 @@
-EBUILD epam-0.ebuild 205 BLAKE2B 1791186d2c63cbab9b7aeb5624aeb7d2e5f8c6a83baf7c985d753b047d5388f162d79f319ca9229544b1f36acfb2ff1b13046cecc74ac5c91c0a78c712145f1d SHA512 dc137fa1a85c10eadd3ea11dc3bccca485dc3a2b7f7a03af398e7c7c592c4339bad5beacd3bd82a6123f97bb9e3d0acb6e50e1f3c36113a51136c21c51644b20
+EBUILD epam-0-r1.ebuild 205 BLAKE2B f4feffae5f02c062475dbe42c6f3daa58fa97fa9155ca99c96b1a3d8ab16f1531edd197d607b5925af507e3cabf712a9db46c9f01ca7a0288ffc5f215642f416 SHA512 c0073d5d44a4db4967c8537f79b5047d92e33d376daf085f0064df70677cde82a9bcf86a3f1606b211a7c5729af473dee93f75ad28b0ff1a4d36ec94ae5cd8a3
MISC metadata.xml 221 BLAKE2B a0dda8dc3093f745d94283847d532e168cc7f74669d284078b7768afafc96c6af33260cb99d4202e7f6f3611cfd5d58054702cf8c83f1fc7103f1230e3096459 SHA512 cbe761c117b6dd24885c8cfe83896bd027383d543cddde6f690c9ee9e8b941147957d36a859e47a9f6510abfa0479e5200ff730f24305e67375af025b106cd25
diff --git a/acct-group/epam/epam-0-r1.ebuild b/acct-group/epam/epam-0-r1.ebuild
new file mode 100644
index 000000000000..6df502deb6a8
--- /dev/null
+++ b/acct-group/epam/epam-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ejabberd's epam functionality"
+ACCT_GROUP_ID=418
diff --git a/acct-group/epam/epam-0.ebuild b/acct-group/epam/epam-0.ebuild
deleted file mode 100644
index 7909cc2a4393..000000000000
--- a/acct-group/epam/epam-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ejabberd's epam functionality"
-ACCT_GROUP_ID=418
diff --git a/acct-group/epmd/Manifest b/acct-group/epmd/Manifest
index 1aaaded72dba..9af82c532f98 100644
--- a/acct-group/epmd/Manifest
+++ b/acct-group/epmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD epmd-0-r1.ebuild 200 BLAKE2B d300b2a3247f1612784635ce06f0cca3ef48b9f01c49919ec3955620ef63b28434da520ecddedc7c757034b470b614dc17bc03736c29000137f8c78e92b75e98 SHA512 f95a919258e9956e1cac3a5c349de3518b5928b8627e129ec8dd346c4e85a0c42ed9253175848c79c1b3811bae52920554f3424f73da04f6fc317df9d97cd675
+EBUILD epmd-0-r2.ebuild 200 BLAKE2B 7b77ad6f7535f17e13e910a2779bdad1889c5e715cc895fb3eb8b581d712f1f022153bb61de31678483b603d2573d812173febecdf1aaad66342ebbb48298d4a SHA512 0891531aed776fecbf0d4582b93699cc3ef42e891848eacc6ae000b6446f08ed31e9a72e6ba505d9e4b9870e42ba3c11ce129ddc568d390d0ea67150727f02ec
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
diff --git a/acct-group/epmd/epmd-0-r1.ebuild b/acct-group/epmd/epmd-0-r1.ebuild
deleted file mode 100644
index 69ad9f1cad2b..000000000000
--- a/acct-group/epmd/epmd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Erlang Portmapper Daemon"
-ACCT_GROUP_ID=335
diff --git a/acct-group/epmd/epmd-0-r2.ebuild b/acct-group/epmd/epmd-0-r2.ebuild
new file mode 100644
index 000000000000..f954ffee5a68
--- /dev/null
+++ b/acct-group/epmd/epmd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Erlang Portmapper Daemon"
+ACCT_GROUP_ID=335
diff --git a/acct-group/err/Manifest b/acct-group/err/Manifest
index 90213683b1ae..14ea9a229773 100644
--- a/acct-group/err/Manifest
+++ b/acct-group/err/Manifest
@@ -1,2 +1,2 @@
-EBUILD err-0.ebuild 146 BLAKE2B e86886726733bb070cd675895d80404253f818fbc728874005bd25b6eee7f900d1b9a0c3acaf4530219c6103b808801267519642ca34cdb377b3fc94842a2c06 SHA512 d7a0fb33ca930aaa3adc8f022dd90ae516a9261ab297edb69b6e043b2e47e0d38dd1d4880b2a56973f91299d0962d014635b1c24e60ca4c2f66669f5af56cf42
+EBUILD err-0-r1.ebuild 151 BLAKE2B 070df455fbe19bf62654b173fc6774ce94c917f53474c23033b83e8603419e28ba6cb57b1ed28e21f62cfe4b6574c4328e9c5f61cfb227d3f623e21615cc226b SHA512 5abd13966a2cac90201f9e76a40b8e107c6e44ceaec8dee38e6597a5bc0781a8cc05671effb3f974ffbb5fb4acba792d01c847e942e98b44c9aab5c9600ac246
MISC metadata.xml 387 BLAKE2B dc4c71051208fdba10dfbb38deb731492f03310bbe6a90d46ef696f7549a851f0933f51d158f598fea4211e55232c15f757d3b436bce0d1b8ff0516c85964118 SHA512 d9a689e19f684bb65ad0b38ad3050ac6aa247b45f7321deaf49111d4153a841bf2ae97b59a21472308c79668de3b96f60e8b50738d5998908c359cd1be0b1de7
diff --git a/acct-group/err/err-0-r1.ebuild b/acct-group/err/err-0-r1.ebuild
new file mode 100644
index 000000000000..961861c84779
--- /dev/null
+++ b/acct-group/err/err-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=325
diff --git a/acct-group/err/err-0.ebuild b/acct-group/err/err-0.ebuild
deleted file mode 100644
index c1dcd9ca10c8..000000000000
--- a/acct-group/err/err-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=325
diff --git a/acct-group/etcd/Manifest b/acct-group/etcd/Manifest
index eba19f54d3d9..ffcb0e504ccd 100644
--- a/acct-group/etcd/Manifest
+++ b/acct-group/etcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD etcd-0-r1.ebuild 146 BLAKE2B f4c72962544a7204d0d59aff67b3d8aab455b3f0187384a2bbd45bac791321fe4f54d32416e24c90af8120624c6aa4374fcf6f02c8b2807c869127c0283c1980 SHA512 50c1984782e97d873a03fd74c6e62f84de459f42c2930be489ca73d95eaa48ff07256985c24240e89fa3c50dfca681ed65395c5519d0957d14374b3fd90127d4
+EBUILD etcd-0-r2.ebuild 151 BLAKE2B eff3e5204d072841e4b185f1b855b6fa1c758af9be639bd62e701c7167240c4d0939e85707c8daeb0f217e9c7fd54e3813d414e8816ca6a7852d529bfb121fb9 SHA512 96e0080c21d45c9514d30f7154ae6ecc4fb788f374b3ff2b3d9d6e57688506357de1cf8aa0d21b522206acffb21bd6a1b64c34ad71c73da1bbca128edb5bc10e
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/etcd/etcd-0-r1.ebuild b/acct-group/etcd/etcd-0-r1.ebuild
deleted file mode 100644
index 841bf1ab43ea..000000000000
--- a/acct-group/etcd/etcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=426
diff --git a/acct-group/etcd/etcd-0-r2.ebuild b/acct-group/etcd/etcd-0-r2.ebuild
new file mode 100644
index 000000000000..0cfe9ef27461
--- /dev/null
+++ b/acct-group/etcd/etcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=426
diff --git a/acct-group/exabgp/Manifest b/acct-group/exabgp/Manifest
index 2a1bfb4ac37f..7a4457f0834a 100644
--- a/acct-group/exabgp/Manifest
+++ b/acct-group/exabgp/Manifest
@@ -1,2 +1,2 @@
-EBUILD exabgp-0-r1.ebuild 151 BLAKE2B ba6cd346296a2aad30236efbd4cae5e5f4680cd963d737b1a41e6a18830c1d71c7d6f298d1c6c300c007cfe2f0128aa9798eead07e36dfbb21714405b4871a78 SHA512 a32a013745a253dc0f44ff73b565824678546e86949b812452ba50560cbd634e62006102b8051cea544330edfcc53fac6b29ef79f94d8c8c1870d4e9d14bcd43
+EBUILD exabgp-0-r2.ebuild 151 BLAKE2B de225420e70ce3a9a18bf0091034f08ff733bf646aad264a04524686bb38efac63a054941fe02d7532316fcd03a42d1272503a24ef48b02db56871fcfe0ad62f SHA512 516c87c50c64728c486b297db2dad0f4e3ffcda3b3af5446c97eee4842bb60a8e238b8dfa1f8eaf72e5c77e9102622ce78bbe0292cc20a5c1d1f8abb23bda5c6
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/exabgp/exabgp-0-r1.ebuild b/acct-group/exabgp/exabgp-0-r1.ebuild
deleted file mode 100644
index ef1948f17efa..000000000000
--- a/acct-group/exabgp/exabgp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=316
diff --git a/acct-group/exabgp/exabgp-0-r2.ebuild b/acct-group/exabgp/exabgp-0-r2.ebuild
new file mode 100644
index 000000000000..273ddc242928
--- /dev/null
+++ b/acct-group/exabgp/exabgp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=316
diff --git a/acct-group/ez-ipupd/Manifest b/acct-group/ez-ipupd/Manifest
index 8d283ca922aa..6f4f1a5036c2 100644
--- a/acct-group/ez-ipupd/Manifest
+++ b/acct-group/ez-ipupd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ez-ipupd-0.ebuild 198 BLAKE2B 3cd7e54261934ca009006fae972748708ed17c197ef32be8a85cc49dcbf539f206c5ba9b9dbf8a2102ff1735f5a2b10b4d4c1b57175fb9d82e1590673f7843ff SHA512 431ffc21b9239bdc4cadf7efe513c8ccd8ed8dfc86652cc9c49353466373911ffb1f9455cdd9ec79d460d5f4c5a8f8697a6130113b0ab3bf72cfef0193e3e4a0
+EBUILD ez-ipupd-0-r1.ebuild 198 BLAKE2B 6415f81a08c6f1220d878b4329f61ae72efcb029eca1294190e6e821ba982bb6ee7d38e3cb08f163d1079091b5592334c8413bd5e6313635a1a3ce84dad11521 SHA512 e3ade307e18ac7de842014b7b243f2ff053094dcb8a7e67a563d2941737150c367a11081eaeb83a7ffb9aa8726a97489f9ffcd7910b0960cf92bd278b33bcf74
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild b/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild
new file mode 100644
index 000000000000..d23e375c5f63
--- /dev/null
+++ b/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/ez-ipupdate"
+
+ACCT_GROUP_ID="261"
diff --git a/acct-group/ez-ipupd/ez-ipupd-0.ebuild b/acct-group/ez-ipupd/ez-ipupd-0.ebuild
deleted file mode 100644
index d37dce72a2cc..000000000000
--- a/acct-group/ez-ipupd/ez-ipupd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/ez-ipupdate"
-
-ACCT_GROUP_ID="261"
diff --git a/acct-group/fax/Manifest b/acct-group/fax/Manifest
index f6c89fda6288..f0f927b42d96 100644
--- a/acct-group/fax/Manifest
+++ b/acct-group/fax/Manifest
@@ -1,2 +1,2 @@
-EBUILD fax-0.ebuild 198 BLAKE2B a98aaf999857f3ba5ea373f3d5d9f638bddc2adf4e9f773af537558ecfdedf513907b6c4a86808f0a48edad59d8e470c95b15fe6498cb3d0718e6310aec923ff SHA512 48859cd9f8be428ff724251b10f2ec521af5f726b57fd36e391e80d82303b5e04b472702c179045227c2deb7ff6d73d9832f960af81759738dcbc6b54042f5e0
+EBUILD fax-0-r1.ebuild 198 BLAKE2B 801b12f3621b73f50bebb4d0ebc1f9347d17f1158e8ceca01bba71c01d17ad25ea72b1fa6813ce8763b79062764acaac38a1802e3d8f7056275deb3edb892675 SHA512 24d60f67b7b05344c12cdb666ad4519f73ef52c1e2dcc08ef486a29e02803740096ed029d9df3c72800cbb777fa7a553d03107976ab9c07d7a4756383bce0b9a
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/fax/fax-0-r1.ebuild b/acct-group/fax/fax-0-r1.ebuild
new file mode 100644
index 000000000000..67affdc2830a
--- /dev/null
+++ b/acct-group/fax/fax-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dialup/mgetty"
+
+ACCT_GROUP_ID="320"
diff --git a/acct-group/fax/fax-0.ebuild b/acct-group/fax/fax-0.ebuild
deleted file mode 100644
index 2e9923179f3e..000000000000
--- a/acct-group/fax/fax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dialup/mgetty"
-
-ACCT_GROUP_ID="320"
diff --git a/acct-group/fcron/Manifest b/acct-group/fcron/Manifest
index 3bb51aa91495..e0d6f239b63f 100644
--- a/acct-group/fcron/Manifest
+++ b/acct-group/fcron/Manifest
@@ -1,2 +1,2 @@
-EBUILD fcron-0.ebuild 198 BLAKE2B 1ad655d295d405331c2e7b52dfa9794ab379989c4e3eb5cb2e5a43b8f4ebd1310866700b7127cb64fd1cabbe3e466c6a10cec9e3297d5823e1cae554d50c138c SHA512 e219d07d6a9474be2182bea70a7900170f4c3fd36cb9b7fc518b7f2d510fceef0d02dd98b9d4c96cd3eaafe23f92da624a7746598116d05bbec3538eb0ba6e01
+EBUILD fcron-0-r1.ebuild 198 BLAKE2B fe5205e29279f86a95d32b1c0de92f0be39f27477869a34f60ffa8dc188ef059d0b130aa3eae029ce9d4302856e07a46607d8f4df361acf5f634a1a0e2b72879 SHA512 86329d6df25b298efd9b21dcc6bce1900c4646954128a727d463231ea6714ee1d3d587e85bb7b39042212870d3834f8f89e9278f42af315be3802e25269247a7
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/fcron/fcron-0-r1.ebuild b/acct-group/fcron/fcron-0-r1.ebuild
new file mode 100644
index 000000000000..56134814b301
--- /dev/null
+++ b/acct-group/fcron/fcron-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/fcron"
+
+ACCT_GROUP_ID="120"
diff --git a/acct-group/fcron/fcron-0.ebuild b/acct-group/fcron/fcron-0.ebuild
deleted file mode 100644
index 2eb3684b77bf..000000000000
--- a/acct-group/fcron/fcron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/fcron"
-
-ACCT_GROUP_ID="120"
diff --git a/acct-group/fdm/Manifest b/acct-group/fdm/Manifest
index 06c47e602cd5..dd8a12da0d25 100644
--- a/acct-group/fdm/Manifest
+++ b/acct-group/fdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD fdm-0.ebuild 191 BLAKE2B 6b035c09f5a102a6d7a1ed4c78bb9e10b4c91a0b19187068e9aef3494d8d704edf541c1f712eb90cdb105149314ddfcfb6d6cf848c0914086e4bccf56d891a55 SHA512 7800564db9169b95b6f396ee6cc64a7896ea6c5c2e89db1efafa124afc8f5b613569a4ea757472a7ead7f7c74f7b9995006703a48e802df1d7af4f4eda6c663d
+EBUILD fdm-0-r1.ebuild 191 BLAKE2B e9cb8ea931210af3f2bf78e324e42adc5f71fae9e0d69b5c4da1e8eaececb6b8c487cbe1d409929459994415af9c054a75ea66a38810de49807e04be59330a6f SHA512 18fa9c978b72c69aae0411d8b37e60c0469b2468fae6ab94d84eeacac48d854bb2b203c56f6eeb6b79f72a25eb6689e5ff469e8a1cb363c234205d418aeee84f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/fdm/fdm-0-r1.ebuild b/acct-group/fdm/fdm-0-r1.ebuild
new file mode 100644
index 000000000000..f1e02f57ad2d
--- /dev/null
+++ b/acct-group/fdm/fdm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fdm"
+
+ACCT_GROUP_ID="248"
diff --git a/acct-group/fdm/fdm-0.ebuild b/acct-group/fdm/fdm-0.ebuild
deleted file mode 100644
index 135f04656589..000000000000
--- a/acct-group/fdm/fdm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fdm"
-
-ACCT_GROUP_ID="248"
diff --git a/acct-group/fetchmail/Manifest b/acct-group/fetchmail/Manifest
index 203131d5d5c1..32d3f422016b 100644
--- a/acct-group/fetchmail/Manifest
+++ b/acct-group/fetchmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetchmail-0-r1.ebuild 189 BLAKE2B d3a6ad73fc23a80df236dacce93d236ce5cf72e1e5ce9d3b9baa6c1a0d261d9bbcfec658ea6a55bb4f912bd5c960725db22b789a66fd20b7f11dffa7ab7b0ac3 SHA512 f59e082db36c2cbed2dbe2e0a54e4491609bcd974dfa7542ba82ea8ed7ce79500101737181d6b708d314e668b0c843123f0e69cc0f9d2eeede6729eb61b6b7e9
+EBUILD fetchmail-0-r2.ebuild 194 BLAKE2B 87ef84ed78e68acca1da00fc96095f496755d01ea0976aa68e7a801f45832808637fe17bdc2b9cd755be566d438630a99f47cdefe87e2aa7cd8e3f637bd4c6fa SHA512 56bf2656cfa9f334c61b2638fe105d9f0cb7b486fd3d7bf0d1cc2c59097fc6a549384a7a4731f474e4cc2da505adb760bd68242a9952e9c825a56106145b3ece
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-group/fetchmail/fetchmail-0-r1.ebuild b/acct-group/fetchmail/fetchmail-0-r1.ebuild
deleted file mode 100644
index 03f13d37300d..000000000000
--- a/acct-group/fetchmail/fetchmail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fetchmail"
-ACCT_GROUP_ID=124
diff --git a/acct-group/fetchmail/fetchmail-0-r2.ebuild b/acct-group/fetchmail/fetchmail-0-r2.ebuild
new file mode 100644
index 000000000000..f08ca98e37a3
--- /dev/null
+++ b/acct-group/fetchmail/fetchmail-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fetchmail"
+ACCT_GROUP_ID=124
diff --git a/acct-group/fhem/Manifest b/acct-group/fhem/Manifest
index 82de52d3c476..86d389552d59 100644
--- a/acct-group/fhem/Manifest
+++ b/acct-group/fhem/Manifest
@@ -1,2 +1,2 @@
-EBUILD fhem-0-r1.ebuild 222 BLAKE2B 9927877fc297ce3661112e6c013f3a86b9a47cdf2bce72a78b4a96e7e1a99c45fb022d4d901e8ea7c4d8e2ce2b2709e700ec956c2fdcf657378c70ad2a2c76b4 SHA512 502628d0f00353ee06b8b2d0b2a168e30ed63738860afca16d2a65ce763a0fefadaad4acbaab2ec41e0ee25b36df2e1a0050ec113d22ace1022eff901d710143
+EBUILD fhem-0-r2.ebuild 222 BLAKE2B 722899fff7e98449193cc43690fb2bb35dfd45765c148a935e783ae4a9a224b4dc420aa8af433b69430fd1a8d79c7cc29d4928c908f7c2ecca4f4941c9f37477 SHA512 9ca90b2de3e85ef55a5900167e81086e01125a9ce1504f125d1f18f099dab5308cf577c83c7e28d2b62f7492addabbe1bd09c1e4b57638e6e063c7e2056b7a52
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/fhem/fhem-0-r1.ebuild b/acct-group/fhem/fhem-0-r1.ebuild
deleted file mode 100644
index 166e07ec2cf1..000000000000
--- a/acct-group/fhem/fhem-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the FHEM perl server for house automation"
-
-ACCT_GROUP_ID="491"
diff --git a/acct-group/fhem/fhem-0-r2.ebuild b/acct-group/fhem/fhem-0-r2.ebuild
new file mode 100644
index 000000000000..7bc0d371f660
--- /dev/null
+++ b/acct-group/fhem/fhem-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the FHEM perl server for house automation"
+
+ACCT_GROUP_ID="491"
diff --git a/acct-group/fingerprint/Manifest b/acct-group/fingerprint/Manifest
index 60be18da090a..863dff83fb92 100644
--- a/acct-group/fingerprint/Manifest
+++ b/acct-group/fingerprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD fingerprint-0-r1.ebuild 146 BLAKE2B 6a073149697ded83c489310002d6a14459b7c557b902079de55c56ae2ba10566a1d0d221738b0532606c9767972c94d9eac3b8fefbc4a6577975d04e44b4655f SHA512 169f56b7317bb0f79f1e16905ba50fe69b85fbddfc881b91cb05e0aa4acbd666490f15e1d6e04b95555feed05beae6ffd494e6105cc4f8dd647cc229af43e683
+EBUILD fingerprint-0-r2.ebuild 151 BLAKE2B 39e009a4475094bbb43d65ae94dc86083137e539935f8cccd5a37dfba11371cba959f364ce388e4a9a9347cc958d29945b3ad09538f2d4f639c076f6bcdcfa9e SHA512 f089689fe4e1a330af1c2a59aaa9994855ee6934cb49a8b7b00d946a1c3c20e30cf00e87d8220ffb23c6d61075aba3cc8d779a51f718c5dfceafac991b766192
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/acct-group/fingerprint/fingerprint-0-r1.ebuild b/acct-group/fingerprint/fingerprint-0-r1.ebuild
deleted file mode 100644
index 0df6a20dbd2b..000000000000
--- a/acct-group/fingerprint/fingerprint-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=243
diff --git a/acct-group/fingerprint/fingerprint-0-r2.ebuild b/acct-group/fingerprint/fingerprint-0-r2.ebuild
new file mode 100644
index 000000000000..9d6861472560
--- /dev/null
+++ b/acct-group/fingerprint/fingerprint-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=243
diff --git a/acct-group/firebird/Manifest b/acct-group/firebird/Manifest
index 993f9d348c60..f1e904990a81 100644
--- a/acct-group/firebird/Manifest
+++ b/acct-group/firebird/Manifest
@@ -1,2 +1,2 @@
-EBUILD firebird-0-r1.ebuild 196 BLAKE2B 595b5dd52613d935f93ab1335da56548bc4a08d0b7ef3a447a01d3aac4ae486dcade1eed241e9c395f48131fc03a83126f95746c7903f06f5377642aad6358ec SHA512 d9019d5bac7b54cad187047c5fe989b3dc1627ed6d93d8d2eeb9e0cf6f7ccd4a6a978252d71921bb1a81a783a7e7f580a76eac2cd25d3b2925348f9ab5aae9ce
+EBUILD firebird-0-r2.ebuild 196 BLAKE2B 004bcf458535b1b7bdeee77a4245fd9cd0ba3439c91443064716bbf49b0e7ca48c9cb8e2399d934b2b78cbb92b0202ea7c4d56c0dc4b6f944c4b5bef9ee2b6c5 SHA512 7fa221cf110c7e42e839f636cad81bee54f02580fb52e6663db51c89527f069835bc5f46495dff747016fdb4b435c283e11c099c230be76a2fa2488faa29c612
MISC metadata.xml 219 BLAKE2B 5b3c48d040de522ffbcb035a9704f5b71799a5a2e45172b39ea97049733842723503ff69869946c69808c965b7ef9eb40cbf1f2a5277815c4bb2e4b7ac978001 SHA512 176cc78690ba2800973fc6fa926e7bcbf3e18e8f45e925491f2349ff8619ef5df4b4a0f01b0a33f9fabbd2218c09581ff028f56379daa85494eaca9387a745e0
diff --git a/acct-group/firebird/firebird-0-r1.ebuild b/acct-group/firebird/firebird-0-r1.ebuild
deleted file mode 100644
index b2d2f28d7ea3..000000000000
--- a/acct-group/firebird/firebird-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/firebird"
-
-ACCT_GROUP_ID="450"
diff --git a/acct-group/firebird/firebird-0-r2.ebuild b/acct-group/firebird/firebird-0-r2.ebuild
new file mode 100644
index 000000000000..e107349d26d0
--- /dev/null
+++ b/acct-group/firebird/firebird-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/firebird"
+
+ACCT_GROUP_ID="450"
diff --git a/acct-group/flatpak/Manifest b/acct-group/flatpak/Manifest
index 0cde70b8da74..16af4321b923 100644
--- a/acct-group/flatpak/Manifest
+++ b/acct-group/flatpak/Manifest
@@ -1,2 +1,2 @@
-EBUILD flatpak-0.ebuild 146 BLAKE2B f1d1f2bb5bea6c6d7ff443094b23fb8455dedf940e0d15623b8ca08ac3d3ea3b65693c3f37561986302cc54e26e4ae5d1cddfbb41ff9969dd32e211da4b9989d SHA512 0782194b389a73cb49b1f5b95bf967901372542e315e6981cf824b7fa09772075e9fa8037fc2140006f80cf06ac6238d119684f259ea84a50e07a88ca164042f
+EBUILD flatpak-0-r1.ebuild 151 BLAKE2B 058c6b84474ffa96b6f1d67ee66918186700217f785100889a1727a8e3015ba2f92cdb619d3bdc8dd5049cf2ef5b6ede9e09f139aeac1ce8b201de2ad8337325 SHA512 0e3b4a3168a25ed023dc51b6407e24afa9a1399b0740eecadfc51d325cca9528f66081940e8c9b307c38248063cbd4c6aca768c6f3e2c9aa789f62a8aa1cbb28
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-group/flatpak/flatpak-0-r1.ebuild b/acct-group/flatpak/flatpak-0-r1.ebuild
new file mode 100644
index 000000000000..e90888ab5ece
--- /dev/null
+++ b/acct-group/flatpak/flatpak-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=313
diff --git a/acct-group/flatpak/flatpak-0.ebuild b/acct-group/flatpak/flatpak-0.ebuild
deleted file mode 100644
index 4b028c888d26..000000000000
--- a/acct-group/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=313
diff --git a/acct-group/floppy/Manifest b/acct-group/floppy/Manifest
index afb867b2bad3..da664d8f3bed 100644
--- a/acct-group/floppy/Manifest
+++ b/acct-group/floppy/Manifest
@@ -1,2 +1,2 @@
-EBUILD floppy-0.ebuild 145 BLAKE2B a2e033042d168039aa7ef556bed7236ea37c400a7203b3064f45165d0934cc7392f0089175655cdb3659121910a7b2b48f13ca83c42561dcf133f7a796a904a3 SHA512 ef4d4b51803258bd97d97c3887e17e14527da4ed904e573452251eb0f2b78181b9a8741f22f60cda10c606b225655822e6b071b2ff6399ae2ae87b336fde4544
+EBUILD floppy-0-r1.ebuild 145 BLAKE2B a2e033042d168039aa7ef556bed7236ea37c400a7203b3064f45165d0934cc7392f0089175655cdb3659121910a7b2b48f13ca83c42561dcf133f7a796a904a3 SHA512 ef4d4b51803258bd97d97c3887e17e14527da4ed904e573452251eb0f2b78181b9a8741f22f60cda10c606b225655822e6b071b2ff6399ae2ae87b336fde4544
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/floppy/floppy-0.ebuild b/acct-group/floppy/floppy-0-r1.ebuild
index 3386a166e7b7..3386a166e7b7 100644
--- a/acct-group/floppy/floppy-0.ebuild
+++ b/acct-group/floppy/floppy-0-r1.ebuild
diff --git a/acct-group/flows/Manifest b/acct-group/flows/Manifest
index 6979663f03f4..4284b0fd4f7e 100644
--- a/acct-group/flows/Manifest
+++ b/acct-group/flows/Manifest
@@ -1,2 +1,2 @@
-EBUILD flows-0.ebuild 193 BLAKE2B a7291a6dc7649bc52032c8eee46abd8a690859eea582535a3a1c5b7970f964199ad334266252db3112ed44462272a40e7031f4004a782a733a139a0069002698 SHA512 cf3d1af5edb3ecd84aac64a8cad97fb238b105717854c80c8464f677212d306e634983852a0c8df9073357fe005688b172bfdf92bbb5e1166330adb56ed362b7
+EBUILD flows-0-r1.ebuild 198 BLAKE2B f9f7d772a2fee4c388012425a5512b36561392da75e8ce0691e6a436f2fc2767824d7751cefa0e2d814ecd69c918ccb38a8d5c323b15dba5fa1552a6d4d7f481 SHA512 6a911f2d15130c8dae3030ad2aeb4ccf128a9a54740239b2e7dd897ae9be3c59d2926c6d20ad6d21264e27c576f3b7457a8f69f9547d6a9000141bc186a10a15
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/flows/flows-0-r1.ebuild b/acct-group/flows/flows-0-r1.ebuild
new file mode 100644
index 000000000000..b6a26f2afa24
--- /dev/null
+++ b/acct-group/flows/flows-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/flow-tools"
+
+ACCT_GROUP_ID=384
diff --git a/acct-group/flows/flows-0.ebuild b/acct-group/flows/flows-0.ebuild
deleted file mode 100644
index 50f9c311d004..000000000000
--- a/acct-group/flows/flows-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/flow-tools"
-
-ACCT_GROUP_ID=384
diff --git a/acct-group/fluentd/Manifest b/acct-group/fluentd/Manifest
index 387768102ab6..368c2fc55ff3 100644
--- a/acct-group/fluentd/Manifest
+++ b/acct-group/fluentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD fluentd-0-r1.ebuild 198 BLAKE2B 6d4e309e203460bf12b90bbf883e24abac11377f137a55bdca6a6630719b13c3d87481ea77db77186bb53d48ab0473f0add33aab404afaa6d08da856bf164d2b SHA512 68cb3fc4b78773ea42ee706f337c8cb5a29532a8f9a38d97f6b809687cb012adb7c132aff3e4b2ba714c93340bdaf9834b04a39960243efcfc16bdb69d181cd5
+EBUILD fluentd-0-r2.ebuild 198 BLAKE2B 5ca399a329d2ddfe42da89168f4636650c4640853c39a1948b85a3388006c88ecb3842f4bd0c8b8040bb65175056189fd66d6189cc9e508e05a6c80f6a4cfd1c SHA512 e9c670927c90555f16f366c11dc6e5d03046fca8f05437dce468df3c18ecf944481c891430195c7f0b8bdd2919078bf42788de187339de88cdbcadf275969d2b
MISC metadata.xml 361 BLAKE2B 7e1f238bf7794a6961711e528c39354435aa64fc495a3c4f465c3ff6c38980fbdc787cbf5085f20588810fd4a07521b9893ba1cd8de67725bbe529d64cf23f9c SHA512 3b146de2c2d91918f739e7acdcb15f755d52fcdf808e592ac2effa1cde73aeb08e45b00bd985638ec1a07e27a1d323c2882b6db8e12c894c6d7487200a49557b
diff --git a/acct-group/fluentd/fluentd-0-r1.ebuild b/acct-group/fluentd/fluentd-0-r1.ebuild
deleted file mode 100644
index 0f86473d11b6..000000000000
--- a/acct-group/fluentd/fluentd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/fluentd"
-
-ACCT_GROUP_ID="504"
diff --git a/acct-group/fluentd/fluentd-0-r2.ebuild b/acct-group/fluentd/fluentd-0-r2.ebuild
new file mode 100644
index 000000000000..bad64bdcd72a
--- /dev/null
+++ b/acct-group/fluentd/fluentd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/fluentd"
+
+ACCT_GROUP_ID="504"
diff --git a/acct-group/foldingathome/Manifest b/acct-group/foldingathome/Manifest
index cc02ec0ebbdb..9e518fdeb595 100644
--- a/acct-group/foldingathome/Manifest
+++ b/acct-group/foldingathome/Manifest
@@ -1,2 +1,2 @@
-EBUILD foldingathome-0.ebuild 206 BLAKE2B 17725af0e44ca6edbff1c3494350986684603a31ee2e2c21fb31cbf8912d0489f345c3fefd6275f36f3c2cf35f91c70d8ca65cdfe6131993537148ab66585a86 SHA512 156f42bce29ee516f7ad154b5ca9f134163b942f1efd8e269f3cc8879e5b873c21af7ea585b60f9fc9926fe2cdf295e40f623d7dc1ec5ae1a9973045ed830516
+EBUILD foldingathome-0-r1.ebuild 206 BLAKE2B 77cc1a2d6479c7ac45a728b9fdf2a4ea48128111b5f8cfb52fb17effde7395939e4f23fc4b1b8a50b13a57b461ddac8bba3d4744fe7fa6a490888fe425c93d6e SHA512 7fd59bc4dc993ce23c9b67c456b39e29522aaa0135d6a1a8ce856f5d8b802f32da77136807518d140958c05d464f9de85f655afa6a0ca9a4a29b802471a095c7
MISC metadata.xml 262 BLAKE2B adaacf2ac22ce09f8b1b68f538773c1e2101156181ff302eca2ce1280ee5d45db4eb302a8eee1bbead5e55942443dd16ef924cfbfdc95a1658dc6a9f460468a2 SHA512 ac924b6b530d96645f173d40f7a2bf0e3abbf49048ebf7fadcea3dd553cd25504f0e68a103395de1fb59a2e5e11497dcead601be01cc6f0295ccbc4155f67e3f
diff --git a/acct-group/foldingathome/foldingathome-0-r1.ebuild b/acct-group/foldingathome/foldingathome-0-r1.ebuild
new file mode 100644
index 000000000000..d2ce82965e69
--- /dev/null
+++ b/acct-group/foldingathome/foldingathome-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sci-biology/foldingathome"
+
+ACCT_GROUP_ID="128"
diff --git a/acct-group/foldingathome/foldingathome-0.ebuild b/acct-group/foldingathome/foldingathome-0.ebuild
deleted file mode 100644
index 216461c86938..000000000000
--- a/acct-group/foldingathome/foldingathome-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sci-biology/foldingathome"
-
-ACCT_GROUP_ID="128"
diff --git a/acct-group/fp-multiuser/Manifest b/acct-group/fp-multiuser/Manifest
index 7276df14faed..07ee0166090f 100644
--- a/acct-group/fp-multiuser/Manifest
+++ b/acct-group/fp-multiuser/Manifest
@@ -1,2 +1,2 @@
-EBUILD fp-multiuser-0.ebuild 201 BLAKE2B daf38ad2ec52ef9f8eabf1369c2047a08eccf1642a215cc10dbf4a7bf45dcdc830199835fe1a49146e4f09ab5b991e7d92771418e990076f039debed481cab6e SHA512 18048e083c0d17c710696e893ed5ae7eb34afb83909ef780e907060ddcc1998d7ebf59e13bdc73a4b0d302b85eab91dfac06aca0cf37b12dd0d069619bd67b8f
+EBUILD fp-multiuser-0-r1.ebuild 201 BLAKE2B 11474175be1fdb058c19bc258adf40ee5235562430edfd1b3672a7ca6b6ccb2e24c9442879e8e1500b0806293ab67c38719a751ef1f31ef14c89049c7a0d72b2 SHA512 b34f9ef2258786ad2d5e1ed73337e1e27a33856446550cc6baf314ea51b36f12112276d34ff1cabafee2413d9ee4f7feea43627808b375c98b13032d5ef03230
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild b/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild
new file mode 100644
index 000000000000..6379f4551c43
--- /dev/null
+++ b/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/fp-multiuser"
+
+ACCT_GROUP_ID="318"
diff --git a/acct-group/fp-multiuser/fp-multiuser-0.ebuild b/acct-group/fp-multiuser/fp-multiuser-0.ebuild
deleted file mode 100644
index a7bd7bb71f26..000000000000
--- a/acct-group/fp-multiuser/fp-multiuser-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/fp-multiuser"
-
-ACCT_GROUP_ID="318"
diff --git a/acct-group/freenet/Manifest b/acct-group/freenet/Manifest
index f0f3b0f550de..6f4ef238efaa 100644
--- a/acct-group/freenet/Manifest
+++ b/acct-group/freenet/Manifest
@@ -1,2 +1,2 @@
-EBUILD freenet-0.ebuild 186 BLAKE2B 1ba47bf44fc3ed27a9858745879e22c32830fba440937b1dc263f45b096d43f95fdf6acbe204bbe7077cbf492d0074bab85ab617f8f32c1d1742a69e6777b84a SHA512 84810c99b31592ce6946c9a1916e3fb57afd49ce9e5702f4c9007ce25ef1bba2fe8b816be5aaedba4cef69163f35ec3b2a2a2cd85b37b481817447ae8679f1f8
+EBUILD freenet-0-r1.ebuild 191 BLAKE2B 3928ed097095d330ac908a9296116fba140b4b5744436dec5f29e32313ff8d2d36da1f685c9c59e31ebb2db36ab6ddbdb5acb64cbe876f17ffc9a09d6d1e355d SHA512 87a7cb6491400783d3cb53d9e128515c725f7d23046880a60e4cb4a31e2e087b87bee69f3e1006037de63489fee77c07c57e36b6a08279f04fa3a15fbe7265c0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/freenet/freenet-0-r1.ebuild b/acct-group/freenet/freenet-0-r1.ebuild
new file mode 100644
index 000000000000..8fb8e574f0d2
--- /dev/null
+++ b/acct-group/freenet/freenet-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/freenet"
+ACCT_GROUP_ID=105
diff --git a/acct-group/freenet/freenet-0.ebuild b/acct-group/freenet/freenet-0.ebuild
deleted file mode 100644
index c09fe1ee67e3..000000000000
--- a/acct-group/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/freenet"
-ACCT_GROUP_ID=105
diff --git a/acct-group/fritzbox_smarthome_exporter/Manifest b/acct-group/fritzbox_smarthome_exporter/Manifest
index f24252d74c18..ac14da0a00f8 100644
--- a/acct-group/fritzbox_smarthome_exporter/Manifest
+++ b/acct-group/fritzbox_smarthome_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD fritzbox_smarthome_exporter-0.ebuild 146 BLAKE2B e4c8d3c0750ff64482c4b0d65a6ada6a1ac671279eccaa78fa2eda18b086efb9bfa3d37bd09db08191e65ddc6d98d75c0c5864a65d93d78dabe61eda28d638bf SHA512 9818ca4d131de35bd2d27a297c87a638783f7a717a82a738ee73dbce093dd1364021d5cdc522fb80895dbe75153b42ef012ec909764df1dbea9720c61c017aa2
+EBUILD fritzbox_smarthome_exporter-0-r1.ebuild 151 BLAKE2B 48bda5e43e6e081811284b2cfae38c3bf529499b796305363899d470f4bf324511eaa6b210eb265c923381fb34b4c2c3f678cbd912db35b5984de48c1d94fbd5 SHA512 8c2c175f6f0425169c935a858b2428e7470bfe90751f2c54181471049a4168b7a75e1fe9a6101a997db45f8b24d0039883465f18aa0de3a05f658c96ec895c92
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..17fa5738728a
--- /dev/null
+++ b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=228
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
deleted file mode 100644
index 1ecaeb6a6b08..000000000000
--- a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=228
diff --git a/acct-group/frr/Manifest b/acct-group/frr/Manifest
index da0310cedf4f..1412accd343f 100644
--- a/acct-group/frr/Manifest
+++ b/acct-group/frr/Manifest
@@ -1,2 +1,2 @@
-EBUILD frr-0.ebuild 146 BLAKE2B c8b31ac7cef83700f2a53720ce136a55c23f56dd109c4e886240500dc95097ca103a8831dea79e35a02760b939af21ae55f94d1220ce0e09c2994def873f4340 SHA512 b477506df227d06df4e0e062699c95be22dc88c9d401b37ab5bca51c0a23a540f1d2fb3b9fb87f63b07ef49f5c3b5392f25121f16d6e89a3f3923722ad1f8fa7
+EBUILD frr-0-r1.ebuild 151 BLAKE2B 80f9f675b0b3011af2c35e1e6e5b6696f5ccabcbccacdd5d910194939ac32702b36aa2a88e10db4f59dd0c4b4967ed0775d6c07c83ca71b98452152e8d382815 SHA512 31cea66b630900047870df4ac5f77c7b6b08d2330a9a4ac0f839a4637088b1a9eb177de4a744ecb5c9b42ecdf9d2d69876f7bad239b59851a7cae806867cfd25
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/acct-group/frr/frr-0-r1.ebuild b/acct-group/frr/frr-0-r1.ebuild
new file mode 100644
index 000000000000..ca45782773ab
--- /dev/null
+++ b/acct-group/frr/frr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=371
diff --git a/acct-group/frr/frr-0.ebuild b/acct-group/frr/frr-0.ebuild
deleted file mode 100644
index 42177f13c3a9..000000000000
--- a/acct-group/frr/frr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=371
diff --git a/acct-group/ftp/Manifest b/acct-group/ftp/Manifest
index a797ce4d0f41..b46b4598d8e9 100644
--- a/acct-group/ftp/Manifest
+++ b/acct-group/ftp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftp-0-r1.ebuild 199 BLAKE2B 8d79da68ef487e6242559a09d13d8ee34cda5dff027a42d564ca6f9eb4c669b40b859cdc88728b203e9580b4d57ad91e87536d96ed59fa07d5fabc651647aad3 SHA512 d808b4a94dfd995a5808aa62de045deed701c0265f44989336e6464ed7b990656a10819a7218a1a1b85cf0cd20935e096a9c04985ff9c409bd0b6ddc9374c4b8
+EBUILD ftp-0-r2.ebuild 199 BLAKE2B 6472b2f089a22b138652e6e2b7e2bd6a85fdb79a9788d404191cd104d48efa6889fa3c1b29731ff7c536f95bfb00743817ab3c023242a524c75f42d644cac49b SHA512 caa2a9d413c64baff15a38f6927bccaca10767f007560b28e11ed592e13d09cfa4cb075002d702d5ca0c95dede25c26d5b948c6d505f28a1da4bacb3eab48a73
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/acct-group/ftp/ftp-0-r1.ebuild b/acct-group/ftp/ftp-0-r1.ebuild
deleted file mode 100644
index 9c11d486fc4a..000000000000
--- a/acct-group/ftp/ftp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="File Transfer Protocol server user"
-ACCT_GROUP_ID=21
diff --git a/acct-group/ftp/ftp-0-r2.ebuild b/acct-group/ftp/ftp-0-r2.ebuild
new file mode 100644
index 000000000000..cba479f59ede
--- /dev/null
+++ b/acct-group/ftp/ftp-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="File Transfer Protocol server user"
+ACCT_GROUP_ID=21
diff --git a/acct-group/ftpproxy/Manifest b/acct-group/ftpproxy/Manifest
index a5716fd68305..6de23f7ff6f7 100644
--- a/acct-group/ftpproxy/Manifest
+++ b/acct-group/ftpproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftpproxy-0.ebuild 193 BLAKE2B 2f9cd8e299a261196b1d686ea86661b55b5bcf322f5b179eeb5372a19aca33081cb08e2d97a8454d95ba2aa4ad8ba9f1b04175497c91a5ad6f6be192a307eb3d SHA512 98dda91977a2726a60f5d13a3a4bc7069b3d9834e7fda99b0a7a9f426921429bd08869a64c6b56aab917b614fed5ede2755d2d3781bf490a0a7e8ce7a8db845d
+EBUILD ftpproxy-0-r1.ebuild 193 BLAKE2B 70c0f2ce9ed78c9347bca75f79127cba9c03cf53385649e0c3334c14cf9d0eab2c1db66ce6c84cbda2064767639841534bca1f3c2737a7747785c4713ec5c33f SHA512 281af53ad9376f5ea4cde1cb085b2205004c3ce786d0a76dc0338f678b8bcc3ab9cae7f8bfe646d4a6933f910bbb7eb678ebcb8cd351af29cdd93cfb88238bba
MISC metadata.xml 392 BLAKE2B fc1f7d674fbe3dfea4c499c4595eaa01bf618ac2cf99dcc75e021d238fa9bcb09708645a67d2c65c4da7ada77e4f338345793455efbdc6ccd4601fd2e25e36b3 SHA512 02230e8e4aea057d502f6a2ffadc349514d6da1f1eb9346741767d1a893dc0fcd050691fb3294dce34fdd50cd8170a084482fa863fbab2da36ad7da441f74a21
diff --git a/acct-group/ftpproxy/ftpproxy-0-r1.ebuild b/acct-group/ftpproxy/ftpproxy-0-r1.ebuild
new file mode 100644
index 000000000000..b0c7b700f6d3
--- /dev/null
+++ b/acct-group/ftpproxy/ftpproxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-ftp/frox"
+
+ACCT_GROUP_ID="182"
diff --git a/acct-group/ftpproxy/ftpproxy-0.ebuild b/acct-group/ftpproxy/ftpproxy-0.ebuild
deleted file mode 100644
index 66b993575afe..000000000000
--- a/acct-group/ftpproxy/ftpproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-ftp/frox"
-
-ACCT_GROUP_ID="182"
diff --git a/acct-group/fvwm-crystal/Manifest b/acct-group/fvwm-crystal/Manifest
index b5e5ee5ef045..72c0d466b2a2 100644
--- a/acct-group/fvwm-crystal/Manifest
+++ b/acct-group/fvwm-crystal/Manifest
@@ -1,2 +1,2 @@
-EBUILD fvwm-crystal-0-r1.ebuild 146 BLAKE2B 8da45aa0003a8d437293e96de8b439bd008e42e5c18703bbd31b2c0e158a7ab0fd27bb4f06b10c95c6bdcbe5ceb7d560fa12077633f84e354163daab5abfd575 SHA512 e896b338cfa24afc90f7141c96922e47c9f0b9e11721d0cebbe82c15f9b5844689b10677407cf2be1544123d99a83edb6e456a95380e36fe1f7a0ca33a67ce43
+EBUILD fvwm-crystal-0-r2.ebuild 151 BLAKE2B 01837f83289b35f8e90a892e13feececa26c57a40e69c0108a3da3fa6ad046f4e2331fee01d445169e388ff5c7db1705926dba836f7637ae0cba8660806842f8 SHA512 c8fca2ed5df1cdc94cdfab55153c7bee1d75ece801b4171635ad244a6826740c5f1fc3771fcdfa7bc5fc3a9191af9aa589e5e1d34731b47b02c4c5d8bdccda73
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
deleted file mode 100644
index d6fc81af1798..000000000000
--- a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=232
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
new file mode 100644
index 000000000000..1061d5c2843d
--- /dev/null
+++ b/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=232
diff --git a/acct-group/gamemode/Manifest b/acct-group/gamemode/Manifest
index 0645ec84942d..f034a41a7877 100644
--- a/acct-group/gamemode/Manifest
+++ b/acct-group/gamemode/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamemode-0.ebuild 221 BLAKE2B fb883727b359ae9eaef0a38f6d64bdd404bfca8036d65b6eb14e84b83b26b329ec517b502c40c62e061046990939d53fb2921e3dccde0cf5a4753eb337408585 SHA512 d696dd8fce6e6cf753d763fd150452b2835ed995d557f2357a311678f8bcdb19e952240ce69762763af94e6a92d9386c5e0e88e068fdf59b8a04f2fef17ac57f
+EBUILD gamemode-0-r1.ebuild 226 BLAKE2B 540a62d73a0b6dc5327140fdef4ac13951436c7def9a9411212c9bb63ce0fb63746bbf501ebd0afcd007ba809c4cd1e7a97abda5dff288484f51c3a3134df6b7 SHA512 7e174fb3eb2e67795cee1abf46ecd7474d51ecafee86cc281f681788287dfba54f9d91e0333e9106364c6876885da4481f15157096264a9fe80faf5382312986
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
diff --git a/acct-group/gamemode/gamemode-0-r1.ebuild b/acct-group/gamemode/gamemode-0-r1.ebuild
new file mode 100644
index 000000000000..6de84c33acde
--- /dev/null
+++ b/acct-group/gamemode/gamemode-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
+ACCT_GROUP_ID=385
diff --git a/acct-group/gamemode/gamemode-0.ebuild b/acct-group/gamemode/gamemode-0.ebuild
deleted file mode 100644
index addb5e4d722e..000000000000
--- a/acct-group/gamemode/gamemode-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
-ACCT_GROUP_ID=385
diff --git a/acct-group/gamestat/Manifest b/acct-group/gamestat/Manifest
index 1a10e847031c..5ecec7fa0e9a 100644
--- a/acct-group/gamestat/Manifest
+++ b/acct-group/gamestat/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamestat-0-r1.ebuild 213 BLAKE2B f350b7b1c42d023861d4483f6cf08498af4f5dbbb0eba72153ab2d1f69128e616422d705ebcba59fae7dad401bb807c50d79bc13abc529b9ef0a02b7caeb12ae SHA512 ff0e0b908e59f34cc21508487404ab70468233ef140fb487d23759169e08feea60f6621487fd6ad54a38bf18b7affd3a101396c6b5d0290b294181b1a24b575b
+EBUILD gamestat-0-r2.ebuild 213 BLAKE2B af70310d0e63e84f583df236c7a0fc8653cb1ee274c84e58e176181e7e0bf9a993565a9b7dae9a9d68c1b9d05cdc79564bb29b60870b18a74e3d72ed87999092 SHA512 5d8a64268e6b6d75b34b6b8fd97e36a9b1dc0e2f099c188e14bbdcb1310bdfbca8c4e50b6ef4af1284438e35b9256e674c630581f6d60cb8afd99a152f2ef85c
MISC metadata.xml 252 BLAKE2B 5cc2c22d613a5c76d3178ea36be48102519ca7619673667d6361743ba59e8f03663362d921f050300cae9a24e8d81c0fe3370db27e8e59092b15e2bb7f3614f6 SHA512 67ed405e37e55df875cf6e28fce9f0e6bd1b98c726458c5b7c5769593f6b2defe317a033f5a46bf79e177a10db2585b4c6ceb7b99571ca054074455b3773d452
diff --git a/acct-group/gamestat/gamestat-0-r1.ebuild b/acct-group/gamestat/gamestat-0-r1.ebuild
deleted file mode 100644
index 8b641548584a..000000000000
--- a/acct-group/gamestat/gamestat-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for shared high-score and game state files"
-ACCT_GROUP_ID=36
diff --git a/acct-group/gamestat/gamestat-0-r2.ebuild b/acct-group/gamestat/gamestat-0-r2.ebuild
new file mode 100644
index 000000000000..bd9da8d91185
--- /dev/null
+++ b/acct-group/gamestat/gamestat-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for shared high-score and game state files"
+ACCT_GROUP_ID=36
diff --git a/acct-group/gatling/Manifest b/acct-group/gatling/Manifest
index a8ebddcd1e75..716cc98714dd 100644
--- a/acct-group/gatling/Manifest
+++ b/acct-group/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0-r1.ebuild 180 BLAKE2B f12c244d50cc81d30cdc906d8ccc0eacb4b7e02b3d5178194dbe14ece4dceb1f081642beafc4c55af73ee811fec61e9137bc366ca404ec0dcb696fbdb91f5bd2 SHA512 d6191769820fc8505aca4cdafe9bbbcd83ffcc18f3f44229512e174fbb3e8a40303b419b2ce4016707267887e99b56355ff719ffc6a185400af5dfc47aa815a0
+EBUILD gatling-0-r2.ebuild 180 BLAKE2B 2d8f3d7633c968969d199850c07f8f0252df883d954e35579f5cea95d6232a03d96a8fd3aa6544b5cb1bb4d10274ec2cb7b46d0f4bcbd2796e71c396a76dcdd7 SHA512 fca0dc08d4185956981f4c1604ba7d035b928e7337fd6875550bdab9b065b37cf817f5a81159aa038378aad5ce85905675f3cdf5bdebb1b0c5b038199883be88
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/acct-group/gatling/gatling-0-r1.ebuild b/acct-group/gatling/gatling-0-r1.ebuild
deleted file mode 100644
index 54710451d35d..000000000000
--- a/acct-group/gatling/gatling-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=364 # matches acct-user/gatling
diff --git a/acct-group/gatling/gatling-0-r2.ebuild b/acct-group/gatling/gatling-0-r2.ebuild
new file mode 100644
index 000000000000..d7970f0e4edd
--- /dev/null
+++ b/acct-group/gatling/gatling-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=364 # matches acct-user/gatling
diff --git a/acct-group/gauth/Manifest b/acct-group/gauth/Manifest
index a2d4662e58e4..247af4c97e8e 100644
--- a/acct-group/gauth/Manifest
+++ b/acct-group/gauth/Manifest
@@ -1,2 +1,2 @@
-EBUILD gauth-0.ebuild 219 BLAKE2B 5e675535d9e40dd480e39dfcadbef52d352591fae5ee3e6eaab2df8ddfee2fed282f5be5a8914fe91524cf8e32d9c369faf439e8eb62bcfc4abe8f1e7885ac93 SHA512 65fba78e00650a955f88937969904ce13c2c9ada86281dfd327319601881f96150a3b0f9b39b58b2361b0e0461727eecfb9146632f9134ecd8e454012d98c955
+EBUILD gauth-0-r1.ebuild 219 BLAKE2B 922d1c8740db2f9722c21f68b12a0578554d96f5e2673703aa927a0e7af24109f0f1ee7a5fe874e9fa6de3a0bc0dd207d0c7929610f6597994a38ce72cd1aac4 SHA512 2ae36d2a2ee7768d5eed62b3042174ddc0485fecc0dcb41a7a658bda181c45802b13ab6bea93e20aff07a13d974aeead38c6fd0a09343a5e0afc4aa97d5d80d8
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-group/gauth/gauth-0-r1.ebuild b/acct-group/gauth/gauth-0-r1.ebuild
new file mode 100644
index 000000000000..7ffd2ea24153
--- /dev/null
+++ b/acct-group/gauth/gauth-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
+
+ACCT_GROUP_ID="138"
diff --git a/acct-group/gauth/gauth-0.ebuild b/acct-group/gauth/gauth-0.ebuild
deleted file mode 100644
index 31dc4549fa33..000000000000
--- a/acct-group/gauth/gauth-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
-
-ACCT_GROUP_ID="138"
diff --git a/acct-group/gdm/Manifest b/acct-group/gdm/Manifest
index 6e77f151ea8a..5aec17dfdd6f 100644
--- a/acct-group/gdm/Manifest
+++ b/acct-group/gdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gdm-0.ebuild 150 BLAKE2B 90ded007a25830e843d6e83df8e63fefd6a438fbbb1d8fc2edf3138bc2f846bb7fa6feb1e1858a5d1cfdfe4ca7eeefeb98949766639020b65b58cc5925656719 SHA512 f55d4a6632f23a9b1d7df9630ccada87dec5545ef805905ce14309b2f7ee398d43162df53e52db44021eac81138fc9181fd424a988c9f013f2d3142b45b7d54d
+EBUILD gdm-0-r1.ebuild 150 BLAKE2B f75d741a01282ca156d979da9fc8206c7aa07dd32e1c5031fd0b0d74863e8dd8284500e3c10c3d0fbc5245f662536b7521ddb9c09fc63e35fc3519dab3694cb0 SHA512 d74e3dea5e17c3a7800591b0ce5ea7c195efcd2823a6c133506c45e0a8eb0de886b2560b8a816ab83525499c1aed132223641c76ada961d894afea32447782f8
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-group/gdm/gdm-0-r1.ebuild b/acct-group/gdm/gdm-0-r1.ebuild
new file mode 100644
index 000000000000..5a31412ae683
--- /dev/null
+++ b/acct-group/gdm/gdm-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=32
diff --git a/acct-group/gdm/gdm-0.ebuild b/acct-group/gdm/gdm-0.ebuild
deleted file mode 100644
index 2d82aac6f39d..000000000000
--- a/acct-group/gdm/gdm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=32
diff --git a/acct-group/geneweb/Manifest b/acct-group/geneweb/Manifest
index bfa3c40dd3c1..f926f99b6405 100644
--- a/acct-group/geneweb/Manifest
+++ b/acct-group/geneweb/Manifest
@@ -1,2 +1,2 @@
-EBUILD geneweb-0-r1.ebuild 186 BLAKE2B c690d56ec0289ae78cb959821f95eb330ccea98a6097ee2ae43925fac92d583af0a95c84e53a43dc1558a0882adef5d7514a831566dbe32082f5338c2fa52bff SHA512 c1fb212272d03bc3da679de87f761932bedb25a515368384343db0c13a351757747bf96772d0b34de10c1f556305eae0ddedf0de4e73d46b539ce747627220df
+EBUILD geneweb-0-r2.ebuild 191 BLAKE2B fc04921553c735cada2e230399f3a77e33bbe74058005bbd2616a25bd3500249ee2ab40a5b73c018aab38263865f3ee1fbcc95801893f392d812e999d49c4938 SHA512 e57f9dc3dbda270a43cccc3dcf736594b9aff865735942f3d7be586010bda0e576e81f0d3a94636585a30a746fce1a7e9d37cafc2f13a62c91a950320077d021
MISC metadata.xml 248 BLAKE2B 6cf7555626f83d30e661b4284812eeb1b1f2fe0c0a2c78e68382cf21165eee45a4027020d509af5b87814913ea7f16a555b7f0b7da174f49dbb0200bcb2511e2 SHA512 4680f3a309b5836b23c44b1578f14ad49f6ebc52413f42e1d1d4b91d7000081df3be0ca1054ed47cd9df06a1a6bb7cf54d184619efff7dedb82ec7b528ea2dd2
diff --git a/acct-group/geneweb/geneweb-0-r1.ebuild b/acct-group/geneweb/geneweb-0-r1.ebuild
deleted file mode 100644
index e68d95f8c291..000000000000
--- a/acct-group/geneweb/geneweb-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for geneweb daemon"
-
-ACCT_GROUP_ID=467
diff --git a/acct-group/geneweb/geneweb-0-r2.ebuild b/acct-group/geneweb/geneweb-0-r2.ebuild
new file mode 100644
index 000000000000..fc4063c85e29
--- /dev/null
+++ b/acct-group/geneweb/geneweb-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for geneweb daemon"
+
+ACCT_GROUP_ID=467
diff --git a/acct-group/geoclue/Manifest b/acct-group/geoclue/Manifest
index ebd856fe7d61..d0b29ef11956 100644
--- a/acct-group/geoclue/Manifest
+++ b/acct-group/geoclue/Manifest
@@ -1,2 +1,2 @@
-EBUILD geoclue-0.ebuild 146 BLAKE2B 5616d9151f98d33d5a81ac4585387af2398d3428b29ad225673591776047eb2c93cafa397b54b2a3f52d48886dbc2be4b8fa4df45bd3147b2f22e44e7dd8302e SHA512 85fa0cdabbdb43c55e8aa0176b563ac367d9887e4cef0d1867630de5c38ab64843b297e0d6cf0752baec4ec31fec1dfbce8e19bdf78aa1dfc4569e03ff7d0c56
+EBUILD geoclue-0-r1.ebuild 151 BLAKE2B 9c6b6c293215f5ab2a7c07ebf251df7647259e31fa1dce2e6ed977f7f735ca63a1555e5156842bf227d8f98e630eb922744269e3495c7fae0ccf0fd38bbc8953 SHA512 a7cdd838d31e9084845b47c25b1baa8e6039300be86d9a28728da20dd52bbb1f546f7f02f8f25ee7ee031acef59401885f3c91777e4bc5f8f152cc9c8e844dca
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-group/geoclue/geoclue-0-r1.ebuild b/acct-group/geoclue/geoclue-0-r1.ebuild
new file mode 100644
index 000000000000..a1d04d1f7011
--- /dev/null
+++ b/acct-group/geoclue/geoclue-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=351
diff --git a/acct-group/geoclue/geoclue-0.ebuild b/acct-group/geoclue/geoclue-0.ebuild
deleted file mode 100644
index 7f96f9de46d6..000000000000
--- a/acct-group/geoclue/geoclue-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=351
diff --git a/acct-group/gerbera/Manifest b/acct-group/gerbera/Manifest
index e450079b36f8..2144f6bc1a7d 100644
--- a/acct-group/gerbera/Manifest
+++ b/acct-group/gerbera/Manifest
@@ -1,2 +1,2 @@
-EBUILD gerbera-0-r1.ebuild 192 BLAKE2B 18aeb3338c5d555aa3a540d919c34bd62c40ef60d495572bada0d6bc03ee0262649f65301529945bf56409b7e50f2b0dc5e70cfc0cdb9f73ec1688f1b0adb781 SHA512 826d28344629898d17f21dde201235ff3e3b366683e96e4824571b7c736c5674e888ee872054655ad0c74167e487af9858b876ce595f7a35cb445f53b1888cbe
+EBUILD gerbera-0-r2.ebuild 197 BLAKE2B b76e3da3f13c586aa30adb5b40f3b9c18516c5ef4bbfbe7e5f53c419b6e30b0524d8ca3aaf152cb81edd7210dc364dfba57ea24f75b7d47ab336adb3bcda1ed3 SHA512 982c1e9059df072796efced867cb784ac86a5b95f16a853968b9cd8b5997beb891780b32a5e21ad6b597747be6399cff0d251147bc9f114ad8ec4b347960b02d
MISC metadata.xml 406 BLAKE2B 6be52a743657b969bb47047966f9220e0c095142868dbe3560aa2e55e16c6a078658a2c54b990f907e5fa0b24f15d3aab7901cfccd78b39aa00393f44e1ea841 SHA512 4a2559a1cae4a2779e48114bcb08ce6d2f1c2b5587d0296f20172a24c7bcffd54f93bcd67fbf0529ec01ff05384e26c194d25d333c63f5318ee0cadd06b7944c
diff --git a/acct-group/gerbera/gerbera-0-r1.ebuild b/acct-group/gerbera/gerbera-0-r1.ebuild
deleted file mode 100644
index f23b0d544613..000000000000
--- a/acct-group/gerbera/gerbera-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Gerbera UPnP Media Server group"
-ACCT_GROUP_ID=429
diff --git a/acct-group/gerbera/gerbera-0-r2.ebuild b/acct-group/gerbera/gerbera-0-r2.ebuild
new file mode 100644
index 000000000000..f275c9a42550
--- /dev/null
+++ b/acct-group/gerbera/gerbera-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Gerbera UPnP Media Server group"
+ACCT_GROUP_ID=429
diff --git a/acct-group/git/Manifest b/acct-group/git/Manifest
index eaabf54cd072..7a16c2ee7eb3 100644
--- a/acct-group/git/Manifest
+++ b/acct-group/git/Manifest
@@ -1,2 +1,2 @@
-EBUILD git-0-r1.ebuild 151 BLAKE2B 92fca84f9b5804e682c7f86e8c5b0dd94ae1043dd40694ef1229d61352d9cfb5406e262f09648461cdefd144fcf61b9d95b7be94b70e1b25f05dad0acae94e66 SHA512 ee8632855f287227ef01a9afd81a564d64815dd25f7d210a0081f0f8d1526c7ea74be5a7f5c628e91edf519bfd519b865e68344ea06eec05b914d8650ebb96e2
+EBUILD git-0-r2.ebuild 151 BLAKE2B fd570a4130786122ad39c1a8d8692a32d0b60320cece4403d633ed5ced98e69426afabb32c15778c8e2994859b332eb9f23b95aff17ebe09830db5b3f16b4b7f SHA512 f91dbe8c57d4782e357934903786c72de04e3ac2d4b87de2f0958a69bc031c2801b6c6c06c84db971f76aef9ae08279584c2369ca85a58a6c65675138488beac
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-group/git/git-0-r1.ebuild b/acct-group/git/git-0-r1.ebuild
deleted file mode 100644
index 21737c5dcdfe..000000000000
--- a/acct-group/git/git-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=196
diff --git a/acct-group/git/git-0-r2.ebuild b/acct-group/git/git-0-r2.ebuild
new file mode 100644
index 000000000000..6e7351ce4f3c
--- /dev/null
+++ b/acct-group/git/git-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=196
diff --git a/acct-group/github-exporter/Manifest b/acct-group/github-exporter/Manifest
index fba41f7b3b75..3a7be60489b6 100644
--- a/acct-group/github-exporter/Manifest
+++ b/acct-group/github-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD github-exporter-0.ebuild 146 BLAKE2B 0194c5e2fa3691cfe16af427e2c9b035f939d359b3316071c19b6c095fa4c55b8627afbc77a9417895c635012257381884679b1521c3071e8f09aa1569c137e9 SHA512 b0181e8bf6f6aec231445b691afd28387583c31ef68c3a6962eb7de13ed51c19e6b12e893b8f6ee1bac3c0e1a371633ff7a55a208cebf9531074e0b088bf6af0
+EBUILD github-exporter-0-r1.ebuild 151 BLAKE2B 4b45a4dacdd691fe1f7af79df567e12de48cd368c320c1efc7c081290876e4e1470ddc45bd339bef0fac885fd4b43cc76703a3deb18d77a30c1865ac00e160e0 SHA512 29a90d8d01bd96c106ed150cb3f16ff2d1517a0e889753031a92e73dd4ea8f3616a177b1e5885bfc731db856cfcc7df05f6cf562a99789cae79a3b991349ae7c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/github-exporter/github-exporter-0-r1.ebuild b/acct-group/github-exporter/github-exporter-0-r1.ebuild
new file mode 100644
index 000000000000..96f651982fa4
--- /dev/null
+++ b/acct-group/github-exporter/github-exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=238
diff --git a/acct-group/github-exporter/github-exporter-0.ebuild b/acct-group/github-exporter/github-exporter-0.ebuild
deleted file mode 100644
index e8bc30acd2f7..000000000000
--- a/acct-group/github-exporter/github-exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=238
diff --git a/acct-group/gitlab-runner/Manifest b/acct-group/gitlab-runner/Manifest
index 6505fa8a5633..da2f5bbf1c13 100644
--- a/acct-group/gitlab-runner/Manifest
+++ b/acct-group/gitlab-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD gitlab-runner-1.ebuild 146 BLAKE2B 8cd9fe9d4eede23823dd4b24485c5b001e6282525ad64cc11ba235739ee55ce6b84957f22611b417c882d63eea31d866b4ac26bad67a3df9e82970793e7954a3 SHA512 91ad3a7179f36f3d387b7da6337379a819751d862e03cae51528140c0b32836485c3c6e5fc87a48aebc7915a3754efe8e139632116514ad4ea687a0b4e11c422
+EBUILD gitlab-runner-1-r1.ebuild 151 BLAKE2B e85815d2950f2ab8502ce1177b7c754993e84ee5e6426448e7f88e0cb2c7d6b8bf4bd3d250391dfff925994d95557803f5ff30694a158cf1ab4ae3996bee366d SHA512 2eeadd86eba7e6f38fa1733234244c05edfe5d94307dd371fa7a81236befc17664e1e80cd6b9364c30fed36e4ea8eafdd3a7b565e4e4a2b29a63c5463887f31d
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild b/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild
new file mode 100644
index 000000000000..9d26a29b7c61
--- /dev/null
+++ b/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=510
diff --git a/acct-group/gitlab-runner/gitlab-runner-1.ebuild b/acct-group/gitlab-runner/gitlab-runner-1.ebuild
deleted file mode 100644
index 7a63620aefd8..000000000000
--- a/acct-group/gitlab-runner/gitlab-runner-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=510
diff --git a/acct-group/gkrellmd/Manifest b/acct-group/gkrellmd/Manifest
index b38f17af03ab..3570510dcac5 100644
--- a/acct-group/gkrellmd/Manifest
+++ b/acct-group/gkrellmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellmd-0-r1.ebuild 151 BLAKE2B c077d551b13cd099b591cf05f5cc879c89bfff6a883f87a85ee642ef5237e0fc23a6f3d7e208220a06f6a7efa9ad8be1dae1d29187f8020485b9084461686d63 SHA512 b2277a80783de6683384877bb0d434f3dc4607e342ddff1591ebb247aeff4dbc8dc70f8082b0378ad208161e85c4e84719bce7543a75860807dd089ec003ad79
+EBUILD gkrellmd-0-r2.ebuild 151 BLAKE2B 18990fb44711cc22f807d9fd249099fd55834fd3263f9d3b00917df3ec2269247c90649dc7a5a5853039fd72b4176b5a84ad0786125264f90c9c2a4c79570951 SHA512 1a9bd83109610e4718989d246da7029413e1e775f2e3d5629244f8496e8b3dab27c3be7d90c41ed905d190d18eaf1621e422a21fef425c1ac65735b4f1407cb1
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild b/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
deleted file mode 100644
index b906a9c72ece..000000000000
--- a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=221
diff --git a/acct-group/gkrellmd/gkrellmd-0-r2.ebuild b/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
new file mode 100644
index 000000000000..41c6b529035b
--- /dev/null
+++ b/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=221
diff --git a/acct-group/glance/Manifest b/acct-group/glance/Manifest
index 93efcc7ef3f4..8de48e78e139 100644
--- a/acct-group/glance/Manifest
+++ b/acct-group/glance/Manifest
@@ -1,2 +1,2 @@
-EBUILD glance-0-r1.ebuild 146 BLAKE2B a1779346f4a4181545c00d247d8077d4a98ff3006dfb6b5c40a35365646330adb08ed0077ee75dfe82d9cb8c664ff9f1d6e28cc22fdeebf5f01389f67c66ad09 SHA512 fd6ad09c9a2daed299e2b66c9605eafe89776915c465f88d875b58b2cb2386dfeb9a639d16506a2200f201edcf8428a401791ffd302cf5f8059476a9d6c3bcc1
+EBUILD glance-0-r2.ebuild 151 BLAKE2B a0892bae46abd36046b5294a0686075561467751cf156c86d6bb9acc6bafea3bc347d603a2cd3926b247ebe3673063a4592386140a1167bf3c6e86d354a387f4 SHA512 a3c817b066bf2d52f30b78eda87f66dba1b6a0260e03d5a5c2fb51b216f867148770498595fe2a363c74f115f6b7c429d95f75a1b2defe4178132f3ba1fefee0
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/glance/glance-0-r1.ebuild b/acct-group/glance/glance-0-r1.ebuild
deleted file mode 100644
index 88a844125280..000000000000
--- a/acct-group/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=443
diff --git a/acct-group/glance/glance-0-r2.ebuild b/acct-group/glance/glance-0-r2.ebuild
new file mode 100644
index 000000000000..cac90772ccf0
--- /dev/null
+++ b/acct-group/glance/glance-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=443
diff --git a/acct-group/gluster/Manifest b/acct-group/gluster/Manifest
index f4d7d6f7737a..745ae9fe3997 100644
--- a/acct-group/gluster/Manifest
+++ b/acct-group/gluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD gluster-0-r1.ebuild 151 BLAKE2B e2dc8c438b32db7062ed2e03a9edcf828735598bc508cd4ba5cdf3ce66e3c26edc3fb7dcff3a3e7e68669be5b562d3f07d780455cec6a99e7a6189d401ed2b1c SHA512 b8722aa1d4ecdf2f22af86e531ae4dc52d81d4006d48c0368041ee7ec6d50b4a655409f79e57f1e44289e6dbaeb6e906358e8c9d7319d6c2ebf02d1a0e37c6c9
+EBUILD gluster-0-r2.ebuild 151 BLAKE2B a4c1d6437ec09f791249ed6e3c18ca74271e9ecef537fe60555cdff0be8821934fc77d30a2d39dfe5bccf0ec40eb699b51f813d6fef4c63f6653b52416978f98 SHA512 7201da50da0f59185ecb098d73a044082cbf64a677c055718b2bd548a5f52fdbf7faa2c6a178870c6f30b82d19f1ee2d36f98327227f905f92ec3180722d1a76
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-group/gluster/gluster-0-r1.ebuild b/acct-group/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index d79d97827530..000000000000
--- a/acct-group/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=416
diff --git a/acct-group/gluster/gluster-0-r2.ebuild b/acct-group/gluster/gluster-0-r2.ebuild
new file mode 100644
index 000000000000..d385d3e780c2
--- /dev/null
+++ b/acct-group/gluster/gluster-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=416
diff --git a/acct-group/gns3/Manifest b/acct-group/gns3/Manifest
index c98a4b8fa519..f35451cad0a8 100644
--- a/acct-group/gns3/Manifest
+++ b/acct-group/gns3/Manifest
@@ -1,2 +1,2 @@
-EBUILD gns3-0.ebuild 151 BLAKE2B ffd5257783f806cf9e2d16747a2b1b047a8595d60b8d282cf103b5dfc8a1eb146a2d695a10c51b2ae3fb5c14e92d8e3aca9dc96376bbbc222c33767fce72bb40 SHA512 1672cbfcbce8ffba83522e46b3e394db08a35722df64b863f1bae6c71442ec72961f5b792dc813823ea36d410bf97ae8b868213015e591d63e9662e8b5ad1eff
+EBUILD gns3-0-r1.ebuild 151 BLAKE2B 8e8f6ab2493e9970dde7f747cf4eb9db456168bae30fa1ecf738ce8c4af16f48d3c8ffac4cdc814a6d4fb9efe482d945369445f4acfe0e4d528f2d53c8009a7d SHA512 018239cc28741d826c73dac5eee797d12007f8524adc8fcc9245a04b530420109af8fddd05d49969f179d0e77b966ca6751ebd3013eaf40340e7dd7ad13102c2
MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/acct-group/gns3/gns3-0-r1.ebuild b/acct-group/gns3/gns3-0-r1.ebuild
new file mode 100644
index 000000000000..f3d20c0d3135
--- /dev/null
+++ b/acct-group/gns3/gns3-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=522
diff --git a/acct-group/gns3/gns3-0.ebuild b/acct-group/gns3/gns3-0.ebuild
deleted file mode 100644
index e4605b5610ef..000000000000
--- a/acct-group/gns3/gns3-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=522
diff --git a/acct-group/gnump3d/Manifest b/acct-group/gnump3d/Manifest
index 83be05387e55..1a9a63948bd0 100644
--- a/acct-group/gnump3d/Manifest
+++ b/acct-group/gnump3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnump3d-0.ebuild 200 BLAKE2B 69294fb3cd21ebe3681e66507a3a4adfde3e4f8743e1ae83151bafadef7915849dfa6f04cb7c14f9b05c3471970144d474ffdcb2c8e69d55c0615f9cda3beab3 SHA512 c7bd38802918aa3d279ff83411fd1f542075c4251a19cc4155c96000197e0b9c7256d2eedef4603fbca42eeffa564825f9936e117fe79ac555f94182e9a282c4
+EBUILD gnump3d-0-r1.ebuild 200 BLAKE2B 2cb64b2d508a75e7ccd1ececa284c1cbc57bf84dd4aaa4d3b005f6c315c16aeb88d621920e159918822dd09ee787ef1af0e88cab7c8777aed089359ba8712c96 SHA512 5ea8aba067e02481c713654655363e53705c6074450dedc153a9f7b6ebb1307215ac76b3241c6ae795bfde5fa2abde296c24ef1130859de8378b12d4e6509eec
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-group/gnump3d/gnump3d-0-r1.ebuild b/acct-group/gnump3d/gnump3d-0-r1.ebuild
new file mode 100644
index 000000000000..c8f2f001be9d
--- /dev/null
+++ b/acct-group/gnump3d/gnump3d-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/gnump3d"
+
+ACCT_GROUP_ID="160"
diff --git a/acct-group/gnump3d/gnump3d-0.ebuild b/acct-group/gnump3d/gnump3d-0.ebuild
deleted file mode 100644
index 3c4504e2ac75..000000000000
--- a/acct-group/gnump3d/gnump3d-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/gnump3d"
-
-ACCT_GROUP_ID="160"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/Manifest b/acct-group/gnupg-pkcs11-scd-proxy/Manifest
index 431ce4428ab6..ea3e9168b54a 100644
--- a/acct-group/gnupg-pkcs11-scd-proxy/Manifest
+++ b/acct-group/gnupg-pkcs11-scd-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnupg-pkcs11-scd-proxy-0.ebuild 205 BLAKE2B a4a63bc5eb7b672291e106d04b76dbbea78ae2f58c73be41511daa77a52c02fe461386a3eaac867530b008e08eadb9cc634e93cfd469fabfd63349048bc60f3c SHA512 b61e1b963ecf3e19ab44c6c901f86732494e9fe8685c9a6e5b35cf210c6103992c42a7fd7789fe98d28593a14ba37b48ef374a4b80684305c87b5f0c0c95e493
+EBUILD gnupg-pkcs11-scd-proxy-0-r1.ebuild 205 BLAKE2B 7bd4a91317af5d14f71d8fed844a4bf083aeb4b2c01fe27704a2bf669ca454a44da0004f6ba72ab8d2ded66dde833e32569d500b397f2d66a3cb7825d630a87d SHA512 479b3940b94196e2823906ebf081560db14210e4935b5c5336b532f1bcdfce80654fd4f366cb7f89fef56cc64db55c7ffb73e12b4552e00d26a0c2ea4b4ba0eb
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
new file mode 100644
index 000000000000..a1b538246fef
--- /dev/null
+++ b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
deleted file mode 100644
index e70168f79161..000000000000
--- a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11/Manifest b/acct-group/gnupg-pkcs11/Manifest
index 01ec27d19be4..4969436f4d36 100644
--- a/acct-group/gnupg-pkcs11/Manifest
+++ b/acct-group/gnupg-pkcs11/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnupg-pkcs11-0.ebuild 205 BLAKE2B 7536d5437079927309ec39b8f9a9caf9fb98ac58f299eee810749d04fe18a2afc9fdd5834d9cc77e6a7142ecf1da550af2e867245c09b85b0f55e36f01b91d51 SHA512 257d04418e694c91be82cc22ba5e8b3b92ac118472f33794bb9f30ae5bb9236649e471b84897f27cfe85a927668c077120bdc9f8abcb2618686f565655596206
+EBUILD gnupg-pkcs11-0-r1.ebuild 205 BLAKE2B 5249b662819dfd56dfdfb3a659ec15f9d877c3639d6af5657d8f8f9bf8b983356565f291f27124ce2904958ae3f31b0cb7551dc830299b49f2cb554d783b34a4 SHA512 e0832778732e13685169ab487185c62315dd5c9dd1a278c900e743827202c48dcc3ec3ac92c0ace67a9e278826e78d0858f0c08fee45e9e927ad287e403653e6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild
new file mode 100644
index 000000000000..11ab8a2ea439
--- /dev/null
+++ b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="373"
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
deleted file mode 100644
index bc56160394b8..000000000000
--- a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="373"
diff --git a/acct-group/goaccess/Manifest b/acct-group/goaccess/Manifest
index b5136676cd64..e1c6a0b6e7fd 100644
--- a/acct-group/goaccess/Manifest
+++ b/acct-group/goaccess/Manifest
@@ -1,2 +1,2 @@
-EBUILD goaccess-0.ebuild 151 BLAKE2B cdcb0d4b95257d24c6d84d6431558bb0a1ffd8cd25b719f8dd2fb0ede3ae475432c51c4e16099152b4a48fa17b20ee34703fc5d3159ce40b14a1790ceba319ac SHA512 c8bf81bece0ee8d9530474d10c3aa43e7021c3fb17206a23562e7fee4971bbc895b9e0e1cbf564f64ddaa11c97f12ce9a749ccdfcd4439e8c045a504f142d544
+EBUILD goaccess-0-r1.ebuild 151 BLAKE2B 9304bce38dd5d15e81b1e22f3759d556d9b8a3fe2ecd5ed5d23744517eef4405d10133f7e65a314234b67935146e06580546b5c28a1dff785988344acea34022 SHA512 bb533bedf5c04e18ad2478de5f03e195ccfd2a7151f0afc88c50f21e45ece2af465c72d0373032347ee5de68991930a55e72e358f6e1f67b0b89e640a4560eeb
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-group/goaccess/goaccess-0-r1.ebuild b/acct-group/goaccess/goaccess-0-r1.ebuild
new file mode 100644
index 000000000000..5b8bc4733418
--- /dev/null
+++ b/acct-group/goaccess/goaccess-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=523
diff --git a/acct-group/goaccess/goaccess-0.ebuild b/acct-group/goaccess/goaccess-0.ebuild
deleted file mode 100644
index e8027df04f52..000000000000
--- a/acct-group/goaccess/goaccess-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=523
diff --git a/acct-group/gopher/Manifest b/acct-group/gopher/Manifest
index 3c312067be6f..35284f21b310 100644
--- a/acct-group/gopher/Manifest
+++ b/acct-group/gopher/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopher-0.ebuild 151 BLAKE2B 04d38e74167ff89157d19efae84f68978c59ecf5b1ace6ecec8dd750d1cb44efff403c32207e3217cfcfd5ef484ce415f40805c197c8c317f88df292a01b93f3 SHA512 a78db9903043c2c098995d5fdf7500c3e98b99e731767fd6df4494092751d582d1603325bcbd781df74570a61f7ea9746335241c713ac34054f103179dcb2b86
+EBUILD gopher-0-r1.ebuild 151 BLAKE2B 24d7af5468dc36b12e477c2f6cebd4e9a71f34631f1fa43d0754e49aae612666c93fd9a78619b98f5ed455804ebf37489929051763f7530089f67ba0dfc597b4 SHA512 e4cb48f1db4eee21640162df11ae1449e9dc688e96ca6d1677aebc379cdc727f235502386538c0347ac52980d510f5ac84b5cf1f08d2eeeabbe0ca5805f20b37
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/acct-group/gopher/gopher-0-r1.ebuild b/acct-group/gopher/gopher-0-r1.ebuild
new file mode 100644
index 000000000000..7e9fe881ffdf
--- /dev/null
+++ b/acct-group/gopher/gopher-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=287
diff --git a/acct-group/gopher/gopher-0.ebuild b/acct-group/gopher/gopher-0.ebuild
deleted file mode 100644
index ea85d8185e0c..000000000000
--- a/acct-group/gopher/gopher-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=287
diff --git a/acct-group/gopherd/Manifest b/acct-group/gopherd/Manifest
index 0c44991b360f..084aed1de640 100644
--- a/acct-group/gopherd/Manifest
+++ b/acct-group/gopherd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopherd-0.ebuild 199 BLAKE2B 9b864f89ef0ebe533a1b724aa1e41d8d7de82fad19b863fa04a93a847811b25aa28448db23e7453ede2ff20a4da3436e7e7e206b947efd2cc3ba146b404cc607 SHA512 6b3fdda00cd10e61c58a678f0d04bdabc642b044181c7802053eee366913d1770fd650cb3d445ebd501ff6621fb39196e21ad1a65eee616267c278dc73378bee
+EBUILD gopherd-0-r1.ebuild 199 BLAKE2B 746b835bf8ff7e42edd24556ea24a584e11968ac967392b06755605688681ea7ca78b9e07cc450f1a25efd2b71ffe9a0eab1710039516ee6c743c772f3aaf63f SHA512 5cbda0b467c1d868ab14bb7f7eadbd0cbb860d491e955006ff229185ad07ef7b8c5750b720b920b63b62736943850dbba3092b74fd1d014a0e8c139aea4c6c59
MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/acct-group/gopherd/gopherd-0-r1.ebuild b/acct-group/gopherd/gopherd-0-r1.ebuild
new file mode 100644
index 000000000000..6f3afeff7650
--- /dev/null
+++ b/acct-group/gopherd/gopherd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/geomyidae"
+
+ACCT_GROUP_ID="132"
diff --git a/acct-group/gopherd/gopherd-0.ebuild b/acct-group/gopherd/gopherd-0.ebuild
deleted file mode 100644
index 7c433e9e43e0..000000000000
--- a/acct-group/gopherd/gopherd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/geomyidae"
-
-ACCT_GROUP_ID="132"
diff --git a/acct-group/gpib/Manifest b/acct-group/gpib/Manifest
index 899f919afa3d..9742ed0a6173 100644
--- a/acct-group/gpib/Manifest
+++ b/acct-group/gpib/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpib-0-r1.ebuild 151 BLAKE2B 3ba086b8f5a076239e98954833656c6f007fff27831ca498af8f6b3004d00d6d565308da083051f1f8e8d09c6e4c24e633ae5597600a2c8beff9930c87eec9d5 SHA512 2871faa878df474d5cacff944be405f3ff377d918509bdd680a89a46dcc15f22ca9f79b3a2a586346d10ee88fea6eef6ad2bb85585b66382dde54d9f762747ee
+EBUILD gpib-0-r2.ebuild 151 BLAKE2B 64ae6d4d9c709654491a0d2f7957b9a99f59d54d093f446f8dadd41ccd3cc49ed9c1ca5aa977dc05b38708606bd7aefa0d408a7d77ef15b96530441c2c2cfb91 SHA512 c75a37016c6377e73644c1f2695d6b613529a36478cd6c90752934d10a0c79bf0d4cb18d890bc1fe3b34f1b796c69d9f1b7e7a3f6c978ad20af859b32c35e93c
MISC metadata.xml 397 BLAKE2B cbd397a1319623dce61bd4db5cea611afd9f6b6f7420fe0cbbbd08f7074cf625dafb3532fc78d969c6a3d283f2c7e4a4f45df4a06440b7946b94917b137643c2 SHA512 2fa1711d8da604e0ab4b6d4f3d46411893abbdcf92889df0f1205dfadf85b3e92253d928b207df9d0918949d4bb4d85a73d4ef3026a48e8001e070a3ca1c96ba
diff --git a/acct-group/gpib/gpib-0-r1.ebuild b/acct-group/gpib/gpib-0-r1.ebuild
deleted file mode 100644
index 88caead90e5e..000000000000
--- a/acct-group/gpib/gpib-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=409
diff --git a/acct-group/gpib/gpib-0-r2.ebuild b/acct-group/gpib/gpib-0-r2.ebuild
new file mode 100644
index 000000000000..e278818e44db
--- /dev/null
+++ b/acct-group/gpib/gpib-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=409
diff --git a/acct-group/gpio/Manifest b/acct-group/gpio/Manifest
index d040b61e4947..484c26c2abb7 100644
--- a/acct-group/gpio/Manifest
+++ b/acct-group/gpio/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpio-0.ebuild 153 BLAKE2B 6d4fcc79713fd8889400b88045cf6c646f9ebbc080ae156c2b382f869d3a04275ee4e2b07f0239a8ee81a528f2833c2c9fc5660f9587d3bcbfe8a241ca1f556e SHA512 323d8a57fad6085806c83a0e1ba2a77047e0a842cdc50b80d8d13f663b9a47d813e92e8473489d52d4db9caaf91c543c0d8636e3a7db8b423be0edb53c23b89d
+EBUILD gpio-0-r1.ebuild 153 BLAKE2B c692fe8dc64ecce5d8b4e1fe75a4deb3efcbfc70ab340f89f07b48fd581318ef69f67e62b159df6030881c92d447416f4cca117006af8dfb9917d52afc3b9117 SHA512 0c1ca61365b5e6b9cac2c1abd6b83263d0ae3ccb78604287fca4c671226b08dd48168238b3de1ed9a39f633f8466f97614ddb38aad654ca7d76d6c2381bdef60
MISC metadata.xml 409 BLAKE2B 6a6baebac33f399b23cd4590a69ddb17a3057d8613b02f7091a6d9f61608bc13668bd5fb213381af1c33c98f7af44a44595c27a10b643968e4498263b7f71191 SHA512 8df55146c11610024c0f330375b071b8e548d7e7a4d6c46e363fd505a8feadc6921f6e0badb5a49a214e0be46f483b776ca71ba6c4e5f6c6b727818116a6c889
diff --git a/acct-group/gpio/gpio-0-r1.ebuild b/acct-group/gpio/gpio-0-r1.ebuild
new file mode 100644
index 000000000000..1a45b51a4b61
--- /dev/null
+++ b/acct-group/gpio/gpio-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="225"
diff --git a/acct-group/gpio/gpio-0.ebuild b/acct-group/gpio/gpio-0.ebuild
deleted file mode 100644
index 9f8e9a3621d1..000000000000
--- a/acct-group/gpio/gpio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="225"
diff --git a/acct-group/grafana/Manifest b/acct-group/grafana/Manifest
index 6cbffe3709e5..2839aa37c9de 100644
--- a/acct-group/grafana/Manifest
+++ b/acct-group/grafana/Manifest
@@ -1,2 +1,2 @@
-EBUILD grafana-0-r1.ebuild 183 BLAKE2B a2c45813c97aacb7a9e4c396b5833958ebf2b95460ea34740942158654743134a145cac9b7bc9b4efc12826907a6b1747f3b5169197cd8e428b61583bbc51129 SHA512 c9d6acf72dfd46fa4207522438536613134d716f05a725527d94c10eeaa4efadc54fdf70bcec054efe039ac21691eb7f9b3daf5952c2ec04db046a30d5762878
+EBUILD grafana-0-r2.ebuild 188 BLAKE2B 6986b43d59ea27db79df18c81c683e3c245c923a882bf65307a11d003576d504c883c15a02545943a6a0649204e79b875aa1cc91fc9a97b1f3564d5ae055a2cd SHA512 f19fb6bde5685cc85ea5153a79f55e067ec05747b07878ad6c73d98ed4c5179bc0a8d3a3afe30bdf926fab8c9365dec00ced1150f5fb1deddf8d6a768ecd46e5
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/acct-group/grafana/grafana-0-r1.ebuild b/acct-group/grafana/grafana-0-r1.ebuild
deleted file mode 100644
index ab11061926b1..000000000000
--- a/acct-group/grafana/grafana-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="grafana program group"
-
-ACCT_GROUP_ID=389
diff --git a/acct-group/grafana/grafana-0-r2.ebuild b/acct-group/grafana/grafana-0-r2.ebuild
new file mode 100644
index 000000000000..e217b4d7a405
--- /dev/null
+++ b/acct-group/grafana/grafana-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="grafana program group"
+
+ACCT_GROUP_ID=389
diff --git a/acct-group/graylog/Manifest b/acct-group/graylog/Manifest
index f00fd3d5d66f..d2dfe8c2a1ea 100644
--- a/acct-group/graylog/Manifest
+++ b/acct-group/graylog/Manifest
@@ -1,2 +1,2 @@
-EBUILD graylog-0-r1.ebuild 187 BLAKE2B 4c442d1faf427cf0542e78fb9e4b66fbcc568cdc9f72a8527e8c4349e068bb6e1dc1c52f87ad57d3dfb7e664502fb1a4aa4ed919550e3412e4f2e8783b3170bc SHA512 2b17687bbc27c0d8af95c25d0ff8f627a782476677b3e417412d8e7d8578c5522f86b59c8e5408aa854121edb87ea06ddd8442c5597456cf95b8890344c22bb9
+EBUILD graylog-0-r2.ebuild 187 BLAKE2B ce3c6429fed60d33629168719e739bea4aac0b00775fe62f50decbe6ccd3e416e245daed3c53163c2dd161f44b05d4922d7f9b3689cb113e6bb3d489c259a843 SHA512 3f57eb61dbc341b6e943868a4cad9a887954a1a2b5d293b6ddf8885d8b19d5bdfb88c15ed5c65cd5a8db88ddfb65e721bda0de27927998c59f2d573d4cc24854
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/acct-group/graylog/graylog-0-r1.ebuild b/acct-group/graylog/graylog-0-r1.ebuild
deleted file mode 100644
index 23ff1b46e12a..000000000000
--- a/acct-group/graylog/graylog-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Graylog program group"
-ACCT_GROUP_ID=478
diff --git a/acct-group/graylog/graylog-0-r2.ebuild b/acct-group/graylog/graylog-0-r2.ebuild
new file mode 100644
index 000000000000..b59addc0d545
--- /dev/null
+++ b/acct-group/graylog/graylog-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Graylog program group"
+ACCT_GROUP_ID=478
diff --git a/acct-group/greetd/Manifest b/acct-group/greetd/Manifest
index 07b866e6d043..fff3b0acd1e2 100644
--- a/acct-group/greetd/Manifest
+++ b/acct-group/greetd/Manifest
@@ -1,2 +1,2 @@
-EBUILD greetd-0-r1.ebuild 186 BLAKE2B 8632a04a685200261c382ea717807d2e238836ac3f2073eabb19c45e025435528ad15f966ca99a183f2246a3ec8fb59a865445cf301e85e29442cbe3ac62d04c SHA512 4b2a1180c2a63ee4b7264c106dd9a33b8bf4c3bffb7fda4806b307bdac6fd7ceea6e465a93d6e37a1b11ea0a148f694b083d0140a0fd8a7e4c9fc4bb1badd342
+EBUILD greetd-0-r2.ebuild 191 BLAKE2B f16b429983466b341f0d37597fda47ff293340013ae6a8659ca58f6eb815b34bcdd1a6c511c875f02afc076c3740fef951befb9849ea2953da6f9803081648ea SHA512 1f9b9e0b18b78493c0dfe6b9d0384f55d5e3a24c37b6e0723a0d00617d8dc0ce7937cae3acc2a21cdda3ce2778fc1d06373c5a70c6b058ae5f185093aea2d1df
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
diff --git a/acct-group/greetd/greetd-0-r1.ebuild b/acct-group/greetd/greetd-0-r1.ebuild
deleted file mode 100644
index defd4a7f1809..000000000000
--- a/acct-group/greetd/greetd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=396
-DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/greetd/greetd-0-r2.ebuild b/acct-group/greetd/greetd-0-r2.ebuild
new file mode 100644
index 000000000000..ae697d32110a
--- /dev/null
+++ b/acct-group/greetd/greetd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=396
+DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/grok_exporter/Manifest b/acct-group/grok_exporter/Manifest
index d4b143a46b97..367937354be6 100644
--- a/acct-group/grok_exporter/Manifest
+++ b/acct-group/grok_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD grok_exporter-0.ebuild 206 BLAKE2B 40ff5681b7dad38023e20a9420df292b70f515de539d0ee64529564c0410f04047e5249de53d390d72f20f86d8b7fd6ce1d3c07899dadee54aa543f78b2aa58f SHA512 25829b366a145f275ebac9402cf77e2dd36b5a41cf119d87feffb0cca0551300b63fbbd668523d49d7f0f9ac6564037541dfb7e43f45fe55983b1cc8bb5f787f
+EBUILD grok_exporter-0-r1.ebuild 206 BLAKE2B d29ec5e255bed5b0340d6b04b958babb00af7c9c7a6f38d8dfd78b03ad64b255db90831d77fd3403da872fbd7e561811a6822a7206fd8439b52c5122e0558ba0 SHA512 0b88810cf38a67eed2c25204b98ad1aa44908f24fbba19c825aa0fb9db5c72f05ff4a34a15d60b1fc53a87780ecec67bf6d2f235effe70b084df7685d28f3d33
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/grok_exporter/grok_exporter-0-r1.ebuild b/acct-group/grok_exporter/grok_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..7667a6a11b48
--- /dev/null
+++ b/acct-group/grok_exporter/grok_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/grok_exporter"
+
+ACCT_GROUP_ID="104"
diff --git a/acct-group/grok_exporter/grok_exporter-0.ebuild b/acct-group/grok_exporter/grok_exporter-0.ebuild
deleted file mode 100644
index ff2c696b3fb0..000000000000
--- a/acct-group/grok_exporter/grok_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/grok_exporter"
-
-ACCT_GROUP_ID="104"
diff --git a/acct-group/groonga/Manifest b/acct-group/groonga/Manifest
index 5968f0aa4184..b91a61ad31ca 100644
--- a/acct-group/groonga/Manifest
+++ b/acct-group/groonga/Manifest
@@ -1,2 +1,2 @@
-EBUILD groonga-0.ebuild 195 BLAKE2B afb8feb4622f66c3708f054133906bdcf094d6bec3e88484cfd56ee0d02156696028ebbc1b00087753aac4ed2cd79f95f679675445ff810bd57c82ac0f41ffbb SHA512 5a404b5d9e6f2749ccf8f167c5dcec222f311fa85bb1b65c3ef34cc29a39d6eef799b1578622cc74cdec07d813124b12070930e3ba5dfb91f2ee3c73041a8f65
+EBUILD groonga-0-r1.ebuild 195 BLAKE2B 5575fe50b9746b5b253e2cf306cf0678250f44be03f790537f476b5cc53a37ec25c2876602cd7668bc8298992c2f7e76240254b0ccf28340bc3766486f2fa0ac SHA512 55e783b075285724e84bc003a9e74951e14573b8fc3785450458745718d92ed40a390dbdac46fe6b1341d93e66f9fd8bb22e23a9001815bec26da270e20c0c9a
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/groonga/groonga-0-r1.ebuild b/acct-group/groonga/groonga-0-r1.ebuild
new file mode 100644
index 000000000000..f99308dcac3b
--- /dev/null
+++ b/acct-group/groonga/groonga-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-text/groonga"
+
+ACCT_GROUP_ID="266"
diff --git a/acct-group/groonga/groonga-0.ebuild b/acct-group/groonga/groonga-0.ebuild
deleted file mode 100644
index 347d9c9825d7..000000000000
--- a/acct-group/groonga/groonga-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-text/groonga"
-
-ACCT_GROUP_ID="266"
diff --git a/acct-group/gvm/Manifest b/acct-group/gvm/Manifest
index f02da02acd99..70031d8a2329 100644
--- a/acct-group/gvm/Manifest
+++ b/acct-group/gvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gvm-0-r1.ebuild 214 BLAKE2B 9f2abda448e10f84fc8e8cbd9b2f6dbf142f54aae3d0d0eb72774076e97516d165fbe3d9bcf4b7e79360cb17b11bd1bd3822a1d80f34b03d73ff834fe2a948f1 SHA512 c2fe11b8cef3ca6ad8301b9b5366d33c1510988207f2747e6541c3dc54cc574b444ba0a445ae3433dfe8c4d7c314e9e6e508580f93ef04d29ce3f2cec5cc13fd
+EBUILD gvm-0-r2.ebuild 214 BLAKE2B e46dfa576dd99d3913fea79fb146aef4cb25a6714558b1d407e570603607b6f1257d2e436eea71f4a1c2b8396a472dce79af50630ac6f81a8720f75190061d14 SHA512 7a96a8a89de8213640897736c0edbf0e253c7d29cb9b8469275d00887d77639718957d9f49bbcfe3439abe29787fdadefe3359490b3063698d2dc982589e37d6
MISC metadata.xml 397 BLAKE2B b1e9b9b22e006817e3d1f223d7ed1196b620d29900dbf44478cb9f4f58f06c1b044ff8dde10e29b4e432b151955135a3e7c95914f477ff97f232939d1fa321e8 SHA512 88f46c3ecc6094a5283d4ed6e820372649bc5a8b37f2913d617e369d613719efb74eecdd2322cf386260b5b98004a28f2cc02c0ea63fc045fdafbf4671232b75
diff --git a/acct-group/gvm/gvm-0-r1.ebuild b/acct-group/gvm/gvm-0-r1.ebuild
deleted file mode 100644
index 1416f062f155..000000000000
--- a/acct-group/gvm/gvm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Greenbone vulnerability management program group"
-ACCT_GROUP_ID=495
diff --git a/acct-group/gvm/gvm-0-r2.ebuild b/acct-group/gvm/gvm-0-r2.ebuild
new file mode 100644
index 000000000000..281c7f93aae0
--- /dev/null
+++ b/acct-group/gvm/gvm-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Greenbone vulnerability management program group"
+ACCT_GROUP_ID=495
diff --git a/acct-group/h2o/Manifest b/acct-group/h2o/Manifest
index d13fe6b25691..8a6a8766f504 100644
--- a/acct-group/h2o/Manifest
+++ b/acct-group/h2o/Manifest
@@ -1,2 +1,2 @@
-EBUILD h2o-0.ebuild 196 BLAKE2B 07de1acb5bf808d50b2900a0092ae06c179031e148e8f6158d37ebf1cf333c05024da51900a26fbc25f030f2555cb52b137ea58654b47d2c7b40b9da03085158 SHA512 30209ec782ccf4761a035cd792dd7dc744b18ed58e6cbcb6bf3dd38caca26a7b948445eb9698d3e2858e0751223d1d70c18db21ec9d8d68c401de22d4e091ff4
+EBUILD h2o-0-r1.ebuild 196 BLAKE2B 52d9e36e7f753b2b85d051878524c7f5c020e039715236621d744ae38dd4c72a83af6be43a92f4e4cd88f7c5c62ce8cef92440bf50418c46c886d2e1e6023ee3 SHA512 d2bbf1cc6fe9fdacbb0904bad12ae6a01cc1ccd910fdf8e2096e92936d8fecbd0bfdae27591389bc02b7cccb3ce1eabd8227df9e5a2dab01302c57d594129d8d
MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/acct-group/h2o/h2o-0-r1.ebuild b/acct-group/h2o/h2o-0-r1.ebuild
new file mode 100644
index 000000000000..49b355695982
--- /dev/null
+++ b/acct-group/h2o/h2o-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/h2o"
+
+ACCT_GROUP_ID="141"
diff --git a/acct-group/h2o/h2o-0.ebuild b/acct-group/h2o/h2o-0.ebuild
deleted file mode 100644
index 210bbacb211f..000000000000
--- a/acct-group/h2o/h2o-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/h2o"
-
-ACCT_GROUP_ID="141"
diff --git a/acct-group/haclient/Manifest b/acct-group/haclient/Manifest
index f5f6c8905843..429e380d0bce 100644
--- a/acct-group/haclient/Manifest
+++ b/acct-group/haclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD haclient-0.ebuild 205 BLAKE2B e1563547ecfe119304885954fd71188321221b86f76bf7e11466ff6f2891a292be9b03b20564502067e81e1f96b927302b791cc859a3e0d88b1d0e139b7173c3 SHA512 51cac51cb51b11918c2db3e8534480fa49b1b03a922adfe743506cd0dc8ee1ad0a3ee88844c24ab5aa10f5c3121d8e2dc0941a65c201abdf880bdddc9cb085a5
+EBUILD haclient-0-r1.ebuild 205 BLAKE2B 4dbebdd120e1c6f09f46293e95b28c644718778be07d7c269546e59e4c137ba454de91ec5fe25c1b923d6ea09327bd281776d41c49d8f1805e049613a68863de SHA512 90acaf01a823d6d543d7efc9bf43420d09150707b0c81623166aa454b6d1358ff39e694dc6c671ebe95a89e103a0da896b8a3bc370d4cb379323636a8e06da7e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-group/haclient/haclient-0-r1.ebuild b/acct-group/haclient/haclient-0-r1.ebuild
new file mode 100644
index 000000000000..b9d4dd667d26
--- /dev/null
+++ b/acct-group/haclient/haclient-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/cluster-glue"
+
+ACCT_GROUP_ID="204"
diff --git a/acct-group/haclient/haclient-0.ebuild b/acct-group/haclient/haclient-0.ebuild
deleted file mode 100644
index 26dcd63c48e7..000000000000
--- a/acct-group/haclient/haclient-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-cluster/cluster-glue"
-
-ACCT_GROUP_ID="204"
diff --git a/acct-group/haproxy/Manifest b/acct-group/haproxy/Manifest
index 9de6ff875960..a4b179a2f768 100644
--- a/acct-group/haproxy/Manifest
+++ b/acct-group/haproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD haproxy-0-r1.ebuild 151 BLAKE2B 5e7b1be61dff02914407570d260b4223bc2ae013da77c741d87a076e45369a263d62acf8451a4b65e24b9ffa39eb523fc923e44b8df24fe642e17ea5db11cd3e SHA512 a348cf3d04d39dc6d5f6cff8b9f1fa168891cb20c0c44cceb40469795ac728393f0a7184e6354ecfc39c164a9ac01ee3602b8ba29cc2a6c0d2a0ca3e1f17485d
+EBUILD haproxy-0-r2.ebuild 151 BLAKE2B 9794a66422ce14e7c18d5a29f91285e3e7e0afa306a6c4b59d1dc5855cf6d5ac4b24dc8b6a6b50eb3523c16149da331bedb1b8a01e7b488c6c262b8e8918b73b SHA512 e5e457bd1862e647461f1d416dbb655d3bb18c0e45d066052b82ce9688e79acb2d46f84819a3fdaae0ab66a51b09b3b85a48ba2725952cd49b4504167e3f7663
MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5
diff --git a/acct-group/haproxy/haproxy-0-r1.ebuild b/acct-group/haproxy/haproxy-0-r1.ebuild
deleted file mode 100644
index 230356aa82f1..000000000000
--- a/acct-group/haproxy/haproxy-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=188
diff --git a/acct-group/haproxy/haproxy-0-r2.ebuild b/acct-group/haproxy/haproxy-0-r2.ebuild
new file mode 100644
index 000000000000..857a2e2f134f
--- /dev/null
+++ b/acct-group/haproxy/haproxy-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=188
diff --git a/acct-group/havp/Manifest b/acct-group/havp/Manifest
index c0efc2a41ec7..ea6140dc38f6 100644
--- a/acct-group/havp/Manifest
+++ b/acct-group/havp/Manifest
@@ -1,2 +1,2 @@
-EBUILD havp-0-r1.ebuild 193 BLAKE2B 3b685727ba904f50ba7c6a05854ba0b92cd5fa1940afba64801290f6438586f778b8145f572475ef7f4d685e5b9dad16f263b2da7bac12e23f3ee32da0ed143a SHA512 7fc232e6cf5b8b80fec6a6a33a53c17b7e710fc5aaae0bcec2acde2c47bb350d23893e91bd20cf3f955c326a0b92b28fc76af6675debdaf3dd60a309e35c03df
+EBUILD havp-0-r2.ebuild 193 BLAKE2B 3b685727ba904f50ba7c6a05854ba0b92cd5fa1940afba64801290f6438586f778b8145f572475ef7f4d685e5b9dad16f263b2da7bac12e23f3ee32da0ed143a SHA512 7fc232e6cf5b8b80fec6a6a33a53c17b7e710fc5aaae0bcec2acde2c47bb350d23893e91bd20cf3f955c326a0b92b28fc76af6675debdaf3dd60a309e35c03df
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/havp/havp-0-r1.ebuild b/acct-group/havp/havp-0-r2.ebuild
index 13e3b77d0e72..13e3b77d0e72 100644
--- a/acct-group/havp/havp-0-r1.ebuild
+++ b/acct-group/havp/havp-0-r2.ebuild
diff --git a/acct-group/headscale/Manifest b/acct-group/headscale/Manifest
index 1b0b3a4e1285..6c95c60ba850 100644
--- a/acct-group/headscale/Manifest
+++ b/acct-group/headscale/Manifest
@@ -1,2 +1,2 @@
-EBUILD headscale-0.ebuild 146 BLAKE2B 64f5306044a7e4ebaeb3776709eae1879df563716a856a80cc5e397be36d12275f9d8895e6aba420603e10106489f2c92f85e58c7ad87eaa773696bc1025f402 SHA512 767da57795495ee3b61188cd2fa5f695cc8808b747ee1dfba218aa8644bdd7a34f6124545b234b8ae39870def6b77bcd43b099ccfe1f83a9c7c801d5ada335be
+EBUILD headscale-0-r1.ebuild 151 BLAKE2B 10d577656a69f162ce89bde7bd4033717dc3686babab0ee5811b05b50e66f3238c710eb57d6dc0c2340412469ce9dab5836145e4492ea7ecb1089123873d437d SHA512 b1238db195546098ab96048ed77ffc95565d92fd94042f963d2eaed2be3b8338d94d8f2f517549a640817862b75f35ec5c6c2181259ffe6cd157d575dff7d33a
MISC metadata.xml 500 BLAKE2B 7dc95b76985ac9cb40ac5f12de2739f6e8f9f4f4a68a0bb397968c7419900c52c6233df1ce7eefa369de0a66cfa07ce8ec71624a6111d72e8c91553012169228 SHA512 d5b77a9da9eba9bdf9ba2ce675f92ca058f145f5bebc3546ad7acbff8140c16915afdf153bba8aacd2ce5130d7427cdaedef64efcb368546da91cbac8b5495e1
diff --git a/acct-group/headscale/headscale-0-r1.ebuild b/acct-group/headscale/headscale-0-r1.ebuild
new file mode 100644
index 000000000000..a1ad07a64135
--- /dev/null
+++ b/acct-group/headscale/headscale-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=514
diff --git a/acct-group/headscale/headscale-0.ebuild b/acct-group/headscale/headscale-0.ebuild
deleted file mode 100644
index 73623757f6d6..000000000000
--- a/acct-group/headscale/headscale-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=514
diff --git a/acct-group/heat/Manifest b/acct-group/heat/Manifest
index e766dea02714..b1136d3540c5 100644
--- a/acct-group/heat/Manifest
+++ b/acct-group/heat/Manifest
@@ -1,2 +1,2 @@
-EBUILD heat-0-r1.ebuild 146 BLAKE2B 5f50eededf66c26070b7d5e6935b97a9c95162fc510e5209e65664156b157bc0f69c05050f33b59e42292f9e6d162d48a42438f01a185c14e4d2f0b0aa175f3a SHA512 81bbcb49da92b6060342903fde253874c78721760851b3b3508271f68d617e4807d619377f061170bb19576741a1e71aa3371d025cb4e11dc6d9a32888f8d9bf
+EBUILD heat-0-r2.ebuild 151 BLAKE2B dd721b2561683e691da7d2a8c5a0174f4e7a6222a27bf74f9fcd237fb773074c4c2057f6e3d10b5fc85dcc562046693b2aaa6f40cca912d89e6fe7ef6d61e8a3 SHA512 49fc4c2f78c235284e0ede7861aaac5aba415480680c52daffe8e19a1c0987b279f53d9ce5eaf33a51ffce1e7126be5e998b529ba80174d1ad32b8a64926f792
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/heat/heat-0-r1.ebuild b/acct-group/heat/heat-0-r1.ebuild
deleted file mode 100644
index d3e6b1b93a80..000000000000
--- a/acct-group/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=444
diff --git a/acct-group/heat/heat-0-r2.ebuild b/acct-group/heat/heat-0-r2.ebuild
new file mode 100644
index 000000000000..44b33bd9def9
--- /dev/null
+++ b/acct-group/heat/heat-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=444
diff --git a/acct-group/hsqldb/Manifest b/acct-group/hsqldb/Manifest
index 0ad5c2581322..63848e211d70 100644
--- a/acct-group/hsqldb/Manifest
+++ b/acct-group/hsqldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD hsqldb-0.ebuild 177 BLAKE2B c6348becd44adf7b6a33086d3de6763878a3c1414bb755b5eee702cd1f08dfc5ebd67b055aeb8dd5b7b740603f691f53c358b573dd9f23c623ffbe045c9d4ba2 SHA512 5edb1b31539aa5ce24274c79aae09f5dd00a47f4a91d7efd941d8657c7065986c69b8924851fe5985a41c5562e47bed4a4f467ba6aa21794982d4471188b6b8e
+EBUILD hsqldb-0-r1.ebuild 182 BLAKE2B 58a6da712b1f9d3c47a6892bd88ccd6c95d922abc1d12b959bf7b223e0a353d97e258167bb27339ec4ebacb241500a547d5088eb326181411a47a9a7b6d76a30 SHA512 68eb1aa8c04abb51544e6f11e70ba24ca32120a674f07dc7572c7317cd4f947e25074e81565f9336025675f16f82b9e82f6895de3eba881aaebc2635b5071ecc
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/acct-group/hsqldb/hsqldb-0-r1.ebuild b/acct-group/hsqldb/hsqldb-0-r1.ebuild
new file mode 100644
index 000000000000..4fd2909bb0a0
--- /dev/null
+++ b/acct-group/hsqldb/hsqldb-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for hsqldb"
+ACCT_GROUP_ID=217
diff --git a/acct-group/hsqldb/hsqldb-0.ebuild b/acct-group/hsqldb/hsqldb-0.ebuild
deleted file mode 100644
index 041bb24be52a..000000000000
--- a/acct-group/hsqldb/hsqldb-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for hsqldb"
-ACCT_GROUP_ID=217
diff --git a/acct-group/http/Manifest b/acct-group/http/Manifest
index 16d3a3d85ef9..4b76d2b5e327 100644
--- a/acct-group/http/Manifest
+++ b/acct-group/http/Manifest
@@ -1,2 +1,2 @@
-EBUILD http-0.ebuild 146 BLAKE2B 73a0adb4516e0ea612354e4dbcda33ffc00be4192c340c046c6062b37cee527d788c63476a59e54cd0ced3130f6692125664738596f0a81854d59295109d06d5 SHA512 4d806cacd1807b50d26fa5db8ebeafd11e90cefb13b4588c1b9f6ff34bb74082395e663917e8e79a07bddb8880d2dead77fb9481f1cf0c67deed470c15066ad4
+EBUILD http-0-r1.ebuild 151 BLAKE2B 85af1588eda33c31dac522cf124591f64cb4d93e899d647fd9016696fc58cbd8a904d1a6dbfcb019252450065b861780ed289d47034e627d79212940d49aef5a SHA512 1420fe82d6b674f164f28913361648a91af0295806d2011cb85e4b9f9e5b91f6bd14b5d80d59ad1189c21825150588e5ad179754c88a03bfb47d614fbf25252b
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/http/http-0-r1.ebuild b/acct-group/http/http-0-r1.ebuild
new file mode 100644
index 000000000000..a91ed39f6dc9
--- /dev/null
+++ b/acct-group/http/http-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=297
diff --git a/acct-group/http/http-0.ebuild b/acct-group/http/http-0.ebuild
deleted file mode 100644
index 6e855875b1d8..000000000000
--- a/acct-group/http/http-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=297
diff --git a/acct-group/i2c/Manifest b/acct-group/i2c/Manifest
index e048601ecf3a..6cbc0d228401 100644
--- a/acct-group/i2c/Manifest
+++ b/acct-group/i2c/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2c-0.ebuild 153 BLAKE2B e564e71854732378a5585b73e3682557be654f756a9344f44aeacc4c438dbddd8027027453e7d2ec0c41e2b0eb708ceb978f0a97dc572c23a3a5beb38840b234 SHA512 7c10267bb3b0656595965222754f560a383020a15cc4558213b3773af6a72bf63505eaa8f0dd184cf0e586f9e6af7c08cdd28eb04aa578449932058aa27cedb4
+EBUILD i2c-0-r1.ebuild 153 BLAKE2B b3fcf77585f369e26364a35e08344eee94bfb64fed2cf8df6e0471329e96bc145605c480968ff6a321c750741ecbe90175d24db2558b8356547b21d3e478af0c SHA512 e7280efe1fd378254181c3aba28337e7eec5fa26bf0f92fe8d3fda2cbee18bc45b727fa566f51b3df582aa0dd88da3d4022979ed5abdd5d268b9e83f79ab3c13
MISC metadata.xml 409 BLAKE2B 6a6baebac33f399b23cd4590a69ddb17a3057d8613b02f7091a6d9f61608bc13668bd5fb213381af1c33c98f7af44a44595c27a10b643968e4498263b7f71191 SHA512 8df55146c11610024c0f330375b071b8e548d7e7a4d6c46e363fd505a8feadc6921f6e0badb5a49a214e0be46f483b776ca71ba6c4e5f6c6b727818116a6c889
diff --git a/acct-group/i2c/i2c-0-r1.ebuild b/acct-group/i2c/i2c-0-r1.ebuild
new file mode 100644
index 000000000000..2ada0a64d487
--- /dev/null
+++ b/acct-group/i2c/i2c-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="226"
diff --git a/acct-group/i2c/i2c-0.ebuild b/acct-group/i2c/i2c-0.ebuild
deleted file mode 100644
index 9318389c592c..000000000000
--- a/acct-group/i2c/i2c-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="226"
diff --git a/acct-group/i2p/Manifest b/acct-group/i2p/Manifest
index 655c7f975091..1bbc7f34e7bc 100644
--- a/acct-group/i2p/Manifest
+++ b/acct-group/i2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2p-0-r1.ebuild 199 BLAKE2B cf128b05c061e4bf01767db2181bc5f59b77cc9fd135f97a9e9bbf4edc99e07f5114f851615f222b90ed404d53ca3a31c70853094e824b091bb01ab309c78228 SHA512 482824f51a6d4d0c74e18aaebab948221706389272487655dba23d9d83491b9a07aac8611157a170e2514aecaf496b95f854fc7077d31ac7dc4aef92a091ce3a
+EBUILD i2p-0-r2.ebuild 199 BLAKE2B ffa2b31b5eb0e4acffdbc9a5fb5a4d4694b61cbddadc482c22079286d3263f9d5512a853d2f6f7d7eeb557c322aeda3a21a625a20459d0c8c6f1fd6c5f9483ad SHA512 f457a29825fbf665de9823adfe772d1df71a5d11118ba2be7add78f6406a13b8522d1de1b25abba58b22d5fa7f14ac794c668181daff6f966ca477f94c7ecea3
MISC metadata.xml 483 BLAKE2B 6e2651a8813c1dd7ac7feef36431a6e08809d57b66381ded08d142088ee4f71d3fd2fed3e441cca0d87b1c22075acac5576528b84997743ad2b2b05144d66b98 SHA512 354e27f466ce32837109c395204282426ff5ca47f7f5e6c50679add744daf3b6507ed9f6e1e954db4ddebb98b9c9e556d8a0de0f58b9a0882905f83b46f69aef
diff --git a/acct-group/i2p/i2p-0-r1.ebuild b/acct-group/i2p/i2p-0-r1.ebuild
deleted file mode 100644
index 9fa033395b17..000000000000
--- a/acct-group/i2p/i2p-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-vpn/i2p"
-ACCT_GROUP_ID=471
diff --git a/acct-group/i2p/i2p-0-r2.ebuild b/acct-group/i2p/i2p-0-r2.ebuild
new file mode 100644
index 000000000000..47ed7781c511
--- /dev/null
+++ b/acct-group/i2p/i2p-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-vpn/i2p"
+ACCT_GROUP_ID=471
diff --git a/acct-group/i2pd/Manifest b/acct-group/i2pd/Manifest
index 36b6d618cc17..c96da7cef9a7 100644
--- a/acct-group/i2pd/Manifest
+++ b/acct-group/i2pd/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2pd-0-r1.ebuild 211 BLAKE2B 217d3a4681c74dca3585d41743720c4d57d9e33a6a35d47c6539d443bcf67a1eb910470043a7b1e8bffb5fbe286ea3a00997e472d3840b4f523452d78daa1036 SHA512 cbf2900498de05306f1cc575f2071a480fceff85291e0275571ee6c3d1a0ad9bc64d1c9b8013415f3d41c20cabad32d872b0ba5823d153d06c2d6209abfde251
+EBUILD i2pd-0-r2.ebuild 211 BLAKE2B 90fc1859b684c66c390689d0c20d5f3cedce243c5c08d6bea0f66afa2796388f0d47dfc25ade30644e44dfb89ea5bbb816534ae22d333d49d1e4b5a5adaeec5e SHA512 78daf64db88c26d3e49d48a638f59085b62a7e984354994396970b5aec45499dca94eb29cf17275769dad7cc9f37c72b74ab8ada37b63caab7fa6b4e5544d93e
MISC metadata.xml 399 BLAKE2B 85166ccc3c029d08bd993b4040ba89b287a14fe22bac1a96834686f074766a5545c64e6062766d0fe4162cf21e41772b8fedfac25c0d3f6f23bc38fc6feb1b6b SHA512 5add7dc4ce04ba1d51cc81d277ed0b7d50e16b678847aa00061fb7df1588f7080a911f54904ef36a3577dc199051189400cbcbb76b2c632cbbad72c2b8876da7
diff --git a/acct-group/i2pd/i2pd-0-r1.ebuild b/acct-group/i2pd/i2pd-0-r1.ebuild
deleted file mode 100644
index 2258cde77ad8..000000000000
--- a/acct-group/i2pd/i2pd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
-ACCT_GROUP_ID=470
diff --git a/acct-group/i2pd/i2pd-0-r2.ebuild b/acct-group/i2pd/i2pd-0-r2.ebuild
new file mode 100644
index 000000000000..e823550e39c3
--- /dev/null
+++ b/acct-group/i2pd/i2pd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
+ACCT_GROUP_ID=470
diff --git a/acct-group/icecast/Manifest b/acct-group/icecast/Manifest
index 0e1b5cf98201..a393a819edf6 100644
--- a/acct-group/icecast/Manifest
+++ b/acct-group/icecast/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecast-0.ebuild 197 BLAKE2B 11758515e3f6984495a294d289eb57b694ea4f709fe106338f5e0aeef0be096a37a0b6c34ac934b5bb52acc9f5e75d14ca54427b98640add086e60ad71cbc3c0 SHA512 58d3e9f5fbef07d32cf3eaf7f58df90eb01f35fe9eeac5c56a23a2b8d48ba817f50404a31fbae5883de78a4a115d80f1b791bf979c312efbfb031bb8a2da28b5
+EBUILD icecast-0-r1.ebuild 197 BLAKE2B bdd254a0b3abc1cdeb059c4258f39936c1fcdf603a6db25e5ebe722ef5578d18a0b2373ab8f2220e7085e5aad7319df643af388a9a6cb69df8ea1fc370585bcd SHA512 cca7413f44b4edb3c21e35802b70764ce9f041a8b9da0c1f41f55c20ae5d0304cdc637d6f69fbae12cf0db23774421d41236d2336e1e715d729c7fef34f0db8f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/icecast/icecast-0-r1.ebuild b/acct-group/icecast/icecast-0-r1.ebuild
new file mode 100644
index 000000000000..eb7e463046f7
--- /dev/null
+++ b/acct-group/icecast/icecast-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/icecast"
+
+ACCT_GROUP_ID="131"
diff --git a/acct-group/icecast/icecast-0.ebuild b/acct-group/icecast/icecast-0.ebuild
deleted file mode 100644
index 8e91828cfb66..000000000000
--- a/acct-group/icecast/icecast-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/icecast"
-
-ACCT_GROUP_ID="131"
diff --git a/acct-group/icecream/Manifest b/acct-group/icecream/Manifest
index 803edb34b61a..874e6f3c7872 100644
--- a/acct-group/icecream/Manifest
+++ b/acct-group/icecream/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecream-0.ebuild 199 BLAKE2B 5ad5878f3278c629f1053228d22ebff5dcc0ccbcafda8ff64bbbf18886529cb04be68924f74346339bc37cdc016de63fe52b685db6ef840903c59aab3dd178c1 SHA512 b54cfbfb17b47a939baa9395e88bf403cacd0bc66b2482f35a98758301888bc1b4e1a6f56dff6fd8669f2a13083588a1fe43ad38fd377b68f62ab485725dc31f
+EBUILD icecream-0-r1.ebuild 199 BLAKE2B f51851dfad002928e2ca4f47b24faac8ebf637644ae5039695ad2cc37a0b2cf0e90879ecb4d01b1472d752ebd611a167ea5cd1c0d5046e6cae6fccb4c34c8a1d SHA512 f2b5afe7b070f8308578d66dcbaf40b2625c7fa784d3b5caf129e447e926bc64780c38db2fa8070a42608e930798acfdc0384e49d725867b4ba7a3c539db1b3e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-group/icecream/icecream-0-r1.ebuild b/acct-group/icecream/icecream-0-r1.ebuild
new file mode 100644
index 000000000000..898cf5518a04
--- /dev/null
+++ b/acct-group/icecream/icecream-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-devel/icecream"
+
+ACCT_GROUP_ID="145"
diff --git a/acct-group/icecream/icecream-0.ebuild b/acct-group/icecream/icecream-0.ebuild
deleted file mode 100644
index 08f8a89a7b97..000000000000
--- a/acct-group/icecream/icecream-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-devel/icecream"
-
-ACCT_GROUP_ID="145"
diff --git a/acct-group/ices/Manifest b/acct-group/ices/Manifest
index cddbbdbf8b6c..d4897443558b 100644
--- a/acct-group/ices/Manifest
+++ b/acct-group/ices/Manifest
@@ -1,2 +1,2 @@
-EBUILD ices-0.ebuild 194 BLAKE2B b09ee9771e5a131e7d39ae8d2a44e23a0983e30e9556d79dd0b629ff998a969fa5bfae97e917c8c157e186a07aa82c2fb932e9b3b462baf9fe1de2a25ef3e67f SHA512 7bcd391b1f6c88a60f00d7b49fe424b7de18ad1d64260d73380e1d2bfd82e6167f3bea23f6eeb70cf2c76a9855fb34abc75542e0a37ca0b7905279003e9e5a08
+EBUILD ices-0-r1.ebuild 194 BLAKE2B 583048b2cde31b10e63986f787155611e2bfa27b51fd592841b50abe6d71e629a1368d583bfa8f09f83069fa65ca6bd9edaed3739cf996deb68426c1ab769cd9 SHA512 f4ffb69935046d2718c39e2baa3eb9610d02106d7bc21b376c92fe7da8f7be19e5e7ab3f39faa8c157b2df417fae9972b4f1af2ea0bac4e62ee4be5d5a5744de
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-group/ices/ices-0-r1.ebuild b/acct-group/ices/ices-0-r1.ebuild
new file mode 100644
index 000000000000..59690dd46fd6
--- /dev/null
+++ b/acct-group/ices/ices-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ices"
+
+ACCT_GROUP_ID="162"
diff --git a/acct-group/ices/ices-0.ebuild b/acct-group/ices/ices-0.ebuild
deleted file mode 100644
index 0efbe032797f..000000000000
--- a/acct-group/ices/ices-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/ices"
-
-ACCT_GROUP_ID="162"
diff --git a/acct-group/icinga/Manifest b/acct-group/icinga/Manifest
index e27f73177e41..7ffbf886e700 100644
--- a/acct-group/icinga/Manifest
+++ b/acct-group/icinga/Manifest
@@ -1,2 +1,2 @@
-EBUILD icinga-0-r1.ebuild 146 BLAKE2B 888c34aadc2858057de6eb62dcac35f5c6a9f669315b91fbd4dc323ecb475079eb58afae4c7b57606d3b911a0f79a9f3229fb17ace6c4d63659beaeb77cb578b SHA512 ea04136042b770ea8f6dc24ab074593029e663821b1d80095cc87b2076af4ef1ceec19f81931e41d3d9d5533225f4d09a56c690250edf079e6290c5220fd1221
+EBUILD icinga-0-r2.ebuild 151 BLAKE2B 69b64c1cea9e3debf5702c90b45135e323d332a4fb68b8070681f75d2cb93932b63d37716b144e4bc46ae2d95b22ca1e97abdf640adaf94c7b2c6d52e0bbfa31 SHA512 60518ea2d7478a3443216bb98549b76d4aad7fd0bad393c02fdbd1d7f9f490fd57e7daf4d177f7e826b0a42dda698b0403450851be7ce0791181629f959ff8ea
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/icinga/icinga-0-r1.ebuild b/acct-group/icinga/icinga-0-r1.ebuild
deleted file mode 100644
index f14f8c10b01a..000000000000
--- a/acct-group/icinga/icinga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=457
diff --git a/acct-group/icinga/icinga-0-r2.ebuild b/acct-group/icinga/icinga-0-r2.ebuild
new file mode 100644
index 000000000000..9d84d81f4cc4
--- /dev/null
+++ b/acct-group/icinga/icinga-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=457
diff --git a/acct-group/icingacmd/Manifest b/acct-group/icingacmd/Manifest
index 1ab1984243f6..f799f8e59d92 100644
--- a/acct-group/icingacmd/Manifest
+++ b/acct-group/icingacmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingacmd-0-r1.ebuild 146 BLAKE2B df0c590925c461687640db71444552d7c5bd70828ed184414569adfcaf30c67595c093ca6d58120bca4194555abe2e3a8b9466a58ce4350f3b667d699e3c120e SHA512 18e90c85500d3cc28f4b4f2262f859910db355eb096539b0b974dcdad1f5fd62a2b2c405428847e1f203ae6ae0664dac012e1c8719d52f4fe883d6c29e62173b
+EBUILD icingacmd-0-r2.ebuild 151 BLAKE2B 334dec4119c14bcdd8511b4b9102ac16074434fa67dc49806ea6970f95b13bac7a863901cca42037931c0c4eba431ae558f9a2465da3877bc27686f9e14e5128 SHA512 0f687530126db975a700e27ee1fe9dd32b2946ac15305b577a9ba4d6ea3b0ef2e8799e93076fda4d30a2d6ef73d8e7cfb65bdcc551006f4606f34e7ae8dddc02
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/icingacmd/icingacmd-0-r1.ebuild b/acct-group/icingacmd/icingacmd-0-r1.ebuild
deleted file mode 100644
index 342794ce41e0..000000000000
--- a/acct-group/icingacmd/icingacmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=458
diff --git a/acct-group/icingacmd/icingacmd-0-r2.ebuild b/acct-group/icingacmd/icingacmd-0-r2.ebuild
new file mode 100644
index 000000000000..9ed75a172c3b
--- /dev/null
+++ b/acct-group/icingacmd/icingacmd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=458
diff --git a/acct-group/icingaweb2/Manifest b/acct-group/icingaweb2/Manifest
index 2d872afc15be..14b09fb1f4e9 100644
--- a/acct-group/icingaweb2/Manifest
+++ b/acct-group/icingaweb2/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingaweb2-0-r1.ebuild 146 BLAKE2B 617c773b883333c3d207d7168acfdbdf17e78e5384314568329d0cda2e00d515cba8cc79a72c8450d7c08543b3e512dc6574eb093f3b38981a1daaa10720a7f5 SHA512 1780439859c93a9133830bec75ece827ae5773c794035f069e78d091300763e845a26e31ba5e3411d50c10c36926e072438e6e0cb2218d6b0c6aaa9f28ae7a55
+EBUILD icingaweb2-0-r2.ebuild 151 BLAKE2B 5781ffd9db20753025129dfb979bfbea5b310dbd255792353d4e38554d67879a21edb1aff7806b5b249a8cea816a4f1c349d423ed83e7965a23958c2d5b9abda SHA512 791b1d20fb313d7013d1ea920663d957a776886f6e401fd50b44b1143c64cb38caadada17ea16992c8463441d384ca7139f696751b71b5c8e9d6e5debb5901e1
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild b/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
deleted file mode 100644
index e2660fdb4be5..000000000000
--- a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=241
diff --git a/acct-group/icingaweb2/icingaweb2-0-r2.ebuild b/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
new file mode 100644
index 000000000000..0f7977916325
--- /dev/null
+++ b/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=241
diff --git a/acct-group/inadyn/Manifest b/acct-group/inadyn/Manifest
index e259a28be6c1..5872d86d5273 100644
--- a/acct-group/inadyn/Manifest
+++ b/acct-group/inadyn/Manifest
@@ -1,2 +1,2 @@
-EBUILD inadyn-0.ebuild 153 BLAKE2B 488c9fcb48c7930452c13a9e7f9d4000772d2d220f6117f08b0b5ea786260648956c4f1c8de1ca651a05545398876660d6a734a403ce830c3b31ff2d4b1e4f10 SHA512 75112cd0cfe78fd01a04f738562b1a4809289d5aac4eb849cac2e73c239e1eabddf29bd6e5a0e5e64d1d2d0131fdfd4e7a1527f89f238a14a888ff0947a78e57
+EBUILD inadyn-0-r1.ebuild 153 BLAKE2B 488c9fcb48c7930452c13a9e7f9d4000772d2d220f6117f08b0b5ea786260648956c4f1c8de1ca651a05545398876660d6a734a403ce830c3b31ff2d4b1e4f10 SHA512 75112cd0cfe78fd01a04f738562b1a4809289d5aac4eb849cac2e73c239e1eabddf29bd6e5a0e5e64d1d2d0131fdfd4e7a1527f89f238a14a888ff0947a78e57
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/inadyn/inadyn-0.ebuild b/acct-group/inadyn/inadyn-0-r1.ebuild
index 1b0c291e1034..1b0c291e1034 100644
--- a/acct-group/inadyn/inadyn-0.ebuild
+++ b/acct-group/inadyn/inadyn-0-r1.ebuild
diff --git a/acct-group/influxdb/Manifest b/acct-group/influxdb/Manifest
index af0b08967666..f04d71a143ec 100644
--- a/acct-group/influxdb/Manifest
+++ b/acct-group/influxdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD influxdb-0-r1.ebuild 146 BLAKE2B 45b65764c72c47fa403ce75a8759d978049b1721e9cc70ded079a14be4b59a77e1716aa90564428a2713db59f1f166d8de7ea9fd0af568c45031925c75ec71c5 SHA512 1edf94c66f684feec72b2e1b2a80c4f4544cfe5db343d5f743d373581f5d6ad743a42785c7cddc4e68a4002700b884a7dede8f7bac9fc0709cdb707997671492
+EBUILD influxdb-0-r2.ebuild 151 BLAKE2B 06ae5cff4ed259666f9632c70490a381e2c7388aff99e89d6361db818997225be8ace3cf1388b953d75722ae8653cdb924cf26f8778abd9b438ac2e1bba8b65b SHA512 4b9ae23881c97b040fe26c26dc69c7c8718acab62d2c2484b214563d69858af54d306d47cf14da56f3c2ae67852c1dc999aa0042c715fe24646c21a26ba9b0e8
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/influxdb/influxdb-0-r1.ebuild b/acct-group/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 8b693e17a672..000000000000
--- a/acct-group/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=342
diff --git a/acct-group/influxdb/influxdb-0-r2.ebuild b/acct-group/influxdb/influxdb-0-r2.ebuild
new file mode 100644
index 000000000000..035b6cd5fcc9
--- /dev/null
+++ b/acct-group/influxdb/influxdb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=342
diff --git a/acct-group/input/Manifest b/acct-group/input/Manifest
index c39a55369569..b7ae5b8d09f6 100644
--- a/acct-group/input/Manifest
+++ b/acct-group/input/Manifest
@@ -1,2 +1,2 @@
-EBUILD input-0-r1.ebuild 150 BLAKE2B ffb48e248cd1fc40822e342f578432c79a9d2a71ba354e9bc5476dbb12c9d050f07fe65984d8c0e424585e691237e8d1e89dfb5811819c27372f0e13337e5728 SHA512 d32553066de6e7fdddc27586ce30bb20eed72689df529ee92a458fb5aebd8d774eb5e12f8856858fb4284334fbc099e192c3d1373f18ea1dc4228593380574ec
+EBUILD input-0-r2.ebuild 150 BLAKE2B 4e9ec6948ef3a52f850bd7906dcd3d859cc5aeea5422902d19abeedf738faf7ed30079df3b2502a4f73c97950b0968d0bf32e8348eed5b1db91aeac8bb3af037 SHA512 7f76231675f4c3148d2b9b07d80018c9183ad89c74b700452ded0a6e340792637e8b9a1a223b8be48feb593e9fffdc6e4b62eb7048d047de404cdf7b3504964c
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/input/input-0-r1.ebuild b/acct-group/input/input-0-r1.ebuild
deleted file mode 100644
index 9ef06e8444a4..000000000000
--- a/acct-group/input/input-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=97
diff --git a/acct-group/input/input-0-r2.ebuild b/acct-group/input/input-0-r2.ebuild
new file mode 100644
index 000000000000..966d8ca0658c
--- /dev/null
+++ b/acct-group/input/input-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=97
diff --git a/acct-group/inspircd/Manifest b/acct-group/inspircd/Manifest
index 786fca6b33c1..6922f88d1204 100644
--- a/acct-group/inspircd/Manifest
+++ b/acct-group/inspircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD inspircd-0-r1.ebuild 169 BLAKE2B 0c0ca44d8d2a3ee7b99bab5692ba52f08dbb8d0e5e929789a6ef7979d475a1b9f6ada85b59a2c1cba7f12579eb4d97992ca86ac592ca30d85c980ea3df51da84 SHA512 8e8f75169fcfd3b7bbdd19afee000c1443a1604c12ae8100d131117fd7bddc544443508bdec30792f38f0d2a4b307e7a412022d27c8b2dd1b44eb6d534cd95d4
+EBUILD inspircd-0-r2.ebuild 169 BLAKE2B 2ca06e9f7fc4f023b38596de2095ddda45457664a3da620a3bfc4934f3fc1bc37f3e42cf43614ae3e66b3a80aca681050c788e431b161049e211d31f35f1417b SHA512 89148001a10496e93438eaff2b97730dc8add73b948c53e00a838446a46fb126fb5a82315f6e8df653479a8cb9998a4c568f8d600c4a16ff45275543d69724e6
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/acct-group/inspircd/inspircd-0-r1.ebuild b/acct-group/inspircd/inspircd-0-r1.ebuild
deleted file mode 100644
index 6d4c94d302ac..000000000000
--- a/acct-group/inspircd/inspircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# Port 6667 % 500
-ACCT_GROUP_ID=167
diff --git a/acct-group/inspircd/inspircd-0-r2.ebuild b/acct-group/inspircd/inspircd-0-r2.ebuild
new file mode 100644
index 000000000000..4c056457ee4e
--- /dev/null
+++ b/acct-group/inspircd/inspircd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+# Port 6667 % 500
+ACCT_GROUP_ID=167
diff --git a/acct-group/ipfs/Manifest b/acct-group/ipfs/Manifest
index f37a5d58d523..3dad770c5c31 100644
--- a/acct-group/ipfs/Manifest
+++ b/acct-group/ipfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipfs-0-r1.ebuild 218 BLAKE2B 48e70745fca2586df57d3f9cc36a5139215b131faf850192c36eb9ec47edc5be7262b5db6619af4881da90d2a758d7cc7a5d8451083285ad0c51dd383f8b9012 SHA512 a3cb974b7226597189bfcf690b83161d0c1934ba633d63b89300c58bf9b653ff74c6cea24b5b6d20448878cb8da8420ba111e6d89d5ca318e87f3a0e9f423569
+EBUILD ipfs-0-r2.ebuild 218 BLAKE2B c0365355132bb0691e2ca2898803e4e0db43a16f04ee569a90c461a1d9ab67212b21b47fece0a757e61cfaea91968f625d87191b23de9ba2fe641150edc354af SHA512 ddb5ff7a7184a53b6535589d0879f832cf28657f7a213da05373f09ce32ddc298b42bfca9990aa85842db9d004d5ea61d0f185f4dacba58d986f63c9e82823c2
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
diff --git a/acct-group/ipfs/ipfs-0-r1.ebuild b/acct-group/ipfs/ipfs-0-r1.ebuild
deleted file mode 100644
index 503f9d4c1a2f..000000000000
--- a/acct-group/ipfs/ipfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
-ACCT_GROUP_ID=484
diff --git a/acct-group/ipfs/ipfs-0-r2.ebuild b/acct-group/ipfs/ipfs-0-r2.ebuild
new file mode 100644
index 000000000000..6328588e24e3
--- /dev/null
+++ b/acct-group/ipfs/ipfs-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
+ACCT_GROUP_ID=484
diff --git a/acct-group/ipsec/Manifest b/acct-group/ipsec/Manifest
index 9e88e06a3f72..65147b758827 100644
--- a/acct-group/ipsec/Manifest
+++ b/acct-group/ipsec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsec-0.ebuild 194 BLAKE2B e59a7eb31d2c8a7f0c8ae9c6a7642e08be108dabf8c7a3476ebdc3f9fb64aebfc6c28c8aed345175214b93b51d1b3aeeab269bdb74202e3eff2e8ec94b898721 SHA512 e9e19747ca125b5d04b2aa4eead078b258a964fb12761ed7daca7603c151b49751001611ba1b93f96b50a832e28caf15b06d691db959a545b43137baf0a7bc68
+EBUILD ipsec-0-r1.ebuild 199 BLAKE2B 8997c3f4ca2e9fbaf67a66ecff5fa66082c78b55d5f29e864b4264c86c28b77017725d19b2bb54001ff7b5efbcb0efbb63fb4d0f3be5be35a74bda53bfbad903 SHA512 9df048a9d596166acb273a456583ba11db3a68c12e4ef259c345a9da13f32fb917ba1846edf9314be8d895c3e27aba7bbb8661c08f544dca6fcb9de0d0ee8c53
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/acct-group/ipsec/ipsec-0-r1.ebuild b/acct-group/ipsec/ipsec-0-r1.ebuild
new file mode 100644
index 000000000000..8a31b9f0e9c9
--- /dev/null
+++ b/acct-group/ipsec/ipsec-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="ipsec (strongswan) program group"
+
+ACCT_GROUP_ID=199
diff --git a/acct-group/ipsec/ipsec-0.ebuild b/acct-group/ipsec/ipsec-0.ebuild
deleted file mode 100644
index d0716459d75e..000000000000
--- a/acct-group/ipsec/ipsec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="ipsec (strongswan) program group"
-
-ACCT_GROUP_ID=199
diff --git a/acct-group/ipsentinel/Manifest b/acct-group/ipsentinel/Manifest
index f1f1d7f9b8e7..0d36f0a10714 100644
--- a/acct-group/ipsentinel/Manifest
+++ b/acct-group/ipsentinel/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsentinel-0.ebuild 201 BLAKE2B c895adeeacc338175b16d481b136dc1e061fa969fe0031e96e8e593201177895ba4462b7a6da8ae3e234360070cf6940e502ab3e4cc865d1e54b681c8839ff66 SHA512 cc261891d44dfa0cb1fbf40e6722f1ef15495056c149dab9e1dab959b8005dfa08104e0c198be0bbeec691ce8db4178d49284a2153bc3f6541dad56b029c308e
+EBUILD ipsentinel-0-r1.ebuild 201 BLAKE2B 9dc43f39d9aedadbb07c8adf6227c383966719749e097672477f1ed0c8eb1ea3f542284965a86c98a4ee99deecde1cc71f8e696338d0b2d3881aee8946dcaa34 SHA512 5af293dc4101bfbc3750826af5474b19fb219373e4e773fb63a4b1d58df824a5b36497063dd17e264becfded72e95dbd205cf203c4797a1db477e1cef2e90d98
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/ipsentinel/ipsentinel-0-r1.ebuild b/acct-group/ipsentinel/ipsentinel-0-r1.ebuild
new file mode 100644
index 000000000000..eb3389f4a1e8
--- /dev/null
+++ b/acct-group/ipsentinel/ipsentinel-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ip-sentinel"
+
+ACCT_GROUP_ID="163"
diff --git a/acct-group/ipsentinel/ipsentinel-0.ebuild b/acct-group/ipsentinel/ipsentinel-0.ebuild
deleted file mode 100644
index 0ab3a10e014b..000000000000
--- a/acct-group/ipsentinel/ipsentinel-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/ip-sentinel"
-
-ACCT_GROUP_ID="163"
diff --git a/acct-group/iroffer/Manifest b/acct-group/iroffer/Manifest
index 00c3906c06d5..f204a1bcee87 100644
--- a/acct-group/iroffer/Manifest
+++ b/acct-group/iroffer/Manifest
@@ -1,2 +1,2 @@
-EBUILD iroffer-0.ebuild 146 BLAKE2B 95628d12f14db67ebe2dd4cbd882f38fa7d0112518b03b86b380ade1f6e7aa37d066790cd7b6952da2e5e31d9fb43b7462320dc3bbffb2cd6b48554d5bd49b51 SHA512 b0f34f3ab3be14e0eafd1a363396628b2148c468702f6400c0cfbcd06b9ce0eaee62edb4a0a25ff376cc7c8ea765269b55e0af1c10c49cc686dfd4026ba80f19
+EBUILD iroffer-0-r1.ebuild 151 BLAKE2B b69bd43b9dee3ccd6a9d2072890778874ed1f7de6e530607cc4e9f22bf29cad8a9e20dbb97e5bb7126ad4d009f5e994b980a7b9fdc019d39cf20991463b4fc96 SHA512 2bdf346c0aa0e90df92eb9d7b3f70e5f2fd2d42c1873b2137a050d8a143de09b6ab2ef83b40092dc384627ed64f2c72c31d13494f1a09e9b6f0f0aa231289e37
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/iroffer/iroffer-0-r1.ebuild b/acct-group/iroffer/iroffer-0-r1.ebuild
new file mode 100644
index 000000000000..f25bc31a520d
--- /dev/null
+++ b/acct-group/iroffer/iroffer-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=187
diff --git a/acct-group/iroffer/iroffer-0.ebuild b/acct-group/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 2e3c37129e70..000000000000
--- a/acct-group/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=187
diff --git a/acct-group/jellyfin/Manifest b/acct-group/jellyfin/Manifest
index 0e456b2ab6fa..8f41a7ea07c9 100644
--- a/acct-group/jellyfin/Manifest
+++ b/acct-group/jellyfin/Manifest
@@ -1,2 +1,2 @@
-EBUILD jellyfin-0.ebuild 151 BLAKE2B 32d3af1e0f16244a52146064c5dbe1fe49e9a2fd3b2bffb75ac9bc3b596e6a5030644d61de97cbe274294709553552fbaa7a0345dc07825b798d8c9adefd1dd7 SHA512 e0eec07960cb03278d479057b0c617f76f9c17476eb170ee1dd3a6799b593574fbbc4fbb08e7287bd121c0ef3a96bab436004ce31257ca9c5576899cc7405381
+EBUILD jellyfin-0-r1.ebuild 151 BLAKE2B ff158d56da7e420a8f9c3523b37177aef7ecd93225fac66a93776279c932a2ce2eb0a00be6722b49417a5974b2e5e6a3da787653bf39def894f39efdd54b01a4 SHA512 d767df063e066144f5f6d9ec9bc7dbbcef5e19b246c7eb32e67667bb1b127f79ff52ef08a368af49248beed2ef90173dc8dc72cbf21676def96f8dded8ce2f17
MISC metadata.xml 649 BLAKE2B 29ce34c89c1300d32c3ff30990ec92e49cfab21d74340d1cd6893650ffda87920348ac5feda5ee68feff3e8adbd8cd6e58548d73879025a206dc82756a99c383 SHA512 d8a36b27ee99f29cf9dfea5cc4a9735732bb11cc5931adb4bfe1d1942378d2477f63417b6a2a694e9691c217d20c5ce84bc8d46af5155c46b99b850c0f561315
diff --git a/acct-group/jellyfin/jellyfin-0-r1.ebuild b/acct-group/jellyfin/jellyfin-0-r1.ebuild
new file mode 100644
index 000000000000..b2f88b650218
--- /dev/null
+++ b/acct-group/jellyfin/jellyfin-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=518
diff --git a/acct-group/jellyfin/jellyfin-0.ebuild b/acct-group/jellyfin/jellyfin-0.ebuild
deleted file mode 100644
index 9d952362cfe2..000000000000
--- a/acct-group/jellyfin/jellyfin-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=518
diff --git a/acct-group/jenkins/Manifest b/acct-group/jenkins/Manifest
index 19802e2149d7..3c31bd7f9f6b 100644
--- a/acct-group/jenkins/Manifest
+++ b/acct-group/jenkins/Manifest
@@ -1,2 +1,2 @@
-EBUILD jenkins-0.ebuild 183 BLAKE2B b1c241c9651d8c8e3d3500c8f50ac6ff1d2542fc8ee7019a0b80eafc94a1d8a1aea3ef20cf42c8677ede80d5f8e11fef8617d2702c841c0c546619449a5b73e9 SHA512 02acd3ab5aff31a13c514f5a209f42a1e06d8a18cd1256f604d53ea51a91121bfc786a9763a6a5342197335ae7673a206aabdda2cd932cfb558299b46e2d3642
+EBUILD jenkins-0-r1.ebuild 188 BLAKE2B 0ad93ffa4901e5d818c2db0aaea0d2fc68d5ce904b32ae3e6d4fd3e51d428fc8a9a2ec4c11ed52f0d8024195f3c2eecb20a76e97115fa180a44afbde3c23b0a6 SHA512 30c54ef2f55d29590bcfa71de80e0078c8a35e7aab7f9c492e20bfe981e1c724a3650d5ddbe8a1cdbf59338d1a72b8a9f8f33838ce9f141a8a5d24378cd7899a
MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/acct-group/jenkins/jenkins-0-r1.ebuild b/acct-group/jenkins/jenkins-0-r1.ebuild
new file mode 100644
index 000000000000..887aa8613518
--- /dev/null
+++ b/acct-group/jenkins/jenkins-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Jenkins program group"
+
+ACCT_GROUP_ID=473
diff --git a/acct-group/jenkins/jenkins-0.ebuild b/acct-group/jenkins/jenkins-0.ebuild
deleted file mode 100644
index c90523f69b2b..000000000000
--- a/acct-group/jenkins/jenkins-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Jenkins program group"
-
-ACCT_GROUP_ID=473
diff --git a/acct-group/kafka/Manifest b/acct-group/kafka/Manifest
index 449fafdfc295..fab6938da32a 100644
--- a/acct-group/kafka/Manifest
+++ b/acct-group/kafka/Manifest
@@ -1,2 +1,2 @@
-EBUILD kafka-0-r1.ebuild 146 BLAKE2B 36588e4aef0eeaabd8fef7a76a123db8483296fa0e71d9a85751bed72c3ca595da114078037faabd2ad834c3f88280535cf6dac6a6853101b6bc61efa5fbbedc SHA512 17d74d410bd7e4cf08d43b288072161b6a3bcf60af2b1f23ee2503ab666d0045141fef8cda5cc72206fd1ffc043e7636cf0dba5c3023376b2379260fffc2b274
+EBUILD kafka-0-r2.ebuild 151 BLAKE2B c7b78c0eb2d6467bf77fbfb99e35fb3d298d45f9201b356cb1b26cea2849c88a9b6e2938b1cc096bf203330e63888db4d0e4f3d5c1818bbab0e1088dc21dd76f SHA512 ad62320884d89a4a1559ab979fd93750bc840037a223fdc88a413817a52712b9a0e9fd1a1bb625ebffa5d424fca7bc0358418d40a809b00613685f35bad37605
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kafka/kafka-0-r1.ebuild b/acct-group/kafka/kafka-0-r1.ebuild
deleted file mode 100644
index 6d08891db8e6..000000000000
--- a/acct-group/kafka/kafka-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=425
diff --git a/acct-group/kafka/kafka-0-r2.ebuild b/acct-group/kafka/kafka-0-r2.ebuild
new file mode 100644
index 000000000000..738fbb5b48da
--- /dev/null
+++ b/acct-group/kafka/kafka-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=425
diff --git a/acct-group/kapacitor/Manifest b/acct-group/kapacitor/Manifest
index ddd81dabfbbf..fbaf1497f0cb 100644
--- a/acct-group/kapacitor/Manifest
+++ b/acct-group/kapacitor/Manifest
@@ -1,2 +1,2 @@
-EBUILD kapacitor-0-r1.ebuild 146 BLAKE2B 2566b20d84fd72e33109a545571b5908b4062b89f8ccc0552c5a3925e16ba3b562b3c9a389d47e279e0b47f420cd991721cf582bb3ffea359c455cff08d5e455 SHA512 64364cfa96c04c1db1c5ed750f1da03576039dbf2beaddad00deb880b18ac919405f4218b64b4ab01f21226bbb5b4e3b907c2ae70b4c4bd93e6b05daea0797c1
+EBUILD kapacitor-0-r2.ebuild 151 BLAKE2B 6703c17509ceaa4297915bbaad96e92ee3da45cf6411d6ec3d78618533dda54274c0a80a882f498e3afe339cb60ba7f1d997bbea0342a7bcc1c1c5e19d67fdf0 SHA512 6217a66d57289992f4f93ae26319f299da48db080858a0986db57279dd98fb26b8bc072b50965ccdc50ad5ffc320bc8a0f3f7516d65028e956bb29e88c27ac85
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kapacitor/kapacitor-0-r1.ebuild b/acct-group/kapacitor/kapacitor-0-r1.ebuild
deleted file mode 100644
index 3e998f71108a..000000000000
--- a/acct-group/kapacitor/kapacitor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=343
diff --git a/acct-group/kapacitor/kapacitor-0-r2.ebuild b/acct-group/kapacitor/kapacitor-0-r2.ebuild
new file mode 100644
index 000000000000..3a84f7bcd450
--- /dev/null
+++ b/acct-group/kapacitor/kapacitor-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=343
diff --git a/acct-group/karma/Manifest b/acct-group/karma/Manifest
index 78fe09496b52..90b722587551 100644
--- a/acct-group/karma/Manifest
+++ b/acct-group/karma/Manifest
@@ -1,2 +1,2 @@
-EBUILD karma-0.ebuild 199 BLAKE2B ee6137b960a3bec6c51b4d05232364c2bd79afcef52343542e5e13a1bbe71391c07ab1c04cd324fc5865ff1611a554ac99cf64ac7031c39dabc3fbce92f94f8f SHA512 0779092d8a6c61a478576e972071ddb9a72559e10a1f273c48cc9dde47fa1e50288ae48f8826f12860b63c3df6ae5613e6010b5050bd263721747b70d28421bd
+EBUILD karma-0-r1.ebuild 199 BLAKE2B 0630c52a00e93d818ac7433f1e049304cf71dd7c281cd9b24ca4096ab36a0ad7ca4f108ed86df89aa2edd6fb06b97f3aca486c5cb9db4f2638aa86ffc09cf8d6 SHA512 0e564440229d8dcaf556b449fdf61768f200c75b1587e8de30b2904ec0c129a648d945ec723e166b6c4c900bc5c91a1627d4a3941304b727a34e3994f7dde76b
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/karma/karma-0-r1.ebuild b/acct-group/karma/karma-0-r1.ebuild
new file mode 100644
index 000000000000..68555d5c9381
--- /dev/null
+++ b/acct-group/karma/karma-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/karma-bin"
+
+ACCT_GROUP_ID="118"
diff --git a/acct-group/karma/karma-0.ebuild b/acct-group/karma/karma-0.ebuild
deleted file mode 100644
index 1631d655b6bf..000000000000
--- a/acct-group/karma/karma-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/karma-bin"
-
-ACCT_GROUP_ID="118"
diff --git a/acct-group/keystone/Manifest b/acct-group/keystone/Manifest
index 776ec2a9915d..d164520cc0b1 100644
--- a/acct-group/keystone/Manifest
+++ b/acct-group/keystone/Manifest
@@ -1,2 +1,2 @@
-EBUILD keystone-0-r1.ebuild 146 BLAKE2B 802d5a902859a74c27c497b6953ceec5cae22fa7036a3d034888be01c34a5ab975f53b34574f975e00107a19abe84a26f48fd5e6e59fec4a2a0c0bc475e5701b SHA512 35f2c950a32cf151c678c37739344d8bdd2ed4cfdbd04d917b1449fd164a64a3d8177a602f48b3bbe903dd9a6f5e2b9fb6f0329e33c96de93496f749c80dcfc4
+EBUILD keystone-0-r2.ebuild 151 BLAKE2B db6e379c04f3685790421d6672cb3c50f1f7efd51b8236e60d866e7cdfe2ec3e920d478d7dd5d12c0d8af51077e9f6e4ec448548ceb1af7d3c4a9eb8e04ae39c SHA512 b92ded1a7965b39713d35bcd00ada887ecdac4b99f390ed4f612d9454c0172f5815208209d8450b76a353966fabad0e6bdc7c2a9008b89a797c6b25380593eef
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/keystone/keystone-0-r1.ebuild b/acct-group/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 06d95b537d6f..000000000000
--- a/acct-group/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=445
diff --git a/acct-group/keystone/keystone-0-r2.ebuild b/acct-group/keystone/keystone-0-r2.ebuild
new file mode 100644
index 000000000000..d477d0ca866f
--- /dev/null
+++ b/acct-group/keystone/keystone-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=445
diff --git a/acct-group/kibana/Manifest b/acct-group/kibana/Manifest
index 8131125e587f..aa01d7ed62f2 100644
--- a/acct-group/kibana/Manifest
+++ b/acct-group/kibana/Manifest
@@ -1,2 +1,2 @@
-EBUILD kibana-0-r1.ebuild 186 BLAKE2B 69fb4e21c1b09789c18cec977adea72b4dda37ff7e95fca823e0652664e2fb18bdf0627ca54d9920f1555d83ce3978b38e2e4dcd461e323a6e74b7578a0823ad SHA512 6ddcf5a360bcb844c7f909902a3dc31dc97f7a0858e3b87b7e9319817109581e676334591903ad49f8d73237490758d689058ac3068b8fd19e67fd91d16a66f6
+EBUILD kibana-0-r2.ebuild 186 BLAKE2B 6d40d1bdfe6b952f13aa713c426b6ebd8951971e20cd14506651155383e6807f50762ed3877d82e096bed96e87d8f9993de5deefe5cdea4c8351a3c79da7cb37 SHA512 1ac7ca9c04070a38bdfaed531c29d610ff53b54b755ec792f2746ee71580f4ecc203925ca6b0ad19221acaeb33a7a8a22db1c320d09e25102c79545516678026
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-group/kibana/kibana-0-r1.ebuild b/acct-group/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index 936486fe4773..000000000000
--- a/acct-group/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Kibana program group"
-ACCT_GROUP_ID=269
diff --git a/acct-group/kibana/kibana-0-r2.ebuild b/acct-group/kibana/kibana-0-r2.ebuild
new file mode 100644
index 000000000000..61a710122e7e
--- /dev/null
+++ b/acct-group/kibana/kibana-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Kibana program group"
+ACCT_GROUP_ID=269
diff --git a/acct-group/kismet/Manifest b/acct-group/kismet/Manifest
index 4adf08648521..66746eda475d 100644
--- a/acct-group/kismet/Manifest
+++ b/acct-group/kismet/Manifest
@@ -1,2 +1,2 @@
-EBUILD kismet-0-r1.ebuild 182 BLAKE2B 6dc41fa6526c2ecbaf8d31b99b0590d069701deedcad72e85463c59f10956d5b5571c01a390488dd5f5db2cdfccb326b2000b87b0c3725bc916e5b7de4242014 SHA512 43197679965719a871cceccc4196a87d124d3bd1f0239109f68a03344c0b43b526243341986474dd3cc0417ff9c26ae90d453d982eaf7350aea7420d2d7aad46
+EBUILD kismet-0-r2.ebuild 187 BLAKE2B cdb5fc2eea34ba7653e4ae7e92f85626286a21d38e6bebe68a6aa99d8119d961bf480e0a10209b25248e51b349658109c90f53c5a9ecec6ad591e3218c8e4748 SHA512 d42fd7ce8d1c72cbca9640b33f31f9856058979d0becfbde4580c2df3ee50b70325c134af237dea022a1e9be3ce978d32c33ca9f9c610e3c3b20d5297708ad4f
MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
diff --git a/acct-group/kismet/kismet-0-r1.ebuild b/acct-group/kismet/kismet-0-r1.ebuild
deleted file mode 100644
index cd8df0799bdb..000000000000
--- a/acct-group/kismet/kismet-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="net-wireless/kismet"
-ACCT_GROUP_ID="388"
diff --git a/acct-group/kismet/kismet-0-r2.ebuild b/acct-group/kismet/kismet-0-r2.ebuild
new file mode 100644
index 000000000000..f06dfe9ab2bc
--- /dev/null
+++ b/acct-group/kismet/kismet-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_GROUP_ID="388"
diff --git a/acct-group/kmem/Manifest b/acct-group/kmem/Manifest
index 45b4a5143579..834016da1205 100644
--- a/acct-group/kmem/Manifest
+++ b/acct-group/kmem/Manifest
@@ -1,2 +1,2 @@
-EBUILD kmem-0-r1.ebuild 149 BLAKE2B ea0bd3ca8325c2c3e7665af06678235b636d948b4a9510ff5026dc00944e9085d99c501ba07d5555288b87109df54f86f3c75ab389796c688ea4fe5ffb769db6 SHA512 321a2016b3d957f25bcf41576413017df7bf413c99fa6891c9679dcd0d66d117f423fb1740a6e8bbb309ccc1b066c9bf9547d1be7256bff02d97219e69d80d46
+EBUILD kmem-0-r2.ebuild 149 BLAKE2B b6936e330f69ce8f03524b53078ca3ddcff200a3d7015e06656b05536655b8ee2235b2280f1670ab5f2228eaebd4382d2698d11326c97bb2f7593a548a8ce416 SHA512 0a248bb3833de7330a8027a84dd949c998b4db0208c82b480b04e31efc4fd87c1ba6eb88035f37a43c3ff40a547b0d0a43363af6b1d0ddcdbfea4083ef675295
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/kmem/kmem-0-r1.ebuild b/acct-group/kmem/kmem-0-r1.ebuild
deleted file mode 100644
index b07239c3b2ab..000000000000
--- a/acct-group/kmem/kmem-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=9
diff --git a/acct-group/kmem/kmem-0-r2.ebuild b/acct-group/kmem/kmem-0-r2.ebuild
new file mode 100644
index 000000000000..68e5fd412c4a
--- /dev/null
+++ b/acct-group/kmem/kmem-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=9
diff --git a/acct-group/knot-resolver/Manifest b/acct-group/knot-resolver/Manifest
index cf82a8260ff7..a87da687319c 100644
--- a/acct-group/knot-resolver/Manifest
+++ b/acct-group/knot-resolver/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-resolver-0.ebuild 146 BLAKE2B d1a19144e78fbbd0d969ec4cc230a8ceb19284c634b01410f7a92e4ef1e877f67e3124fc7da391651fa0fe1218f9dd345758a32c1309c6e756c9977092269cba SHA512 fe785f1f7a7468ff6512dccd2ef2129e12621dd64cb488a6f97abfce457b6ad7909d8a58c99ce8bc0e1ee780391bb06173263afe118776396784217ecd1351af
+EBUILD knot-resolver-0-r1.ebuild 151 BLAKE2B e2b2ec4149f1b4bb9a25253dcfdbf222222c4cdb20309177ff296fb2cbd6e21b927c16cd5f11fd37603a55074d7a7a31e5519781ee8c69f5adb7735f8affb76f SHA512 8e65b7d0720ffaf11bd7caf3ae99471eb7ed6f35dd2eb38c3f6daeb4f1be45b6d053072dfdd5e8be4909174dacec1247db7ced3eda1f7d82c0d063fe63ecdb7f
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/acct-group/knot-resolver/knot-resolver-0-r1.ebuild b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
new file mode 100644
index 000000000000..cd9132400076
--- /dev/null
+++ b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=525
diff --git a/acct-group/knot-resolver/knot-resolver-0.ebuild b/acct-group/knot-resolver/knot-resolver-0.ebuild
deleted file mode 100644
index e786894a7da9..000000000000
--- a/acct-group/knot-resolver/knot-resolver-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=525
diff --git a/acct-group/knot/Manifest b/acct-group/knot/Manifest
index 742d4fc21dea..45e4c6b72a2a 100644
--- a/acct-group/knot/Manifest
+++ b/acct-group/knot/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-0-r1.ebuild 150 BLAKE2B afcd002f4fb11e4ce7c3a28fd59b26ddbc036b6a17b8e505dce673bf21fbf72b39493401f0e4bdd8aa19135e80c775776d4cfcb3c2aadb5c017904753ad3895b SHA512 8b3877f5d6e398c2f9b02c891cde8ed8f7e7e06bba88118ccc86ea47e9bc74f1974c93f30d3fef0c7e8615c75efe3f59d31f836a791328669343276b07593fb2
+EBUILD knot-0-r2.ebuild 150 BLAKE2B aca2edcac668ff0276a07c04bbb14297aee6ba67eded7592b587b832121bcd88857391b4b48ec988ecd05e8595ff300ab73b234e693a73f85715ec280a2a3115 SHA512 dcc9f9b14aa9ee3dbb05f52b8bb36e021c8d69b476a4ac4fed0a7944ae9bb54d9be4bab81400b8641c869f853c901684eb213a13b008a18c32d6c2bc73a6d1fd
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
diff --git a/acct-group/knot/knot-0-r1.ebuild b/acct-group/knot/knot-0-r1.ebuild
deleted file mode 100644
index f35128d81950..000000000000
--- a/acct-group/knot/knot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=53
diff --git a/acct-group/knot/knot-0-r2.ebuild b/acct-group/knot/knot-0-r2.ebuild
new file mode 100644
index 000000000000..227d7be2e8aa
--- /dev/null
+++ b/acct-group/knot/knot-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=53
diff --git a/acct-group/kube-apiserver/Manifest b/acct-group/kube-apiserver/Manifest
index 9e3218e25452..1bd3399dc006 100644
--- a/acct-group/kube-apiserver/Manifest
+++ b/acct-group/kube-apiserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-apiserver-0-r1.ebuild 151 BLAKE2B d68d1abef30358b9378d39e2e1c8b3de7a81c2831a9121e286adf9c23188d8bac8a92c8f2e8efad5b3360735844024d023af8575bd6e33585381a7482d99ed6f SHA512 c0905b505bf44cab492644323d80ef6831549dee58102336acb103de1fa07543315c3a9cc048b5a1f380bd9a65cddbb7cd31316d810dfc6ac4771e49b6ffa54e
+EBUILD kube-apiserver-0-r2.ebuild 151 BLAKE2B c645303908b7ce624702d6d951e3f5f7ec04eda18b00ccab8da270d1b4a57d178f802b2bedfda11d6f0dd03ae47c79fcec2237aa5ffb7132402f0e393710e6d7 SHA512 e4cbf09f45848fe9c27ab4e13d9df89f6303d60def2233863d1a69a58a4ee0bece0b3a07c1b8d25fd28ad63cc60e6fb43af12ba4adcac280638c1a9700e8badf
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
deleted file mode 100644
index 52abae9b534e..000000000000
--- a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=432
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
new file mode 100644
index 000000000000..e314e709eba1
--- /dev/null
+++ b/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=432
diff --git a/acct-group/kube-controller-manager/Manifest b/acct-group/kube-controller-manager/Manifest
index 00c8bd1923f5..5d5e0a158003 100644
--- a/acct-group/kube-controller-manager/Manifest
+++ b/acct-group/kube-controller-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-controller-manager-0-r1.ebuild 151 BLAKE2B 3c72dd8271d27d579a00e93a62ab98e176080e33dc2d334ee91088360ad9d5a16c01807275c6c99d64a264319ddfe443f5ec2cca8826d86b9d44f053036ed521 SHA512 5a9e687349803bc6c403c5feb4cd16cfee1290339117aab6dbb01ceab2b4524bbcb29730b6445d3e62e2a429f3fcb5386f1631438bd8fc773023bc5cac82e426
+EBUILD kube-controller-manager-0-r2.ebuild 151 BLAKE2B 07cf3c0bb529655b751a69f70b6ad149384cae557c2ebd8f6078500c60228d8f454fa6e239b17a1ee0c5abf27e3014135f337df9500208735f6fa04c8a94f69e SHA512 d219fb3ecb34c0deba2d5b6bd9a6e6528ab45efd9a84e18bd7fb2232c44cf1d39c1b24a99cf754f024653bf4a4e6ad0cf42e8849c11e3bc175db875c799fa805
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
deleted file mode 100644
index 7fc976b63174..000000000000
--- a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=433
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild
new file mode 100644
index 000000000000..763c1ac5a255
--- /dev/null
+++ b/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=433
diff --git a/acct-group/kube-scheduler/Manifest b/acct-group/kube-scheduler/Manifest
index e32b775e7349..9b10fc81db7d 100644
--- a/acct-group/kube-scheduler/Manifest
+++ b/acct-group/kube-scheduler/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-scheduler-0-r1.ebuild 151 BLAKE2B 96658ba855326fc57a693f2d0dff9e616597c132ae15f3abf5398e1ea79a2b23e0dbcf44c7254fdeaf5004233ef2df8b68d677816da788024ffb7e319a0ac718 SHA512 2c631b3ce0df4e6c0cdf1f6b22cc5f449e9e15cc47fd7c10c3bc97c1d0fdd49b5749dfdc54907fe2ac40b9880d27248623635ead19fe2aae80e02e6bf3d640a0
+EBUILD kube-scheduler-0-r2.ebuild 151 BLAKE2B 6921f8b1a381cdf52728a204654498d5943a6d332c029813734826607f4aaabdb127dccb519e263ac6decb8efde23ade08a9c618b1d8a10825d0b3a714898bcc SHA512 59668584db75f4d45ae08f47280bdc87ee923d5e07d79c5a674e6982e4a1ae8fcbe71ecff5df30d62faff7fbddffa3fd0819388f16d1d9b8b9db63b74660c1bc
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
deleted file mode 100644
index 1b61e2a92b1f..000000000000
--- a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=434
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
new file mode 100644
index 000000000000..9b3c883ca810
--- /dev/null
+++ b/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=434
diff --git a/acct-group/kvm/Manifest b/acct-group/kvm/Manifest
index 373f38e3f26f..69f2d0ff8dfd 100644
--- a/acct-group/kvm/Manifest
+++ b/acct-group/kvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD kvm-0-r1.ebuild 150 BLAKE2B dd8665f1e1db1d9c69cb4f2d71be815a2d5fc5742af346e86f5ba79f27077b4a095e860cffa1707e00fd1ef9c221e85247d6b743e2fdd5ded9a0ef4830eab774 SHA512 5a0be4e0cd8fbbb48f36d94f0d51aefdee999d018f132464ae5d7f7928be9ec840873fcd15680df974ea87d3532a68d92fedb6b1335cc9a6a4b7e5b6ea5648b6
+EBUILD kvm-0-r2.ebuild 150 BLAKE2B d48ebefb710fe5399f19a92eb43b7e6d4b04cfd5596d7f73a47c48b3586c9f69b3caead82e1a1cb8275fbcbd39a8e4ee3c5b425af2e94ea2d503ff4c53978086 SHA512 13313a08d175747ef836f23447be46923cab07aa463d0dced4905df5ad6481fb456605bca8539a55bd98cbf6376284a9ae4b5e7f3ea0e28952382b6ab850a68d
MISC metadata.xml 307 BLAKE2B f3bc564fda062e522caef7e6ffbb50e253b7a17f2ab2f24e7df84cb805bee9d454e3b4bc946c5764464219161ad057177ac7c8911cf3056291b06770d2b1b1df SHA512 fb2e553cd8a6663edc6cfb17d2a41193f970b89efaf93e2f2516b9ca778e8a9426126c4f22cef7535ebc2d99912507e3906fce0170859005ab2e1590632534bc
diff --git a/acct-group/kvm/kvm-0-r1.ebuild b/acct-group/kvm/kvm-0-r1.ebuild
deleted file mode 100644
index eadc9b037d32..000000000000
--- a/acct-group/kvm/kvm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=78
diff --git a/acct-group/kvm/kvm-0-r2.ebuild b/acct-group/kvm/kvm-0-r2.ebuild
new file mode 100644
index 000000000000..125d57ad0b93
--- /dev/null
+++ b/acct-group/kvm/kvm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=78
diff --git a/acct-group/ldap/Manifest b/acct-group/ldap/Manifest
index eff268c0b60b..592f3b55b2a7 100644
--- a/acct-group/ldap/Manifest
+++ b/acct-group/ldap/Manifest
@@ -1,2 +1,2 @@
-EBUILD ldap-0.ebuild 146 BLAKE2B 1bba5b3775242743c7cd0ed70ab235b621f94118cce2b259399293bc465b32f35c7579d063d6a180bcfb3ad12365d8b744c091569382d3dfd2831d06d97540f8 SHA512 165954c77f2cb40f113f1ad10411ac30bb93dd9556835139c0262c7d5924de72a58a57b90082833ab1e555aaf6c492b0d7ebf34b72c3cf22cd8c64554acf7f77
+EBUILD ldap-0-r1.ebuild 151 BLAKE2B aea14a17cefa4e53d6e4cb8bafcba364276d16b5e1af9c646ad160b97192b5cd9c0c1134ab73d32458e5ad2197f837b5149bdf4f3ad2d87a46fff5d8aa6a7b64 SHA512 ed611b86cd45dc9fff99470d76c094ddee8f58bbac831334f0be60cc41b376942d1e533ac223a81c14bdb67ebc50eeed756be246270045a0e040f9b826974f40
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/ldap/ldap-0-r1.ebuild b/acct-group/ldap/ldap-0-r1.ebuild
new file mode 100644
index 000000000000..f90c3a827f8c
--- /dev/null
+++ b/acct-group/ldap/ldap-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=439
diff --git a/acct-group/ldap/ldap-0.ebuild b/acct-group/ldap/ldap-0.ebuild
deleted file mode 100644
index 88f92a325683..000000000000
--- a/acct-group/ldap/ldap-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=439
diff --git a/acct-group/libreoffice/Manifest b/acct-group/libreoffice/Manifest
index ea6f5f78db7d..043444e194d0 100644
--- a/acct-group/libreoffice/Manifest
+++ b/acct-group/libreoffice/Manifest
@@ -1,2 +1,2 @@
-EBUILD libreoffice-0.ebuild 153 BLAKE2B 93bc7b9775610a66a706980848d3738e003cbf2bb00e4f466c0061d2debf6f276a96865cf5e1fb7ea510c702c525caee12b68db3f0cc1e3aa1630417d4940cf5 SHA512 1bf0b96d9e8a6e6b853b91e7d7afdafb0fb30c072d371ac08b2e2e02c0011860b785ae62233e847c86e22cce7ef997a78e3fffc5e7fdb5e102be4ab1e1f940ec
+EBUILD libreoffice-0-r1.ebuild 153 BLAKE2B 3e27287c2d8fce4bb11f5a4a73d8315b1b98881d2a25f62991ee38450a6af906fb2ac413d4e967ea8bd1a5a634f91bf964de8d436c4e58c48ad7550edcc464d5 SHA512 c8ae5cfd9e45d0bb07770eab2ef3e7e11065004b66de583c60a3e63280fd59c679ed5941680b2c50b233d89ea58d45e8040b102523a2311e9b436d8e62ef088d
MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/acct-group/libreoffice/libreoffice-0-r1.ebuild b/acct-group/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..8d9a73b20e9f
--- /dev/null
+++ b/acct-group/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="512"
diff --git a/acct-group/libreoffice/libreoffice-0.ebuild b/acct-group/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index bf052171998d..000000000000
--- a/acct-group/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="512"
diff --git a/acct-group/libvirt/Manifest b/acct-group/libvirt/Manifest
index a7f3044db298..5ad0c88a9b00 100644
--- a/acct-group/libvirt/Manifest
+++ b/acct-group/libvirt/Manifest
@@ -1,2 +1,2 @@
-EBUILD libvirt-0-r1.ebuild 150 BLAKE2B 59cb75a9296ba0b5e63d1401d4c8ef2fcfb8d6ad795feb9ad87d95319375348284e59d84e6f018dcb1f3e312d12a1e8c25a64fb67b76fae95cbd9ab9c5ff3c9e SHA512 e0e6a9a3c6184c02d72a8cbe085d1d2e77bd54397e67028ef6a0939039c8b50ef7746b42855f066c91313e5dec4eaa38cd31db05d390db8bb5be32f95fff8d2c
+EBUILD libvirt-0-r2.ebuild 150 BLAKE2B 1a7eb33c8ce00043293606375b151ac4532ed77c4b3f65861988aab3428215534d9b29b0dca7a7a66befb49a0cf54b7270c0b9be00a3f17e906012ea0cfe0f14 SHA512 f04cb2ad8ccd72f12701e21a2ef13d8929454748004d78c4e629e136e2bb19a12617d077052e10b804abae29a03e09232f827e690983f15d221614c62a28f198
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
diff --git a/acct-group/libvirt/libvirt-0-r1.ebuild b/acct-group/libvirt/libvirt-0-r1.ebuild
deleted file mode 100644
index d9d2709c5851..000000000000
--- a/acct-group/libvirt/libvirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=79
diff --git a/acct-group/libvirt/libvirt-0-r2.ebuild b/acct-group/libvirt/libvirt-0-r2.ebuild
new file mode 100644
index 000000000000..b3143725a005
--- /dev/null
+++ b/acct-group/libvirt/libvirt-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=79
diff --git a/acct-group/lightdm/Manifest b/acct-group/lightdm/Manifest
index f836e5f8564b..097d7a302710 100644
--- a/acct-group/lightdm/Manifest
+++ b/acct-group/lightdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD lightdm-0-r1.ebuild 197 BLAKE2B a7fb16bab90c0d06af0f1fdf81bce8a89a3e282d36362bf2e5a22ed7747feabe240d9fd27ec54cb595276785f5683d70627599b981d9710f5554781dda0d12bc SHA512 c03ba0634bc436c25a5f53e2e0ffca4ab1232e701e1b576af2528fa76812faed21553d9249b263d7de8f3427815ff65f48cf3c48792f22f84b4aa75ddaef44f2
+EBUILD lightdm-0-r2.ebuild 197 BLAKE2B 4a1f0c5a71a4d9fe10cf5256dff2dacd53386243ca02e8532b002f062467f55665f54b1314d9349b82b1809ff63c4652c0c4a63324abee321ddde18b567d4173 SHA512 51ad773207313bdda9c5c0230ad75e924e37f375534bfb2d1b48462199ea84f070648745a745474466d792ba7b55965f70ce2786a6d22889ee24ee70523be510
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-group/lightdm/lightdm-0-r1.ebuild b/acct-group/lightdm/lightdm-0-r1.ebuild
deleted file mode 100644
index e2adc778ff71..000000000000
--- a/acct-group/lightdm/lightdm-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/lightdm"
-
-ACCT_GROUP_ID="134"
diff --git a/acct-group/lightdm/lightdm-0-r2.ebuild b/acct-group/lightdm/lightdm-0-r2.ebuild
new file mode 100644
index 000000000000..45f3a67230aa
--- /dev/null
+++ b/acct-group/lightdm/lightdm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/lightdm"
+
+ACCT_GROUP_ID="134"
diff --git a/acct-group/lighttpd/Manifest b/acct-group/lighttpd/Manifest
index b3f3e93dae86..dcdb56bbd510 100644
--- a/acct-group/lighttpd/Manifest
+++ b/acct-group/lighttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lighttpd-0-r1.ebuild 146 BLAKE2B 7cb39baec7dda61b97a160b5e09068801979e3230fb75622df45a88f60688aad86d8bf2461b12d14c4a19b21efac2d729c0ae85efe6256a6883e669d8434304d SHA512 2b1b803ec1b592e944c0a8a46d3119682c2c199d80cd8bbcf01aea2a6927b920d30711ae0e0c8ad1d79ccd6c403a1787650b5483c644f4c5d33890d3d7ff899d
+EBUILD lighttpd-0-r2.ebuild 151 BLAKE2B 21d96c00156009f30a422ea3789c547269dd62e7b16f2254416861e7dd4a2ad7e027c174c7e70562ba166c24c9d919f2b276d4f1c2a6ad8c4a511e41ca24cac2 SHA512 8ee6a94ec9452d7cdd217d2840df15305001e2493a2fe0254c31192bd9de02e57b0c54734d1007edb9583e9126c668340f29bf9b5c0845e2899153aafa9b0ec1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/lighttpd/lighttpd-0-r1.ebuild b/acct-group/lighttpd/lighttpd-0-r1.ebuild
deleted file mode 100644
index 16dac2e24281..000000000000
--- a/acct-group/lighttpd/lighttpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=302
diff --git a/acct-group/lighttpd/lighttpd-0-r2.ebuild b/acct-group/lighttpd/lighttpd-0-r2.ebuild
new file mode 100644
index 000000000000..044328ed7179
--- /dev/null
+++ b/acct-group/lighttpd/lighttpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=302
diff --git a/acct-group/litecoin/Manifest b/acct-group/litecoin/Manifest
index f3b7b9426bf0..6ad5e79e5969 100644
--- a/acct-group/litecoin/Manifest
+++ b/acct-group/litecoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD litecoin-0.ebuild 196 BLAKE2B 6aba1511d4fd084e305ab75a905ec1ea7de98294db68f1e47f06b9c7719ff075e6432063e0b70aade1c37eabf201a0f44e14953d12deb19c3cb3d7c009853327 SHA512 3b8be3e6a9fb988800546c322dab1dd076d1531ca792ef1b07f3a8c493734ba0d423460e80d2a10308c9c3958e38dc9517bbd8d843e74ab3e3108773275478a2
+EBUILD litecoin-0-r1.ebuild 196 BLAKE2B c4b925d7f94790e41fcee2e93878b0a6580dabd185e729dd292d57c3060111c67f214d60d457b2d877e8ee35d4e040eb8d80e644f12452ac33af780d6dfb3364 SHA512 54a38ecd33d333d9e0bb6c72514cf64a0c0a620c0b129f53bc426ae5aef6b644bfe20aef409737538cafbe50b6d565051fa5572116b040c85c2b144963c23af1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/litecoin/litecoin-0-r1.ebuild b/acct-group/litecoin/litecoin-0-r1.ebuild
new file mode 100644
index 000000000000..f04bbe6599ef
--- /dev/null
+++ b/acct-group/litecoin/litecoin-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/litecoind"
+
+ACCT_GROUP_ID="256"
diff --git a/acct-group/litecoin/litecoin-0.ebuild b/acct-group/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 05549b4b53e9..000000000000
--- a/acct-group/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/litecoind"
-
-ACCT_GROUP_ID="256"
diff --git a/acct-group/lldpd/Manifest b/acct-group/lldpd/Manifest
index aa7453462d4b..6cd39b9e4376 100644
--- a/acct-group/lldpd/Manifest
+++ b/acct-group/lldpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lldpd-0-r1.ebuild 151 BLAKE2B 2e64b2527233fd372fe8cdc85a7091a758a01b40da1ca5863603ac66a064a8d8a2fb23a7e572a05b692b4bded032545d4820c5dced7fcf82a8e89da56bfeb4ca SHA512 7f4b0a82c033ca0a28676d613e40bfd43261de329443462ec0d9dde2d0cdeadcdf123e19c12892b9d9f2514a592c2f71637a703bccf00bea53db32bec0186b3d
+EBUILD lldpd-0-r2.ebuild 151 BLAKE2B 8f3e7b54d70a088fd59162f2ff8809ca9112a94739f63bb2dd8e103142362b5d30bdb99df6390252df64f036acf8d30e37418801d1770b6e78678b7504dd6337 SHA512 95ca51deb35a85b25e19eefd43788ff5d63da60d8894278ebac20f184a09a3140d1b85b5f31c8e1e2345ecda2b9516a724c6110bf80b4ec87df75987e65b5bd8
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/lldpd/lldpd-0-r1.ebuild b/acct-group/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 7482f9b79142..000000000000
--- a/acct-group/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=315
diff --git a/acct-group/lldpd/lldpd-0-r2.ebuild b/acct-group/lldpd/lldpd-0-r2.ebuild
new file mode 100644
index 000000000000..de42bfe44bdf
--- /dev/null
+++ b/acct-group/lldpd/lldpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=315
diff --git a/acct-group/locate/Manifest b/acct-group/locate/Manifest
index ed5701956aec..de60d7510fad 100644
--- a/acct-group/locate/Manifest
+++ b/acct-group/locate/Manifest
@@ -1,2 +1,2 @@
-EBUILD locate-0-r1.ebuild 146 BLAKE2B 63dd494d2b23617970ce4412d94ac16f4ba2cf0b15ff13cfcb28d5b3c4dd3b67c59a5263cbe01e7f99a8b5a260d2cc085ce0088b5f3fcc7d1bb131dfa68b586a SHA512 318518e23bdc9adcb55f0683c3fa5998e7b7ffc553aead8920766200080408953e0e1e74772cda973f4460bb3dbac3e8fa036d6ef404ba813c7f10a23dd1968a
+EBUILD locate-0-r2.ebuild 151 BLAKE2B fb31ec9d6d3ca45b60d78f62fc082a3ac21fdffd9bd86e5091997b27b5b0fe34eb8c7def342a26fb616bc935770a6ca9c4d0d1aca3ac6182111258c1c48fa510 SHA512 86e34031fe500aa5a14070353db4067fc104ee55e75dd1d09311657c66b640b82739919e9bc7939aca55d71bd06e3543e7cba2f65c6d6fc88d0f2b478a48e859
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/locate/locate-0-r1.ebuild b/acct-group/locate/locate-0-r1.ebuild
deleted file mode 100644
index 59071dc6b158..000000000000
--- a/acct-group/locate/locate-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=245
diff --git a/acct-group/locate/locate-0-r2.ebuild b/acct-group/locate/locate-0-r2.ebuild
new file mode 100644
index 000000000000..6cd73ba39ad5
--- /dev/null
+++ b/acct-group/locate/locate-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=245
diff --git a/acct-group/logcheck/Manifest b/acct-group/logcheck/Manifest
index b876fc315cd2..04a19b6dbd0f 100644
--- a/acct-group/logcheck/Manifest
+++ b/acct-group/logcheck/Manifest
@@ -1,2 +1,2 @@
-EBUILD logcheck-0.ebuild 197 BLAKE2B b3d989419ac9ebb9b0319399407cb33397cee4f1a7597e2ed759d77dc175ffcb891833add6ca01462a7bfcc76020843cc944d4631d8c6a03c1ce592a5b15c04d SHA512 b58f79a4aa280f317efee8205fba7b5313d5d2b67a267b861351b21ea73474da3ff1b652dfdd0f2dbca9dc388bc270856ebba2df8c5fa0bc2bbc51369210437b
+EBUILD logcheck-0-r1.ebuild 197 BLAKE2B 8a1eb76ad9c5af3d6812c28af6fb532bd2d1f7f010dce2eeabda940168231a9407360c29da9568cc8715393b014d0f1a7e5ab67c57d960b28713770c310720ee SHA512 d991e52132560f6f0a91b6ec08026b803df0ef66568af9e4fe94fbe248c048607859bb3bebc3a62a6be618cd031c85d70194d284dcd3e8a4f64fbc0977fcd564
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/logcheck/logcheck-0-r1.ebuild b/acct-group/logcheck/logcheck-0-r1.ebuild
new file mode 100644
index 000000000000..8bba51bbeaf3
--- /dev/null
+++ b/acct-group/logcheck/logcheck-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logcheck"
+
+ACCT_GROUP_ID="284"
diff --git a/acct-group/logcheck/logcheck-0.ebuild b/acct-group/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 13e5e4692590..000000000000
--- a/acct-group/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logcheck"
-
-ACCT_GROUP_ID="284"
diff --git a/acct-group/logstash/Manifest b/acct-group/logstash/Manifest
index 6f68cbfc61a7..d6b02bfdacc7 100644
--- a/acct-group/logstash/Manifest
+++ b/acct-group/logstash/Manifest
@@ -1,2 +1,2 @@
-EBUILD logstash-0-r1.ebuild 188 BLAKE2B ed36a4be07db7882f86a99bae2e155926bb5e139ecb8f4a75c7e1f063b4d12596be5ae8bbf026ef1865ae8c313e55d646cb6e99c2b40817cc2d28d70bdc8a9c8 SHA512 507c1b0323222b9b9423cdede2261d2edb5dcedce64a4892ecf49fb09dcf1620efa11e3e2bcacd7a348932a0c5c39b75b347f5616e276a96658ebba8f655338e
+EBUILD logstash-0-r2.ebuild 188 BLAKE2B ba3b2e68d00348f9fa7d7bc7115b49a0a9f4e8ec137cd2b1120d75e434823926ec2ec517630e13752efa844543d40591ee2c3760e36a83102d6ddf3ce2ac8a52 SHA512 d16199ca20a79f9387ac6b1f19703f515e523bb1e92be7727820d11bbafee52855591aecb5f2d107358c158d1d8827b635d7312455888765251bcf26a9882d4a
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
diff --git a/acct-group/logstash/logstash-0-r1.ebuild b/acct-group/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 8253d88b5c0d..000000000000
--- a/acct-group/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Logstash program group"
-ACCT_GROUP_ID=270
diff --git a/acct-group/logstash/logstash-0-r2.ebuild b/acct-group/logstash/logstash-0-r2.ebuild
new file mode 100644
index 000000000000..42641f69f967
--- /dev/null
+++ b/acct-group/logstash/logstash-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Logstash program group"
+ACCT_GROUP_ID=270
diff --git a/acct-group/logsurfer/Manifest b/acct-group/logsurfer/Manifest
index 072f3e604e3c..30787c484df0 100644
--- a/acct-group/logsurfer/Manifest
+++ b/acct-group/logsurfer/Manifest
@@ -1,2 +1,2 @@
-EBUILD logsurfer-0.ebuild 198 BLAKE2B 5e4c3bc7460d1b5d120415d496c86e804c060c164fffd0fd6a69c2b5ae26538e3d1534080adb0149715fccd07dbda24ea163ad009a41806d01d38488f878a694 SHA512 3484f390e1e3072d078dac571615300240cf9a12499ca368792c8279fad5ac313d5cde3f99c24ce2287d802f21266a2853dba128eec68db53516fbd261b48890
+EBUILD logsurfer-0-r1.ebuild 198 BLAKE2B b1d5f3073b7657e25a1eb51c220e2557287863bfea35633d67806202293d6976023953ed4b9b52153c5e237a0f70e092fcb4ea3cde69e20017ecd7320b193494 SHA512 a1756d206d0a2ce227a2de856a52a2d64c7e6241ee320ddde28cebb57dc097c44574451ee7ba8a0c4c90483503e76e0e24aa010d3ed96e40fae7b711a07b97ed
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/logsurfer/logsurfer-0-r1.ebuild b/acct-group/logsurfer/logsurfer-0-r1.ebuild
new file mode 100644
index 000000000000..3d292f5966bc
--- /dev/null
+++ b/acct-group/logsurfer/logsurfer-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logsurfer"
+
+ACCT_GROUP_ID="249"
diff --git a/acct-group/logsurfer/logsurfer-0.ebuild b/acct-group/logsurfer/logsurfer-0.ebuild
deleted file mode 100644
index eedfe2f2838e..000000000000
--- a/acct-group/logsurfer/logsurfer-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logsurfer"
-
-ACCT_GROUP_ID="249"
diff --git a/acct-group/lp/Manifest b/acct-group/lp/Manifest
index 7d695a149c5f..0d44343eb412 100644
--- a/acct-group/lp/Manifest
+++ b/acct-group/lp/Manifest
@@ -1,2 +1,2 @@
-EBUILD lp-0-r1.ebuild 149 BLAKE2B 4e4044cd2f2b0e34c4b2d5776736d2febdc8db2c7d5c8719de2ecc209721a7337a18f8696201b52495216e12917bbbf06f779f33495d23411c9c73027dcd772c SHA512 0e3821fa4ab1a49f1e2c4d96fe7c56a424de909fc6aa1201318e8f2aeabc3379c98ce0017e673f713091b13fcaf22a6ad926bb46ed20b1cf4988e126e60f627c
+EBUILD lp-0-r2.ebuild 149 BLAKE2B df4f8d76b5227d5c88d4eaef450b47768e68165c685706eb790ae5055b714594e0ba0532785f162a594f81d119385eaee989ddcdb443f462070bbc271066330a SHA512 7afd7905ae4e94b262188a6609a7cfa7cc925f4035342b27be32aad874e2fbe63684948540c0accca5edeb7a9b0936ac4d764378009f2e2f3735f5c437b5e179
MISC metadata.xml 301 BLAKE2B 86ad0bddef68521045ebb915b0ba368f84a75abbb241412b62599c2ee8c31697e6a7a01dd432c1b8e233aaeabd3db7593e861c5616256a3f9961b986b8e1da3b SHA512 c021de9a8b6fb3d4e8a5e3d1c17ec4af1864f421df07cfc431e147ed1fb4bc00f2428e988220c162a6732747086ab884b43a9e390bb8e6314563a48e1e2095a4
diff --git a/acct-group/lp/lp-0-r1.ebuild b/acct-group/lp/lp-0-r1.ebuild
deleted file mode 100644
index 9af7c058ba87..000000000000
--- a/acct-group/lp/lp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=7
diff --git a/acct-group/lp/lp-0-r2.ebuild b/acct-group/lp/lp-0-r2.ebuild
new file mode 100644
index 000000000000..618f81be25b3
--- /dev/null
+++ b/acct-group/lp/lp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=7
diff --git a/acct-group/lpadmin/Manifest b/acct-group/lpadmin/Manifest
index 20685f8d7ecd..2b6b91429b43 100644
--- a/acct-group/lpadmin/Manifest
+++ b/acct-group/lpadmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD lpadmin-0-r1.ebuild 151 BLAKE2B fe985ecbb43e35ce631828df68ec9f0a2e3bb7ca45b574e23e55cd0a1be543a9955062de1b20bcd3905bf1bb3a1b4e98df281753a90e30fd58b18c24c5aac308 SHA512 e570517b2fdc74926c584bca705bf23fe25636d6522e94c0d3b22066cdd0825aef0a794912a80a3e193d04c46b2c51167b17e9c3e3204b610c252fd538def7de
+EBUILD lpadmin-0-r2.ebuild 151 BLAKE2B 6d604eaaa87590f194aa99c4d9623aca1a871f1f7248dd6a1e4430d3fe819099fe2f748b8ca1dd2f89b7f4f2a8aa89b8673eeecf8bbaffbb9bb8d99fd84d326d SHA512 57aba1a7ff4a32e174e5f9984c47f0af8dc14ac533ae085ef2f2af046065e53b7acf1db93cc00eada438ea238921dd8c3c69c9cddfa8c9ef9f993acd80db1fdf
MISC metadata.xml 221 BLAKE2B ce23f4ebf10e1e55aa36ba3cb894fd1b38220b6e75aca1d9261563a503cd86ab04c537d6c0740b62865566c76a1cb201e07e9f717a6e53ec899b0bd6827c8624 SHA512 6b27a3121ee6f6cd4e7dc0e1880b6b9b51171196d9739663ecc56d1d8e73ef3d81cda09cab6bcccc2ff3ea98e260a3f9e9c5091b3df20fd08e2b443ec435777b
diff --git a/acct-group/lpadmin/lpadmin-0-r1.ebuild b/acct-group/lpadmin/lpadmin-0-r1.ebuild
deleted file mode 100644
index 3eede12f4ab7..000000000000
--- a/acct-group/lpadmin/lpadmin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=106
diff --git a/acct-group/lpadmin/lpadmin-0-r2.ebuild b/acct-group/lpadmin/lpadmin-0-r2.ebuild
new file mode 100644
index 000000000000..4ef70c955560
--- /dev/null
+++ b/acct-group/lpadmin/lpadmin-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=106
diff --git a/acct-group/lxc/Manifest b/acct-group/lxc/Manifest
index 7ad5c0997e4c..a49d8d3215b5 100644
--- a/acct-group/lxc/Manifest
+++ b/acct-group/lxc/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxc-0.ebuild 189 BLAKE2B 155216bfb081cb9e51eee99b903a6e04b7a48dbd1bcac9fb36078ae0f4b7fc400125500ba9444907bfb36685cd31d629662e94283b895dec2717055fd290251d SHA512 eb693ec967d51cae4d996471d6dc53148a2baca85fdbe0dbbfac8fef45ea70dbeafa9d90356aac28b35353034d62c12b8e04ae9f3e684bc211e32c23fceefa47
+EBUILD lxc-0-r1.ebuild 194 BLAKE2B 53801e58b9978c28f7a6a77f216a69ee213e868654817af9417818f58d25d7e25039f033ac25da38f2c8f20fae2d03c4fc8b8558bb987592a7107850ca99e22c SHA512 0cf6c779f84ca3c75eb58ca0796780d382c6529b1efda4764b6ac300938cc70a35dd26e5b39dd274f043d7015ca20a2085944e81ae9416497e12ef30427fc440
MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
diff --git a/acct-group/lxc/lxc-0-r1.ebuild b/acct-group/lxc/lxc-0-r1.ebuild
new file mode 100644
index 000000000000..32280b0d00db
--- /dev/null
+++ b/acct-group/lxc/lxc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=358
+DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxc/lxc-0.ebuild b/acct-group/lxc/lxc-0.ebuild
deleted file mode 100644
index 5a4d8a9ffcdc..000000000000
--- a/acct-group/lxc/lxc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=358
-DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxd/Manifest b/acct-group/lxd/Manifest
index 6486405cf9e7..ae7fd2772524 100644
--- a/acct-group/lxd/Manifest
+++ b/acct-group/lxd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxd-0-r1.ebuild 189 BLAKE2B f970417ae2f7a8b7380c9fa5bc71395c388160f63e3b747902467eee2c256b7f367e97283cc039af51b7807ecd7218701f5561401f24b1d47cfc39bf8dadc6a6 SHA512 97b99520f8d049bca2e99b27c120ef815121fc00568057de6ab7e4dc5d69032ed765fe618af474d980090c1244c726f2148818ea282f11528f0032127b317c74
+EBUILD lxd-0-r2.ebuild 194 BLAKE2B db30fe63418abe7de473b04c27eb3565d41bb90ca1a3855cae27599f38eac6cf92bcea9f41eaaf7e97c03336fc788ee41fd4fc9eb06e096ce73aaeb06c6e9a8f SHA512 bbd72ab733c06d46428bd416ef6b264f5cc29594783322a202b2f8ae86c2a1f8ee6c22c7e42e3317844f0f184b0d1ee0af8b8e68256bf2679fdf8e6a6428c361
MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
diff --git a/acct-group/lxd/lxd-0-r1.ebuild b/acct-group/lxd/lxd-0-r1.ebuild
deleted file mode 100644
index 4277214c445a..000000000000
--- a/acct-group/lxd/lxd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=402
-DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/lxd/lxd-0-r2.ebuild b/acct-group/lxd/lxd-0-r2.ebuild
new file mode 100644
index 000000000000..3d00c2969023
--- /dev/null
+++ b/acct-group/lxd/lxd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=402
+DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/mail/Manifest b/acct-group/mail/Manifest
index d00f07973bc3..1d936bec8eaf 100644
--- a/acct-group/mail/Manifest
+++ b/acct-group/mail/Manifest
@@ -1,2 +1,2 @@
-EBUILD mail-0-r1.ebuild 183 BLAKE2B d02a954dc4c10edd2a89cce9162654d7ff1b435ddb18eef1443006530e9d5d75d19ce378ef5073defa0baa6041b24367b9aad7f01b4543e51062012a4b2b063e SHA512 b03816e2369e2c60bdbe24533a5057dadc01b677a84af58b674420808bd9231d7a3424cd0cc4f8abbb87c3b08507018ea11aa985a170600caa1e5af5795bcddb
+EBUILD mail-0-r2.ebuild 183 BLAKE2B e51079d08de4ac6adaf06be287a0953b2274a3fc8c1f27fd08704ce19837460b654cba28f8b31718e53cc8614ea174a5fa0692572beb9ac058dc15abd1a5e458 SHA512 6122e77360ba2acd55305584cd8c18aadac02fac40304773f07eb60cad166c2cb2945562f6ce9da41b1141340c838838637ba75b133cfb69b2a36d7fdb0b8f70
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/mail/mail-0-r1.ebuild b/acct-group/mail/mail-0-r1.ebuild
deleted file mode 100644
index 009cc32b854b..000000000000
--- a/acct-group/mail/mail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mail program group"
-ACCT_GROUP_ID=12
diff --git a/acct-group/mail/mail-0-r2.ebuild b/acct-group/mail/mail-0-r2.ebuild
new file mode 100644
index 000000000000..4d07cc2e2645
--- /dev/null
+++ b/acct-group/mail/mail-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Mail program group"
+ACCT_GROUP_ID=12
diff --git a/acct-group/man/Manifest b/acct-group/man/Manifest
index 7482e2d4dbf7..b55ec6c42dfd 100644
--- a/acct-group/man/Manifest
+++ b/acct-group/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-0-r1.ebuild 150 BLAKE2B 393bf4cf84bb826a1a3c94d6de851af5f3772a00eaa83a0c741b37af1dc7e316d34c8416b21579bc8bdb83ebc06abd8b19c768c223bf7e356b4b1e2ef1994de7 SHA512 a2c9bfa148c6ce1456cbe2c8b3e3b76d9f32e9c5b069effaa1f87d606750b9ca0db6010d578926b996c0f98d7f4bcbdd8fa8d0796a84db6eb8db9e491ada19f1
+EBUILD man-0-r2.ebuild 150 BLAKE2B 59695b071eae00e45b00f760262a4ca77d39f4fafd30b256ac42bd5ac1343994197f79165f4666d63673c5c8011257af600882461a541c371871102442ab6393 SHA512 b82a485a15f31c3c153965353be3ba96fc8cbd0271f35e03f3c983abfb22ea14735d05383b687087ac10dbe9ef7327e9dc1d962b254ad8938d575445b9a07d00
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/man/man-0-r1.ebuild b/acct-group/man/man-0-r1.ebuild
deleted file mode 100644
index 77c58e22ae04..000000000000
--- a/acct-group/man/man-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=15
diff --git a/acct-group/man/man-0-r2.ebuild b/acct-group/man/man-0-r2.ebuild
new file mode 100644
index 000000000000..c14861bca27c
--- /dev/null
+++ b/acct-group/man/man-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=15
diff --git a/acct-group/maradns/Manifest b/acct-group/maradns/Manifest
index 43307be24c5a..6a3b1d80923a 100644
--- a/acct-group/maradns/Manifest
+++ b/acct-group/maradns/Manifest
@@ -1,2 +1,2 @@
-EBUILD maradns-0-r1.ebuild 150 BLAKE2B ca34532d6f90cf93065638d4382ec1714f3601d52948950cfa0ea7359ae702c865d9e347ef9c77af103d5ebbf7516c8c70323547700c4e1cbf3c201d18a6a6ce SHA512 aeae32838648374f71b0c69c2ae516aea52aa8323921bf82269d2de050e709d97b8ac67e3ff2c943269ba79d9a8693debea4c2b5007b45c22d0ebce391afb0d7
+EBUILD maradns-0-r2.ebuild 150 BLAKE2B 4336395513c43f8b64e6204c4a14dbef97b61014afe427e53a44a910865ab32ae046779dc8a4f08bb41776d0949a3d89c8bc3e1b56317af29dc7f6d60122f414 SHA512 9f51565fbcf1a36fe9ea3bd0cc13101a8b737c4031ed03d04f1f19ba48d6085c18468284a552b176b1ad23ebd583f4ad996dd28598839b3aa33ba8c0f98b1139
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/acct-group/maradns/maradns-0-r1.ebuild b/acct-group/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index 95932e13cd11..000000000000
--- a/acct-group/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=99
diff --git a/acct-group/maradns/maradns-0-r2.ebuild b/acct-group/maradns/maradns-0-r2.ebuild
new file mode 100644
index 000000000000..9886574c2705
--- /dev/null
+++ b/acct-group/maradns/maradns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=99
diff --git a/acct-group/memcached/Manifest b/acct-group/memcached/Manifest
index 04f4795bec64..da4085b43eac 100644
--- a/acct-group/memcached/Manifest
+++ b/acct-group/memcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached-0-r1.ebuild 146 BLAKE2B 6a68996d704e48f5abdadb81a83044394f9a1579cad6bdf4258fc544731580d6fd0e9e83218b69ba119fb2fa3bbae427175dadd2552c3e51ba9eb6231038bfa7 SHA512 773ce6db883751cffe71dbf19f678ecd150d509c67b1b7bd3d4254ffe06fee9b86503a29f1c1ad858c637b39a25292b10b9b3f57dedbeb63b08eb34411bbb1b3
+EBUILD memcached-0-r2.ebuild 151 BLAKE2B 7f1675b66cfc1b04981689f93ac677c5a3ac0c8bbf95cc4aa64aeee81ded7440e842d4d36677a8eab28362a5a9f0d7f59fd328588ee0da1dffc04904ec021a91 SHA512 d400a3485b858e082fafa7396696064b80da4c9bd27e8cf81061451d9edd39a829a5787ccf818e44eca0b11501a1db0794a23409e5c60bd17ed8f1c0d9acecbe
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/memcached/memcached-0-r1.ebuild b/acct-group/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 02291b5e7a48..000000000000
--- a/acct-group/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=441
diff --git a/acct-group/memcached/memcached-0-r2.ebuild b/acct-group/memcached/memcached-0-r2.ebuild
new file mode 100644
index 000000000000..efcdd1096125
--- /dev/null
+++ b/acct-group/memcached/memcached-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=441
diff --git a/acct-group/memcached_exporter/Manifest b/acct-group/memcached_exporter/Manifest
index b7a2a71e7f04..68841917a5f4 100644
--- a/acct-group/memcached_exporter/Manifest
+++ b/acct-group/memcached_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached_exporter-0.ebuild 146 BLAKE2B 39444a4e322352755f0a14a514ddfad4f5dde5941d657a375d69517a2c36d168ff40cdebca8f5edb7032cc916ff08798e71a30881f7d0c6cd7e868c7c95e87e2 SHA512 13540e7c40192f1deeef6841d4d65ea483de64077c99bbc68f0edc4dc3f3ecf9ea81fd419879eef3d6d0777301e3fe81069fbf7e95e6a8b37e208f0b4babfe9e
+EBUILD memcached_exporter-0-r1.ebuild 151 BLAKE2B 2cae867ec21155e7de106eebdd98468b41d54d0b0277c6803ec352e7d757b4e757a8c1575bc508d8972c049120429d55ad7acbaf49d11eb3738a33d2be25454a SHA512 6b911f75661d757f2780b3e3f6f6a3b711a7f85eea1a2a777d7f79e535c1bd79b27e476f323bfdc30a4fbcc0b1b49a4dcf6112f8eb6e2573253fceb2439e40fc
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild b/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..5e8edc6f6f93
--- /dev/null
+++ b/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=234
diff --git a/acct-group/memcached_exporter/memcached_exporter-0.ebuild b/acct-group/memcached_exporter/memcached_exporter-0.ebuild
deleted file mode 100644
index 294122b7d637..000000000000
--- a/acct-group/memcached_exporter/memcached_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=234
diff --git a/acct-group/messagebus/Manifest b/acct-group/messagebus/Manifest
index 13509a039216..b16002a23dee 100644
--- a/acct-group/messagebus/Manifest
+++ b/acct-group/messagebus/Manifest
@@ -1,2 +1,2 @@
-EBUILD messagebus-0-r1.ebuild 151 BLAKE2B 97d318e579efa38f0bf37441a9e1abfb719437cd3431f33bb23c5e631f90fcc6a1e51de2f35ef9798df68e3a06faf08c8548921251a5f9132722a50ca34d3aa0 SHA512 fe3d52fd76f3062aecde533c81c7228188ef2c5baed52fd5818f32e29496936438d706aa61a02d77fa890535eda007a8371d672ff38ecdad93e0c1a67a2450db
+EBUILD messagebus-0-r2.ebuild 151 BLAKE2B 9a9cb326ee0d5c3e094d90a7b1a2e90d07dca4bd141d5e7e3ff0ba8b8c87f25e703967a6d3bcca38182446ef18e396ac51b86a375da9903f661d8ddf57933959 SHA512 2f35620327b0577a6b35f6d468d2c6adff973b6161a4c8a384193a653b40ac34f52acd8abeb6b841115d62289eb94c2fc22cb7e785b2476de0cf31e8e9029028
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/acct-group/messagebus/messagebus-0-r1.ebuild b/acct-group/messagebus/messagebus-0-r1.ebuild
deleted file mode 100644
index 3e335b806835..000000000000
--- a/acct-group/messagebus/messagebus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=101
diff --git a/acct-group/messagebus/messagebus-0-r2.ebuild b/acct-group/messagebus/messagebus-0-r2.ebuild
new file mode 100644
index 000000000000..c4ee2ee50216
--- /dev/null
+++ b/acct-group/messagebus/messagebus-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=101
diff --git a/acct-group/mgraph/Manifest b/acct-group/mgraph/Manifest
index edb4c97d3ffd..bfde5f8e4b9d 100644
--- a/acct-group/mgraph/Manifest
+++ b/acct-group/mgraph/Manifest
@@ -1,2 +1,2 @@
-EBUILD mgraph-0.ebuild 194 BLAKE2B 97db15c818972ddf81d2f7540a47120b905a64dc33a568b5021644d702fa813dcd274943248635460f5861fb8c1943bfd660c86fe5e86e4f738fb31a97829910 SHA512 c8cbb644a61ad684c22ad30c525be9b35fc79fd195c44e72e2b202ba7779b2298003612f2c3f4f9a85200dad353b181d77340367e237b06ea64ba97a230359a0
+EBUILD mgraph-0-r1.ebuild 194 BLAKE2B 5e3a7495186c000aefc7966b42f3d4fec0cc2257ab4cc6692c9fd49b4c19c1585fb1e894c03bb89b3250b9ae3159764a1aa79a43f9af0042ef70ce5e696257c3 SHA512 3d352867cce0de41083529148565f65f20872b4db0548bb048f1aeedd752d5f15851cee71469d9765d24ef7afedec525cda1029b508e495d3d11ee04c6449d3e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/mgraph/mgraph-0-r1.ebuild b/acct-group/mgraph/mgraph-0-r1.ebuild
new file mode 100644
index 000000000000..77e91ef55a0e
--- /dev/null
+++ b/acct-group/mgraph/mgraph-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/mailgraph"
+ACCT_GROUP_ID=376
diff --git a/acct-group/mgraph/mgraph-0.ebuild b/acct-group/mgraph/mgraph-0.ebuild
deleted file mode 100644
index 04e2463215b2..000000000000
--- a/acct-group/mgraph/mgraph-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/mailgraph"
-ACCT_GROUP_ID=376
diff --git a/acct-group/milter-regex/Manifest b/acct-group/milter-regex/Manifest
index 47a4bd5c8957..21cc077694f8 100644
--- a/acct-group/milter-regex/Manifest
+++ b/acct-group/milter-regex/Manifest
@@ -1,2 +1,2 @@
-EBUILD milter-regex-0-r1.ebuild 200 BLAKE2B 15ed5702911bb43a23a101c18ef136d147e29993ebcee2d003e83a5f57b077ce5166f691383bf94ad6854c197de8e2b04a6b9985e87934645f7fabe812c01d89 SHA512 233156efbadbc807f7e4064479a5cbbe5c3f8527cf635605e1c3372d78ae3351a633f27992fd878edf881d8e475697130cb6b0a3de9cc5da66ca2df0ef487365
+EBUILD milter-regex-0-r2.ebuild 200 BLAKE2B 41ef87e307c71c04d377c81c7608b5589e120ea7d82afbd47d9cd63b375d015ef3eaa06293b9203ae831ed6cbd6ff3dba82bea1086633c748b2c6274c22f51af SHA512 a0423b8776f10488f36e9838da4cfbf3bef33a884e14109c5bc562cb81ff573a3db6e63d3bcc4209e380384d3983da375ff761ffb579f4bbe3b47f815c307a74
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/milter-regex/milter-regex-0-r1.ebuild b/acct-group/milter-regex/milter-regex-0-r1.ebuild
deleted file mode 100644
index 0cf264ba6eb6..000000000000
--- a/acct-group/milter-regex/milter-regex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/milter-regex"
-ACCT_GROUP_ID=438
diff --git a/acct-group/milter-regex/milter-regex-0-r2.ebuild b/acct-group/milter-regex/milter-regex-0-r2.ebuild
new file mode 100644
index 000000000000..5a6247c9190c
--- /dev/null
+++ b/acct-group/milter-regex/milter-regex-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/milter-regex"
+ACCT_GROUP_ID=438
diff --git a/acct-group/minbif/Manifest b/acct-group/minbif/Manifest
index 92411e912580..c486154ad442 100644
--- a/acct-group/minbif/Manifest
+++ b/acct-group/minbif/Manifest
@@ -1,2 +1,2 @@
-EBUILD minbif-0.ebuild 192 BLAKE2B ca5de1baebfedc683bafb75490119456b3cb5c5c4e969f6d6c40d6a77869c709986c77173308d0c5a6bd5ab10be8cc29cf8b19e1b352fb90bc1b47e49921ec41 SHA512 95c7c5d129b8d53c238b44736458238eca0f13a53c705b563c9ab81369d57a21b53ad70b3c2c056eca4d8cbe870a77069dfbdf2290fe596af2980049574e52d1
+EBUILD minbif-0-r1.ebuild 192 BLAKE2B f5adcee63eaf341b62b28ea217d6c78fb203e904f388dcdf323c4f1f633e1600e3e99771d6be754e2175eeaad0778693c54dff4b5546555942cb459f6ea9b42a SHA512 0692244f87a56af8a7e56ceb90c2aaaf747236fbfaa105d864dc10eb3e6a10242a13bafd6662c674f756ae87d380763d87ee1d97a9d0ec0f9a4238c8b7c1c78f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/minbif/minbif-0-r1.ebuild b/acct-group/minbif/minbif-0-r1.ebuild
new file mode 100644
index 000000000000..364bc0f1d192
--- /dev/null
+++ b/acct-group/minbif/minbif-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/minbif"
+
+ACCT_GROUP_ID="260"
diff --git a/acct-group/minbif/minbif-0.ebuild b/acct-group/minbif/minbif-0.ebuild
deleted file mode 100644
index f5157fcd399b..000000000000
--- a/acct-group/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/minbif"
-
-ACCT_GROUP_ID="260"
diff --git a/acct-group/minecraft/Manifest b/acct-group/minecraft/Manifest
index ae70cc428329..e50e148b1f72 100644
--- a/acct-group/minecraft/Manifest
+++ b/acct-group/minecraft/Manifest
@@ -1,2 +1,2 @@
-EBUILD minecraft-0-r1.ebuild 201 BLAKE2B 6d4c95bc217af4456092a7842c9844e8a422bd4ef6b77fc2bba6444aed46edd0624978e4baf17c29b16d1141987d4372fcf86cc272fee1c33054a6832aa625ae SHA512 79a32c21d4d41f05f08828fecdcb7fbc724d13010324450c4bef760fe702544f65a9864b1496af9a656e7d7e1b78bd4d59d981f42770e950d34a503fda37c2fa
+EBUILD minecraft-0-r2.ebuild 201 BLAKE2B 8a571dc255d15b3c4e5b587012e28fa9bfdb205cbdacae76b2f132d81f0470df258840168a493953152478b61e06a2c8d5cd9498df4376ba470e2d4a53571e8d SHA512 057affbd46f27ad7ae9f1784c4dcab390d11cb8390206bd57ba6431cdbf18c52b2cec76d21a04c13cc3f1c02e67fe637a9eea223ba3c551982def285e0f84424
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/minecraft/minecraft-0-r1.ebuild b/acct-group/minecraft/minecraft-0-r1.ebuild
deleted file mode 100644
index c09dd13e6cbc..000000000000
--- a/acct-group/minecraft/minecraft-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft server"
-
-ACCT_GROUP_ID="490"
diff --git a/acct-group/minecraft/minecraft-0-r2.ebuild b/acct-group/minecraft/minecraft-0-r2.ebuild
new file mode 100644
index 000000000000..2d3d01a8778e
--- /dev/null
+++ b/acct-group/minecraft/minecraft-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft server"
+
+ACCT_GROUP_ID="490"
diff --git a/acct-group/minetest/Manifest b/acct-group/minetest/Manifest
index dd0a7164dd07..6b2f38efec91 100644
--- a/acct-group/minetest/Manifest
+++ b/acct-group/minetest/Manifest
@@ -1,2 +1,2 @@
-EBUILD minetest-0-r1.ebuild 200 BLAKE2B 79bb71a778624c35e295efec8bb1573bd5cd0899abdf9130930a7d9ba9a454e77ea444069f53b56938b48fb3c7ff0c57f502281feced3c8aba5983d46cef2b81 SHA512 f6177b5bb5bf717b555b74eb6e302c1ed1751cee578a86a4eb0a2faabaca5467eed579811b463100053d986a4d19896819e184d44baa6fe0f60b5dbc9f1c3fa7
+EBUILD minetest-0-r2.ebuild 200 BLAKE2B 35ffd374b50bf1cbb77e73098c5bddac16efde760edd34998b25c627b18a7a530e06c35525bbe8f845e194306eebaee93e68a54e9819eaec7f7703b7365e9e9e SHA512 cfce77d027e548c42efff4340a039a301643e42a8b26fc11b5309317ce6b994458f78754dde2bbd46ca6160994fc09ee093072266b50107a4ca4d4e9a6c4ac93
MISC metadata.xml 360 BLAKE2B 4867d8ae1f68605b01a06a446474bf19088f0cc57c5b381dd3af707e32bb7727c348b2c59b4ff654551be2ab78ac7ded05a0e258d0601740d27c058bbc08e863 SHA512 db7554cc1f206ef22ee9748d3102d40cb5b1085f5acf3f2cbd732ea11e122da26d20d2065d7184ea4a6b94105b4e53794af339c869f5432cc005e46b4b506545
diff --git a/acct-group/minetest/minetest-0-r1.ebuild b/acct-group/minetest/minetest-0-r1.ebuild
deleted file mode 100644
index 7a81fdf38907..000000000000
--- a/acct-group/minetest/minetest-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minetest server"
-
-ACCT_GROUP_ID="480"
diff --git a/acct-group/minetest/minetest-0-r2.ebuild b/acct-group/minetest/minetest-0-r2.ebuild
new file mode 100644
index 000000000000..0ab3add9768c
--- /dev/null
+++ b/acct-group/minetest/minetest-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minetest server"
+
+ACCT_GROUP_ID="480"
diff --git a/acct-group/minidlna/Manifest b/acct-group/minidlna/Manifest
index f3b248c3bb1d..50db0c921061 100644
--- a/acct-group/minidlna/Manifest
+++ b/acct-group/minidlna/Manifest
@@ -1,2 +1,2 @@
-EBUILD minidlna-0.ebuild 151 BLAKE2B 9d505dfa50cd5799df0ae483cdc727ac6610d18a9218a65faf81f9c3859b8bb79b0a68e9cb0ea6d39f53f13bccfefafe39c111df55abd7ceb3cc0922bc744ca1 SHA512 9231b6a9fc1c3996e9a45dcad3999c3e8665fab0c30f30cd13fe36f3f1c8e59436472f5698189ee71993b968d46b8020796a754b63d546eecc51fe1e6a0e45ab
+EBUILD minidlna-0-r1.ebuild 151 BLAKE2B c1d1f2f79fc20a53a1d88badbdb75c30ef6b60124078f3c37d2020f0a6025d6611ec0fd8ced025a7d5395adcc27356d3bdc5c91c6d4ac60b16837e5a93038050 SHA512 dab8c732fb97177bcac9fe97d3ed0c619d83f1bdecf0ba9103f1f97a87ac8ebdb410bde1bda9c4af2fbbf278abc2de6359ae7f6d7c738de8a65da9b1d0900071
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-group/minidlna/minidlna-0-r1.ebuild b/acct-group/minidlna/minidlna-0-r1.ebuild
new file mode 100644
index 000000000000..0bd234023279
--- /dev/null
+++ b/acct-group/minidlna/minidlna-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=339
diff --git a/acct-group/minidlna/minidlna-0.ebuild b/acct-group/minidlna/minidlna-0.ebuild
deleted file mode 100644
index b6f116a6d174..000000000000
--- a/acct-group/minidlna/minidlna-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=339
diff --git a/acct-group/minio/Manifest b/acct-group/minio/Manifest
index 36346b25c58c..cd433b6f2bd1 100644
--- a/acct-group/minio/Manifest
+++ b/acct-group/minio/Manifest
@@ -1,2 +1,2 @@
-EBUILD minio-0.ebuild 146 BLAKE2B 672553ecf3db4df7649b99519adbe1554e926b9063aa2709b16c50eebe7cb7748c09e62c2305d18cc4015678f5beb71e6a7110f4a6d2a5a774e2cf468e0ac4b2 SHA512 1e167eef6823066fb3bdf7de039b8afb2fc08cab1adb45b7257adc0c2a6540ca142bfc4f194d651da8ca41e5c678f4d67c4994750ef550b5741dfcae42e5f5a2
+EBUILD minio-0-r1.ebuild 151 BLAKE2B a1eb2387786c441ef267100e082d57a23e1e218c5c4733d9c48188c08a29b655bd0f047eb3c396b38286d2d217480c9afe16e1d318c5ce8ba18febc7a621df36 SHA512 5c19401688f509f5782a53f7c30ed290f0751051c999ff832d95a804aaeaa4258ee10ef56046fadd3a478cedeabc115912a7a7e6c12e20557dc7520aadcef553
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/minio/minio-0-r1.ebuild b/acct-group/minio/minio-0-r1.ebuild
new file mode 100644
index 000000000000..803a65bb10f2
--- /dev/null
+++ b/acct-group/minio/minio-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=309
diff --git a/acct-group/minio/minio-0.ebuild b/acct-group/minio/minio-0.ebuild
deleted file mode 100644
index 692376c4968f..000000000000
--- a/acct-group/minio/minio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=309
diff --git a/acct-group/mogile/Manifest b/acct-group/mogile/Manifest
index 380f50904a75..290da4bb4364 100644
--- a/acct-group/mogile/Manifest
+++ b/acct-group/mogile/Manifest
@@ -1,2 +1,2 @@
-EBUILD mogile-0.ebuild 180 BLAKE2B 437a74e6323fc20b2e356a00c63ed6d28528871efd86ac2a68413110299c4c969a08a414050a350735b753dc177d729a9470a20239b50f5afe1e004d3908dc38 SHA512 a5f8a330a8fd2bbbc9fde1c5aa80c7e6f5c62074607a0a2fa7b4222039e7c49f9c428e5829f1a9218c327610f9cd696ef52cfa569a0e1960113a72b5811e37ad
+EBUILD mogile-0-r1.ebuild 180 BLAKE2B c527b575ce262e8ca3c8bd43ccb7a816af12f1d55d5752008c6e2c62b3fff597da90bded8e1bca3c15f8ef9b5b8a62620e4fb8e964c790a852062ff649ddecd8 SHA512 32d3eaa1186e80756b5fc736823feffb396c8f5fe2db7c0e8ce007b48b313ae472515c32c6477b325ba6b3851d2d22430de851c49792a7734382d0cdeb4cc1bd
MISC metadata.xml 296 BLAKE2B afccbded98b241e31d1d4810d0213d05e04f65e55d77540618e3508976acd9cb381c5ff54ffe36d0d88da75c22d66b0df4b785c33fc5b3f5a8c6695f1ce207ed SHA512 9ee502a57c0e4eb85ae2a1e8b0d6d2a3ba2d8e96d22610728441201d1ff4050b447a194f0da401e33c7e4ce91b5abf04b85f08e70c286e2c739edda5aa4dbec0
diff --git a/acct-group/mogile/mogile-0-r1.ebuild b/acct-group/mogile/mogile-0-r1.ebuild
new file mode 100644
index 000000000000..fae6fd78811d
--- /dev/null
+++ b/acct-group/mogile/mogile-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MogileFS group"
+ACCT_GROUP_ID=231
diff --git a/acct-group/mogile/mogile-0.ebuild b/acct-group/mogile/mogile-0.ebuild
deleted file mode 100644
index 7774948b6b0c..000000000000
--- a/acct-group/mogile/mogile-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MogileFS group"
-ACCT_GROUP_ID=231
diff --git a/acct-group/mongodb/Manifest b/acct-group/mongodb/Manifest
index dc7c4c17d91d..641db92e49b2 100644
--- a/acct-group/mongodb/Manifest
+++ b/acct-group/mongodb/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb-0-r1.ebuild 187 BLAKE2B aaf15e283ac917d6a293267fd1694cf1bddcbdcdfa3e17509405426a449c2f2d6d82fc4e24ee4429e8366ecf92c965cf7d5831165c444fe2b2743c062c6699c2 SHA512 5558890d1ec1b4978a145c1102fcbfb0a4baccbe0b2f5b098de9ddf7bbe78dc0cdee18578fdfc21a79fa796d7e4c0ad5ed396c0825d8c07649847ff0affb718d
+EBUILD mongodb-0-r2.ebuild 187 BLAKE2B a738bf7fd489811052893d4b104ad55ef08e3059f94ae062b7170bd803ac6127af42c58c829f7db9dc5036687df29aa60d6aa6b898858faf79fc66a5d31724ca SHA512 2f790d5c4b2fb7fd96f19b709cc3028b36b4bd7291115b5849cda06585f39cf3fdb02d83b1e5c3d4c0bc37d4fafda037a988641748da017052f804aba45b6fe7
MISC metadata.xml 506 BLAKE2B 914c508b2299ec351b57287f94ab25b016f8f6459a5de86da19b40850a9a90c364218a867589963d471becd19c93b73adb668787aa0134ffd2005b4d39fca7ee SHA512 d94bdd1e741af6d113f86aa60e837c3249ec74f11c6878a6932ecdf8c420968e2236a04bcca8e33ae77d7fd3029e7dbc78054167ef6feebfcab998ca527a677f
diff --git a/acct-group/mongodb/mongodb-0-r1.ebuild b/acct-group/mongodb/mongodb-0-r1.ebuild
deleted file mode 100644
index 72c2f3ebbfbd..000000000000
--- a/acct-group/mongodb/mongodb-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MongoDB program group"
-ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb/mongodb-0-r2.ebuild b/acct-group/mongodb/mongodb-0-r2.ebuild
new file mode 100644
index 000000000000..edfa300f4fe1
--- /dev/null
+++ b/acct-group/mongodb/mongodb-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MongoDB program group"
+ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb_exporter/Manifest b/acct-group/mongodb_exporter/Manifest
index d5b87401a53b..708ea1598b82 100644
--- a/acct-group/mongodb_exporter/Manifest
+++ b/acct-group/mongodb_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb_exporter-0.ebuild 146 BLAKE2B e270af01bf868143b87fa65a08349ce9a48c4ed9980aeccea0211e8c8fa2e9427387ddeadf4640a7be867c0232159a879075f53ae756ea3f7cfe2f2377bf0ae1 SHA512 e7d0ff072fa4103d5f605410a51b636e538d1d32f6b7a84f0e8b1c42704550736fdb3cdef91e90ebe74bd51e0422a58d68fcf23482e50bc258928a775e21dad2
+EBUILD mongodb_exporter-0-r1.ebuild 151 BLAKE2B 71e441c4245978c8163ee794ce76f5bd6da309a2a2a94b61d92d126ed7ccb3dbbde2e3ca80bc069e63a9cf0132bf731193d02ab89cf3acfdc62d12a326a8b0a2 SHA512 82ad5f1a34e11337597150d630940804f9cec971af780e8f6b3f2a3795b5a0b784302f46734ea60c7d598c0c0e640d95af8edbd19943f4d7b3952ab83de353b9
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..be67ddc21397
--- /dev/null
+++ b/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=277
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
deleted file mode 100644
index 946813661ba4..000000000000
--- a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=277
diff --git a/acct-group/monitorix/Manifest b/acct-group/monitorix/Manifest
index 6901b5548e9e..ad42f2c04827 100644
--- a/acct-group/monitorix/Manifest
+++ b/acct-group/monitorix/Manifest
@@ -1,2 +1,2 @@
-EBUILD monitorix-0-r1.ebuild 188 BLAKE2B 4347eca1e5330bc5f1f2c9d2e516e7af08bbe681ff416249f055f08606a75f9c09b877ede39a66e355c1d08a9a9194da856db99d780ee9b1ed6437a0b2b28e81 SHA512 ecce9a44b19fa8b20da9f2e74d243641d845af8d7ab60222159ce95ca345744cf59beeeaf484983a691d2d5837492835262a149d4fa7d11c5ea7f9ae8c498b63
+EBUILD monitorix-0-r2.ebuild 193 BLAKE2B 9a842b9268a317e5938729742829d92ee888ee122ae86489a688db160b24f14e4df1996b83966d755d1e44c6b17cea7a1b2d219e4b063c3319908b0fb3c376a9 SHA512 e554d6cecbdd2551799847172d7a436e8920d0539413483e6dabb9b791b5ee80cdbcc4cb85a18821750a7a002af5711f5ef112ea48d8d07f190524dfd83937dd
MISC metadata.xml 391 BLAKE2B 9ead41308785d3c5c7733cf997c688ae1ee8584c5eb379d8a03f14921a7597aa28951510c0bff8d5a0ec80df5b13864f34dd2b2ed962ddd870b3777187b0e09c SHA512 af160187c0209c791cfd8d497da9a9ff4b6fc3762300e309d5d75df2571fec2b52bdba990b2d13667d3fed5cf50e6d3938b70683e53d0937adb15e4897ca49d8
diff --git a/acct-group/monitorix/monitorix-0-r1.ebuild b/acct-group/monitorix/monitorix-0-r1.ebuild
deleted file mode 100644
index f3a179de66cd..000000000000
--- a/acct-group/monitorix/monitorix-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Monitorix system tool group"
-ACCT_GROUP_ID=401
diff --git a/acct-group/monitorix/monitorix-0-r2.ebuild b/acct-group/monitorix/monitorix-0-r2.ebuild
new file mode 100644
index 000000000000..54384a731a69
--- /dev/null
+++ b/acct-group/monitorix/monitorix-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Monitorix system tool group"
+ACCT_GROUP_ID=401
diff --git a/acct-group/monkeyd/Manifest b/acct-group/monkeyd/Manifest
index 7df066a9a7f9..9f8519016e7e 100644
--- a/acct-group/monkeyd/Manifest
+++ b/acct-group/monkeyd/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeyd-0.ebuild 200 BLAKE2B 6d586274beb543fe6774793606ad298b19bedbf4a1e4f72353333047db8ba3d09f1d589b2b33f020d4ef9c74f2c5412a248127660ee02324e95eb8bead6efd18 SHA512 8f77053946db48d3a523ac5319a4955ea554f458da68bfe4c8ecbd4243a43a106966c06672ca37ce51ff96fd6164bc43540319e9112947370aa3d74a93d6efcd
+EBUILD monkeyd-0-r1.ebuild 200 BLAKE2B 6e5ea12841f0a4beaa05224e4f878da3ec36495a63641bc8a805b1d816c1682c37bdd89f221f125a99d8100f206af95d0ad65560c111de4b42e9b6b951546217 SHA512 f91f5a3e593933768d2e6e3db79070c77df53f3810721c2aa30263235146f64fa1c396cecefd5b48c7a949c7feb95296658d394515a087d82de12e04b3559343
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/monkeyd/monkeyd-0-r1.ebuild b/acct-group/monkeyd/monkeyd-0-r1.ebuild
new file mode 100644
index 000000000000..e27300e4a43b
--- /dev/null
+++ b/acct-group/monkeyd/monkeyd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/monkeyd"
+
+ACCT_GROUP_ID="149"
diff --git a/acct-group/monkeyd/monkeyd-0.ebuild b/acct-group/monkeyd/monkeyd-0.ebuild
deleted file mode 100644
index 6869bd2a7451..000000000000
--- a/acct-group/monkeyd/monkeyd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/monkeyd"
-
-ACCT_GROUP_ID="149"
diff --git a/acct-group/monkeysphere/Manifest b/acct-group/monkeysphere/Manifest
index 54eaa10c6a8e..37721c4cb712 100644
--- a/acct-group/monkeysphere/Manifest
+++ b/acct-group/monkeysphere/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeysphere-0-r1.ebuild 188 BLAKE2B a5fa947fb024afc08bbe0dd4c2ac82fcdab9d2c56d7b350acd4ac2901fd82da140034fd0d981ea47787442bb424d5bb80b5ba9a95b1ab8fc4cbdc67f45234db4 SHA512 74225f94940989e6424a54a0cd9216f24fcb9b35c2f23cfdafe85ae218ad6b9296d8082de0c3b497e117799e8ac9922fcbe95069ca6625d8c932beb17424bfa3
+EBUILD monkeysphere-0-r2.ebuild 193 BLAKE2B 9fda991d31b7084520e0b3fb171ad02cca6c0e26d385779c695e4314d62b2aed52f6d7a57d8f8009837a21ee498631f4cdae22e19135383e4dc8878865fcee01 SHA512 b1b4af84ad1873c06e147bd08a60b59470fd73f9cb8d93a8a63f3fc0270784e91595a09d2434d591fab0c68dd4db8b57ff875353b2747d5741d4e00f54e1fce8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/monkeysphere/monkeysphere-0-r1.ebuild b/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
deleted file mode 100644
index dbbab8a361de..000000000000
--- a/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="monkeysphere program group"
-
-ACCT_GROUP_ID=390
diff --git a/acct-group/monkeysphere/monkeysphere-0-r2.ebuild b/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
new file mode 100644
index 000000000000..a0ff0762a9af
--- /dev/null
+++ b/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="monkeysphere program group"
+
+ACCT_GROUP_ID=390
diff --git a/acct-group/mosquitto/Manifest b/acct-group/mosquitto/Manifest
index 8b22f9325dff..b7246accd4f3 100644
--- a/acct-group/mosquitto/Manifest
+++ b/acct-group/mosquitto/Manifest
@@ -1,2 +1,2 @@
-EBUILD mosquitto-0-r1.ebuild 203 BLAKE2B 96dff333d4c3f641940f7a16af6115168305ad14c50c861bb5be3a00539a21fb2f83afcf527fe2a796c0f6ede56527e6c91984629245568aa3d6671afc8321ec SHA512 f0d953d1d855925abf4f747e083efe4a8cadb0bffaca50caa4241c28e780de6fbf5c2ee4093a812609b32fe195f2287d0a271b363c3e796c863898b365c1f7fc
+EBUILD mosquitto-0-r2.ebuild 203 BLAKE2B 35eaa49b7aced977eda6e5cab85e8713aaa7de3df1bcf8b03367afca40b379f3d4de98e7aa9547541a7fdfd4c1e3b2cb900eb513ec99eb156474c8c1c2eeac95 SHA512 424bc3f91dc0cb0920f3d3bf4c708a0fe7fbe1e2e7fd46318e06f95c6dcc7171ccf2eed4003e2f5d300acbe56eb6dadf15fe10c1b6d745ecf53521da1d0eb4d6
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
diff --git a/acct-group/mosquitto/mosquitto-0-r1.ebuild b/acct-group/mosquitto/mosquitto-0-r1.ebuild
deleted file mode 100644
index 7c23d70d81c7..000000000000
--- a/acct-group/mosquitto/mosquitto-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the mosquitto MQTT broker"
-ACCT_GROUP_ID=482
diff --git a/acct-group/mosquitto/mosquitto-0-r2.ebuild b/acct-group/mosquitto/mosquitto-0-r2.ebuild
new file mode 100644
index 000000000000..791a2328f351
--- /dev/null
+++ b/acct-group/mosquitto/mosquitto-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the mosquitto MQTT broker"
+ACCT_GROUP_ID=482
diff --git a/acct-group/motion/Manifest b/acct-group/motion/Manifest
index 19fa6807dc05..0f10750ed971 100644
--- a/acct-group/motion/Manifest
+++ b/acct-group/motion/Manifest
@@ -1,2 +1,2 @@
-EBUILD motion-0-r1.ebuild 146 BLAKE2B 578075e210c48d0089d306ccee22081474383c156386e1b25f2524f98250aa29f82a7091608499a7c6372209718995c1bc75db3af62c516c31511d257cc89d5f SHA512 5b20c9f5a214b8fa077e331707a9f9fa9ba3bbac2b5bfd19c12938d23170a098eeb8bb5c50736a68a919da5d6097e5fa29d03338ad696609a44b4ea50a96a4d0
+EBUILD motion-0-r2.ebuild 151 BLAKE2B 879a78638edd8bdf2c021011aa06f742d9c5ace061faa2653e69a865f63b34c18f899a1fcb4b7edf7e4c8cb74909b38b8f2f830a386fd12c9c79b0825e3004cd SHA512 bba5badde514a479e82fa9bd041aa971eeb966653f19e1df0d5c951e7ad5481cbbaa2223eebd06c1b88638602b8c79532aa20ab4dddfc6caf0dd56a51bcfd19c
MISC metadata.xml 396 BLAKE2B c23e0428f6d197596409734471aebdc88231ccdc6abf3b132414ac1c4a2aa933017b5d6368b018e8e91ca1c01f38c49933af23888f2a6eb3b9e333eee0677d81 SHA512 c5fbc86f53d46fda14e9268883cad59049f01e2f356185af9a0d0ab8d5e76de69923768027bfd0d3fe02af6af2c008adcfeed20f3d312a8bf458fa655376d19e
diff --git a/acct-group/motion/motion-0-r1.ebuild b/acct-group/motion/motion-0-r1.ebuild
deleted file mode 100644
index 596311157273..000000000000
--- a/acct-group/motion/motion-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=395
diff --git a/acct-group/motion/motion-0-r2.ebuild b/acct-group/motion/motion-0-r2.ebuild
new file mode 100644
index 000000000000..e62c9b8e5c62
--- /dev/null
+++ b/acct-group/motion/motion-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=395
diff --git a/acct-group/msmtpd/Manifest b/acct-group/msmtpd/Manifest
index 017783b8692a..a363bb6a757a 100644
--- a/acct-group/msmtpd/Manifest
+++ b/acct-group/msmtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD msmtpd-0-r1.ebuild 151 BLAKE2B b4421a820cbdedb643b4f8e29faeab7f9f978d30cb386af6e58f6b237c190351da29b9063b7dc408fa83af456472f2385b663e167247b976af1e821e6ff6807b SHA512 1203526c8655d0e41a0b3eca8b90cc8cab126c06915246dbf3f7c59068c78488375f314065455dbf7378d74ee43d8be2d24cc7a119dc002f2caecc4a57c77598
+EBUILD msmtpd-0-r2.ebuild 151 BLAKE2B b4f374b2908ac29ee42602422bbdbb9fda9c5949025976833ee591c3f4749936e1ffc3c3929c1ae5004b1523811789b1984c5fcdc288ad3df3607a85004c889d SHA512 d21d4b1a5cdfa3b4c50255c34144d2e3718940ee2a6bd3dd7934dcf77516468cd60fc04cb77d2a523e5ab8219783e454c5268ddeb960f32a12223d7cf6a71d29
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/msmtpd/msmtpd-0-r1.ebuild b/acct-group/msmtpd/msmtpd-0-r1.ebuild
deleted file mode 100644
index 42d6078fc96f..000000000000
--- a/acct-group/msmtpd/msmtpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=222
diff --git a/acct-group/msmtpd/msmtpd-0-r2.ebuild b/acct-group/msmtpd/msmtpd-0-r2.ebuild
new file mode 100644
index 000000000000..de4f2dbcb1d5
--- /dev/null
+++ b/acct-group/msmtpd/msmtpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=222
diff --git a/acct-group/munge/Manifest b/acct-group/munge/Manifest
index 5e26506d10d8..2ea00f933bfd 100644
--- a/acct-group/munge/Manifest
+++ b/acct-group/munge/Manifest
@@ -1,2 +1,2 @@
-EBUILD munge-0.ebuild 195 BLAKE2B ba7588db342e2d031b3d5a4ea43755f98fa4e9ffdfb2cae8abb93904d818720f56b91c59353a9cb0518a6b43b69868979f98ffaf023908aa59ef419735781560 SHA512 ea0b09ab44300d1cc8a4f6d8755dd2dab64dbf8adbb1f22bb725163129352cf27498c0ccb4b588718bd8cd399c09b01009947232da0f5b3f87f23208165d908e
+EBUILD munge-0-r1.ebuild 195 BLAKE2B 2238d5fb768ae5f63e1a10625d6950174decfafa014b3bd0918ec919d4cdd727897f270737a076be1de52b7c10694908040f07624243a72a0bd69666fe30917e SHA512 39613934c915a38330186c4784ac32c5df35650e4f786b6558311f198aad8c75edce7cd790755928bb0f1d8300ea67cf734bb62b5b8d937b14a99da47cfaa65e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-group/munge/munge-0-r1.ebuild b/acct-group/munge/munge-0-r1.ebuild
new file mode 100644
index 000000000000..fbd452f5355a
--- /dev/null
+++ b/acct-group/munge/munge-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/munge"
+
+ACCT_GROUP_ID="144"
diff --git a/acct-group/munge/munge-0.ebuild b/acct-group/munge/munge-0.ebuild
deleted file mode 100644
index d51744087c22..000000000000
--- a/acct-group/munge/munge-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-auth/munge"
-
-ACCT_GROUP_ID="144"
diff --git a/acct-group/munin/Manifest b/acct-group/munin/Manifest
index a552196afaef..ee6a04cb0855 100644
--- a/acct-group/munin/Manifest
+++ b/acct-group/munin/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-0-r1.ebuild 151 BLAKE2B 3ebf44ee080bd2336747d1da660e1bdad2d274bcc7ef2383d6df192985aa909e17ac2e2ebe845ad76410b3bde4c9907a7f61c5e72b0b6e1d7edf7bb90e821e60 SHA512 5fbb18d85eb9ccb62aac4a11814e6f5b2c1152e68e114b736979171fe802811e8070407685325403cc1c0d45555a41d60be5f49f1fc7113772a9299584a787a3
+EBUILD munin-0-r2.ebuild 151 BLAKE2B 69cdb0e071971eca40d11ee63073d88229488693f8266d385e5aef456e526064cfa85cf6a0e29a8012fba5d9a4fbe2ace74cef949f90ad250e754ea129fe670a SHA512 68629e012acccb44da2830b9d732b218e63a3e586f7e575631de8fb637cb8f3be7ba5a2c03e3620ad18fd20e3e154448a9fe563eeabe8c16277e021651bf66e7
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
diff --git a/acct-group/munin/munin-0-r1.ebuild b/acct-group/munin/munin-0-r1.ebuild
deleted file mode 100644
index 0a7dafb4a9d9..000000000000
--- a/acct-group/munin/munin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=177
diff --git a/acct-group/munin/munin-0-r2.ebuild b/acct-group/munin/munin-0-r2.ebuild
new file mode 100644
index 000000000000..dd3de035605f
--- /dev/null
+++ b/acct-group/munin/munin-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=177
diff --git a/acct-group/murmur/Manifest b/acct-group/murmur/Manifest
index ebc50e858c08..65decacce58f 100644
--- a/acct-group/murmur/Manifest
+++ b/acct-group/murmur/Manifest
@@ -1,2 +1,2 @@
-EBUILD murmur-0-r1.ebuild 151 BLAKE2B e63e55bcdeb536f3e9639259292b8b3ac5ec7930fdc81686acf8e95d5799f01598511a39cb6a83609e6134d192c232f994ca147dc7c7affe2617bc011febbdaa SHA512 a14a5341cb986eddafdaeba3e2e50ecf64e48b468cbe082a1ba5ed850ff57aff1125666a9e6ffdaf8243eec64d68d58026b92c4cb11dd7beed328dae0697a525
+EBUILD murmur-0-r2.ebuild 151 BLAKE2B e1584b186618c544502ae5d2e7d4f65187da705f1a2da66c6233fc1b47233cdc7ddc68bac94f0c90062e69cf9dccf580ee24aa58e1ddd33457bd813f671cadd4 SHA512 a64c980306d0456aa68a2552c932b1749b7b84589bdc213a8311d623c8289f5d9595fead47f357557fd5749e31264fb4642daaede2da2f5f62b6999022e35a54
MISC metadata.xml 259 BLAKE2B d393fe53508d06da051d73863657c1cf9f63ba80d8217c3c17ed754a7e652bc90be692dbb619d2a5e3e1d0dd258a6019c7b9a7aec0597bcc0f63e2f16c60774a SHA512 3292858f61d9b06b284b4cae18383cbd9cacbee726291402e1b3cd104f9498dfeb4074c6550ff64b5ef374f40d3d329b04f2f3010be782ff06e896d4c666c925
diff --git a/acct-group/murmur/murmur-0-r1.ebuild b/acct-group/murmur/murmur-0-r1.ebuild
deleted file mode 100644
index 301727364fea..000000000000
--- a/acct-group/murmur/murmur-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=122
diff --git a/acct-group/murmur/murmur-0-r2.ebuild b/acct-group/murmur/murmur-0-r2.ebuild
new file mode 100644
index 000000000000..a7bf8b136eeb
--- /dev/null
+++ b/acct-group/murmur/murmur-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=122
diff --git a/acct-group/mysql/Manifest b/acct-group/mysql/Manifest
index c7315bd7866c..912c8dec91d7 100644
--- a/acct-group/mysql/Manifest
+++ b/acct-group/mysql/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysql-0-r1.ebuild 193 BLAKE2B 49da2816d643868d9cf15e3fc735acaf2d7ed2f26deba6d28583a943fe2628862cadd30a0d9c2a2c621acb2afd24c7afc0b63f8fb459e2d13ff4ae2f7e96ce3d SHA512 1fe3ec73a00253548a1fc6bcd861dd9c274c6f7fc3a0f0b3a435347bc06f2d5fd0f5267c496d174f970b54299d39c4fe97a106eb28b763a8892ec0d42d356367
+EBUILD mysql-0-r2.ebuild 193 BLAKE2B 9e0d8188d9cee1e819944deb8b857e7d5bb4d1aea79a54d67cc5c1a1d993e01892433cc04eeb48772963fe7f309dbef28e96e4264da1a354e03049e23da7d62f SHA512 533730cf488bf85c92b565e0969f4466bd84067d7cfd1a8d78c9e8b7c9075fd128bf46cb1f4c7ba7de73980112448e8a94d7b050f7f257bf2f487dcbf89a9dc5
MISC metadata.xml 258 BLAKE2B d72173be6096a07ac4d2cb3e8cc161e6d817e7bf3f3b87c82c8c490403d67487ad3f4d65edb951b3a9ddfbe38a5c2a28b335436fd14f7af773d630a61d34f2e8 SHA512 25f8d8e566c979bffdcba13749feacf7d50ed10ec9099018bb18984d97dafbadb4787b4e49e618658390afa31c86531d08d27e13ff8119a39195d6dde26d9b6c
diff --git a/acct-group/mysql/mysql-0-r1.ebuild b/acct-group/mysql/mysql-0-r1.ebuild
deleted file mode 100644
index 872b4a6bb7d8..000000000000
--- a/acct-group/mysql/mysql-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MySQL program group"
-ACCT_GROUP_ID=60
-SLOT="0"
diff --git a/acct-group/mysql/mysql-0-r2.ebuild b/acct-group/mysql/mysql-0-r2.ebuild
new file mode 100644
index 000000000000..c3f6923ca9ce
--- /dev/null
+++ b/acct-group/mysql/mysql-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MySQL program group"
+ACCT_GROUP_ID=60
+SLOT="0"
diff --git a/acct-group/mysqld_exporter/Manifest b/acct-group/mysqld_exporter/Manifest
index 7cf08842385b..cb14eef77bec 100644
--- a/acct-group/mysqld_exporter/Manifest
+++ b/acct-group/mysqld_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysqld_exporter-0-r1.ebuild 146 BLAKE2B 579609b1c39fe382bd1a39edcb95807d77cb3c64ed3b88255c114bb0fb908d88b7adbc766b451d258186f640af282fd10203b8f2fa669a9c2843b4afa630219a SHA512 db0633ab47606e06653193476952d4e9f2f500eccb899cb1e268ccf792f485a9d67f2d0b40785071a311eac1dc70b9a5251c8f3129a2b4bb9444da52d7bc52a5
+EBUILD mysqld_exporter-0-r2.ebuild 151 BLAKE2B ea6d341b60b80f8d00cd9490548d80c02d5af148de0534787464e0ac3a1c83ff54ebf8a11134cba8b8abd759daf85b44ae2fbe5020948474efafecc37c0eb595 SHA512 ec4d59c2050b1bf878fa930fb53c1740fec25f36e16d01612694ddc7db69828e5ea1a1ead7afb7b3bf5f6f82212b65962bbaa33039a1e1ee76e6a6d3cfb98f02
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
deleted file mode 100644
index 4b0688ae2798..000000000000
--- a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=308
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..6abb65361f3a
--- /dev/null
+++ b/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=308
diff --git a/acct-group/mythtv/Manifest b/acct-group/mythtv/Manifest
index ecf7a3c4fdbf..8372f0f821bc 100644
--- a/acct-group/mythtv/Manifest
+++ b/acct-group/mythtv/Manifest
@@ -1,2 +1,2 @@
-EBUILD mythtv-0-r1.ebuild 205 BLAKE2B 6ec8e3e27a08b26192e1de51b800d478839b609a6d671187a61eec9a3958a0e55b53ff90a055b7810783763b89712b5d2a473c3d5908802d90b05c65e6de8f9c SHA512 2a679c86bb3f914ab48be0eafdb9c62e3a7b38c47a2714695983ff284b1bb2489db9e752619d08b0f313462b3defef66184632c5d8aefd1b84473243bfdb6de8
+EBUILD mythtv-0-r2.ebuild 205 BLAKE2B 8c13607a964fc3b615d33b76925cbe7e2346c22d38db06e005138826f2b88510dcfe40a4509c8478f979e2745cf919944a10b2fe4a59fd3cee695b3ecb6363a4 SHA512 3e2e48bbd71d2893f212ff1c4392842be5b8fab6357b86a15a96681acf6590ff077af2227d68cc62870ef869ef230242b0912056a4824d7e6d6a9cef414b19fd
MISC metadata.xml 496 BLAKE2B e22557387c28a1116ab1766aaa52ffd256b079cc8cddb3930c112ce912947f32376129b579e9bd80c9f11de245b7fbe1ff64e1ccf26ee575886b0cddc0577cd4 SHA512 64909e19b147996b6e0798de36c038148169be312e0e3546f9818baead0adfb264a6184a37ede327ba3890881f39fd38707ee06341b140d7589b9a9021c2026a
diff --git a/acct-group/mythtv/mythtv-0-r1.ebuild b/acct-group/mythtv/mythtv-0-r1.ebuild
deleted file mode 100644
index ef82259b7b02..000000000000
--- a/acct-group/mythtv/mythtv-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mythtv mythbackend server/deamon group"
-
-ACCT_GROUP_ID=117
diff --git a/acct-group/mythtv/mythtv-0-r2.ebuild b/acct-group/mythtv/mythtv-0-r2.ebuild
new file mode 100644
index 000000000000..1bae0b27c841
--- /dev/null
+++ b/acct-group/mythtv/mythtv-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Mythtv mythbackend server/deamon group"
+
+ACCT_GROUP_ID=117
diff --git a/acct-group/nagios/Manifest b/acct-group/nagios/Manifest
index 28e1a0ad27ed..d814944d1b19 100644
--- a/acct-group/nagios/Manifest
+++ b/acct-group/nagios/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-0-r1.ebuild 151 BLAKE2B dbffed0d81911eb858097a037e6d4aa9e47b971a53c49dde628ca092b7b3ea554f10b3f44f832873e7644eca1bb10989b299d4d8033e00b4c7410f64c3e4d4e0 SHA512 93e70152cc37fe15fe60ebe6433f73c9d9fd73f68f3871d94c92ba0231792a4000ab1cce088b582adde0d797013bfa21a2074382dd7ca988d1cb1ec02bf1e2ea
+EBUILD nagios-0-r2.ebuild 151 BLAKE2B 9e0290f1fc1ce30d1998fa169dc39379d303335e98a32cc4b770c38fbec53039dac071f2328a360483ef2e428924c38192c74d8beef04d907a66389adb27a6bd SHA512 d2cd587dd157eb0018302230eb215ddd0c16602838e1c817cfda483195a779783ee160936b83bb4f7478a00dab657fe7c468e9fe5840429ef9e3ca4282eecfc8
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-group/nagios/nagios-0-r1.ebuild b/acct-group/nagios/nagios-0-r1.ebuild
deleted file mode 100644
index 4d2ee9d295ea..000000000000
--- a/acct-group/nagios/nagios-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=436
diff --git a/acct-group/nagios/nagios-0-r2.ebuild b/acct-group/nagios/nagios-0-r2.ebuild
new file mode 100644
index 000000000000..57bd2f5d883b
--- /dev/null
+++ b/acct-group/nagios/nagios-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=436
diff --git a/acct-group/named/Manifest b/acct-group/named/Manifest
index 75a71401489d..aeb94135a7a9 100644
--- a/acct-group/named/Manifest
+++ b/acct-group/named/Manifest
@@ -1,2 +1,2 @@
-EBUILD named-0-r1.ebuild 145 BLAKE2B f2dcf872885c94761dcaedca38434160ae93d9f28c17b80f3591ad2b5afc59319e215ccd73cec6e6d23585fbe6cae2a1e00a254ec0278ae3e14e89720aec0c4f SHA512 a243157555f25dde112ba4850cacc94d4d9a0f67545c4d72d6d68fc5596fafb81412f00e2f235307cf791c8b8473f511b7857418657c9cf2b78f73d1f265a791
+EBUILD named-0-r2.ebuild 150 BLAKE2B dd80ba8bc1f3cacc2355af066bd414aa8bbe9167a929d3a4f8b2baf7c7774f414a34fccd1cdc597fcda351918fa87c33cd2dba6b039f1f3fecd2bd613140ab7a SHA512 4fde18850b6b9846ec645bce7781ee61081f8fe0d31b90e898e951c0ee44bb8e3fb7a65b2e040da540237d7987984d8ebdc1731ded338750d721078f3399af31
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/named/named-0-r1.ebuild b/acct-group/named/named-0-r1.ebuild
deleted file mode 100644
index fb6bcdd96000..000000000000
--- a/acct-group/named/named-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=40
diff --git a/acct-group/named/named-0-r2.ebuild b/acct-group/named/named-0-r2.ebuild
new file mode 100644
index 000000000000..ddeeb7029d58
--- /dev/null
+++ b/acct-group/named/named-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=40
diff --git a/acct-group/netbox/Manifest b/acct-group/netbox/Manifest
index 499f32ceb8d9..99eb89b7ee88 100644
--- a/acct-group/netbox/Manifest
+++ b/acct-group/netbox/Manifest
@@ -1,2 +1,2 @@
-EBUILD netbox-0-r1.ebuild 146 BLAKE2B 9ba1fd4f4cccf6fd843428c0934f0f76f1d8cc0009c80c65d00a451be31c7863e0da5e2a7bd8f9b757251eb38cc2f8f25602883ff8bd93d96fc8f2df8971f84d SHA512 be9b318a14c33d35222c416135e756f8eedb13f857d452d3934e85184e21ede9f81b2c68ab7343d464dc1972054e4c12394de3d125bb9cdcfbaac255f0027964
+EBUILD netbox-0-r2.ebuild 151 BLAKE2B c95516ed796b5f2bc89a3d6d336e3437a1969d86265037e37ee465581af3361a2f79175b5ee28cd7f957656ad9b7af3be62d469f1dea52b08398a987caface14 SHA512 1dd833a3fa35f1e611780b6c25615e0a74460bee7d10f9f9c566c9bb2485612dbe0600d8f695073be16104eda8371a9c18ada85fb7c08b4e6f0fb3164886554d
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/netbox/netbox-0-r1.ebuild b/acct-group/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 84d5f36743b9..000000000000
--- a/acct-group/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=431
diff --git a/acct-group/netbox/netbox-0-r2.ebuild b/acct-group/netbox/netbox-0-r2.ebuild
new file mode 100644
index 000000000000..4043cbd07462
--- /dev/null
+++ b/acct-group/netbox/netbox-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=431
diff --git a/acct-group/netdata/Manifest b/acct-group/netdata/Manifest
index 7feb3b66cb57..eb1cf892f13e 100644
--- a/acct-group/netdata/Manifest
+++ b/acct-group/netdata/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdata-0-r1.ebuild 151 BLAKE2B 2107243979f441ef2196817152ee98b917cf72d2618f6e92d90c4bae545d19323e36ead5d2730bfccfd775e36d0706ca370b4fa2662243d1670d5778e70431a3 SHA512 14c4f110574249858b65185909808c3bf63f939728f059e33b2b2cb6f2f84e9a4a542422858de67a7dface89336e3293297439d274e8ff6e9bbc7ea4d1526f68
+EBUILD netdata-0-r2.ebuild 151 BLAKE2B a4d4fecf591793508bc2c311d6ea8b04a4aa4d280333c158b5315609a109f1c0545daa58542645438e41f29c39bb71ea6cb275d800f68865bdd18ef26018711c SHA512 30ce78c7ae5b204bf503447767b4ad1681f73779b0329fab26649a37f880dd31089fbef9dbacdbaea03901b1898e5b95e846af6e05a27e61c29d9ebe7d93140e
MISC metadata.xml 255 BLAKE2B 5c405696da1838a5ef8da4bb3a32993157261b449cd28da0cbfb24fa2f33ea1a15ec1415fdeee87c2c051b023c58208065b0cdfdd5de15d648ab675420d9a2b6 SHA512 df4870842bef82cb206492fb14b03f0195dab3fd6aa1eed1c6aeb9c57978bfa68fb37a523ee3d8591937e750dbb52579e24b245e0213be6805b5ee461392cc12
diff --git a/acct-group/netdata/netdata-0-r1.ebuild b/acct-group/netdata/netdata-0-r1.ebuild
deleted file mode 100644
index 7cb3b1013662..000000000000
--- a/acct-group/netdata/netdata-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=290
diff --git a/acct-group/netdata/netdata-0-r2.ebuild b/acct-group/netdata/netdata-0-r2.ebuild
new file mode 100644
index 000000000000..38db03ef5a1b
--- /dev/null
+++ b/acct-group/netdata/netdata-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=290
diff --git a/acct-group/netdev/Manifest b/acct-group/netdev/Manifest
index 20600b416720..1b8c0b781c2e 100644
--- a/acct-group/netdev/Manifest
+++ b/acct-group/netdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdev-0-r1.ebuild 189 BLAKE2B 50c5141f0361f0ddd62c6eb0b71b6691f35ed7e72da485cf19b29e6c0c10ed890fd1cc3cdd39252ac7693e004ab6bd587aed662153313ad5bbe8f9abf941491e SHA512 3a3de6f7da7bdeab9048541470222f8899765c76864c3e0b7f41a32d96e3f0376bde5307025907c1f31a65132a5e7c5f6a6ccfd610e96affcdc9d1e5efee48db
+EBUILD netdev-0-r2.ebuild 189 BLAKE2B b94baa6b4f55508847cf836bad51b52f27929e584a8845054126d0ccf910737643b93f6f785316d76f25b125d880b826a81699700dc2e01104ffb3dd8631804c SHA512 6de75999b6311d41dafd3d3dfa86e41d5e05b6ec40a8c129ebccc765648e66adc18c6a90a617c0e985b694f96c36abeca8c501c31e404f4f63b04a6b304156ef
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/netdev/netdev-0-r1.ebuild b/acct-group/netdev/netdev-0-r1.ebuild
deleted file mode 100644
index 9dbe3bcb29fb..000000000000
--- a/acct-group/netdev/netdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for netdev (avahi)"
-ACCT_GROUP_ID=64
diff --git a/acct-group/netdev/netdev-0-r2.ebuild b/acct-group/netdev/netdev-0-r2.ebuild
new file mode 100644
index 000000000000..8841c2494070
--- /dev/null
+++ b/acct-group/netdev/netdev-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for netdev (avahi)"
+ACCT_GROUP_ID=64
diff --git a/acct-group/netperf/Manifest b/acct-group/netperf/Manifest
index aa1cd9c94580..550feb56fa56 100644
--- a/acct-group/netperf/Manifest
+++ b/acct-group/netperf/Manifest
@@ -1,2 +1,2 @@
-EBUILD netperf-0.ebuild 201 BLAKE2B e4910d32e12de0f9ecf4014c3b92b6a405fa0bb5f106c5aba2c741c1f6601d3509ed90ab126e64982c8ab3083490da24e5c674f65e431116a0b76f725dbdba94 SHA512 efbdafe04392a0e340a938efa062959dc249235acf50889bde6a9f1447d84246dcb2ca7dd307feb378cb74527faa81611ec7a676938ec493178c7ffd83f06542
+EBUILD netperf-0-r1.ebuild 201 BLAKE2B 3dd426001c463c6236e1852cead04d68d76ee966fbdd2a60d1c3250fd7c5f8caaf819fe7a3ca80afc18697e9fbaa0f0d4413ea771df4262d92acdefc6901d5ba SHA512 f9dea76c3ebac8d751b92ea816548906823eeabde18b9ca5d2cd8f6cdda34fbee8bd0f8f52714c521d74aca8a15bbafbbd73573d4998a2c88c00f0a4c1a42cee
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/netperf/netperf-0-r1.ebuild b/acct-group/netperf/netperf-0-r1.ebuild
new file mode 100644
index 000000000000..eed641e94964
--- /dev/null
+++ b/acct-group/netperf/netperf-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/netperf"
+
+ACCT_GROUP_ID="168"
diff --git a/acct-group/netperf/netperf-0.ebuild b/acct-group/netperf/netperf-0.ebuild
deleted file mode 100644
index f4a3499b161f..000000000000
--- a/acct-group/netperf/netperf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/netperf"
-
-ACCT_GROUP_ID="168"
diff --git a/acct-group/neutron/Manifest b/acct-group/neutron/Manifest
index 4f9c217e9fec..be7133b272da 100644
--- a/acct-group/neutron/Manifest
+++ b/acct-group/neutron/Manifest
@@ -1,2 +1,2 @@
-EBUILD neutron-0-r1.ebuild 146 BLAKE2B 32629da4e9b9e59a55418e455ab77037135d6055715d9e5c6ba7adea17a4ca80f5f0fa9d6d6d33bc733b5976cc6ecf94cf00401df72efe55576ee3255e51205d SHA512 a73186f848b8a3eca8fed271c60c8e8ed11d93219a6ccf3237c52364f609be2a5202ae4fb1dfa3e59e635e40769fd6e1092e45ed9572db89caf504a1108b3264
+EBUILD neutron-0-r2.ebuild 151 BLAKE2B 8b0c674b688cdbeb4087c1192f75ec993c0f90c29ad1f630c5eef2bd9a57d397a83589114a9e552d3a4924d741f460c85a270dfdbcdb41c6bb063e55395d5da7 SHA512 fcb0dba91d0ed37ac2b9bcd0d2c7befcfa337312ad0c0475a7d91f7ecfd4928b5b8d3f7ed768c8475e0db01bcbf1f58abb961164777dc244cc602805e1b34686
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/neutron/neutron-0-r1.ebuild b/acct-group/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 90ea9e731a2d..000000000000
--- a/acct-group/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=446
diff --git a/acct-group/neutron/neutron-0-r2.ebuild b/acct-group/neutron/neutron-0-r2.ebuild
new file mode 100644
index 000000000000..d8a95c80e8a1
--- /dev/null
+++ b/acct-group/neutron/neutron-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=446
diff --git a/acct-group/nginx-unit/Manifest b/acct-group/nginx-unit/Manifest
index d52498e59f32..f9339c755245 100644
--- a/acct-group/nginx-unit/Manifest
+++ b/acct-group/nginx-unit/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-unit-0.ebuild 203 BLAKE2B 72830e2222621769e42d9ccaab77d6b0574289a6625fbd627936e72e6b60351cda6ad753e3342c071a1f11ebee7fbac4b6e64f5e625a929d15a829f39a91f065 SHA512 626e6b8eee1bbbf2bce0db0a122dd842e914f7db8138ce4039923dbd7ba52faca1d1684a1f9b3fbed24eb0d5ee0449fbb9bce0b9d49202272948ce7f151a61cd
+EBUILD nginx-unit-0-r1.ebuild 203 BLAKE2B 72830e2222621769e42d9ccaab77d6b0574289a6625fbd627936e72e6b60351cda6ad753e3342c071a1f11ebee7fbac4b6e64f5e625a929d15a829f39a91f065 SHA512 626e6b8eee1bbbf2bce0db0a122dd842e914f7db8138ce4039923dbd7ba52faca1d1684a1f9b3fbed24eb0d5ee0449fbb9bce0b9d49202272948ce7f151a61cd
MISC metadata.xml 223 BLAKE2B 095cbe9aa757b7e872656ee3f17c562e1628cbcc794c9776c46c6edb22e30ee62d077a5ec6a59f26fc453bea96c643cf710e773a399651bedebe8a5178f56344 SHA512 33143373e4f170a675d3f9edd8439432444e03242e1e9cae2166e5e2b189ba1401ecbf93a7496999faae23851c4de60b705b9598a59b97894dc89d6aabc4bd6b
diff --git a/acct-group/nginx-unit/nginx-unit-0.ebuild b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
index 004f55765547..004f55765547 100644
--- a/acct-group/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
diff --git a/acct-group/nginx-vts-exporter/Manifest b/acct-group/nginx-vts-exporter/Manifest
index eae4d347fb82..7cb0fb2871cf 100644
--- a/acct-group/nginx-vts-exporter/Manifest
+++ b/acct-group/nginx-vts-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-vts-exporter-0-r1.ebuild 146 BLAKE2B 3b1466fedf886daef1c928679eba89a56d77bab4fc417ef80a12281368b0a4548b35b0c51ce074ba0d3a9339668ddf5fc6039d6099b79643c6a21b72ddbe3f86 SHA512 4d7c015bb913a582e777202ce5722d8fb9e27280959a3da0a8dcdf3e32ed0f784198205547cbbda6a2fae531dbc61d9797fa7d0bfa5167b1ef0a9e67c4271947
+EBUILD nginx-vts-exporter-0-r2.ebuild 151 BLAKE2B a340d114305c1e9d4e8fab39a6765b2122651f9e99515d9f1e91b4a3371eae67fa10ae1b648daabcf7d0bf02c7fefc74a8636255d37246008248778b08fb7689 SHA512 2b56183b19cfe40f5dbf8013a44608dc8e30bc4539b5b719cf6ed31a05983a06b6c0ba5dc45f3a1e72ca9525f25e5e11dd1a932c6376ac01929fcc28e9d06bb2
MISC metadata.xml 258 BLAKE2B 14fff3c5ded754d49480aaad0bf53ddb8cc4d824c072af60647f5bc179aebe8902564c877b9ac0199384d2823b1950a6c48cd2c6297c604e0d2f92c276a9768d SHA512 2d2417fd604c1e3dd12bcb46d06e08b1acdf2117eea460d115f66f0114a6daf2a3dbaae7af7ae74625398d336f5759a6e5456f4f1d0104bcae4e74265f6a0e54
diff --git a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
deleted file mode 100644
index 07125df90248..000000000000
--- a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=354
diff --git a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..392a6c4025f1
--- /dev/null
+++ b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=354
diff --git a/acct-group/nginx/Manifest b/acct-group/nginx/Manifest
index 08da48c4b9c1..657e04180764 100644
--- a/acct-group/nginx/Manifest
+++ b/acct-group/nginx/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-0-r1.ebuild 197 BLAKE2B 9aac7743c1006267a372c60997947739a656de576975f9dd8a90add559d1819b151579a2c5c264fae2e683cfb27c7ea12ded6c9dc39b7baa02cf7bf23819bd24 SHA512 77579daa5aba7b5717c25627daca987051f733790f4a2ff2949fe291600d184e6ef033508531b262e74aad484d7d354bd707e9f456b203278c3f3ad2c718c228
+EBUILD nginx-0-r2.ebuild 197 BLAKE2B 6634aaf47ef5981a2da844e54bae5649291f20476989c82c2acaa17225e609ca6cbf26941adfaceb3862fa78eb85b2202c21de559f7c49f7333715c4265423b9 SHA512 527afc6785f6103f7a557faf3c4ea3a62899963111ccd79fac56add44b5f1fa9e3ddcce891760e3028b7a940bb1164cd6db1e8676140115509da5f94af73e02c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/nginx/nginx-0-r1.ebuild b/acct-group/nginx/nginx-0-r1.ebuild
deleted file mode 100644
index b326e769a163..000000000000
--- a/acct-group/nginx/nginx-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/nginx"
-
-ACCT_GROUP_ID="82"
diff --git a/acct-group/nginx/nginx-0-r2.ebuild b/acct-group/nginx/nginx-0-r2.ebuild
new file mode 100644
index 000000000000..bca1e3ecda27
--- /dev/null
+++ b/acct-group/nginx/nginx-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx"
+
+ACCT_GROUP_ID="82"
diff --git a/acct-group/ngircd/Manifest b/acct-group/ngircd/Manifest
index 9f6a75bbd013..e310207ca511 100644
--- a/acct-group/ngircd/Manifest
+++ b/acct-group/ngircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngircd-0-r1.ebuild 190 BLAKE2B a2eb4052a88c3d82aa3ccfdcda10e7e539839c54b4d16d71f5e2f3495be4db86749093d9377972870d8621a6b4e98d9d2d6a2aca1389334717de387ddf9ea39c SHA512 b3a581a9dedf0dac14ccd92a275553c02ef981b2f923008030f4a363112fb40568d3416a8687486b1093bd5aef997ac5bb52f32063d582ccd3365d4d370d9b52
+EBUILD ngircd-0-r2.ebuild 195 BLAKE2B 930e996afbe43d39069242a5c9ba5a2fd0718ee96b53e36717dd502c0586241f4c87b0f65276e9f2941476e466fa97b250a391db1d12537e06d79bb0a344a307 SHA512 2d90565b1badb5543d232ee4af180d86a4ffde6718c80c19120fab8fea1bc5b9697f5b7332fb1b12d2e31dbe2f97331c4be8184586bf237cb94c6eafdc17d9b6
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/ngircd/ngircd-0-r1.ebuild b/acct-group/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 54e757d68d33..000000000000
--- a/acct-group/ngircd/ngircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for ngircd (IRC daemon)"
-ACCT_GROUP_ID=413
diff --git a/acct-group/ngircd/ngircd-0-r2.ebuild b/acct-group/ngircd/ngircd-0-r2.ebuild
new file mode 100644
index 000000000000..ea2849f0ea6d
--- /dev/null
+++ b/acct-group/ngircd/ngircd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for ngircd (IRC daemon)"
+ACCT_GROUP_ID=413
diff --git a/acct-group/ngrep/Manifest b/acct-group/ngrep/Manifest
index ded4fc145221..577dd1d6324d 100644
--- a/acct-group/ngrep/Manifest
+++ b/acct-group/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0-r1.ebuild 199 BLAKE2B f8df4a2844817902ce9c8d9e88c698dbafed83067e064dcfb41ab2ed8ea9b8778ef2604adeb13f927bf2145f3b6ce84728b2a619b9393e39cc450f01e8fecd65 SHA512 c87cb919c6e986cc304fc13240b45ec7569fbbd3c2e27c4db50c6e80a03e72f70b1b6ac685c94872f5a218369e450533927c5503c3dbecbbb45ff36a7f5e7e5c
+EBUILD ngrep-0-r2.ebuild 199 BLAKE2B e4b224fdcc2f43d364d1011f0d5abf78f0c2bbf2acc5d080441fc422b3725b1c54f3e8e3c9b775253443cfee3f14d70db2361ce95264437783b9bcdc661721a5 SHA512 5ce1505baf110f1177ec8b0f26d9fd9984056104f3ae7480515b81e186a4e6367cb997348bc5fa6d09563205a9ebaf9a4fdaea2b2e59ef403fc4d7daf2b81d25
MISC metadata.xml 625 BLAKE2B dccaf7134c266c36cbb22380e96e5dba09a7b9ce70285cc21c10168b236c7b17e7dd52e3c84dfe4a311ab600263159f7acf04243edefdfa00937bc43d54b71dd SHA512 3f7d9d8ee4647bded5bf3b73b7fe5489b19b82e27a8e0150f08a6f3cb1a2dfe9292591ab4d378f897e09d98d77b276960aa756d22af7affb4ef2e40b90737003
diff --git a/acct-group/ngrep/ngrep-0-r1.ebuild b/acct-group/ngrep/ngrep-0-r1.ebuild
deleted file mode 100644
index c01e5f34d05e..000000000000
--- a/acct-group/ngrep/ngrep-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/ngrep"
-
-ACCT_GROUP_ID="185"
diff --git a/acct-group/ngrep/ngrep-0-r2.ebuild b/acct-group/ngrep/ngrep-0-r2.ebuild
new file mode 100644
index 000000000000..4953ba08691d
--- /dev/null
+++ b/acct-group/ngrep/ngrep-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/ngrep"
+
+ACCT_GROUP_ID="185"
diff --git a/acct-group/nm-openconnect/Manifest b/acct-group/nm-openconnect/Manifest
index 5a0306cb39c2..8d497975fb2a 100644
--- a/acct-group/nm-openconnect/Manifest
+++ b/acct-group/nm-openconnect/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openconnect-0.ebuild 215 BLAKE2B 3a0fee76befe88ccb1dd8581420fed87c926ba5308ea64676ab754a2736d043eaf4aef24a3c77c8eb35f0015611c5772115d426e19a4f233fa83293de929b183 SHA512 6f0780ae8f0c6112e84838bca4fd3f21d5dd38738fe80829a31c3a1831a71a6dec93ec16fc846eb746c338d2a2601cd08aea0a86b1cc46b55be0aa3f8f72689d
+EBUILD nm-openconnect-0-r1.ebuild 215 BLAKE2B 6bffc326b21029fe47d9321f1c2faede45ee33122ffd869c8cee28e33454f170d9cc97dd46d14d76afb92c2d58b0f363fcefb22f970345a3b70a2924d4185b7c SHA512 b2c9301dd582208f449e493ac724cebe4b9ee1c1e806d0b7d785892961b44768e0230f4e892af87787d7e2f3c5e1b15a39c10216422c0a16bfd9c22c983259d9
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild b/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild
new file mode 100644
index 000000000000..90d1a5c1369f
--- /dev/null
+++ b/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
+
+ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openconnect/nm-openconnect-0.ebuild b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
deleted file mode 100644
index cf11b4322042..000000000000
--- a/acct-group/nm-openconnect/nm-openconnect-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
-
-ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openvpn/Manifest b/acct-group/nm-openvpn/Manifest
index 3649f31f3cf9..ca55ff3291b9 100644
--- a/acct-group/nm-openvpn/Manifest
+++ b/acct-group/nm-openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openvpn-0.ebuild 211 BLAKE2B b490a9fb057d16fece1720e2e50b09d6f81a71fc0520fe932f979068d1dc78b3819e882a036e887056c9a32fe254161b331a56fa330529d5b9d788f93fb9d5e6 SHA512 8cef0fec22ee80dc3d9b3f3c334be6cdfe16549a0aae2df4eb1c3e2b9a9ee72559fd8566711d3fa520099c43e30eb6bf7f533b1e2a2d7984a42b71fd6fcdbc4d
+EBUILD nm-openvpn-0-r1.ebuild 211 BLAKE2B 740d057dde0a44b165e5a20c7fe83ebeb85dc1854677e5f2edf29397ddd05379c3aed5e346c0b5973fc12c15c15c6fcbeffb143129260cf71e39de0258035d2a SHA512 aa492b649e9cb0e88303a655d887c808f555ae3f47d661ff226f0f0597116ee738cf69e8048449d8d9e92ec29a4a22d7e9667a39a5571199c9bdbe527f1af4b3
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild b/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild
new file mode 100644
index 000000000000..c97d1aab90ef
--- /dev/null
+++ b/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
+
+ACCT_GROUP_ID="143"
diff --git a/acct-group/nm-openvpn/nm-openvpn-0.ebuild b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
deleted file mode 100644
index 2c34fcd00534..000000000000
--- a/acct-group/nm-openvpn/nm-openvpn-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
-
-ACCT_GROUP_ID="143"
diff --git a/acct-group/nobody/Manifest b/acct-group/nobody/Manifest
index b4d86f5a71d9..e4e586c3b705 100644
--- a/acct-group/nobody/Manifest
+++ b/acct-group/nobody/Manifest
@@ -1,2 +1,2 @@
-EBUILD nobody-0.ebuild 174 BLAKE2B 530f12cf22e355c0c37a3fc2840a283e67cd99b7602130eb68a90eb8d9cc5286b278d5c62c983a440abf16534c8a3c7e01199b0458408b8ff73a9a3cb56467d5 SHA512 158c3040bbf6ee4061027b477eab8eefee93e6e34b5cceda93e19b4791e24ff3bb60c86e38544b4b4ed29a44f5b5a9b470a6a1572b31d264c570f9b00c255574
+EBUILD nobody-0-r1.ebuild 179 BLAKE2B 02f2ae52eb2de462d52b91fe1ce45ad533f6f98ab32c0b64f62de469f858107b4db859d0d1b67641a14d88b91a8f6ab5ce2fc00ea0b22874819fce0f6120ebed SHA512 c8f60c0c04d106c2e1223834663832ebf363babf750067fb047f1dc0fa57e9e21239255d841080824ccad347d35ef3429873a94c1b6646afb1abac2fc0e58339
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/nobody/nobody-0-r1.ebuild b/acct-group/nobody/nobody-0-r1.ebuild
new file mode 100644
index 000000000000..4f32dd5f538e
--- /dev/null
+++ b/acct-group/nobody/nobody-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=65534
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/nobody/nobody-0.ebuild b/acct-group/nobody/nobody-0.ebuild
deleted file mode 100644
index 29b11e8db9d2..000000000000
--- a/acct-group/nobody/nobody-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=65534
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/node_exporter/Manifest b/acct-group/node_exporter/Manifest
index cb61583af5b6..41e2b5646558 100644
--- a/acct-group/node_exporter/Manifest
+++ b/acct-group/node_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD node_exporter-0-r1.ebuild 146 BLAKE2B 866b51e4b252048085cbae84c29e023febe2f7af6952bcfc6cd0f391385de92fcec88c8eba9d52379413f9386e33849fd71f888578934dc3d8ed3c5ef448a129 SHA512 34d3cb8b13015b79657115a892c2334b2038fa28afb8f24a5d4b1352e5f6997a218b20e95119abc28d6eb685b3c48adb2b441aab87012f9603160a10cca9b0dd
+EBUILD node_exporter-0-r2.ebuild 151 BLAKE2B b2f06f494b6aa14abac46ce60b6a1e42c93be7dcd58ed4ae2c43e6dd660ad9b6eb57a1fd7f188f4f2ed2635a521fca6cb21750b45d23c4375c831a7b7fbe857d SHA512 8f683e29cfe061fd85f80463ac72bf2138b52ffebe2a950d9548796ac110db9a1116b8370a5342458b0ce73fd36a33ff80459aae701576240bef10ba739d79bf
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/node_exporter/node_exporter-0-r1.ebuild b/acct-group/node_exporter/node_exporter-0-r1.ebuild
deleted file mode 100644
index 7faae92e4669..000000000000
--- a/acct-group/node_exporter/node_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=459
diff --git a/acct-group/node_exporter/node_exporter-0-r2.ebuild b/acct-group/node_exporter/node_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7c28a071b53d
--- /dev/null
+++ b/acct-group/node_exporter/node_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=459
diff --git a/acct-group/nofiles/Manifest b/acct-group/nofiles/Manifest
index 3c9106dedc60..2188276178a9 100644
--- a/acct-group/nofiles/Manifest
+++ b/acct-group/nofiles/Manifest
@@ -1,2 +1,2 @@
-EBUILD nofiles-0-r1.ebuild 151 BLAKE2B eef47639de66651b0df1b4832fbfcba730ebbcac4e8377fbe99bda10db4c5a70f7389ee45d79fde4a248e904089e4f1a35014164de2379d1c5ca8a5cfc76bbe6 SHA512 9f57107eb29783f8fe30a8c9781ba335b786c602188a65538132044ccee6f7c96db5d833edc439cf6acd605c85de467e0570a86ac95f7e549efd53d491cc8153
+EBUILD nofiles-0-r2.ebuild 151 BLAKE2B 4339829e393785c4d3465f722c4eb5bdc73215578e0dc4b85b1543013a57c8418d5e6354d41e1632a49c2d7531d3f305d6b2cbfce08c2276d1badffdb86bb5d2 SHA512 3929ea68268072d39e00fb7d2f97697c8b4a09f52a28a9a1b40d30300bd7896cb26c26f492caad846b7f3031e509134a303992eaac7c026ac360c8a40b5b9330
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-group/nofiles/nofiles-0-r1.ebuild b/acct-group/nofiles/nofiles-0-r1.ebuild
deleted file mode 100644
index 7f42c5050e80..000000000000
--- a/acct-group/nofiles/nofiles-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=200
diff --git a/acct-group/nofiles/nofiles-0-r2.ebuild b/acct-group/nofiles/nofiles-0-r2.ebuild
new file mode 100644
index 000000000000..1da9c58aaf7d
--- /dev/null
+++ b/acct-group/nofiles/nofiles-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=200
diff --git a/acct-group/notary/Manifest b/acct-group/notary/Manifest
index b5d965dda7e6..bb06522bac0e 100644
--- a/acct-group/notary/Manifest
+++ b/acct-group/notary/Manifest
@@ -1,2 +1,2 @@
-EBUILD notary-0.ebuild 194 BLAKE2B 4a44635a55b46c192e0d2118d692318d5a0a3eba826ba15bdf351130ab79433f56a6eff80cc74c12e23e86ba948df06711405efc01aeb640c5062396733677f1 SHA512 a3269e5e1af4079544eddf0743e2e8d7000ade30655e111728914f2c039f13cb8b28dedf7860034c844c2315583fbf0e8f97d0f133a3efc13ecc024337a33a0e
+EBUILD notary-0-r1.ebuild 194 BLAKE2B 2aecfdf6e2a7c6f693a70ee2b1a986ab30d38f7260db292714af35141e21d1179591cf282949c15b461e20bc10b5b26fdd3bf047bfeef3e468a589e2aa1f7ce5 SHA512 a7c3125ba91e7b3c05ae8d3ffa6c76845688ab1767cd12b48046ee7ad6f488446e3362adb59ea014d88b3e15360ba094cff078f2bfb227d2f2f01f8c94f4a6d0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/notary/notary-0-r1.ebuild b/acct-group/notary/notary-0-r1.ebuild
new file mode 100644
index 000000000000..c40e97bec775
--- /dev/null
+++ b/acct-group/notary/notary-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-misc/notary"
+
+ACCT_GROUP_ID="280"
diff --git a/acct-group/notary/notary-0.ebuild b/acct-group/notary/notary-0.ebuild
deleted file mode 100644
index fb865b1555cc..000000000000
--- a/acct-group/notary/notary-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-misc/notary"
-
-ACCT_GROUP_ID="280"
diff --git a/acct-group/nova/Manifest b/acct-group/nova/Manifest
index 561dcf15c58c..6985ff0387e0 100644
--- a/acct-group/nova/Manifest
+++ b/acct-group/nova/Manifest
@@ -1,2 +1,2 @@
-EBUILD nova-0-r1.ebuild 146 BLAKE2B 6549db6cc0640dfa32cc470897a5ee0f2d93055b3ea691c3d8b20b4f363293cf16b8c9e69d5055b0141802fb75bd1de7b341859f34611d6c626b6bf41215e763 SHA512 caae9e1b15ee500f2d4607421973bdb7d072365fc57dbaea14dac614ec75ef9aeed919fb0ab62c937ac0a6c37be9a37de9ebed44bd13f894ac57a11854e71d98
+EBUILD nova-0-r2.ebuild 151 BLAKE2B 193128d8568308493e97f9ac889d6b17e95a940dd3b2a6527d7aaa915c73bcf77d8dbc8f00b2ec374a4eecd1103fb99f47bbd920b9da2fadb1de5aff3e6abf0f SHA512 8e157d5ce751bbcbfa6f916b01a9f7c7bdf976a3d21449e910604fda5f131373b8fa0c69cada73294f06de3927733156ab70cc04a6b084dbeb03d41665a3958f
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/nova/nova-0-r1.ebuild b/acct-group/nova/nova-0-r1.ebuild
deleted file mode 100644
index 076e02d12e40..000000000000
--- a/acct-group/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=447
diff --git a/acct-group/nova/nova-0-r2.ebuild b/acct-group/nova/nova-0-r2.ebuild
new file mode 100644
index 000000000000..806349afc01d
--- /dev/null
+++ b/acct-group/nova/nova-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=447
diff --git a/acct-group/nsd/Manifest b/acct-group/nsd/Manifest
index 342c8947540c..0bf757993a1e 100644
--- a/acct-group/nsd/Manifest
+++ b/acct-group/nsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nsd-0-r1.ebuild 151 BLAKE2B c5ed7c63f353bbd136697a2208ec31f2d5bdcba23bf044208a6f0b0053300df7a847ae19b37bcf5a0157df339faa38d66dfc8994012d11e190f82c590d200aea SHA512 1c15aabe3bd0270bb7bf9f26c318b368ced7757d609fdfa4fee54356bde99b9949c0246a6da0e2fae95691eab2c0cbe9fa7328c9270d68e8dc0c0766e1da43ba
+EBUILD nsd-0-r2.ebuild 151 BLAKE2B 7bbcf1697dc27d0d95efe7a6aa3c60566e9b87407d05cda72048f18b284d95a682c0ebba5ee21703b6fba6a2f084aab6a16a03c74461cd38805d497ff31fc688 SHA512 e472081321ee41b1060730199a0b94c3c6b6267de1eedc375ad0343572ff7d41c23ac0837775c9005fd6dff6e0458328cd42d2aef6f843a1fe473562ac4d9657
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/nsd/nsd-0-r1.ebuild b/acct-group/nsd/nsd-0-r1.ebuild
deleted file mode 100644
index 3fd399f2dcf7..000000000000
--- a/acct-group/nsd/nsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=223
diff --git a/acct-group/nsd/nsd-0-r2.ebuild b/acct-group/nsd/nsd-0-r2.ebuild
new file mode 100644
index 000000000000..456480d76323
--- /dev/null
+++ b/acct-group/nsd/nsd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=223
diff --git a/acct-group/nslcd/Manifest b/acct-group/nslcd/Manifest
index 8da6dab790d8..58baaecc0c7f 100644
--- a/acct-group/nslcd/Manifest
+++ b/acct-group/nslcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nslcd-0-r1.ebuild 151 BLAKE2B 5db2a75f4b9986aa3ac7eeb19f35116e4c7cebe43c50b4176f4adee20ac81603d17845a66b264dc8d2c18cf3666e2ecef514b68f7cf2cfe2f3882c675d7bec3f SHA512 8d33a0790a5e2b0597cad6a3218e3bc05ecd8d07c64ab86a248f2df9a14940ad85ded346af6819326b5d720d507b46c69e902cc369f0a37c06ac59cff03b710c
+EBUILD nslcd-0-r2.ebuild 151 BLAKE2B e219cd39f60144a42efeedafeacd496a160b2b0ddf840cfb163ef4460d3f8dcbde30292aa7a07bd1ec02d2a90695ff52685d87fb65ce5c10d1314db2de3aac36 SHA512 b259de362952c8642887244a23e057474bcf800d7b4c7ac35873b9b9ad6ee9a9a5c5c5c890c29a5cac4a569b6089d3efde41e4d5746369c557566470b780c406
MISC metadata.xml 377 BLAKE2B de37a4550f576438d2d9e50c63d53758876cb174ec6a40846b0c70f377cc1d0928d24951fe803bbb28dcbffa5a30dacf89c05a814ae7304b61ead2c115cc9b25 SHA512 29c89211671ec281f5aa38644ba64d43c90dc32251074e6c0a399b8087e3d5085f0277b1f7899ea278389b406270c0b35e18cbf30cec9fa52cbfa5e7ceb9038d
diff --git a/acct-group/nslcd/nslcd-0-r1.ebuild b/acct-group/nslcd/nslcd-0-r1.ebuild
deleted file mode 100644
index 6e4738a45005..000000000000
--- a/acct-group/nslcd/nslcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=357
diff --git a/acct-group/nslcd/nslcd-0-r2.ebuild b/acct-group/nslcd/nslcd-0-r2.ebuild
new file mode 100644
index 000000000000..138e0d6b99e8
--- /dev/null
+++ b/acct-group/nslcd/nslcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=357
diff --git a/acct-group/ntopng/Manifest b/acct-group/ntopng/Manifest
index f2e45fa449d4..145dd0612f70 100644
--- a/acct-group/ntopng/Manifest
+++ b/acct-group/ntopng/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntopng-0.ebuild 151 BLAKE2B 13dc0b1f28e7789eb18373363803ed01b7fdb72da80275df004b831cd90f2618b891caaca2b334b2b309a5b1b436cfd4ceceb3904a4373fd9939b3a3173ffd75 SHA512 8aa7ed4a78fe90a03fb5f72f0b952339db9f3b97034079eb3f76b0d4fcc60428e2dcbbf803862de938bb39ea38e686c8c737820bb69d04a69c53839d01c5bb01
+EBUILD ntopng-0-r1.ebuild 151 BLAKE2B 4fef83e8c60800a059f8439c6a48b618511e307710df770b2f9a3ded8c2d12943f16d740940e302b024b9328c8928bd0f4df7cc0b7266bc57f06549a5d9a3d58 SHA512 aa7917340a2b0c2b2706b7a049a477fd8cba253a8f9f9a61635cfc10468478e4cbced45c6ff34cee05ecc902617b1f81bb9ae686e9f7f98851bc60454241422d
MISC metadata.xml 219 BLAKE2B 5a19926bd602ddf2021d79fb07de89ce03868320d23f61ec16b122f9ba23e04bd24a71be898b22d9518d5792fac5d5860a181f3813a1b78727117a6a3bc93e6f SHA512 e55af6d159cb39bae94cf8b8c9adfc62ef53d56aa11c024e8c4001aae58d9b9256b059f1a4918f55bba17b231ff7725a002f67a5642f92f3118835f3036c2fa0
diff --git a/acct-group/ntopng/ntopng-0-r1.ebuild b/acct-group/ntopng/ntopng-0-r1.ebuild
new file mode 100644
index 000000000000..5f19248d57aa
--- /dev/null
+++ b/acct-group/ntopng/ntopng-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=296
diff --git a/acct-group/ntopng/ntopng-0.ebuild b/acct-group/ntopng/ntopng-0.ebuild
deleted file mode 100644
index e64f641de3d7..000000000000
--- a/acct-group/ntopng/ntopng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=296
diff --git a/acct-group/ntp/Manifest b/acct-group/ntp/Manifest
index f6781eb440b8..46f4652595dc 100644
--- a/acct-group/ntp/Manifest
+++ b/acct-group/ntp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntp-0-r1.ebuild 151 BLAKE2B d5e97ea0aae3b05872ec0eb114ec6b878b9a0b564f16dd15069bbda7e1688a57f3b05d18a52686930b4708459c0d43e6af345fb937677ab987ccf7be71064d7e SHA512 f2f9f06cf11b51ff082ae6a3335685bb7a9f04cfa8b13fa1cd086fb6a774767c614701430ecc2cc4702474332be2073123e01e62f193bb6bba2db2b8104b8a6c
+EBUILD ntp-0-r2.ebuild 151 BLAKE2B a07b679dc328260ff4cc5f8ce52c57a4083aeb4473b5cd2aff22ee3fa8e45602d8e9f3b983488803014f5a6a2f8808b4fbcae18a7f4d5cd7c1a555955a09f022 SHA512 e4bf6d97ac8cd994e06aa5842c91fbad7da8a5d4f8867ee95b612099bfc53eb9c3dda3fc60e87c16b34880be850033aff89a942c53aa73e756e579e099382500
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
diff --git a/acct-group/ntp/ntp-0-r1.ebuild b/acct-group/ntp/ntp-0-r1.ebuild
deleted file mode 100644
index d8f17217cd8d..000000000000
--- a/acct-group/ntp/ntp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=123
diff --git a/acct-group/ntp/ntp-0-r2.ebuild b/acct-group/ntp/ntp-0-r2.ebuild
new file mode 100644
index 000000000000..45fffae0e48e
--- /dev/null
+++ b/acct-group/ntp/ntp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=123
diff --git a/acct-group/nullmail/Manifest b/acct-group/nullmail/Manifest
index 50f4e20cb6a3..2d1714647085 100644
--- a/acct-group/nullmail/Manifest
+++ b/acct-group/nullmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD nullmail-0.ebuild 194 BLAKE2B f414bf4100a4b26f99a1ac67ed435639419e0edde7284f2eb54dc65cc60908a74ff5170ff93ca57004eeba589d7e96176a6740ce614aae3e880bbf83d5992f84 SHA512 7f5a59046b6ea2d68da7c77ea8b75eea2e03103c8a11c615027b5abbdfa6bd326c55cffef219e0588cf1f1d53e2f77f53e3a7ce3e8bf1ad9b63215d768818d4f
+EBUILD nullmail-0-r1.ebuild 194 BLAKE2B 80cb08d06c3433d44217ec1323baf7f52dd3bf6082fa850901f04d737a4c7e6f32b1fa82aa9c66eb13c236f8741ffa127b10c5fa1f78b66a2458e73cf23730b8 SHA512 c4eba6605bd36ac2576a569cd4892d5e22b161bf605acb43739f79a238bd020da195e209437a2917cddd33652ef9422a562c08d57f8ede9ab12fb29888479bb9
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-group/nullmail/nullmail-0-r1.ebuild b/acct-group/nullmail/nullmail-0-r1.ebuild
new file mode 100644
index 000000000000..c85a088847ba
--- /dev/null
+++ b/acct-group/nullmail/nullmail-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the nullmailer"
+
+ACCT_GROUP_ID="88"
diff --git a/acct-group/nullmail/nullmail-0.ebuild b/acct-group/nullmail/nullmail-0.ebuild
deleted file mode 100644
index 24f773d248c5..000000000000
--- a/acct-group/nullmail/nullmail-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the nullmailer"
-
-ACCT_GROUP_ID="88"
diff --git a/acct-group/nut/Manifest b/acct-group/nut/Manifest
index 1dff8ec2d360..9dd54b454fb6 100644
--- a/acct-group/nut/Manifest
+++ b/acct-group/nut/Manifest
@@ -1,2 +1,2 @@
-EBUILD nut-0.ebuild 201 BLAKE2B 9a1844c43912a891f9a2a809ca457868236e34dc70da4442c5e069713310a75433741b80a49f90c4bf3a7776df3d9ff3fb785c178a180bf02b4e21df1a9a459a SHA512 c15551287466b6dbeb7a6a9215a736ed63b2cb6baa63600baa6627e179bf431e9ab367bcf5628ab85e3dc28dfb076ed794470a9792a8867d242509ba8e77c71d
+EBUILD nut-0-r1.ebuild 201 BLAKE2B 0653c3ce2c220e15afa35e916fdaa054041c3f9f444c700933478dcb2b30258f93c49da5712bf53bf700840a427111826515c334c448c69ff34d84c963af9eaf SHA512 1774db2ffed5ddd306e3da8f664dbf1205e3a3cc00225ef3b7e0fd3980ab341465b2fd161592f738c450dc1eda0a518981fc58a28975e8b4571f1cfab15508e0
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-group/nut/nut-0-r1.ebuild b/acct-group/nut/nut-0-r1.ebuild
new file mode 100644
index 000000000000..f85662f46ff0
--- /dev/null
+++ b/acct-group/nut/nut-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Network-UPS Tools"
+
+ACCT_GROUP_ID="84"
diff --git a/acct-group/nut/nut-0.ebuild b/acct-group/nut/nut-0.ebuild
deleted file mode 100644
index e54ff2647200..000000000000
--- a/acct-group/nut/nut-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Network-UPS Tools"
-
-ACCT_GROUP_ID="84"
diff --git a/acct-group/nzbget/Manifest b/acct-group/nzbget/Manifest
index eaf1b8b3005e..9af850d834c0 100644
--- a/acct-group/nzbget/Manifest
+++ b/acct-group/nzbget/Manifest
@@ -1,2 +1,2 @@
-EBUILD nzbget-0.ebuild 186 BLAKE2B 5699c191b20400aeda6110bc751a7e7f76aee66e61f69b0d1af167c173582fc1ac92e9c68ad711fb98af547da3630f076c4e181fd5080f8bcc6451067b390d96 SHA512 40c7246fc7bddae620e29312745717eefdfd049849b4b2cc0b5194b88ae49792692dd3baf3a1aa80c61e074558860448bee61ecd9d6b185264886511f4cf24b0
+EBUILD nzbget-0-r1.ebuild 191 BLAKE2B f15bcd9316391f4f6f8be64a4637361e8cc668e3680f0b636d01a2fd719cf3d25ea341e46b968c7fde3f5cf66f68c8887dc7d1cd393588c4eb73f3986301da05 SHA512 d85411457e3fbc3fa1da702df6c30196c48354b3cf7be66a1d3c382035ec85c3b8d5b64c98ef665a29251b7a13efc561ce7137aea522b298bda6cd2e2542831f
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-group/nzbget/nzbget-0-r1.ebuild b/acct-group/nzbget/nzbget-0-r1.ebuild
new file mode 100644
index 000000000000..63dbcc4c6cdb
--- /dev/null
+++ b/acct-group/nzbget/nzbget-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nntp/nzbget"
+ACCT_GROUP_ID=398
diff --git a/acct-group/nzbget/nzbget-0.ebuild b/acct-group/nzbget/nzbget-0.ebuild
deleted file mode 100644
index c0dae092d2b2..000000000000
--- a/acct-group/nzbget/nzbget-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nntp/nzbget"
-ACCT_GROUP_ID=398
diff --git a/acct-group/oidentd/Manifest b/acct-group/oidentd/Manifest
index 1f2cb309cf9c..69ecebdea704 100644
--- a/acct-group/oidentd/Manifest
+++ b/acct-group/oidentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD oidentd-0-r1.ebuild 151 BLAKE2B f69fab1ece33dca539758678aba81ecdc631ea2485b18c195a4553094bc8b9d97a8067ca263fec520b2ee4e63584bb9f4ea3f2cc52e8f481662a14e9fb9c9281 SHA512 d7e9fc7d5a3220945acbd9aba79eaa1d2c53c09d73d9c3b6c8fe65ff4737b9f078f3123a9580e3f7507a87e26c102a53ffc6659e17c12ba397110ed922a2a1c1
+EBUILD oidentd-0-r2.ebuild 151 BLAKE2B 009c5a3f95ef2c335ba0342ed24a291fa324354f1cf8bc7fa629889623ce93bff98da7df58e21f73ebe89017f29370213736d88fbe4afaafb7386bf7821520c0 SHA512 2f1b0a2509fd41242678420d0ed9e0d98938ecb366cf2b73e451f01234cf4410596847fa8ebe1d93fe093e3b480d2bb4599e7fa3d56364a6e479a80c85cb4dbd
MISC metadata.xml 393 BLAKE2B cece790dd0310b08c71dfc107e0cf9d28a86714a8d14361140f30820be5987008fbb1f0954db16c6686a8c087bc54f0935960d4ce718e2f61240d2e83e67823f SHA512 4b60a9a9e648418f7d7eb82dd3f5d4ab28caf622f9f84cd8db5a782cd5db5e6bf1b20a4dae54b65f27998db671aa1ddd64ddd3e9ef26ffb1d786bcae82760cb7
diff --git a/acct-group/oidentd/oidentd-0-r1.ebuild b/acct-group/oidentd/oidentd-0-r1.ebuild
deleted file mode 100644
index dadd950f9544..000000000000
--- a/acct-group/oidentd/oidentd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=493
diff --git a/acct-group/oidentd/oidentd-0-r2.ebuild b/acct-group/oidentd/oidentd-0-r2.ebuild
new file mode 100644
index 000000000000..703dc5367d39
--- /dev/null
+++ b/acct-group/oidentd/oidentd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=493
diff --git a/acct-group/openct/Manifest b/acct-group/openct/Manifest
index 7f6d7077a92b..a1982d71ace1 100644
--- a/acct-group/openct/Manifest
+++ b/acct-group/openct/Manifest
@@ -1,2 +1,2 @@
-EBUILD openct-0-r1.ebuild 145 BLAKE2B 333ce4d44800b1f61bd10706824d553b66cb5993538a395c5b77990964ac24ee013cda085071c28293147cd78c2b2efa9e2eb934dd57dcb1d25a7c78d30fa130 SHA512 c0413e424d9c423a2422ade65283d2424391c9dcfcb81deab0c19e43f6346a4e155dd55c811d457306f374c63ab1c9e73ba7166752c3b456295eaabdee99204f
+EBUILD openct-0-r2.ebuild 150 BLAKE2B 43d37aa8de1374725fcbd20dd2d3244f38b772041a72433689f005dadc33e3b0800a06f19413477fa3252c27e679efc1c39101e527d001e8fa5301ce8627f2d4 SHA512 1e1b3312779312023094ec5bb17e728154718e34767fa534083e9d5e3fa0a777f51ebf43df11cc81b13c1b11e704acb883b1417a00c625e11534bd000b2c61b9
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/openct/openct-0-r1.ebuild b/acct-group/openct/openct-0-r1.ebuild
deleted file mode 100644
index 256a6212aaef..000000000000
--- a/acct-group/openct/openct-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=46
diff --git a/acct-group/openct/openct-0-r2.ebuild b/acct-group/openct/openct-0-r2.ebuild
new file mode 100644
index 000000000000..e373f6d15260
--- /dev/null
+++ b/acct-group/openct/openct-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=46
diff --git a/acct-group/opendkim/Manifest b/acct-group/opendkim/Manifest
index 0331739a2847..fb7e0b536245 100644
--- a/acct-group/opendkim/Manifest
+++ b/acct-group/opendkim/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendkim-0-r1.ebuild 184 BLAKE2B 6a3beb733dc0857ffef956d53155ea84f820ef385723fc49cd8291200413fd67ac661bdd08495f819e9e0010ff0669f8dff99d5c909be78dc4d13c04603e14f3 SHA512 d3d6b2d77ada1983b4c76f352cb50a7d5538b0c6e47b6729b5c1b35f638df7d9d9ce33ea99f9a4c8fe21ad316b0d71aa4014e4063b524911088378b4b9481193
+EBUILD opendkim-0-r2.ebuild 184 BLAKE2B db78f98946102aba35cfb6bd5a0c0e9b4e3ecccf48140c9008caff7952106f9aadbf238ee619fd49b3e70039fdc6d379a4ced81a9efc8f3c5b6ac4596ec89b70 SHA512 3e6eb1ec5c9ecffe697872069581f63eb6dcd3589cc12ba0b056d6c43d2a8878adfd08f9f9d59e7b343f1f02157c8ae88c2670b1ec20f742ca72b228ff53cd82
MISC metadata.xml 247 BLAKE2B 4846dc5414f3478596a37af6a99c490ce9ac8dc341903d8fff794c05354b7a73309f70aac92faa801fff9f8a6aed87860af87e5d227fb2c6425b907038bf0052 SHA512 7a189fd4e7c0f67664c0788b4769a1c038374eb224c259fc206dd1d2448eaa1deab71c612186cff31cd380fb445fa4ba066a0cf881028191e8adb0aae9d862c9
diff --git a/acct-group/opendkim/opendkim-0-r1.ebuild b/acct-group/opendkim/opendkim-0-r1.ebuild
deleted file mode 100644
index 984414e1f114..000000000000
--- a/acct-group/opendkim/opendkim-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for OpenDKIM"
-ACCT_GROUP_ID=334
diff --git a/acct-group/opendkim/opendkim-0-r2.ebuild b/acct-group/opendkim/opendkim-0-r2.ebuild
new file mode 100644
index 000000000000..daae0306083c
--- /dev/null
+++ b/acct-group/opendkim/opendkim-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for OpenDKIM"
+ACCT_GROUP_ID=334
diff --git a/acct-group/opendmarc/Manifest b/acct-group/opendmarc/Manifest
index 5d748fc46f20..f25ec1302ff9 100644
--- a/acct-group/opendmarc/Manifest
+++ b/acct-group/opendmarc/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendmarc-1.ebuild 197 BLAKE2B eac1c3318c8e3aa126053702d44b3a2ff0a3dd8f90e3a596a4a0d0b8ef986ac48c28521234527e21c0ab7865bcbe3226bba1fc77fd7fff64ccfb5e9370ce2d23 SHA512 f380801dab4e85a1967e20aac046cc97831ee4d3c2a2151d1ee9fcad7193f90505c1d816c63d77446501dc033c673e7f9ceb3c2745c2485583c6227744d19fc6
+EBUILD opendmarc-1-r1.ebuild 197 BLAKE2B e99cf1a893e8ae464a079df062a343eaa79bc707c3f758652d972df62edc2901477a499641d3e332546027c603087094fc9617188a5fec9aef92d5f3792a91e8 SHA512 352a4e841db96fa11d65c20a4f076cbd14192471550986923c23839284db6ff67abf951f3e64678f7f5ed1112a13697e2a0e907f907a190f3e058b57c64afa2a
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/acct-group/opendmarc/opendmarc-1-r1.ebuild b/acct-group/opendmarc/opendmarc-1-r1.ebuild
new file mode 100644
index 000000000000..fd6d9faa1c13
--- /dev/null
+++ b/acct-group/opendmarc/opendmarc-1-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/opendmarc"
+ACCT_GROUP_ID=244
diff --git a/acct-group/opendmarc/opendmarc-1.ebuild b/acct-group/opendmarc/opendmarc-1.ebuild
deleted file mode 100644
index 87306502f6d3..000000000000
--- a/acct-group/opendmarc/opendmarc-1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/opendmarc"
-ACCT_GROUP_ID=244
diff --git a/acct-group/opendnssec/Manifest b/acct-group/opendnssec/Manifest
index 7f273c7c9e6d..87ecabd4f8e6 100644
--- a/acct-group/opendnssec/Manifest
+++ b/acct-group/opendnssec/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendnssec-0.ebuild 199 BLAKE2B 456bea0ea1fd33ace88925e18ffaad5e9706e06203fd3ceec15d5d5c0b6ef91c0f4621c07ae0fbb99376c5abd0af1a04b6ed3853152736d0ad83a65d9c6af2e0 SHA512 9f39dbeab6105d5d27228ce6480710f9fcaac990b43dce28e305f96975e3888be5730ae16abc4bdb6c4cc91cd35aa85af06aac37d35e1c37118fb6e5a6e1aae4
+EBUILD opendnssec-0-r1.ebuild 199 BLAKE2B bb1b81a91ed5ca2623ca3e7a5166ace012cbc8cb528733c43ac4ad9b6eca5f8c84864a46de365e1cf9b112bd3e4afabc65e574f5a1ef397ce8fd0c4a4eae1cfe SHA512 9901e2d05bf7c5bac8c13fee8b0dfdd99875cd70fb1d2e54a0be51bf19766bdce977c0b39c112dc9b25155682843752ed247afe2b8ca819dcbced91dd4353471
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/opendnssec/opendnssec-0-r1.ebuild b/acct-group/opendnssec/opendnssec-0-r1.ebuild
new file mode 100644
index 000000000000..291c3d63eba3
--- /dev/null
+++ b/acct-group/opendnssec/opendnssec-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/opendnssec"
+
+ACCT_GROUP_ID="151"
diff --git a/acct-group/opendnssec/opendnssec-0.ebuild b/acct-group/opendnssec/opendnssec-0.ebuild
deleted file mode 100644
index b1ab40784094..000000000000
--- a/acct-group/opendnssec/opendnssec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/opendnssec"
-
-ACCT_GROUP_ID="151"
diff --git a/acct-group/openntpd/Manifest b/acct-group/openntpd/Manifest
index 0b0fdbdb8063..bb7667a5c281 100644
--- a/acct-group/openntpd/Manifest
+++ b/acct-group/openntpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openntpd-0-r1.ebuild 151 BLAKE2B b1acb5b39795218e081cb5f75c2c5a4acae8937bbf11a826a2f874facaee03c5da5ea7fc05c3d4eb3339f6542b497df90d6cf30200f9b542134982ea16507080 SHA512 4ddf4bba82f52e88d8bf87e32f513bddecca9380a517ca7568dfcbff3f3b6d0a1ce2c582133f5fe628e06ccf3c46df6c5fb7a8f4868812e1ccf92c701e4cb058
+EBUILD openntpd-0-r2.ebuild 151 BLAKE2B ee5d94a5731250d9645b6101c3c5bfece480b5b08793f68f18023109299d0d1268e3ae8743dc52f6662be60a4e5ffd770a2509a7b8ae0cd248942cc0ecf2446a SHA512 048a83640265ce60f09acae5d0e290f37897e46b7d893de6d4011e16c42053fb1805aaa12e9d09ba707ff849f4832caa3948553e3b86cd4a939b0bffe6ccf1c3
MISC metadata.xml 392 BLAKE2B a875ac61061b518231ca2dc61e92dec80b9a647942ba08b241bd897a2232a6b3ab804f875de8a64a1d323f4b289193571998d867279ca135dda95ab1f056abad SHA512 4418af84fefa90044cb549d2195537df74dcfe7a8c02011b8e0a975f660e0226c942da080b20529fc5752fe0e87928479ac433de3d7ae2947182672e3508a030
diff --git a/acct-group/openntpd/openntpd-0-r1.ebuild b/acct-group/openntpd/openntpd-0-r1.ebuild
deleted file mode 100644
index 26450b27e0f8..000000000000
--- a/acct-group/openntpd/openntpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=321
diff --git a/acct-group/openntpd/openntpd-0-r2.ebuild b/acct-group/openntpd/openntpd-0-r2.ebuild
new file mode 100644
index 000000000000..3ee1906bc806
--- /dev/null
+++ b/acct-group/openntpd/openntpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=321
diff --git a/acct-group/openrct2/Manifest b/acct-group/openrct2/Manifest
index 9b6ed84841a3..d3610f3f001c 100644
--- a/acct-group/openrct2/Manifest
+++ b/acct-group/openrct2/Manifest
@@ -1,2 +1,2 @@
-EBUILD openrct2-0-r1.ebuild 210 BLAKE2B 8ac07510bddbd19b7a5e113fab10425819d75b519978b317339273b50745451b9649729ccbe90748b5a3106d30f4f34f3c308107123724cbcbb018eb73ca3c53 SHA512 9abe44089e89cd7f45595f6a9164bd4554d8a3943890d7d28e78f81349ddac5e15ad260a71e35d4d23a22c11c7f47170fcc30c3e82b88d40b00f93c405f0b888
+EBUILD openrct2-0-r2.ebuild 210 BLAKE2B da1059464e97e2b6644a16123e815013c805abdc9a1617d3f125a0bc7d723d1efaf2393eb397489d0f75beb0c261c54fcbc30debf8f585a7574ae01cd7bb4ef5 SHA512 1017a5c1345dad02c9b4fc4158d086f539270123fe837c9e53fb0b6da408ab4cc539654e9222f46469c92338e2b023dc35bf158adf6d7aa10993be9bd6a8a66c
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/openrct2/openrct2-0-r1.ebuild b/acct-group/openrct2/openrct2-0-r1.ebuild
deleted file mode 100644
index 234d39ba1ebd..000000000000
--- a/acct-group/openrct2/openrct2-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the OpenRCT2 dedicated server"
-
-ACCT_GROUP_ID="479"
diff --git a/acct-group/openrct2/openrct2-0-r2.ebuild b/acct-group/openrct2/openrct2-0-r2.ebuild
new file mode 100644
index 000000000000..73667b9af642
--- /dev/null
+++ b/acct-group/openrct2/openrct2-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the OpenRCT2 dedicated server"
+
+ACCT_GROUP_ID="479"
diff --git a/acct-group/openttd/Manifest b/acct-group/openttd/Manifest
index 27cc6c3d5a88..238edfa26b5e 100644
--- a/acct-group/openttd/Manifest
+++ b/acct-group/openttd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openttd-0.ebuild 205 BLAKE2B c7019c412dcc4d1bdce15b1762166398c79773785c43012abb5e1897b0f291644de1129ae4fc4df73be11297f0aac99fe9fe8f02e45c570b34c6d3796b21be78 SHA512 f15a8dc96047d657402fb9014674eff80523fe45e2604ff736924b4878ab4022f16a79e10cbf59d36135c0703b1a58d01dba6a56e7208ec0b68735add4419ac3
+EBUILD openttd-0-r1.ebuild 205 BLAKE2B f0c7f97fc881e9d18bb6d59eb08b66b1e61488eb849dad9df0753074a1e9ddfefa432035126953246ab9992dfa46540976671ff8ccb8e3f9766478988e10602b SHA512 eb321725e3c19bfa565b14693aec366253f9359f0442155d75fe49d56b44ab942e7d03a2f8ac5ffca80425ddde47739ba026807f2177890a2964771d7e682486
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-group/openttd/openttd-0-r1.ebuild b/acct-group/openttd/openttd-0-r1.ebuild
new file mode 100644
index 000000000000..0bcd30d046a1
--- /dev/null
+++ b/acct-group/openttd/openttd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for games-simulation/openttd"
+
+ACCT_GROUP_ID="513"
diff --git a/acct-group/openttd/openttd-0.ebuild b/acct-group/openttd/openttd-0.ebuild
deleted file mode 100644
index 1d9a13b5160b..000000000000
--- a/acct-group/openttd/openttd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for games-simulation/openttd"
-
-ACCT_GROUP_ID="513"
diff --git a/acct-group/openvpn/Manifest b/acct-group/openvpn/Manifest
index 1daca1f456de..278441f8f7cb 100644
--- a/acct-group/openvpn/Manifest
+++ b/acct-group/openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn-0-r1.ebuild 151 BLAKE2B 3968a30316cf1bcd41ffc38ba26c8eab7b112253e891239fb57ed45dbad2a92ee229ebc9b76ea8056eed176844eb77ff306656acbbbebce3c3467c283337a390 SHA512 cec9c03da4e14be96de2c49ccff3b5e2fd990ef2b44f64f2576eda34262161b008e420b4b94b6c4c33fa528e4a4244ac6d5e2e39201f889fe41a0155e333fde7
+EBUILD openvpn-0-r2.ebuild 151 BLAKE2B 18fd193096556d89b0247da4df265b517558f9dc93f228a687626b600192307e49fbca5fddea4447a296df48b66e2958161528e5602946b552b8dc797f5130ce SHA512 f8430a4d813ee9ef3f84a525af0eb56d7a83e6b694338061b4343cece1497c5786a9b67c38956162b1777e23b02b321f33e8a6988ef01f3e75895736a492864f
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/openvpn/openvpn-0-r1.ebuild b/acct-group/openvpn/openvpn-0-r1.ebuild
deleted file mode 100644
index 0abedcd63903..000000000000
--- a/acct-group/openvpn/openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn/openvpn-0-r2.ebuild b/acct-group/openvpn/openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..8ab888445c6b
--- /dev/null
+++ b/acct-group/openvpn/openvpn-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn_exporter/Manifest b/acct-group/openvpn_exporter/Manifest
index 535780724808..63dbb3ca7c97 100644
--- a/acct-group/openvpn_exporter/Manifest
+++ b/acct-group/openvpn_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn_exporter-0-r1.ebuild 146 BLAKE2B 6bdee6c03c51e61e251973cbadc6eceb3cb6c81ab5f8ca8e9925bdb41d1b8599557f5e53c1da8e3e7c3535ec547a43b976d45ce082bcb1d06a45299dd6b89523 SHA512 c56291d801ffd45e2dee1445934de3cb3f665ad0a5eef88225461e541098b5613e3051bb163a230ef72d446625887b778c783ff2848279ec79359479365458ca
+EBUILD openvpn_exporter-0-r2.ebuild 151 BLAKE2B 174b95f5663a534f459d8269c3f09248f9186ee3da2854032b895547404f6bba19c4b2fbc8822e279f8a6c446c2a85a0d54c457a3c71f6ad7d0d5387c53bb241 SHA512 1ec6331b77f2b555cc6d99e050c7173a38bbed77e8c94fbd6b544f6871c7572edd4ec7930219451379f0f1eb8e1e8d5a0e86c842a26bdc2280fed361dd25f327
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
deleted file mode 100644
index f950a40c2758..000000000000
--- a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=355
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..99350ce10aec
--- /dev/null
+++ b/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=355
diff --git a/acct-group/opm/Manifest b/acct-group/opm/Manifest
index 4722a3e1cf9a..b9884e7bcca2 100644
--- a/acct-group/opm/Manifest
+++ b/acct-group/opm/Manifest
@@ -1,2 +1,2 @@
-EBUILD opm-0.ebuild 192 BLAKE2B a84826ae442a9e80bfd338351c9a4ef358c6654c618f8c2d3e31161cbeff3d726d2490a5c1d2b5ff843811c5d82c2ab9141c86ac4ef45d9e6713296f3f2ad9eb SHA512 6fc91d49469e011ddd8fdec918d81017146c407b95b2da8ce5e7ca7a8aff2345b7b8b3163f7cd527f3e82284d017a689fa672c7609bb6629dfadd88e9bc33911
+EBUILD opm-0-r1.ebuild 197 BLAKE2B 6f59deab551c6a982ce48d144f0162b7f372f09a7c4320093cebdd4a4e9f2359893a4e859938bea9193ccfa73297aa50c88d9587febcc370bdb15ef90e2dd7fc SHA512 f92a81198ecfeb5290549444389cb3a3eb57168f17c07395187ef5c9cce8e70efab3122e0665e62dfa8494a835ab2fa4c07bc439d9ca2d86887756746df2792e
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/opm/opm-0-r1.ebuild b/acct-group/opm/opm-0-r1.ebuild
new file mode 100644
index 000000000000..ef89d5cd2cc5
--- /dev/null
+++ b/acct-group/opm/opm-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for an open proxy monitor"
+ACCT_GROUP_ID=127
diff --git a/acct-group/opm/opm-0.ebuild b/acct-group/opm/opm-0.ebuild
deleted file mode 100644
index 155f6374c269..000000000000
--- a/acct-group/opm/opm-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for an open proxy monitor"
-ACCT_GROUP_ID=127
diff --git a/acct-group/oprofile/Manifest b/acct-group/oprofile/Manifest
index e93e6c5be255..f8e037568003 100644
--- a/acct-group/oprofile/Manifest
+++ b/acct-group/oprofile/Manifest
@@ -1,2 +1,2 @@
-EBUILD oprofile-0-r1.ebuild 210 BLAKE2B 19b343756bbf2af8e1cdc84be3ad8ae55ba3c64a8977184ceba51b54adf4e9050ea8eb6a1591ddbdc3077e13406243979a131a9e365846fff31223dadbded15b SHA512 51b4d81b6571d39e031d7a82868689fdcd80585093be51ba194abd04a20888dce328916063b5a63691d697184890f4470b64486ba16dbdb291017d0f9c16a6b1
+EBUILD oprofile-0-r2.ebuild 215 BLAKE2B 9d2c4ef047a1f3d5b1f44406c6164dfb0676ac529c1f536f58c7d0978e12e0a8b1a635e7223929ee3b2240243af69f71e1961df9b039cee495594d77bf288f70 SHA512 c948502825e595e7d2cfe474a8c276faf0303c7e1cf6b09aca61d36dce6c89a292123924b7e50ec3edb67e0ec0c047621c3196006d5fe3ecadd0730db4be708c
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-group/oprofile/oprofile-0-r1.ebuild b/acct-group/oprofile/oprofile-0-r1.ebuild
deleted file mode 100644
index 2b203421271c..000000000000
--- a/acct-group/oprofile/oprofile-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-util/oprofile JIT code processing"
-ACCT_GROUP_ID=492
diff --git a/acct-group/oprofile/oprofile-0-r2.ebuild b/acct-group/oprofile/oprofile-0-r2.ebuild
new file mode 100644
index 000000000000..05251855d7c8
--- /dev/null
+++ b/acct-group/oprofile/oprofile-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/oprofile JIT code processing"
+ACCT_GROUP_ID=492
diff --git a/acct-group/oragono/Manifest b/acct-group/oragono/Manifest
index 84e5853e88ba..494813736582 100644
--- a/acct-group/oragono/Manifest
+++ b/acct-group/oragono/Manifest
@@ -1,2 +1,2 @@
-EBUILD oragono-0.ebuild 193 BLAKE2B 17663dc485c76bccd97513f8975dbd598156c3271279bcf303f710f74b059b6a1e04837cb26877452e5b4f926b8182a7e3180c00c74b102c7e1ec02aa72f2baf SHA512 64b5178411bc76dd8124da152d51ede1c6eaeb1b430f5b961b39a9a5f25c474affca3acd41a829a1d832594c5b22cb70abd29e4cf89c4a007656eafb71bae538
+EBUILD oragono-0-r1.ebuild 198 BLAKE2B ec9a69902f9248fd319f046063597ebf14de8bed74e79f8f0c6962528fc52ad21ad4ced3e07a668dc6a0e6d2238f7ba74cd2e47685185778d2aed55e79bf4f34 SHA512 d6a1a60821b3bc41b553ac69832c59fdd9eff09d7b877dbffd188cec05479a093928c9b957ccb4dd3a0880dd0c0cc449fd023a7d15ae0c39333cda83fa498f84
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/oragono/oragono-0-r1.ebuild b/acct-group/oragono/oragono-0-r1.ebuild
new file mode 100644
index 000000000000..9595ed9beec8
--- /dev/null
+++ b/acct-group/oragono/oragono-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the Oragono IRC server"
+ACCT_GROUP_ID=324
diff --git a/acct-group/oragono/oragono-0.ebuild b/acct-group/oragono/oragono-0.ebuild
deleted file mode 100644
index 2566e7772276..000000000000
--- a/acct-group/oragono/oragono-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the Oragono IRC server"
-ACCT_GROUP_ID=324
diff --git a/acct-group/ossec/Manifest b/acct-group/ossec/Manifest
index 955704cf879b..39b4059ba1fc 100644
--- a/acct-group/ossec/Manifest
+++ b/acct-group/ossec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossec-0-r1.ebuild 194 BLAKE2B 6217c683976cb8cc6f5618949736bbbd97f1bf1d097dc24154f3bddc2882227fe933c7dfff2bbbce60f092429c09984862e9dd9e004c125d2067ebde04290f84 SHA512 60e12f1b6663eeb3bb1d489aa95122f0ac8fe099f3077b3de6a012374e3e8e2176ac254751c30b00081a98976291da37ea1a78fc0a3d3622f84e2fae79922707
+EBUILD ossec-0-r2.ebuild 199 BLAKE2B 2ec1d0e61385cd56c4876e6c2d0f2cdb79cdbb6dcfde81fcb6127a1dec0fdd1c005316b2e260da3ed290e964f847361d8c4a583ba3abb2c7adbe0568d160eb13 SHA512 8b704f3422a55e3a29526714be9a2dc24ccec53c746d8c2af1150a7ae7afc7eb8cc457fad3eebe754fed68dd84d8312ef3909f9fe094092dbe3aa2d9a207df09
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/ossec/ossec-0-r1.ebuild b/acct-group/ossec/ossec-0-r1.ebuild
deleted file mode 100644
index 591266c60294..000000000000
--- a/acct-group/ossec/ossec-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=330
-DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/ossec/ossec-0-r2.ebuild b/acct-group/ossec/ossec-0-r2.ebuild
new file mode 100644
index 000000000000..966abb634df9
--- /dev/null
+++ b/acct-group/ossec/ossec-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=330
+DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/owntracks/Manifest b/acct-group/owntracks/Manifest
index 28ee4e5bd5de..e72e1ceb691b 100644
--- a/acct-group/owntracks/Manifest
+++ b/acct-group/owntracks/Manifest
@@ -1,2 +1,2 @@
-EBUILD owntracks-0.ebuild 205 BLAKE2B 1d1822467c4ed2ee1e06702225885855a2e6a2c63c73e76411546ed272d8b1635786841e6f2b2fe680aecfdfcd5e38cf66730a4743b5a6221fb001bd22d77f40 SHA512 f68bb964f094bedd2e37305145e6b18a978843377c44cb181bc625686205e50a2f54126ab56cf3e35263fee8ada63964cf0fbe391898374b6df644eafc550a84
+EBUILD owntracks-0-r1.ebuild 210 BLAKE2B c9a74bf7c9f82b769024c32b75f92e0e5808f347ecad51e6b6e8cffbd9e2916eacdd12edc997db6480e00cb15e68b21d2edf3134a0093de679b1dc2fb0b366d3 SHA512 83d1c0be3d22745264af3c267a5f96054d4b0d373bf5f6f24d243a1127bd73db5e6cc699766847e062124c83a57decb76787d0aba480ed010c1f1f6131334ce1
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/acct-group/owntracks/owntracks-0-r1.ebuild b/acct-group/owntracks/owntracks-0-r1.ebuild
new file mode 100644
index 000000000000..fe5d67599e48
--- /dev/null
+++ b/acct-group/owntracks/owntracks-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
+ACCT_GROUP_ID=524
diff --git a/acct-group/owntracks/owntracks-0.ebuild b/acct-group/owntracks/owntracks-0.ebuild
deleted file mode 100644
index 10c2ac74184e..000000000000
--- a/acct-group/owntracks/owntracks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
-ACCT_GROUP_ID=524
diff --git a/acct-group/p2p/Manifest b/acct-group/p2p/Manifest
index 2e6a94fc16b6..1a2a6ea95ecb 100644
--- a/acct-group/p2p/Manifest
+++ b/acct-group/p2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD p2p-0.ebuild 184 BLAKE2B bb96c33604a99f1d9ab0fe05b5a8d2d7d4fea24f50d39216eed1c6f2347dc77df60cbd0c097903231bb2f74c49caaf76147cc5e2797711d16004465a2308e597 SHA512 eabb93c889280cf9e48bf67366425dd74774497407d545ade7f95b8181a5f5a574228656d65dfc4961681ef4a1d9c9c49dfeb59d9a2e3305ba4cb8d02b9bc91f
+EBUILD p2p-0-r1.ebuild 184 BLAKE2B 9897f845d1ea6a4d854d6f1465b93f6938a14501a67c3f0d0123c0e423162f32e0c21bf476110db01769ca7c2b0aaa997cf292b1b5eb4a688684cb9fbc3a46bb SHA512 8e6b811f5915f7ba52637030d14b13e05af0b281e78a2cb0e826a55d497a4f3ec5167b3ca062b56110e17b950aa4aeecbf13708f9da443de10827f1141fe79a5
MISC metadata.xml 407 BLAKE2B 6cd79e7645acb510b97a94008e57434ff0e0c1a6e01f0b26a7f1d1f9904b3eea8cc1039f621ecec6512c6bd463fbed7a6472b7fb9a61f7d94b9e6643fa443bca SHA512 d701b4402b608096a4b6aa7b89c6e789bb86d8c84cf07ebb0525d67a8f32b9db650da91ae01c7051d53e09137eb5a2c4734008eab43f029c06cfe47f9761272c
diff --git a/acct-group/p2p/p2p-0-r1.ebuild b/acct-group/p2p/p2p-0-r1.ebuild
new file mode 100644
index 000000000000..52040d2ff7be
--- /dev/null
+++ b/acct-group/p2p/p2p-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mldonkey"
+ACCT_GROUP_ID=378
diff --git a/acct-group/p2p/p2p-0.ebuild b/acct-group/p2p/p2p-0.ebuild
deleted file mode 100644
index 682fd4cc07bc..000000000000
--- a/acct-group/p2p/p2p-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mldonkey"
-ACCT_GROUP_ID=378
diff --git a/acct-group/partimag/Manifest b/acct-group/partimag/Manifest
index 570e76af2802..af12edff7323 100644
--- a/acct-group/partimag/Manifest
+++ b/acct-group/partimag/Manifest
@@ -1,2 +1,2 @@
-EBUILD partimag-0-r1.ebuild 199 BLAKE2B d04bccd7067c82923be93bc23a2e6b634da06e5b4de0510af9d12d1aaa7d2ab244e5730de9529bb28fe4d124686ccf502d7221c5e29a3eee63807745aab7111d SHA512 9c703271edfffa572b50cba4582cd5642ab0efb2bc8bc09754cc21b02feaaca439e2f09269d971d3e152d0360031d2628e7ce3ee8cccdc66bb896218d7dae4d8
+EBUILD partimag-0-r2.ebuild 199 BLAKE2B 9f4e8869633a6a34685827708deba2c5048cbedd359b59d489500ba4817070b8e09cbda18f5bf4603e3d473191c2f4d2aefbca460ce17ad72e894c2c9d625a61 SHA512 59f8f1fcc52e2994d4a0bdb720d95f6e1296122e529c2f1f5a915c2d3127c88f747089857c075b23e9fa61d1a41072f3284ef3716cd166fd4e25609f6838ade0
MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/acct-group/partimag/partimag-0-r1.ebuild b/acct-group/partimag/partimag-0-r1.ebuild
deleted file mode 100644
index d1c1482d6ab5..000000000000
--- a/acct-group/partimag/partimag-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-block/partimage"
-
-ACCT_GROUP_ID="91"
diff --git a/acct-group/partimag/partimag-0-r2.ebuild b/acct-group/partimag/partimag-0-r2.ebuild
new file mode 100644
index 000000000000..1b3b59f53e25
--- /dev/null
+++ b/acct-group/partimag/partimag-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-block/partimage"
+
+ACCT_GROUP_ID="91"
diff --git a/acct-group/pcap/Manifest b/acct-group/pcap/Manifest
index d0cf964a7b53..888d4147ab55 100644
--- a/acct-group/pcap/Manifest
+++ b/acct-group/pcap/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcap-0.ebuild 201 BLAKE2B 6fcf91eadb676ca86e263112d3d4c097f98a839ec147211a7db58611293c0512fa1210c2617ae73a986e94933a2d553784c2bc9e4ba14b5c30249cb41f6651ae SHA512 fc5a51956c16ff9ca2e73ee286532a41e083fe7cb5963d5a911f2eeec3bd8e9c9273a02c76de3226b7a2bdd09780ddd6ad2b95147db79dd4a4a4be04591cbaf0
+EBUILD pcap-0-r1.ebuild 201 BLAKE2B a687828fa1e2874af4e7de0d80f0ad1670e7589f78699bd2338c6c00d54f340abbee2aa6cc80a9872b6f815c792aefbf785c7536bfabe846db0be39a2283026f SHA512 72fd9f043c154559b757de86e5dad74c87270af3f39a53a7d69b222618736124e47464a1aed44ce616d062c923f73982652ff31a19a1d165659e03e018e94af2
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/pcap/pcap-0-r1.ebuild b/acct-group/pcap/pcap-0-r1.ebuild
new file mode 100644
index 000000000000..7bb74847aafc
--- /dev/null
+++ b/acct-group/pcap/pcap-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for capturing network traffic"
+ACCT_GROUP_ID=377
diff --git a/acct-group/pcap/pcap-0.ebuild b/acct-group/pcap/pcap-0.ebuild
deleted file mode 100644
index 7c6ece39614e..000000000000
--- a/acct-group/pcap/pcap-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for capturing network traffic"
-ACCT_GROUP_ID=377
diff --git a/acct-group/pcscd/Manifest b/acct-group/pcscd/Manifest
index fcb81e89da0a..833131829a45 100644
--- a/acct-group/pcscd/Manifest
+++ b/acct-group/pcscd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcscd-0-r1.ebuild 145 BLAKE2B 48573d7944b547f0ccaae5385d2350d378a9da96601a43bee4fac29e7fd007b074aaa97f813ee5b5cd566db8155dde73e2d56f1e4a6b288e7d399ea483894335 SHA512 2a648a8658f5cee5f35ca032a37c9079c6b0267dd313b22fa28396db11ad1eb9f5f1b171073ef98ada3d4409c0b01293b2feb4ec818395ab3588c1f9bbc4c61f
+EBUILD pcscd-0-r2.ebuild 150 BLAKE2B 6cf563a89da076b182f7267017f6ddc96e1a92941a51742f6a17d63a1c2d942c3110297c8737be1777402e4f9271859c4f462cb48983425d08a1bab0ffba120c SHA512 6577587824482acd281589433d993cbf028a4d5b50e2e97fa825f4e59b5fb17a69aca226c4969056bd323480a635a3a43eb583c57b3545e75f7b019e434af9d4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/pcscd/pcscd-0-r1.ebuild b/acct-group/pcscd/pcscd-0-r1.ebuild
deleted file mode 100644
index b2d98afd01e9..000000000000
--- a/acct-group/pcscd/pcscd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=47
diff --git a/acct-group/pcscd/pcscd-0-r2.ebuild b/acct-group/pcscd/pcscd-0-r2.ebuild
new file mode 100644
index 000000000000..29a733881a71
--- /dev/null
+++ b/acct-group/pcscd/pcscd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=47
diff --git a/acct-group/pdns/Manifest b/acct-group/pdns/Manifest
index 66676edeed5f..5f7e04cb5279 100644
--- a/acct-group/pdns/Manifest
+++ b/acct-group/pdns/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdns-0-r1.ebuild 146 BLAKE2B 4f62c9a763a94b693a38085f2b8e8b27acb08db934bec0b2894bc13d8f02586f6f70fbfd94a491261e1714791075ec889a37bf7c991d181a63d081d3b13c88c5 SHA512 5383eb2d31832155d6a81938101a114ac206ae1b73e6166fac3c9fdfc8e4bc7052ec9701d3d391c78822e66466767598aabe24d3d07b18d47f436bc502f5d994
+EBUILD pdns-0-r2.ebuild 151 BLAKE2B 5ccb0f5f229bf7bc729a74486d5c7afba5975071992b10e6f40e54891ad2a4b85dba3c034e8daa7190d5c0ee1cbe809f3e3860a024e054076dcf11445d903ed7 SHA512 ddc6bbb85d117f90bf496fc097aaa3cce4d357383b52b456a563fd8efba355cee63e1bcbb7f5bed99e6094167c54ab4974706d48c911681ad4cd61842e8256ab
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
diff --git a/acct-group/pdns/pdns-0-r1.ebuild b/acct-group/pdns/pdns-0-r1.ebuild
deleted file mode 100644
index 4f9392b371a0..000000000000
--- a/acct-group/pdns/pdns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=423
diff --git a/acct-group/pdns/pdns-0-r2.ebuild b/acct-group/pdns/pdns-0-r2.ebuild
new file mode 100644
index 000000000000..660d64dd4e1f
--- /dev/null
+++ b/acct-group/pdns/pdns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=423
diff --git a/acct-group/pdnsd/Manifest b/acct-group/pdnsd/Manifest
index 210d9ce608e1..2e92b2e0f38c 100644
--- a/acct-group/pdnsd/Manifest
+++ b/acct-group/pdnsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdnsd-0-r1.ebuild 151 BLAKE2B a508c8297de8588c8ad53cb6285ff9a53a6e045e37f30c2dc54199907830f5bfe5edcc3c7b078044ad837ec033682f60c7edd14d0b3bb1d873e0b92d15e012d0 SHA512 b24ae3c454c9852828e30be46321a562c8bcee74f045bbfdf353163ea953d1be8c0c20f59fc2fdf3eb059c5a87152629eaa24e3a1a9aac4fe3b43be69e262a01
+EBUILD pdnsd-0-r2.ebuild 151 BLAKE2B c47ea4171f32203184c44fcf0584c3f545ed0c1c1a3bc69923da325a30763a3a051a40e42e83ffa0f1a3dc5702e5eb332e9e9c1fe54be9c917174ff1988235f3 SHA512 cc6912f792b9daa06fc8df93c6ac36a6e10ff7c103f012d81d057d75a6fdad94b0ef187b9211eb29067adcf1d5b79e0de308c12004d942e07c5296faf144f1cd
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/pdnsd/pdnsd-0-r1.ebuild b/acct-group/pdnsd/pdnsd-0-r1.ebuild
deleted file mode 100644
index 6c6a29d76f0d..000000000000
--- a/acct-group/pdnsd/pdnsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=184
diff --git a/acct-group/pdnsd/pdnsd-0-r2.ebuild b/acct-group/pdnsd/pdnsd-0-r2.ebuild
new file mode 100644
index 000000000000..9a4d6fcc6db2
--- /dev/null
+++ b/acct-group/pdnsd/pdnsd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=184
diff --git a/acct-group/pgagent/Manifest b/acct-group/pgagent/Manifest
index 02a2e596f3b6..63cdf96048df 100644
--- a/acct-group/pgagent/Manifest
+++ b/acct-group/pgagent/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgagent-0.ebuild 195 BLAKE2B 237e57921dc02b2289aa4c032e23115c8be30188bec4de08657047ebade6819c093ac00117724af524096a116e1cd7ab120a128e88d6614810f11cca90312636 SHA512 58de205afa5f66a6c9a219db86681b4281302f4a484798ca0c8450292eaf1d8dc6be8967246f057cf470471a665bc1c4f0879386e687a14ee00db0373f1179eb
+EBUILD pgagent-0-r1.ebuild 195 BLAKE2B 70db29c7f03e8315c863a7d886e5bb408ab16d361bbfdccf541623e1d5311949d68d6b66d26bb94f033c85bb7c6c3aa35d140ace2bc39187a7bf4178492892b5 SHA512 8e2702185d19c973062436444e46bc47c5845b4aca10382d86b868a95d51950e9cb02f5f7c8c2d12a2d9d7d5433824002b98c474d7f8a6cdb7f794b242aeea10
MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
diff --git a/acct-group/pgagent/pgagent-0-r1.ebuild b/acct-group/pgagent/pgagent-0-r1.ebuild
new file mode 100644
index 000000000000..5c1514304544
--- /dev/null
+++ b/acct-group/pgagent/pgagent-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/pgagent"
+
+ACCT_GROUP_ID="135"
diff --git a/acct-group/pgagent/pgagent-0.ebuild b/acct-group/pgagent/pgagent-0.ebuild
deleted file mode 100644
index a5716bd1cb4d..000000000000
--- a/acct-group/pgagent/pgagent-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/pgagent"
-
-ACCT_GROUP_ID="135"
diff --git a/acct-group/pipewire/Manifest b/acct-group/pipewire/Manifest
index f35ccb06857a..1fa3cd4e5b06 100644
--- a/acct-group/pipewire/Manifest
+++ b/acct-group/pipewire/Manifest
@@ -1,2 +1,2 @@
-EBUILD pipewire-0.ebuild 151 BLAKE2B c0c119f25a34290b1230891cb5d33623b76c8185d6d6723e6a3faa665d9c4e0211d4de1eb56e38eea6b359b9c5c6a2702a6b1f8f4409c816e9ff97ed608dcc84 SHA512 e65e2b5b834ee6db7c9179099be08c7372eb1a6385849908df5d758cf5ffea357bcf11d1639c043c57af672209ffee0661c7f6a249b65fd6e92d11a070c80ed5
+EBUILD pipewire-0-r1.ebuild 151 BLAKE2B af1da4f0b494abd4ade100ddfb027d4a2d4961c01a59a5e32f326a63762af8e1034daef468eaca33799ee2ef8b313d2baced627f4d6d5a4a38a4be4cb74a0575 SHA512 655f62b8ae8ef800b042b101487c062a0c455c097e079f7ac83202034cc42fee740bb57d9e01b9ee1282d11b3ad05d251dd98a5e1e29e6117e71a4c7568d9dd2
MISC metadata.xml 345 BLAKE2B f519f452866108391c70c15f93d9c861d4d2abc2d7e8abad79bee5e5e2649119643c9563e2c256c5fa194df4b2bb8b641ff62136215ea3d79564edffc849e9f8 SHA512 1fe7551246560d5f17056ed4d8ef3b88f080d7beb1285054cdc691e392686b62107695fc35afaa4bee308bcdd850ae69d1302bb7127fec149854de58b226f469
diff --git a/acct-group/pipewire/pipewire-0-r1.ebuild b/acct-group/pipewire/pipewire-0-r1.ebuild
new file mode 100644
index 000000000000..5e1d25235785
--- /dev/null
+++ b/acct-group/pipewire/pipewire-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=509
diff --git a/acct-group/pipewire/pipewire-0.ebuild b/acct-group/pipewire/pipewire-0.ebuild
deleted file mode 100644
index c21081d66ed0..000000000000
--- a/acct-group/pipewire/pipewire-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=509
diff --git a/acct-group/pkcs11/Manifest b/acct-group/pkcs11/Manifest
index a79127e3ac3d..3174dea1339f 100644
--- a/acct-group/pkcs11/Manifest
+++ b/acct-group/pkcs11/Manifest
@@ -1,2 +1,2 @@
-EBUILD pkcs11-0.ebuild 200 BLAKE2B eeb91b7df5bf9023e621de9046533b3fddeae2333ccb634e826e052d65deddd9bad40ecf5607c2811920c8be75671459820e07cf0eb5b9f949d95bf80287c09c SHA512 e2328030c63476b736000b6fceb23ad2c47c98456b827c491efed89fce3a82661d7a2b0f88a9cbee3702ba457223463049830ed1b2059bdcdffea8a3b921a924
+EBUILD pkcs11-0-r1.ebuild 200 BLAKE2B af7cf5740fa3174d5313f1f31544a7275badd5f033061dc37baa7a601c893b4ecbdce47bf87411a1cf8c0a4ed038d3070060b8ecf997275286d7ca03a8dbf43a SHA512 053cdf7e435f58810b56e41d3787e1fa9bf41cf371bccac3edcbd53bce11457803c98f416651db7673d6bb0db664dc07c3a5e5c9377b9a19db5d705f3b1f4cba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/pkcs11/pkcs11-0-r1.ebuild b/acct-group/pkcs11/pkcs11-0-r1.ebuild
new file mode 100644
index 000000000000..2c25489a23a4
--- /dev/null
+++ b/acct-group/pkcs11/pkcs11-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-libs/opencryptoki"
+
+ACCT_GROUP_ID="331"
diff --git a/acct-group/pkcs11/pkcs11-0.ebuild b/acct-group/pkcs11/pkcs11-0.ebuild
deleted file mode 100644
index bd2c78e56eca..000000000000
--- a/acct-group/pkcs11/pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-libs/opencryptoki"
-
-ACCT_GROUP_ID="331"
diff --git a/acct-group/placement/Manifest b/acct-group/placement/Manifest
index 671998d02211..252370b86778 100644
--- a/acct-group/placement/Manifest
+++ b/acct-group/placement/Manifest
@@ -1,2 +1,2 @@
-EBUILD placement-0-r1.ebuild 146 BLAKE2B 8efc80a4ac166d43f4d8c1c17e3948722a193a8ac01f1c24d65f75dd61b7e9bcbcff1b46b2e2b800591c2c4db08010b4b6385d777262b429270e1b73be30c620 SHA512 dd45c9c0754f964be66aecbf017503d928b5a6f72076317b6264c1d55bef105745953717697f36d0c7c08727726396e5141c66354d5e1ad88337f3cefad9dd1e
+EBUILD placement-0-r2.ebuild 151 BLAKE2B 970a6af0f350ef0d96488544ff42e0359ebc1989fcb14fae8435848c9d0cf2dc713fa98d476aa522ed3afa0ae33acd45426f6fd27cd775d5f19c0e639777bdef SHA512 847aa08b2d4ae93ca62e1943255723f017f696b3d367a3b9de7be49d7d370435c3b51997aa6f7ee52d8e20ab8a2f47e571acc03f835fbd455d690ad11fd22c6b
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/placement/placement-0-r1.ebuild b/acct-group/placement/placement-0-r1.ebuild
deleted file mode 100644
index 4fb6ed986132..000000000000
--- a/acct-group/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=448
diff --git a/acct-group/placement/placement-0-r2.ebuild b/acct-group/placement/placement-0-r2.ebuild
new file mode 100644
index 000000000000..2d561e1d290a
--- /dev/null
+++ b/acct-group/placement/placement-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=448
diff --git a/acct-group/plex/Manifest b/acct-group/plex/Manifest
index f517be322a13..7f088f5ba2c4 100644
--- a/acct-group/plex/Manifest
+++ b/acct-group/plex/Manifest
@@ -1,2 +1,2 @@
-EBUILD plex-0-r1.ebuild 189 BLAKE2B e86ad24b0cdbeba3d1590d737bf1e22cd2c56e1b13d9754400b68990e28f048bd96ccd11d41942aeb5086e470d84b175c7716099de52d6cf993129ce9fcddbcf SHA512 64677da0c0cb9124e1f49ae6fa19e48486a4310005172c7c52ef30bf0740a445cc7c2f01852556c3d5b05cf1c71bf2f42ea5a0aef29991cb8c39365befe73efd
+EBUILD plex-0-r2.ebuild 189 BLAKE2B 01596048ad3dec7d47c05b8f6a18cb1e5a2cdcb15ecc71a5a695af7c0981799f450c384335ba12479b8943cb80a3ac593086cc3839690911e6643b57aa8df3e5 SHA512 9f27b5a873096ad4fd877e6093c07c53751ee4362c31dd321e8ef44117bf69d9d2af1ce02744ffe1c6aef90c2faa6ec1b8fa168ac512ff8f21d5300c719036e7
MISC metadata.xml 398 BLAKE2B b0364533e5e51af3ff46cce6e364786496e4a93a365d7566da1fad2f1a7a262cb18a2afb43d3e3f02d9a7e6a6f76148ae49c40653b63b3d11f242c99f113cd90 SHA512 c05d31ba64239181f746b0d3c66dbca84895f310378b754431ff3b8e27127a02ae3372c538fb21c23f94d4ad7331c9a9aa90b001a1fe581aeab2ccd913495a8a
diff --git a/acct-group/plex/plex-0-r1.ebuild b/acct-group/plex/plex-0-r1.ebuild
deleted file mode 100644
index ec85c721a861..000000000000
--- a/acct-group/plex/plex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Plex Media Server group"
-ACCT_GROUP_ID=103
diff --git a/acct-group/plex/plex-0-r2.ebuild b/acct-group/plex/plex-0-r2.ebuild
new file mode 100644
index 000000000000..9239d7ea7f62
--- /dev/null
+++ b/acct-group/plex/plex-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Plex Media Server group"
+ACCT_GROUP_ID=103
diff --git a/acct-group/plugdev/Manifest b/acct-group/plugdev/Manifest
index 5f9b71d6d4ce..bc92340dd0b5 100644
--- a/acct-group/plugdev/Manifest
+++ b/acct-group/plugdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD plugdev-0-r1.ebuild 209 BLAKE2B 680ffebfbb8aa140a1cc83b909f60f9832c695994a3505a59d822a365170e8b96f66cd57833670f587463900102062836b835e7a44c34f26211daaab1827e392 SHA512 0403744e2f993bfb6003c8c86f2d1ad798cc20361952634fef55ee0fc31c3a916c1af39c03487bca6ddacf0c411d33e3e0c6c02334bd781bd52f652036f23224
+EBUILD plugdev-0-r2.ebuild 209 BLAKE2B 8fd9464ed1bce96bbfac6f5cd9e201a23c9aa04da0575f25129f581751acb7b6ae6615f6bf7caf345f14ba59926ab62c9e9f16e014a4cdbe362d78178ee3ffe4 SHA512 60c5239e296d682e66c8a10c894f9999159964d19431f51b268854cefc0fb94f204358e9644a54047df4ef4a1f1e835b8005e955f77724a87dd24006f2a5edfd
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-group/plugdev/plugdev-0-r1.ebuild b/acct-group/plugdev/plugdev-0-r1.ebuild
deleted file mode 100644
index 66735a7fc0ff..000000000000
--- a/acct-group/plugdev/plugdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group controlling access to removable media"
-ACCT_GROUP_ID=272
diff --git a/acct-group/plugdev/plugdev-0-r2.ebuild b/acct-group/plugdev/plugdev-0-r2.ebuild
new file mode 100644
index 000000000000..e37da5772628
--- /dev/null
+++ b/acct-group/plugdev/plugdev-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group controlling access to removable media"
+ACCT_GROUP_ID=272
diff --git a/acct-group/polkitd/Manifest b/acct-group/polkitd/Manifest
index 64be670eb65e..4601809bd373 100644
--- a/acct-group/polkitd/Manifest
+++ b/acct-group/polkitd/Manifest
@@ -1,2 +1,2 @@
-EBUILD polkitd-0-r1.ebuild 151 BLAKE2B 6489d1ae2735ebeab755afe6c9a837ac2d1440c9696f0f67d26f6a15a8099bebf4e5bf08c25aac580bb49cafcb8d36ccc4ffd599470922b93b27900219516467 SHA512 7c530aaf5859558db0b8c5ab4b3ee6fd523cb4076d61b56c40362ae33c8b85f643c98a31e40c8d737f121104956ac835553e66d13c696a718285fb4985ad9ca4
+EBUILD polkitd-0-r2.ebuild 151 BLAKE2B f4e8357ddf0c81a5d2551cfd8c5ba814acc5391c9cf0b82913b3a0817be64a579cbeaeba89a1c8a1030bbaf32460ee678df9ad8c211859075fe402e782f533ae SHA512 f778eb02bb2bbc0e1476973c17c5e20225569b7600396075d635c58b308c4e94b91c62bdf2c1ac1e02047031ddfb52a757a4eaa5f900582b869189cd687d9404
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/acct-group/polkitd/polkitd-0-r1.ebuild b/acct-group/polkitd/polkitd-0-r1.ebuild
deleted file mode 100644
index 7e7baeaeb481..000000000000
--- a/acct-group/polkitd/polkitd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=102
diff --git a/acct-group/polkitd/polkitd-0-r2.ebuild b/acct-group/polkitd/polkitd-0-r2.ebuild
new file mode 100644
index 000000000000..9398dcab7cc3
--- /dev/null
+++ b/acct-group/polkitd/polkitd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=102
diff --git a/acct-group/polw/Manifest b/acct-group/polw/Manifest
index 9f3a93b49cb5..75c6504586b8 100644
--- a/acct-group/polw/Manifest
+++ b/acct-group/polw/Manifest
@@ -1,2 +1,2 @@
-EBUILD polw-0.ebuild 205 BLAKE2B 0c56fb727bb274ace2fdcbadc71c07b01a0952d9168981b87938652ac116f23b19e126566a21c5bb7fbf01f144b3d2bf61cd86d235c3d652d322c91493269668 SHA512 ce23a4403d8c02a5b2fd98658fca95cadb7524e4659643513afdd77332e89f064c1a49510638bddcb61ac6b330057c774a6908beb188442cbba0e5e44667afc5
+EBUILD polw-0-r1.ebuild 205 BLAKE2B 1985cd8eaf2a152801d15f7182019fe61f2740f9004d6275f5f43853496e464ee904271053049372d25faa32cd0dda5f8d46a7d8a8fd2d8a54c05d7ae668ef85 SHA512 08402171a20806e25c843c115f60c3f7cd6c52008748526b8073f2553e2357219de63c7ce7bfa4193cfdb7a0b7fef1a83921d8a10ceff45f83619dfce098949b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/polw/polw-0-r1.ebuild b/acct-group/polw/polw-0-r1.ebuild
new file mode 100644
index 000000000000..24831f7820a0
--- /dev/null
+++ b/acct-group/polw/polw-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/policyd-weight"
+
+ACCT_GROUP_ID="263"
diff --git a/acct-group/polw/polw-0.ebuild b/acct-group/polw/polw-0.ebuild
deleted file mode 100644
index 66480cce7428..000000000000
--- a/acct-group/polw/polw-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/policyd-weight"
-
-ACCT_GROUP_ID="263"
diff --git a/acct-group/popa3d/Manifest b/acct-group/popa3d/Manifest
index d3176a370fcd..b34d46a21205 100644
--- a/acct-group/popa3d/Manifest
+++ b/acct-group/popa3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD popa3d-0.ebuild 191 BLAKE2B 5ba52905ef0388645142e265d5a0795fd9249a966280cabdab0cbcabc627a47e375e358ba0ee8025e4c9129f100ecaf2e02cc97784adf722c9032cebcf7dd70a SHA512 946d9e70c9b2e768731f30185b5ca366a7903c98143abb5e6b7a7296e12536664e9268b8393009cc12e12c11e855e6cc95a7b6252e4c33e642ed9cbf3424a57a
+EBUILD popa3d-0-r1.ebuild 191 BLAKE2B bd9eef847ba8909ff43d5542f332c8df7984b4d8480111ceec7c55c5189fa0b94c0054487f3b867ab7c2e6ce5acbf13c4590b8330f3bda7e3e59aceaddaceef3 SHA512 73b5e431c6738c498f601571e28afcb0f402891c8237003504743184469256448c8a85709bbebe01af3c83d4322ac18eebebbc91662bad0e7cf4206c43f43bef
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/popa3d/popa3d-0-r1.ebuild b/acct-group/popa3d/popa3d-0-r1.ebuild
new file mode 100644
index 000000000000..7857b0f08331
--- /dev/null
+++ b/acct-group/popa3d/popa3d-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/popa3d"
+ACCT_GROUP_ID=375
diff --git a/acct-group/popa3d/popa3d-0.ebuild b/acct-group/popa3d/popa3d-0.ebuild
deleted file mode 100644
index d3620c927b38..000000000000
--- a/acct-group/popa3d/popa3d-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/popa3d"
-ACCT_GROUP_ID=375
diff --git a/acct-group/portage/Manifest b/acct-group/portage/Manifest
index 2d0ec8a3ee24..890ab9515183 100644
--- a/acct-group/portage/Manifest
+++ b/acct-group/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-0.ebuild 146 BLAKE2B 45dea68faca3534d46e980fdc60ebf6f13cd73f84e42f0402e3b3f707faa8ab5c0a7d05e7a23434dbf60f4a1455492aa0a21c379e20ed5369212d2abdb4e991a SHA512 f5752a736335714dc1103c4354b32fb38f826d7d9115d209a3bb607703859ab8700201c32a5c7dc5069b6ec74877106f81223285258e6e71d860a3a63b2382ce
+EBUILD portage-0-r1.ebuild 151 BLAKE2B 31062297d69dfd137a09d1391cd48d2df91abe08ff586aff11c8bc444da9822da2f903ecbf473fa084b2e06b56ea1de5fe767e34c097d3ae3165efc9488df4a6 SHA512 2852394f4b77f6492024732eea925ec22165c213ff50ea0fb0b4c5d6b42fae59d89d8ae5f96aad62cb1275ea7ef21c7988e4f517ac7bc197a0ebde1841d18949
MISC metadata.xml 224 BLAKE2B b8b01962c2bc1d5abaad41f5f9c1af011244a3a3c73ca8544a532a151b5afd90cd1a423ff4d796bd9dc76ac7504a385a850c5f6ceb4c8a5d76e44aa52452d24e SHA512 fa9628394e8600bac8ce6f6f75926875f02d5469f9f5e33f4ab3180504d1a4f614a72973fffb21513b73bf93e22e97d03a4b3fa5360c52e322a0d2919e1f47ae
diff --git a/acct-group/portage/portage-0-r1.ebuild b/acct-group/portage/portage-0-r1.ebuild
new file mode 100644
index 000000000000..84de44bd01ab
--- /dev/null
+++ b/acct-group/portage/portage-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=250
diff --git a/acct-group/portage/portage-0.ebuild b/acct-group/portage/portage-0.ebuild
deleted file mode 100644
index 802a74d18716..000000000000
--- a/acct-group/portage/portage-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=250
diff --git a/acct-group/postdrop/Manifest b/acct-group/postdrop/Manifest
index 12001db6514f..da11bd773346 100644
--- a/acct-group/postdrop/Manifest
+++ b/acct-group/postdrop/Manifest
@@ -1,2 +1,2 @@
-EBUILD postdrop-0-r1.ebuild 151 BLAKE2B 5cee5470da2a82de26d3750c36202ee07d8755a2a0e31ce74cc3a5ff89f0d19cadc4dc85f13381678c0424435842c091aafb2b5a9e1f4fb29af82c6acac0502d SHA512 850fdf163034cf424b6db895bc4704831341d893f89b43288c2bf02f27a562b15c6ef1346b920bf5b1dcd085e2cfa863bf5aa3a81923221b9827ce4c136df27c
+EBUILD postdrop-0-r2.ebuild 151 BLAKE2B 5fa66ee5bca9886f86298c7a6d944b88860652e3693a8ef7a52cddebc03ae414d685ef299f6fbe18a78f268f17d3f4eee00acd6305e737b36fc749bb0016ee33 SHA512 dec47d888619d404acb350889c37919c78162e138b549ee25e5453bb161855a54b401e6d65abb34f9dca8a038981129b5f613e4a858221f9fe9836a1db9ecc39
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/postdrop/postdrop-0-r1.ebuild b/acct-group/postdrop/postdrop-0-r1.ebuild
deleted file mode 100644
index 2898ed6fb8ec..000000000000
--- a/acct-group/postdrop/postdrop-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=208
diff --git a/acct-group/postdrop/postdrop-0-r2.ebuild b/acct-group/postdrop/postdrop-0-r2.ebuild
new file mode 100644
index 000000000000..9931f3853516
--- /dev/null
+++ b/acct-group/postdrop/postdrop-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=208
diff --git a/acct-group/postfix/Manifest b/acct-group/postfix/Manifest
index 96d55fefc3b8..4f26d3e9b833 100644
--- a/acct-group/postfix/Manifest
+++ b/acct-group/postfix/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix-0-r1.ebuild 151 BLAKE2B a720939a64e2234c5f4d9df8c78f3e4af0c614a4fadac6c1c71e5d7cb2681844cf325a189d4b8a060373f77762e3c68393af0bcb7ab1ae3553cd4f59387370fd SHA512 e7396631ed0748f7d0207d8b4bfe35f73b8bcdd01e513ae2e5e01d59c8255eb9042db36551429e3078ec2c151b73a5db5fc1577af2bce4cd9e7d7b03d14e2996
+EBUILD postfix-0-r2.ebuild 151 BLAKE2B 7fbc22dc668e039bf2c353b6cd044ce6778ac8903be6d618d298e2c3f3a99dc7ffbdb2ce8ec51727cc221962360d132d683da14a6c9958c00680a79b31102b9a SHA512 7c6953fa73592c75ad276aa87d61e2b2059fd40ed8ba0d4d1b6193d379b787ca4139594280e0fc65e68aea8d1915347cbf514c0aa7c06183fc415c94ce688e3d
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/acct-group/postfix/postfix-0-r1.ebuild b/acct-group/postfix/postfix-0-r1.ebuild
deleted file mode 100644
index 3ee20e0cc981..000000000000
--- a/acct-group/postfix/postfix-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=207
diff --git a/acct-group/postfix/postfix-0-r2.ebuild b/acct-group/postfix/postfix-0-r2.ebuild
new file mode 100644
index 000000000000..0df662082122
--- /dev/null
+++ b/acct-group/postfix/postfix-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=207
diff --git a/acct-group/postfix_exporter/Manifest b/acct-group/postfix_exporter/Manifest
index cd1dcd3baa84..ca0ff60116bd 100644
--- a/acct-group/postfix_exporter/Manifest
+++ b/acct-group/postfix_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix_exporter-0-r1.ebuild 146 BLAKE2B 89d3e632d4468f3d79da5b1a0bcf9fe002e8f137daa8f700f66da69176570370b3f932e7f4304c626412a8ccfc221d31b03fde06e1e77607d6f7ddef3fc2f36a SHA512 9a2e42aecfcd2857eb81ee847190484bc4435b857348284452e0c0e11dd5efa9407d3e9c2175ad84beee35dae59eda383b1c4beefeb0a43aecce09b9157b46d7
+EBUILD postfix_exporter-0-r2.ebuild 151 BLAKE2B b84a9fce0505845646490b0630ffe2dbc6c0a441b218be3b7d6d5c873549975e25f97c50685be167f337732568c8e082fc4f57ecc47df75ce0e2110499665f24 SHA512 8d02df57851f10e949aff08ccac9fbb735971dc6daa5bf3634bb7facaee145ae8d862b5ec1ca530a6ca0762341375adb0557ec18397e1d4212e8643f4ba06556
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
deleted file mode 100644
index 4b924be02018..000000000000
--- a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=356
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..727bbf6ae770
--- /dev/null
+++ b/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=356
diff --git a/acct-group/postfwd/Manifest b/acct-group/postfwd/Manifest
index bc411bb0cede..845e3ef7305a 100644
--- a/acct-group/postfwd/Manifest
+++ b/acct-group/postfwd/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfwd-0.ebuild 200 BLAKE2B 229a795ea0fc775ed744c5c410292be94cf47610131290382570e0387a855d44aff984c67e58b01615445327557b840f09608aaeee56f78fd138a2bb2f6deb6a SHA512 ee4db2e19682aa9df06b98c041dc72fdc6e91a29feab72c3b4522b91927449de2205059927c70f1bfe9e1dd3c30e28173c29716bc0f3f76aee1c32fa2167c88f
+EBUILD postfwd-0-r1.ebuild 200 BLAKE2B 1be93455b40f2549ddd921b6134f16f06922574c3889116955329cba4038537eb0b946020e1bd221dd50fca93175d89e222e8c22ac5476716f83f2ac905b4466 SHA512 28b42538067d4e4b241f32a6a93b1178c50764ab466d7b02a3a18bb5cda2b97093e30be95eb7498e246b7ff587052005eafdfbfae707e15cb5100c435b32ce95
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/postfwd/postfwd-0-r1.ebuild b/acct-group/postfwd/postfwd-0-r1.ebuild
new file mode 100644
index 000000000000..cafa87134d52
--- /dev/null
+++ b/acct-group/postfwd/postfwd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/postfwd"
+
+ACCT_GROUP_ID="189"
diff --git a/acct-group/postfwd/postfwd-0.ebuild b/acct-group/postfwd/postfwd-0.ebuild
deleted file mode 100644
index a912e8aeb7fb..000000000000
--- a/acct-group/postfwd/postfwd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for mail-filter/postfwd"
-
-ACCT_GROUP_ID="189"
diff --git a/acct-group/postgres/Manifest b/acct-group/postgres/Manifest
index a56673d1a46b..364eedeb97fc 100644
--- a/acct-group/postgres/Manifest
+++ b/acct-group/postgres/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres-0-r1.ebuild 193 BLAKE2B 184bbfb968a2471d685abef0f6dc5857f1814b26aa65cd36b91c399ed24aae29b98e68276a34e72fe8d246d11b74501461532204dbfbef96fab0ce0ab6d5417d SHA512 e4c1221dedb5458ad69d41c23d21b837fbb9aff84a4b315824a7a2838cfe592102adc74d03b41f203530635b44dfc692d34bbcfaf3c9008da1b005d907213961
+EBUILD postgres-0-r2.ebuild 198 BLAKE2B 5e9f4afc23025b89f7fd341ce145b88ce6ff74df710a59d4c3d84d818455a6f6c07e183b7e25553814215642591022f03536ecb968dabe09c66edf4e86e90e03 SHA512 e292e64eacb6cd5524ff32fb797f91ebc996599ec42cc08995cc607de5070d2fe7e85b3330876c9c6055de4d8618bb85d0a8bd3e879e58ca0410228e9a526530
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
diff --git a/acct-group/postgres/postgres-0-r1.ebuild b/acct-group/postgres/postgres-0-r1.ebuild
deleted file mode 100644
index 979541863f53..000000000000
--- a/acct-group/postgres/postgres-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="PostgreSQL program group"
-ACCT_GROUP_ID=70
-SLOT="0"
diff --git a/acct-group/postgres/postgres-0-r2.ebuild b/acct-group/postgres/postgres-0-r2.ebuild
new file mode 100644
index 000000000000..1331ea3b1e55
--- /dev/null
+++ b/acct-group/postgres/postgres-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="PostgreSQL program group"
+ACCT_GROUP_ID=70
+SLOT="0"
diff --git a/acct-group/postgres_exporter/Manifest b/acct-group/postgres_exporter/Manifest
index 6fd00d04f2dd..827a8a083a23 100644
--- a/acct-group/postgres_exporter/Manifest
+++ b/acct-group/postgres_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres_exporter-0.ebuild 146 BLAKE2B 5a968eb9a1b2106045583bc42ace0492072ed98b70d9469b5bc2381882d67871bfe4c6476b34c113af4033adc5774899e194a241ef428fdbe090eb66a0429dbe SHA512 5f8c3badaa3bb9647f2065a9c5f1c9fa538b4b7dbb0b388a4723922c583f23d395f8bc1a935e5fc7e240cc1b0d0d1d3542a42d2a901a466e08d95c7817036aea
+EBUILD postgres_exporter-0-r1.ebuild 151 BLAKE2B 378b0b64df68680f7b668a864c2b983595169cc6d3f3a0c65041be4f5303939b9994e650f2e1907dba1f49f88ef58acb914c917ea5357e2603ee4b24d589a0b1 SHA512 e0b419e4a75bc6093c2eece61050f550b13b17cf0ccb119b06caa0ca9fe32e09a41b9bb58a298b15eba4491f2aa8e80ae8c633bd1e60f463b8d36c6e8ace3b10
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild b/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..977c3853bcc1
--- /dev/null
+++ b/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=233
diff --git a/acct-group/postgres_exporter/postgres_exporter-0.ebuild b/acct-group/postgres_exporter/postgres_exporter-0.ebuild
deleted file mode 100644
index 06302af88d1e..000000000000
--- a/acct-group/postgres_exporter/postgres_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=233
diff --git a/acct-group/postgrey/Manifest b/acct-group/postgrey/Manifest
index 7288e07f97de..691b55f5bee2 100644
--- a/acct-group/postgrey/Manifest
+++ b/acct-group/postgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgrey-0.ebuild 195 BLAKE2B e964ad5d109c6c87ba8e4eab26f39fdd7f79c32cb2ee1fefad4eb47b710d0564603f8093860553e2505900f4aa8dc118981d1f18dc85d89e0c525eef5ba3ee03 SHA512 8831175b0d37e9035f570024a87481a42b5f9d411fb6ea2801a3bc97e1d9dc2e86369c4550b2a94e53ce06ed0f419f7aee80d9f9cf169c6b7fac369a6136e750
+EBUILD postgrey-0-r1.ebuild 200 BLAKE2B 48e488a18a7aa337d4a8161e870cf9ddffb15d411fbea20c2954ac8f7a37bfc2220047ccf22668bd6b950691f996b9d96c5c9ccf724570af5b0d00defb4ae233 SHA512 0b98d0a72051752fe3a816384ed46bb58a831290a3588f1c891054c19231b799142764454837fb30a0c74253d96adda46824f146b132d506cd876c1e0e78042a
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/postgrey/postgrey-0-r1.ebuild b/acct-group/postgrey/postgrey-0-r1.ebuild
new file mode 100644
index 000000000000..9aace7c3955d
--- /dev/null
+++ b/acct-group/postgrey/postgrey-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the postgrey mail daemon"
+ACCT_GROUP_ID=360
diff --git a/acct-group/postgrey/postgrey-0.ebuild b/acct-group/postgrey/postgrey-0.ebuild
deleted file mode 100644
index ff132477a3d6..000000000000
--- a/acct-group/postgrey/postgrey-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the postgrey mail daemon"
-ACCT_GROUP_ID=360
diff --git a/acct-group/privoxy/Manifest b/acct-group/privoxy/Manifest
index abde1c9c0ed9..e58c695e2dab 100644
--- a/acct-group/privoxy/Manifest
+++ b/acct-group/privoxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD privoxy-0-r1.ebuild 204 BLAKE2B 64de3e3733a663bfe5c6a2e7143c5f3d04a0e909926b99d2cbe4b2d00a583a4af4d4732e1d8b1611acd7fd048620758f073d676b7c4a3c1eea7ff94e2cddafe2 SHA512 5028c425b6acb601096ab1acc100b638a81f71bd12b5431758364ea211b5e458cad67293816e8155fe388c6af2841f45a0f2fc7ac69c401e7eb0436de69fd595
+EBUILD privoxy-0-r2.ebuild 209 BLAKE2B 5e28cba94086038fdcab1bbef14bcc9ca848f847b21bd2b9674863d2d6318f10306ffcb9c4fc896ca6e488d915ce0ce8645bfa73f9322217d0065a4ead22d65f SHA512 6493c6ac80f7f8a4b0d981b6ab611184b8d7e6bee738d7c37b7c99a017d607c54b149d5a588db83318fac854d7fa9a347aa90f662301bed39116baca03539404
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-group/privoxy/privoxy-0-r1.ebuild b/acct-group/privoxy/privoxy-0-r1.ebuild
deleted file mode 100644
index c45bf8db39b2..000000000000
--- a/acct-group/privoxy/privoxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A privoxy: privacy oriented web proxy group"
-ACCT_GROUP_ID=392
diff --git a/acct-group/privoxy/privoxy-0-r2.ebuild b/acct-group/privoxy/privoxy-0-r2.ebuild
new file mode 100644
index 000000000000..152a13fb5e9e
--- /dev/null
+++ b/acct-group/privoxy/privoxy-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A privoxy: privacy oriented web proxy group"
+ACCT_GROUP_ID=392
diff --git a/acct-group/prometheus/Manifest b/acct-group/prometheus/Manifest
index 25f184c96802..c906e6c17c89 100644
--- a/acct-group/prometheus/Manifest
+++ b/acct-group/prometheus/Manifest
@@ -1,2 +1,2 @@
-EBUILD prometheus-0-r1.ebuild 151 BLAKE2B 18f8df19c8a6f156d07abb65e5732b656ddec1c201cb572d57aa544d9fe4d3cbf54e9165cb0b0464a75775b17a88ee9362c2c2bc1a67cf2986a2108943210e8b SHA512 69bea8b81238e6ece98d26f192086f1e15bfd40c0f78ebed92ccfc8b4e089e20e85661c0d8de4d64ea7384e187a975cc5e7c13c1f4118013bbfcbaf50d48b9fe
+EBUILD prometheus-0-r2.ebuild 151 BLAKE2B 969dc4025933244f908fa2066ab0415894e7755273c8b3bbfae7d68349504fa7d33edc2d07801eb896df258de3ccb1b0043f0bbf2a9566fc2b5cb0ec6d8d0e6a SHA512 269dd0b42251e23ea180df0515751db7f76061836d0a0ddb3dcf4c3566eacd24c769ad16ab97aa4c5cbc907e18332239ef2b8f7e1a4b5ba00c35b20730045acd
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/prometheus/prometheus-0-r1.ebuild b/acct-group/prometheus/prometheus-0-r1.ebuild
deleted file mode 100644
index 9a19925826cc..000000000000
--- a/acct-group/prometheus/prometheus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=430
diff --git a/acct-group/prometheus/prometheus-0-r2.ebuild b/acct-group/prometheus/prometheus-0-r2.ebuild
new file mode 100644
index 000000000000..7b2cae83ab40
--- /dev/null
+++ b/acct-group/prometheus/prometheus-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=430
diff --git a/acct-group/prosody/Manifest b/acct-group/prosody/Manifest
index d841ec91fda6..5c3bfe019baa 100644
--- a/acct-group/prosody/Manifest
+++ b/acct-group/prosody/Manifest
@@ -1,2 +1,2 @@
-EBUILD prosody-0.ebuild 195 BLAKE2B 71c9575e6535132f641a5ac49e6ff84c7b8ad0c864eb215c03069d1c0eb6ccc35c53792bc2be34fc100a2142ba123a31d3d5dffb490983bb7323bfbb46968905 SHA512 f538f43c2c2019e881832382e9b9dbe13399da80b9f979feb6f491d1588e1394c7a1b347b5150cdcb280ba2bacd17d9c2326edabeffc71f97f71762ff5f29461
+EBUILD prosody-0-r1.ebuild 195 BLAKE2B e7921d58312b1af15ee44fff7da5935925f2b39bfb0564d4403313110f7e7a49a1154ca23849c32f60c7c5a0c1730d63e86f32dcf8f3cf97dc76911e3d572d08 SHA512 d3acd68530d7dedcb263a2d4f231c942afff366b1cd40510c2064e6c62e993c3dfd013481f32b46edd9244626de4f78fcade690ae3a7caeaed34168ce3294c5d
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/prosody/prosody-0-r1.ebuild b/acct-group/prosody/prosody-0-r1.ebuild
new file mode 100644
index 000000000000..f90772575391
--- /dev/null
+++ b/acct-group/prosody/prosody-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/prosody"
+
+ACCT_GROUP_ID="115"
diff --git a/acct-group/prosody/prosody-0.ebuild b/acct-group/prosody/prosody-0.ebuild
deleted file mode 100644
index 9baa70ab7f70..000000000000
--- a/acct-group/prosody/prosody-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/prosody"
-
-ACCT_GROUP_ID="115"
diff --git a/acct-group/prowlarr/Manifest b/acct-group/prowlarr/Manifest
index a4ab1029204f..d212a6b11eb0 100644
--- a/acct-group/prowlarr/Manifest
+++ b/acct-group/prowlarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD prowlarr-0.ebuild 151 BLAKE2B a5531dd979df6afcfa53a518dd9448c07841d4f3b3da8cb3d8b53f5819840d7bc45bfe42549b56cd56de022316902101d1ce63c652309d774674d75a188910d6 SHA512 74d1d8085a805a4857de9319b2509ac720c5115013ec411891f1aef9b0ec136654e16c835b6cee81e97658d694c7f6137392bbc4ccb3a34dcbc52ac04f396519
+EBUILD prowlarr-0-r1.ebuild 151 BLAKE2B cd96378400cd217cbda3f010e6f37e4816e5cacb4fcddaeb679921bca3af541d970ae659449957b4caa0292963ddc6238970576055b20ab481c3f1214715699e SHA512 32177bc48a816b94d05b02807cbb1a009bdd919eef5bc2e5bf9e2c9976ace97f292b29abf34344ee7ecd35c6dd7e6edbfad9a255f88dc0035d6819617b36c1f3
MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
diff --git a/acct-group/prowlarr/prowlarr-0-r1.ebuild b/acct-group/prowlarr/prowlarr-0-r1.ebuild
new file mode 100644
index 000000000000..fe67ad261fe3
--- /dev/null
+++ b/acct-group/prowlarr/prowlarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=517
diff --git a/acct-group/prowlarr/prowlarr-0.ebuild b/acct-group/prowlarr/prowlarr-0.ebuild
deleted file mode 100644
index 5ea7e36d2c6b..000000000000
--- a/acct-group/prowlarr/prowlarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=517
diff --git a/acct-group/psybnc/Manifest b/acct-group/psybnc/Manifest
index 7c74ed89b69f..bc432ebf650f 100644
--- a/acct-group/psybnc/Manifest
+++ b/acct-group/psybnc/Manifest
@@ -1,2 +1,2 @@
-EBUILD psybnc-0.ebuild 193 BLAKE2B ffd9a5b83312bff8fae6c7e6f1d80274810e842fcead821c7cbfe327fff8599f04628d74fbf8389ce831197d7fe0bd93d3544036ecf9afed071315cf0c696e16 SHA512 5b27dc65541c6ad2a16632246b934500e4ffbe389fe1d6c5d322f65d0d3cdd5483fdc8c886353a15d992913901cb7e07bfa6b895bbb4d9dd6f6dd887be5d1ed0
+EBUILD psybnc-0-r1.ebuild 193 BLAKE2B e1666a862dd9af2772b7e2c288dc53d6cce1d055d34cc8783b8240ee01a613fefafb763f0a87aa0c9284ea416c7edf62f5ca6427fd0511c653f7b23e18d11f54 SHA512 dea9435be7686bf63cadd0142a89159a2a22af53da0529db13aa97b48454438de1c77604dab0d53b81c3ded46236fed5dfdd78ad144da521aca3fbc429806d59
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/psybnc/psybnc-0-r1.ebuild b/acct-group/psybnc/psybnc-0-r1.ebuild
new file mode 100644
index 000000000000..4df3a6c278ec
--- /dev/null
+++ b/acct-group/psybnc/psybnc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/psybnc"
+
+ACCT_GROUP_ID="259"
diff --git a/acct-group/psybnc/psybnc-0.ebuild b/acct-group/psybnc/psybnc-0.ebuild
deleted file mode 100644
index bde356121739..000000000000
--- a/acct-group/psybnc/psybnc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/psybnc"
-
-ACCT_GROUP_ID="259"
diff --git a/acct-group/pulse-access/Manifest b/acct-group/pulse-access/Manifest
index 4be7eacf54a4..74569f357e55 100644
--- a/acct-group/pulse-access/Manifest
+++ b/acct-group/pulse-access/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-access-0.ebuild 151 BLAKE2B acafaf537e4f681967f2844146f98640a66ec78748178ef21a60f8d20ed81761fb526ee55fe75919fb608b7b9f52a82a5bdc8d2f7d4f3e5472c8b77ccef90a1d SHA512 acd9f99ab41aeacdabeced2eb860d21223d1fc87c4ad63ae300261d8b75ab392e96c87a88d02abbfa604e777feec9479d8457c6892894057e6155a5cce7c39f2
+EBUILD pulse-access-0-r1.ebuild 151 BLAKE2B 7ce9faa3217da58b8b3b50ac8a5a386018a88e1e214d8aa6ed15cb749015453fedb57996953ef93b7babdfe44a982d25ce2f2f8c22cb2605b744d9201e897f86 SHA512 39a4fcad2548ce60a531bedd2ad5c5906200a44e772edb04c5f9f7bfc96db3313dd23eaaf9c775d54d84d795f162e23df879174954061d35bb2416efc170ca9f
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-group/pulse-access/pulse-access-0-r1.ebuild b/acct-group/pulse-access/pulse-access-0-r1.ebuild
new file mode 100644
index 000000000000..763cd4096edc
--- /dev/null
+++ b/acct-group/pulse-access/pulse-access-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=172
diff --git a/acct-group/pulse-access/pulse-access-0.ebuild b/acct-group/pulse-access/pulse-access-0.ebuild
deleted file mode 100644
index 700feb5f191b..000000000000
--- a/acct-group/pulse-access/pulse-access-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=172
diff --git a/acct-group/pulse/Manifest b/acct-group/pulse/Manifest
index 3902acba44d0..6d802d7f73eb 100644
--- a/acct-group/pulse/Manifest
+++ b/acct-group/pulse/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-0.ebuild 151 BLAKE2B 608cb62b89a61e237617b5fe742c5f3407dc0363ef6154115b155468cca648ed07211479ea1092da16b247131e37ae9d2115e7892f855ec155e9d52251ecc56f SHA512 d8e117f912a87621646e38277405bb13bf0a92cf23d178dde990f0fdfb1c43f7263e9ede5cbd241520cf1410250dabc1b3515ecd9edf5c139468fcd925d4177d
+EBUILD pulse-0-r1.ebuild 151 BLAKE2B a2fe121e2c18839aa6e3b67fde98dca2c405e9d320d2b484befae0ae609b3ef2fc3249128cd6feb31577677d3923aa2017c71f40972bda4445f46e1c8582d519 SHA512 428e3b373b7e4e9480aff65abbe0a3bc1df2bd4826b08254d42762e836f0295c2921a33cba26036a8f4d0d30d74ad0ae514a6ed24e81a4d35cf99a02cd78cb62
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-group/pulse/pulse-0-r1.ebuild b/acct-group/pulse/pulse-0-r1.ebuild
new file mode 100644
index 000000000000..dcbe29e5d3c1
--- /dev/null
+++ b/acct-group/pulse/pulse-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=171
diff --git a/acct-group/pulse/pulse-0.ebuild b/acct-group/pulse/pulse-0.ebuild
deleted file mode 100644
index 5b0084f6f4f1..000000000000
--- a/acct-group/pulse/pulse-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=171
diff --git a/acct-group/puppet/Manifest b/acct-group/puppet/Manifest
index 9d376011b47b..03c538f0ed4c 100644
--- a/acct-group/puppet/Manifest
+++ b/acct-group/puppet/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppet-0-r1.ebuild 146 BLAKE2B 68f7d3ce618a61445c27874ed1bc5205422598e3798041fd48a02950bc09fff101819650665b2c9e55519c4652892d6ea89399f9e9cf2fc1e0544240ddb207d3 SHA512 0a73713b27365d292aa4517e5ac52c5ea502ae10c1f3c39b56a286f355b5b7672d23f701b299e5793f326df6a6f9114056430c5401eadefd78658c8fa06716c7
+EBUILD puppet-0-r2.ebuild 151 BLAKE2B d29adeeb70056243c82224c46a1718974def17655d11a98e05e9218cd33e1f7ddea0a0be9367aa3212340613561857b194acc3b9925aad26c660844a35c62427 SHA512 6d463c63447a0112a801ebd1e0c3562bb65a9dbf0698b45bfea420972e16a0a5fc69a0bbf41e5fd5e1123859b81f3aff2493d31124b3298b035984e41d8fa1da
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/puppet/puppet-0-r1.ebuild b/acct-group/puppet/puppet-0-r1.ebuild
deleted file mode 100644
index cf9422869bf9..000000000000
--- a/acct-group/puppet/puppet-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=455
diff --git a/acct-group/puppet/puppet-0-r2.ebuild b/acct-group/puppet/puppet-0-r2.ebuild
new file mode 100644
index 000000000000..aaadca579eb4
--- /dev/null
+++ b/acct-group/puppet/puppet-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=455
diff --git a/acct-group/puppetdb/Manifest b/acct-group/puppetdb/Manifest
index ce104cd0b266..4f612a19c050 100644
--- a/acct-group/puppetdb/Manifest
+++ b/acct-group/puppetdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppetdb-0-r1.ebuild 146 BLAKE2B ff6a419a3e9bb86eddbf1051c523e1d19ad75894852189b7296127493ebcf0c80397137cc05af220b1ea8c3a0a13e9e32dc9b94f5f0ddb87ee596e2e347a001c SHA512 a3f358c0eb70f61f210785db9014d1b97bb96173ee096c8283781b38a9aeee16ee94db1992e8cae16e5b51531835fb68300157ae405322b1ae14ca55fe1130ea
+EBUILD puppetdb-0-r2.ebuild 151 BLAKE2B 701b9d6f2eefed1e3e75ec06d864cf4b22ebaca364d2bb5c9e89f574c4d3c93e9dd16aa764d02e04103217066ae134c59d680f3b0bec8755dbffaf2923b2015a SHA512 3a98adfe05768ef4c15b3c655375d30949c9a2347fdbc4c744ec33cb43ea8e2ffa599325656de9e120605a370dce84a0a9aa2ffd4ebe96c6f3a2f39d2c446462
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/puppetdb/puppetdb-0-r1.ebuild b/acct-group/puppetdb/puppetdb-0-r1.ebuild
deleted file mode 100644
index 55e4b42af293..000000000000
--- a/acct-group/puppetdb/puppetdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=456
diff --git a/acct-group/puppetdb/puppetdb-0-r2.ebuild b/acct-group/puppetdb/puppetdb-0-r2.ebuild
new file mode 100644
index 000000000000..623782c5052f
--- /dev/null
+++ b/acct-group/puppetdb/puppetdb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=456
diff --git a/acct-group/pushgateway/Manifest b/acct-group/pushgateway/Manifest
index 98bee9f0503f..a23e954d6657 100644
--- a/acct-group/pushgateway/Manifest
+++ b/acct-group/pushgateway/Manifest
@@ -1,2 +1,2 @@
-EBUILD pushgateway-0.ebuild 204 BLAKE2B 193c8282ec16a5e026a3c632a4fa65f3359576355857f9a36a1c08b3d452ca3b734f566b67962c1be0b5732bbcd571b962db81a6f72ec1e3ea5f8b3e19d3eee6 SHA512 f3241947a68282cd2f770ffc534f9df5b0bddb6421139d87681d49b10ac43bac6a683b8c6f8407220899430bbb9aadfc9382f4a419d6b284a08e7e04f8b6d937
+EBUILD pushgateway-0-r1.ebuild 204 BLAKE2B 4fa3fd7e4742ee8f87672e19bbaff30c925f950e8fd62b63f92a83f8687ee71269d78ec740e0f8763658b090853df8ec76184e67682dfaa23f967d8f28d52cfa SHA512 9f5381fa062d40720e250d1fc3d0d9649d0108c73e6c9ff3770c006374e9273936aa75e9d63f4b8cd0f08a0b0cd048cf84a4cf505ccb37a8ec8142c6896041cc
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-group/pushgateway/pushgateway-0-r1.ebuild b/acct-group/pushgateway/pushgateway-0-r1.ebuild
new file mode 100644
index 000000000000..013d7ec8b032
--- /dev/null
+++ b/acct-group/pushgateway/pushgateway-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/pushgateway"
+
+ACCT_GROUP_ID="288"
diff --git a/acct-group/pushgateway/pushgateway-0.ebuild b/acct-group/pushgateway/pushgateway-0.ebuild
deleted file mode 100644
index c064f6390f10..000000000000
--- a/acct-group/pushgateway/pushgateway-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/pushgateway"
-
-ACCT_GROUP_ID="288"
diff --git a/acct-group/pvpgn/Manifest b/acct-group/pvpgn/Manifest
index d8afdf9a364a..66638926c337 100644
--- a/acct-group/pvpgn/Manifest
+++ b/acct-group/pvpgn/Manifest
@@ -1,2 +1,2 @@
-EBUILD pvpgn-0.ebuild 226 BLAKE2B 41e96958e5df62b47733fa67c0ca638336ba5c836df2869990ad7661fc9f02725d14d344a9acc75850e371f2f90aa52e691486cfc200d3101b434da7c7963176 SHA512 4d59a231420ec7f984c21a2881912fe891623059148eb980f25e916ccf91927117eeef16d173acf7a860358dbf03252df0d36ae5b17e85fc689e2b054f79515f
+EBUILD pvpgn-0-r1.ebuild 231 BLAKE2B 62d8c7e38ed258fd3add75681d9051df7db7bbc268a53751ca2fb3f3b43d7061ea41d2fc975d0cb0da741e9df8783c9c1438e2b945559f7c66aa1fc2ee5e3743 SHA512 3c2f80cb741b0e53cfb716a2095d86ef3170e6c09a10ae59456c571c37df4a02c1ffca52d66bf9252a9b6d37d0523eb8899e8adb634b7961ca5c288a0d4e9b28
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-group/pvpgn/pvpgn-0-r1.ebuild b/acct-group/pvpgn/pvpgn-0-r1.ebuild
new file mode 100644
index 000000000000..3c9571852687
--- /dev/null
+++ b/acct-group/pvpgn/pvpgn-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
+ACCT_GROUP_ID=285
diff --git a/acct-group/pvpgn/pvpgn-0.ebuild b/acct-group/pvpgn/pvpgn-0.ebuild
deleted file mode 100644
index 0a8c0d6e5da8..000000000000
--- a/acct-group/pvpgn/pvpgn-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
-ACCT_GROUP_ID=285
diff --git a/acct-group/qemu/Manifest b/acct-group/qemu/Manifest
index d5fbaa5da8eb..e2af8d9fdc98 100644
--- a/acct-group/qemu/Manifest
+++ b/acct-group/qemu/Manifest
@@ -1,2 +1,2 @@
-EBUILD qemu-0-r1.ebuild 150 BLAKE2B 69e90cf97d3d0fcb711ad8f527d755f303c39d36f7f7b87a1175bf283a25fcab62a851136eedd5730b97ef6f14869fca1d0039db733ee1a7be80d849822b60d7 SHA512 97171f553aac0144c20d4f0cd343d52bcc647785e1750ec8b2482ff30cc31ee02c66c5406f6141d1607d947d0cd97f9c3c9cb49fdd7201b1e188a2f7dded60d6
+EBUILD qemu-0-r2.ebuild 150 BLAKE2B 0c731e9d674b09f92ce157803a962c2f07936981962792cbe7cc3614e9154cfe330bcf839d3f4e5094740483d4e29dcfaaac2d43019c19dc778b9070035b8c62 SHA512 98c04716a1131a961399f6622aa617fede4025d65a38f81d4be386f13cc61697c3b7a738a9a7e40b20e771d6784ac804e96b5682afcaabe96aa348edfc351f8d
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
diff --git a/acct-group/qemu/qemu-0-r1.ebuild b/acct-group/qemu/qemu-0-r1.ebuild
deleted file mode 100644
index bfa7c828015d..000000000000
--- a/acct-group/qemu/qemu-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=77
diff --git a/acct-group/qemu/qemu-0-r2.ebuild b/acct-group/qemu/qemu-0-r2.ebuild
new file mode 100644
index 000000000000..207fc98e46dc
--- /dev/null
+++ b/acct-group/qemu/qemu-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=77
diff --git a/acct-group/qmail/Manifest b/acct-group/qmail/Manifest
index 88ee23f05f98..435627e40a46 100644
--- a/acct-group/qmail/Manifest
+++ b/acct-group/qmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmail-0-r1.ebuild 151 BLAKE2B c2ed534c65c644e3956200ea297ce767210c53aa751a8c2e7b324e84ecb02ca5f26a19fd16b612ea3c55529fd0cb8af41617c40231440a99704d2adba0a9f341 SHA512 50add0e6670ca64b3491956be8e792e44449cfa02f0ab330a1f353151a58cc71d7257e04e304d374916a28e63ff85b264af7126cfbe569756ec972f96d683169
+EBUILD qmail-0-r2.ebuild 151 BLAKE2B 10392d9f6f07a41e0e7bec4af065cd72af9c846a1a53d36e047cfd759bf8f5d90142d3b1e82ce88d5ba9cd205a28533ed85325649bff160aee775975a0d425c1 SHA512 2d12b46f74af1f3a70e7a9e9c89ceec71f820faa300bba387cd44d2854bae2806d74482146c44a4b316fe63c998f6a6ed7eb48de9bb61684bbded0554ead20ac
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-group/qmail/qmail-0-r1.ebuild b/acct-group/qmail/qmail-0-r1.ebuild
deleted file mode 100644
index 86f1ae5e27f3..000000000000
--- a/acct-group/qmail/qmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=201
diff --git a/acct-group/qmail/qmail-0-r2.ebuild b/acct-group/qmail/qmail-0-r2.ebuild
new file mode 100644
index 000000000000..8dd6a346f564
--- /dev/null
+++ b/acct-group/qmail/qmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=201
diff --git a/acct-group/quagga/Manifest b/acct-group/quagga/Manifest
index 2626ac4e524e..f6a66708f141 100644
--- a/acct-group/quagga/Manifest
+++ b/acct-group/quagga/Manifest
@@ -1,2 +1,2 @@
-EBUILD quagga-0-r1.ebuild 151 BLAKE2B 0b546c65e580136e175fd27025e2d6e09b5c896baea3f3340364e13d99eedc263c0ea2d8cc611e312a4994399dc202be710eccbdc5e65818d3a520eafe529952 SHA512 3673808d5bf2e47aefb8d8c93e3ff3f0468d30564eba07941e63ed6cafa55b50f10edd272a065cac9d581f25affacbf6fb24054c84f0fde4f19f3df6fad498fe
+EBUILD quagga-0-r2.ebuild 151 BLAKE2B 2c247d5e3c8da050d9f558dee7e2e2ff7204de7421a449a18711172aad1390835c9a04b6513841313f0eb3a60bf52f2f92c415728dd0492a3c0b801de044e0d6 SHA512 741c9c51c655fe1333ff3879d31d0c1a4d8c288ea53968c9be6dfc2f05a0ccf8688c798b8a5b36d590ae6e38d2a124daf94a36930bc159b7bddaa17abf2e68a0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/quagga/quagga-0-r1.ebuild b/acct-group/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index 104f8007e235..000000000000
--- a/acct-group/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=424
diff --git a/acct-group/quagga/quagga-0-r2.ebuild b/acct-group/quagga/quagga-0-r2.ebuild
new file mode 100644
index 000000000000..cf8345de1bb1
--- /dev/null
+++ b/acct-group/quagga/quagga-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=424
diff --git a/acct-group/quassel/Manifest b/acct-group/quassel/Manifest
index 497271f2df52..d1020f147868 100644
--- a/acct-group/quassel/Manifest
+++ b/acct-group/quassel/Manifest
@@ -1,2 +1,2 @@
-EBUILD quassel-0-r1.ebuild 146 BLAKE2B a07c0887a4a070c4e7b626369b021fd20880c06b9579c3b813fc21dfe9e643c1d8d39c7d91d6da750bb0705b6e342bba7e8ff8aadbea60882401d1b2acc7f619 SHA512 5c6fb5801924f16665c8cd3c919320eca14efc3928ea5e5fabfed9123fb0644a3ec5b25a093ddc3093ffc337dafc3f4d5f814c4cbbc4633eef183a27b0a1afe0
+EBUILD quassel-0-r2.ebuild 151 BLAKE2B 1f51ead974b7f09748b3bcd2ec9b83ec9f0a4e3198009a8a46f2d39f5af0f3a83b2ec776b17307c423b7f33781d843512a52e830bcbcb07d3c626b77a68b9c80 SHA512 e7c4e4c09b0eff59a89f2479de7ec3f342561fa42926fe13b05909c91341015ad39aeb6a6d0bd27aa1d273b45e74a0aa540edb4420306f509b231b4dee4cca8c
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/quassel/quassel-0-r1.ebuild b/acct-group/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index e700412c050b..000000000000
--- a/acct-group/quassel/quassel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=472
diff --git a/acct-group/quassel/quassel-0-r2.ebuild b/acct-group/quassel/quassel-0-r2.ebuild
new file mode 100644
index 000000000000..ed73341e1622
--- /dev/null
+++ b/acct-group/quassel/quassel-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=472
diff --git a/acct-group/rabbitmq/Manifest b/acct-group/rabbitmq/Manifest
index f871f4aec4ee..5b659e1dc75c 100644
--- a/acct-group/rabbitmq/Manifest
+++ b/acct-group/rabbitmq/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq-0.ebuild 205 BLAKE2B f8896181cbe6d286636ffbfa52e911c25b92f78488c7564faac59042494c165a75e092fbd14ed0d6b533b88fd20d3daf5a8b128f253f046753ff79fb989d5f35 SHA512 4f8312deab54040de08ecc51e0d1d2f1949e2999b0e0d96bcd1da4ba3189f9254b5e0891dd0506e5a30c7db2c91719f259890541a81d342aa1f96cbbb820dcb3
+EBUILD rabbitmq-0-r1.ebuild 205 BLAKE2B 8dde75d4a2899add227a6074b69797f4fba2abb2e96ab4f579583f7283a33d240eb2f60488e50dc2d741e452bc36f7c1868fb7ab2f475b25550bf138bbb5b30a SHA512 007ae8f2373b42e0ede66a938450b0078f70598633a0b9fe9f866feab51d9905f805a9fcbb3dc29017b28f9076d219509bb4b157532fdbe03443c4f5f8faea33
MISC metadata.xml 244 BLAKE2B 7a5cfcea42b430285e098019ccdf99eccf96c5ba82feeb5354a023aeb0c197c9e7c138b8329bc20a0080cc028c546a0fc52b74c383a64645aef2eea22b894522 SHA512 04757d267b2495bcc0f50cd5354a9bf2f5093ca396744f4cbcdb4eed249e94333226c52e346261ba8da975d3d5fc7bde3c50a5627875a15247b338bb1eddc2e7
diff --git a/acct-group/rabbitmq/rabbitmq-0-r1.ebuild b/acct-group/rabbitmq/rabbitmq-0-r1.ebuild
new file mode 100644
index 000000000000..68e9ffcebc90
--- /dev/null
+++ b/acct-group/rabbitmq/rabbitmq-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/rabbitmq-server"
+
+ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq/rabbitmq-0.ebuild b/acct-group/rabbitmq/rabbitmq-0.ebuild
deleted file mode 100644
index 58c6c1ee1b21..000000000000
--- a/acct-group/rabbitmq/rabbitmq-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/rabbitmq-server"
-
-ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq_exporter/Manifest b/acct-group/rabbitmq_exporter/Manifest
index d70979b6674b..01289c4d0f2a 100644
--- a/acct-group/rabbitmq_exporter/Manifest
+++ b/acct-group/rabbitmq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq_exporter-0.ebuild 210 BLAKE2B 44dbd22eba325fcb068d6e3e82ab84604ac00d284563ab603ed7b4fb41e069bce58cc291157d9afde836c0f32e8545aae8f037085a71ef1c50fee42d7dae2751 SHA512 c4ddd655d87a51123bb0db20bce824b0f44baef6325097b26fe34c44c4a537a8ada1939524702b397ff2d5628653780f9e88d20628ea9e4b90781a1e80a8d176
+EBUILD rabbitmq_exporter-0-r1.ebuild 210 BLAKE2B 0553f0bfbdc161ed8fee25bd749db44f6c4e2d5f82bde712699960123f55a8c106683038ff012e37c247ebd6ea3df18a94d17f43c529e49a873676efe25d7967 SHA512 ec0145cbbfd53e41f031d6bf12e306bf6b6cd32cac16c4e59df8ebd2ac0becafffe0c0e0352af8c5643e3b4cce64e0e4a345e48c6e5c95883ccf4711a6cbf175
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..6ebea851e441
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
+
+ACCT_GROUP_ID="107"
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
deleted file mode 100644
index bd882d0b8866..000000000000
--- a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
-
-ACCT_GROUP_ID="107"
diff --git a/acct-group/radarr/Manifest b/acct-group/radarr/Manifest
index cd1d6e95960d..830160b26702 100644
--- a/acct-group/radarr/Manifest
+++ b/acct-group/radarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD radarr-0.ebuild 151 BLAKE2B 27c7624723cb9eb6f70bc6a0a54fb754e789b754d31771376674a03adf124bf4f192190263132deb265f0b983a44dadb71556ae5ce6bfda975ce499cc9d574d3 SHA512 3c6f7003f92cd89f185fb24ca4ddcea875982011069f8eb81a99a393c6747131b7a3b29c24a03e6ba9a24a2b7b69983fcf1c2f00a1aa89b8c37fcc984e5ec1ba
+EBUILD radarr-0-r1.ebuild 151 BLAKE2B e3ed9c8257e3b5cc95c6265c621c6b2532bbfa65bc876054cb353cace4d9b0f1b4133538060d2d0c4a7c602220f5ccaa40a5f04d8250bad01eb496f9bb87dbb1 SHA512 0b2a2e555913dccc3c759843460ea643692219e8d944016af252df030b51ffeaabcac2989344a3276653f3c9fc6ea96ea9560096047a87587dc9ee84ab4b5acd
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
diff --git a/acct-group/radarr/radarr-0-r1.ebuild b/acct-group/radarr/radarr-0-r1.ebuild
new file mode 100644
index 000000000000..521778e8e827
--- /dev/null
+++ b/acct-group/radarr/radarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=516
diff --git a/acct-group/radarr/radarr-0.ebuild b/acct-group/radarr/radarr-0.ebuild
deleted file mode 100644
index 1437f0ef9d20..000000000000
--- a/acct-group/radarr/radarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=516
diff --git a/acct-group/radicale/Manifest b/acct-group/radicale/Manifest
index d290c882111d..50f870144432 100644
--- a/acct-group/radicale/Manifest
+++ b/acct-group/radicale/Manifest
@@ -1,2 +1,2 @@
-EBUILD radicale-0-r1.ebuild 197 BLAKE2B 2c7f118a22b17a08262b34dcdb074c4336d26c66f8601fe691af03c5d72bc1e91083b13ec552bde26fbd625ffca5128e4332985250cd1ceab01ec6a520746ed4 SHA512 840478f0a3f9b114f821801b7c7cd088d6f69b53b2ab20f3986212e78649107d1b1c87ff6f285436c873e3f7bc725a44bc8e19cc2e9b9e87ed6f334d993a18a4
+EBUILD radicale-0-r2.ebuild 197 BLAKE2B 35a1508c8d49961fc354cb8574c33609ff26f09c663e6d99b21deb6a2ec80587cc3962591c08e1789716164f400c01fc7495bb4697467a5c1361627c8c3c02c8 SHA512 694f42c00a07221ea1e653b9ad1f66601d6c7cf7ceea64e22e8799c1e5d3324b605b53da7bc0ef98645779be8696f31f8b7331a292330f4837fdc600cce1c607
MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
diff --git a/acct-group/radicale/radicale-0-r1.ebuild b/acct-group/radicale/radicale-0-r1.ebuild
deleted file mode 100644
index a2150f5982d2..000000000000
--- a/acct-group/radicale/radicale-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the www-apps/radicale"
-ACCT_GROUP_ID=327
diff --git a/acct-group/radicale/radicale-0-r2.ebuild b/acct-group/radicale/radicale-0-r2.ebuild
new file mode 100644
index 000000000000..3a15e9f97970
--- /dev/null
+++ b/acct-group/radicale/radicale-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the www-apps/radicale"
+ACCT_GROUP_ID=327
diff --git a/acct-group/radius/Manifest b/acct-group/radius/Manifest
index 268e5811f8ec..f2c2f5d9089e 100644
--- a/acct-group/radius/Manifest
+++ b/acct-group/radius/Manifest
@@ -1,2 +1,2 @@
-EBUILD radius-0-r1.ebuild 189 BLAKE2B 4e65282da73dd41a44294456141015d186c85adc5b5a9dae7c7058869a4d79afdc5a7b52e8b2ae2484ab669fcad954954c98ae81d331d21bef05d69e4538cfe5 SHA512 1b2e8e1ea7d9c708dd4a490aa5c1a9f9e7ea0a0d2dd658b6ba8882a246ab7fbf4d937f797bc843712842e722776ff0d4ba4d1d964a857a335ac30e174ea5f628
+EBUILD radius-0-r2.ebuild 189 BLAKE2B 14f35032161caf3fedcfc6bc01bc59d1c4e487ab3bd68fb5f01a730aadf91ab416c5f2b90311777b033c9bb1036bde801de895f5c0f8247f66841d3dffb9b127 SHA512 c9649fa9af04dbd8a01b1cae66e0c6bfb9803b39b23265ec59d8fe5d5d21e0034ad890bb31321a9b6f1ccd8e308c2619cc5eb6d2b6349c447225121e91281580
MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
diff --git a/acct-group/radius/radius-0-r1.ebuild b/acct-group/radius/radius-0-r1.ebuild
deleted file mode 100644
index 78aaa17a382f..000000000000
--- a/acct-group/radius/radius-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="FreeRadius program group"
-ACCT_GROUP_ID=95
diff --git a/acct-group/radius/radius-0-r2.ebuild b/acct-group/radius/radius-0-r2.ebuild
new file mode 100644
index 000000000000..70012871610e
--- /dev/null
+++ b/acct-group/radius/radius-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="FreeRadius program group"
+ACCT_GROUP_ID=95
diff --git a/acct-group/radvd/Manifest b/acct-group/radvd/Manifest
index 742dde2ab3f9..2041cf3fd6da 100644
--- a/acct-group/radvd/Manifest
+++ b/acct-group/radvd/Manifest
@@ -1,2 +1,2 @@
-EBUILD radvd-0.ebuild 212 BLAKE2B 1b199af40d7631b36019935fadc708881bfad2fccf3c0274fa79c0ddb6e0507cf71d2627aea6653ed1299aebb48475719c4bed11c5c3f2870dfd0de36db38331 SHA512 2e094a78c0908b5dc39f3ef287d3f44db7c16d2e2647dde4adb254248c16002679a357a7e693db41f1cf726eba7571612ed436bec62667b81a79dab2ecd70d9c
+EBUILD radvd-0-r1.ebuild 212 BLAKE2B baee93531003ee315ea3baee0f9f4b71adbbe50b418361711a33f8d43f0300060e12116ea237fbc0c6e0d0737758a33bb327159d8cc68653d3b9b77a18d89c0c SHA512 0365bbaea4b316c755a5c26537543458e2ac419654726794b2721571d8bb2ea3a3e6be9022eb8a36b134b96c851b53be5ff410f5a98a5bd909578fb8eae325bf
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/radvd/radvd-0-r1.ebuild b/acct-group/radvd/radvd-0-r1.ebuild
new file mode 100644
index 000000000000..576d1cfd0166
--- /dev/null
+++ b/acct-group/radvd/radvd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Router Advertisement Daemon"
+
+ACCT_GROUP_ID="215"
diff --git a/acct-group/radvd/radvd-0.ebuild b/acct-group/radvd/radvd-0.ebuild
deleted file mode 100644
index 36fff292c554..000000000000
--- a/acct-group/radvd/radvd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Router Advertisement Daemon"
-
-ACCT_GROUP_ID="215"
diff --git a/acct-group/rbldns/Manifest b/acct-group/rbldns/Manifest
index 62b13dd235dd..59d1c003e76d 100644
--- a/acct-group/rbldns/Manifest
+++ b/acct-group/rbldns/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbldns-0-r1.ebuild 151 BLAKE2B 4b4313edf465676fa90cc4a61b6e2dacda62542c457448df38522af8daf1bdfd34342f9bad64e4ee27651cc81dc00db6a49696bafa9d6cc97a5429950bb7ba8a SHA512 0dc016c8a7a0226b5315b0f66b4f213b05b68824285ef0183c892bdb39f00c2f19d3882fcb97a3a9b5dacba64e1fe5121fd3c705bb26146b14db327a2c314d48
+EBUILD rbldns-0-r2.ebuild 151 BLAKE2B 2fd5c6a1da137baf0e0e2127c56af49e2d61fb4c18834679280194fb75d0c10f1514fb6a54356fcd10634b637f4ea7b8da33be8cb9a29c59dec7fc9954dc32de SHA512 72d3b54aa6cb5b1b277057b255b8b0536910255ea4d8a945819047df648284981ca1ffae5a9ed4ba1f980c6e2d67578201b2f3ba8856c4b4a13edbd98a8f2a18
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-group/rbldns/rbldns-0-r1.ebuild b/acct-group/rbldns/rbldns-0-r1.ebuild
deleted file mode 100644
index 6a70e0c3be3d..000000000000
--- a/acct-group/rbldns/rbldns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=153
diff --git a/acct-group/rbldns/rbldns-0-r2.ebuild b/acct-group/rbldns/rbldns-0-r2.ebuild
new file mode 100644
index 000000000000..1034e41ae529
--- /dev/null
+++ b/acct-group/rbldns/rbldns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=153
diff --git a/acct-group/rbot/Manifest b/acct-group/rbot/Manifest
index 07217b66b8ca..4dbbaeaff994 100644
--- a/acct-group/rbot/Manifest
+++ b/acct-group/rbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbot-0.ebuild 193 BLAKE2B 42f069dcd54e57f4799206e10451f5c3104654e426fbd860d82691eb5cf5f4860a6ec504e49f097521b74bc9ec923310140dc34487416bfd56959185f8eb232a SHA512 549ed3658c753edcc78e75c8508ff669d70398b29b285b0f823e1492064560cae1ce13752daf8d9ba5b55034dd63f3e6130240601c866e5058f586d4a7e4edeb
+EBUILD rbot-0-r1.ebuild 193 BLAKE2B 9568ad2dd3456d5193894d9d5402ebc1995d0931de60a6ab1934d47df70efd42e0a140a47fe3761a8faff604c9b0839080313ab74e4a015370ff089b960dc7c3 SHA512 6510b31039438833649f931764d094fb9092d7b4988705d7dbd8a23cc3878227bc01a3c2e05574f0eb686ef2ecc8ed0b7f800ac7107fbd54fdcf187604958a3f
MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/acct-group/rbot/rbot-0-r1.ebuild b/acct-group/rbot/rbot-0-r1.ebuild
new file mode 100644
index 000000000000..aa03c16b5c3e
--- /dev/null
+++ b/acct-group/rbot/rbot-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-irc/rbot"
+
+ACCT_GROUP_ID="129"
diff --git a/acct-group/rbot/rbot-0.ebuild b/acct-group/rbot/rbot-0.ebuild
deleted file mode 100644
index 2e26e14ae37f..000000000000
--- a/acct-group/rbot/rbot-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-irc/rbot"
-
-ACCT_GROUP_ID="129"
diff --git a/acct-group/readarr/Manifest b/acct-group/readarr/Manifest
index f9da29e5dba6..443961bbec2a 100644
--- a/acct-group/readarr/Manifest
+++ b/acct-group/readarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD readarr-0.ebuild 151 BLAKE2B f6b07cdf6dae2553be12bb07f07abdbc8e533c9e403f6b3add0393f8cffdfa730ea17bf9aa51617a9595fef814ce6292476851dc41df93c6f70e6fa235bde414 SHA512 d2302ff767f32d98b296c95faf40b360acd45d3789db7a080ee7bd877f009d1cb02b8741c34eabd4e7383fd38ab592a059cf9ce0094d94e3db47c5e8700ae9da
+EBUILD readarr-0-r1.ebuild 151 BLAKE2B 33ca226fa2ab89ee316213b74b82b865e57e566c6e6b04b506f25e945b728f8e5fe327fb5c3805d1190bb16fedd372e7570d7b489f97f67564faa45c585afb1a SHA512 df8fb03207b210b8d72255510ec7762402716bc5c09bdd2a6a649d5d08ec61071b02f3ce21ff388ccb5a38e554b31e2deb6dd5a3546fb625f70628950204f08b
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
diff --git a/acct-group/readarr/readarr-0-r1.ebuild b/acct-group/readarr/readarr-0-r1.ebuild
new file mode 100644
index 000000000000..7035a70d4581
--- /dev/null
+++ b/acct-group/readarr/readarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=521
diff --git a/acct-group/readarr/readarr-0.ebuild b/acct-group/readarr/readarr-0.ebuild
deleted file mode 100644
index 24ba49a36df4..000000000000
--- a/acct-group/readarr/readarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=521
diff --git a/acct-group/realtime/Manifest b/acct-group/realtime/Manifest
index 7599a735f43c..2391d7978172 100644
--- a/acct-group/realtime/Manifest
+++ b/acct-group/realtime/Manifest
@@ -1,2 +1,2 @@
-EBUILD realtime-0.ebuild 187 BLAKE2B 5c6319f542bf747b435bc9c216f7871a33a96e5ae8ec95dc6dd8a3af47621b0d46c39200bef295f9831e2428702fa39dd9c535a2f6adb46b8991481c41f1162e SHA512 c9e55eb2b4f0a8f9d1a79bb61c5335f2325a6a109ac2e25c99d887db3377458e2a9ce4debae966af0ada6ae625019ff3d1d9f60d5c504ff677686f6673400a13
+EBUILD realtime-0-r1.ebuild 192 BLAKE2B 838801f713222458043a3f658ee09de6a5baba75558cf63396c2ff9a46d4474629e757d66ed8f3a344229305161070bd3398a7222a3a3ac29dc26604eaf85e56 SHA512 5c545555c277b397ded5ccf2cd4546555b0434fc8febd1d103dc2980bab747c04bb0614c6bf376b64b568577e2058988bbeb993f728640e14f96d4807e5b13a2
MISC metadata.xml 260 BLAKE2B 67e6833093739454709d11437f08f56992d87b35e1f70405c5667ce6f35164e50891bd5a590f67a234c7a6bcfaa53bbd3b0034324a70aaabf1dfbdac16c20681 SHA512 ec587e23153929573978a938c94e2e87519f5e08fba1e07d0aedfa782f6ce09480299149ad874c04f7f5acf21c1ca8275efcb2a3589d16842041ce1c11cb63ab
diff --git a/acct-group/realtime/realtime-0-r1.ebuild b/acct-group/realtime/realtime-0-r1.ebuild
new file mode 100644
index 000000000000..a4734a21bd4f
--- /dev/null
+++ b/acct-group/realtime/realtime-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="realtime privileges group"
+
+ACCT_GROUP_ID=206
diff --git a/acct-group/realtime/realtime-0.ebuild b/acct-group/realtime/realtime-0.ebuild
deleted file mode 100644
index eb80c1e91091..000000000000
--- a/acct-group/realtime/realtime-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="realtime privileges group"
-
-ACCT_GROUP_ID=206
diff --git a/acct-group/redis/Manifest b/acct-group/redis/Manifest
index d066acc89707..8e2dcb822400 100644
--- a/acct-group/redis/Manifest
+++ b/acct-group/redis/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis-0-r1.ebuild 184 BLAKE2B aa157cd9d72f21d426c80fb895be5feae718f01039d35758376b82995b068a155263f6b63f1f95808392aa81978f390e9f2fedb33ecc368c56680cfbe1dcf34d SHA512 b18cfbc9b6f98dc92402d8bbcc6c2df1c2b05de09ec97077a1488bfdd0424eccaaaddaa19190362331b96f20ebaaf2f04d562ef1e4e0d4a030509fdb9d0dd864
+EBUILD redis-0-r2.ebuild 184 BLAKE2B dd56f337c5e0b8243f670dd4f7251d507a8058b6b6245c63483dcb7a2731eec11c9d9ae21500090394934759fc6188f284a87380990c37f25a3a728d1977a258 SHA512 f84945a149c7692bb17713e1b6e6847cd262bf014e49e1a1a0ab218b1b35d35a2259efc7a91c42f0d85396bec7192f048c0da8af9f7b50ba3fd8fe03f9e73a50
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/redis/redis-0-r1.ebuild b/acct-group/redis/redis-0-r1.ebuild
deleted file mode 100644
index 83f725cd298c..000000000000
--- a/acct-group/redis/redis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Redis program group"
-ACCT_GROUP_ID=75
diff --git a/acct-group/redis/redis-0-r2.ebuild b/acct-group/redis/redis-0-r2.ebuild
new file mode 100644
index 000000000000..0b0048c13fa7
--- /dev/null
+++ b/acct-group/redis/redis-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Redis program group"
+ACCT_GROUP_ID=75
diff --git a/acct-group/redis_exporter/Manifest b/acct-group/redis_exporter/Manifest
index 10432745d96d..d484fe62c8be 100644
--- a/acct-group/redis_exporter/Manifest
+++ b/acct-group/redis_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis_exporter-0.ebuild 146 BLAKE2B 0fa09b4da1b6a5434c0b3da78861b7001b8fce1eb82aa6a8dfc368f3156b4b9b991c296f2fa4e05317d13d00314008e09c7ed6e4f60b12b60414179e40ea2054 SHA512 6d23d6c453272484a49a56538e32baa13dcbaaed36333725056b1f36a1a8aa17c634ac439fbd8505c5d757132558bbbced25f6db2888403832e68ac25f6d2e94
+EBUILD redis_exporter-0-r1.ebuild 151 BLAKE2B 2e31dd57d34d4183a34be35a3d5b628dde96e0f2ed53c17fef48872ee68c9d89e02e3d5161ee621f3db4399fd58ea5f23dce8641e3ec48dc4fcb1f62a89b5a2f SHA512 8bb44851ce025f0cf9f7e877594649bd3fd6042a259c0c4bdc8b2b5af8c8c191fae84d56d410eb42f0531747612a42044ef172de989ca71b90c46627dfe6c3dc
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/redis_exporter/redis_exporter-0-r1.ebuild b/acct-group/redis_exporter/redis_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..29ee8b117172
--- /dev/null
+++ b/acct-group/redis_exporter/redis_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=298
diff --git a/acct-group/redis_exporter/redis_exporter-0.ebuild b/acct-group/redis_exporter/redis_exporter-0.ebuild
deleted file mode 100644
index 89b3cb579f87..000000000000
--- a/acct-group/redis_exporter/redis_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=298
diff --git a/acct-group/redmine/Manifest b/acct-group/redmine/Manifest
index 45e2e5fbfdaf..f99df3b5811d 100644
--- a/acct-group/redmine/Manifest
+++ b/acct-group/redmine/Manifest
@@ -1,2 +1,2 @@
-EBUILD redmine-0-r1.ebuild 151 BLAKE2B 0300c2ef1a4c3659951455937a831f0f62330c9d77135bc2e41f04bbb636695d0adbedb606d96da3092d3adeb8850a80b186db9d5c7eb60718de20cbc624bca8 SHA512 bcf8ac5f65bf52d4af62dbc0044db1c510bc36f80a019dbf7d021216602c195bf365969408d2545bf0547099ee0d36cd97198b18c7ec04399c66e2dae4585684
+EBUILD redmine-0-r2.ebuild 151 BLAKE2B 7000074dff875ae7be39f11532ee9f50dd5a0014345d69ff75c48c3dba173b62d118951c6ca03420ce35f3b4f1a135b3b054c3379260ce075f7daed9e5d4b8b5 SHA512 a82f0b251973c78061128eba7b2852228a68bf378615e579fa696d6bc992bd4537fbb883a420e47d76bd15bafd443d0c86887c7a01f52fa24cbe1aba42ae626e
MISC metadata.xml 419 BLAKE2B 2c84505ed1c07ec955c61a163c3b3a400f1c01aae3dde0973c3e84a5462a7f7cbdbeb2dcf06e7fba91b49c97fc363ae5fc4af182bb26488ae98becbd548038a6 SHA512 d2ee91c4509d8d2e07dbca4a37eafb9186247aa3f37d68eb777bb0b540cf40ef5480380ee81ca69ea778f7b8b4344274008717190d2ca9c0d8f4f2566d1b6baf
diff --git a/acct-group/redmine/redmine-0-r1.ebuild b/acct-group/redmine/redmine-0-r1.ebuild
deleted file mode 100644
index 73e968b837a7..000000000000
--- a/acct-group/redmine/redmine-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=451
diff --git a/acct-group/redmine/redmine-0-r2.ebuild b/acct-group/redmine/redmine-0-r2.ebuild
new file mode 100644
index 000000000000..f2fa23df394d
--- /dev/null
+++ b/acct-group/redmine/redmine-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=451
diff --git a/acct-group/redsocks/Manifest b/acct-group/redsocks/Manifest
index 2ede650844ba..05d62e68896c 100644
--- a/acct-group/redsocks/Manifest
+++ b/acct-group/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0-r1.ebuild 199 BLAKE2B 6ec5442a800d1f45261821439f30fcc7ea1f54507fbf2d114eb2b505346c265ebb21a8febbf5800a6f6e445d4d3626eba86e3706d17085e09c489cb9aa6ed323 SHA512 d5f088c8291c2e2955912f3ee05e0f69d86835ce760aa282b787b752ac41234c503176a0627f1cd7c9ab2ed2f22fb995f746a736fd942b41ab6be9f69054c172
+EBUILD redsocks-0-r2.ebuild 199 BLAKE2B 4cf43fb765a21f4e898138827ce66bde2acd414e6941b52051515663b084f50c1442653c91789c4a9de79d10f4e8610d41640fdfa7d38c48575941cc70eeb29c SHA512 79e1f2407dd747e1f08824c4d2be07cad42815acd5a04d513fff61de6a08d80acdf439b100842e4c3399de5717f290dcd9773c7a8d7a71a07aadabd1ea3b9a3f
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
diff --git a/acct-group/redsocks/redsocks-0-r1.ebuild b/acct-group/redsocks/redsocks-0-r1.ebuild
deleted file mode 100644
index 376e5708d210..000000000000
--- a/acct-group/redsocks/redsocks-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-proxy/redsocks"
-
-ACCT_GROUP_ID="154"
diff --git a/acct-group/redsocks/redsocks-0-r2.ebuild b/acct-group/redsocks/redsocks-0-r2.ebuild
new file mode 100644
index 000000000000..af112f79b9d8
--- /dev/null
+++ b/acct-group/redsocks/redsocks-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/redsocks"
+
+ACCT_GROUP_ID="154"
diff --git a/acct-group/reg/Manifest b/acct-group/reg/Manifest
index 7027d6dc2c71..bada0d40c647 100644
--- a/acct-group/reg/Manifest
+++ b/acct-group/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0-r1.ebuild 199 BLAKE2B 5464f03c30e36c9cd7b1637cf9d1750db74c8734af6fd6a265ceb9bcf28e56b3b7b7f718622e0b8b315c0fdf010df75640fc3a580aea88ec89b475305373a7b4 SHA512 6771827d2a89fe77c6fd19878efc7c395c162e71362d474a7473581f3d681859ae37c16e5e84ca4d6e4504e15ec032204e71c08797fca667554f88fe5f96d7b2
+EBUILD reg-0-r2.ebuild 199 BLAKE2B 7eaac7cf85987256035cd4e8256a09cd5ce526328597601db6b9113a8629d188c6b4ec6bf2321955e0462e56bf6640a3c7fddb089535da6bca031d4dd4c6a1da SHA512 7533957ccd000cd55ce08fa800d3331ad3d292cf8b9c9745d72f5fe8f9f1e29e37abf30f3f9494a8349955c8b769155bd2364f8754c0d61cda0646438df775a8
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/reg/reg-0-r1.ebuild b/acct-group/reg/reg-0-r1.ebuild
deleted file mode 100644
index 8bc51aa11edc..000000000000
--- a/acct-group/reg/reg-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-containers/reg"
-
-ACCT_GROUP_ID="503"
diff --git a/acct-group/reg/reg-0-r2.ebuild b/acct-group/reg/reg-0-r2.ebuild
new file mode 100644
index 000000000000..ecccab5fa8d8
--- /dev/null
+++ b/acct-group/reg/reg-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/reg"
+
+ACCT_GROUP_ID="503"
diff --git a/acct-group/registry/Manifest b/acct-group/registry/Manifest
index 794556b81c68..7574451b771d 100644
--- a/acct-group/registry/Manifest
+++ b/acct-group/registry/Manifest
@@ -1,2 +1,2 @@
-EBUILD registry-0.ebuild 211 BLAKE2B c6f056fbdce331d52e27b8faa47e8a735c545fd8f9a590ea9e907e292004653f51ebf81669a3c193033aa12b57536c935c1ab1103d3f09095fdb4f85a065563b SHA512 194efa635fef21226cb8cf08077d1b42512f42f9680380cdad16a6e212b3f79e32ee3ee723f49d62fa2bcd4b72e5e1d4ae3568919509dfa50789517b16ffd896
+EBUILD registry-0-r1.ebuild 211 BLAKE2B 5c191c0b4d54fc620f98aaeb1d9a431a8ca6acade0571600785f07164443dfb1a96a68902ad5f7823f37283d567b4304a54f1e56b23fdfcd063dcc6b44098e26 SHA512 428ae33717f20fd09ba351e69bb12beed70d7a4648ed98d7cbc2f84df4fc73728f6df517dc1988e948bbe0102870c944ea8dd73b9202b4a3d2bb9923df387e0a
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/registry/registry-0-r1.ebuild b/acct-group/registry/registry-0-r1.ebuild
new file mode 100644
index 000000000000..2d3b7c31cc34
--- /dev/null
+++ b/acct-group/registry/registry-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/docker-registry"
+
+ACCT_GROUP_ID="295"
diff --git a/acct-group/registry/registry-0.ebuild b/acct-group/registry/registry-0.ebuild
deleted file mode 100644
index 6da5197ae7ec..000000000000
--- a/acct-group/registry/registry-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-containers/docker-registry"
-
-ACCT_GROUP_ID="295"
diff --git a/acct-group/render/Manifest b/acct-group/render/Manifest
index 04b7ccbc89d4..9ba762b69ba0 100644
--- a/acct-group/render/Manifest
+++ b/acct-group/render/Manifest
@@ -1,2 +1,2 @@
-EBUILD render-0-r1.ebuild 150 BLAKE2B ca2fce947680874905b28583d9b87325f6e8137f17ee0ca8a50a0f62222b9af2460c693ed73e502d7faafff1c518f89bec9a238b5e4e5ff3903c5e1bbb531ee2 SHA512 ea7a2749ebaec33bc980b281b5a09c04979235f01ecda174d9751e1b14a68a8cc7aa138a2c6531696fab3699b2726c5c6c197001e72b5863ede12bd1f3935191
+EBUILD render-0-r2.ebuild 150 BLAKE2B ab7b9e652f999445d5633b6706043c019cb52d8cee22033041998fd62ad47d5c8349c3e66d407eb56aa70900e46771f14e427e5f9a9562f25a13fe651fe2e9de SHA512 522edbd56cc0f83c03224cad824ca21ced3b2a4514474b8e6cdeef00d14e8f903ee60502046715340bbe812015fd0ee7ed076758a6ee220fe0a1f6a0ddded3fc
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/render/render-0-r1.ebuild b/acct-group/render/render-0-r1.ebuild
deleted file mode 100644
index 6e31b1326308..000000000000
--- a/acct-group/render/render-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=28
diff --git a/acct-group/render/render-0-r2.ebuild b/acct-group/render/render-0-r2.ebuild
new file mode 100644
index 000000000000..0a6ab8cd9485
--- /dev/null
+++ b/acct-group/render/render-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=28
diff --git a/acct-group/roccat/Manifest b/acct-group/roccat/Manifest
index 0e026601897f..632850f14b30 100644
--- a/acct-group/roccat/Manifest
+++ b/acct-group/roccat/Manifest
@@ -1,2 +1,2 @@
-EBUILD roccat-0.ebuild 202 BLAKE2B a3305df2b97ab57f4e46e2a14ee83194ce28de85d1bb1b83be878fa9c8ea74d1a7e3c981c90c7b19bac77e412628596262e7024136ad815ae0a86242f4b03bba SHA512 c31cf6808281c7108d8bd251a3bc9ba8c49a2deb3eab0852ee1a021213d489e14793b1ae28594be04f036e7a60ed86b0b10545abf04dc67e85dd07f0f703739f
+EBUILD roccat-0-r1.ebuild 202 BLAKE2B 738780807a93a23195d9a100762b0cb422eec3102f0f10d48d558bb356e7cee615983401a15c3a446cd28fb3196de9afa233676e61c64fbfe8d19e6be5731b9b SHA512 a440eb67607195dc5c61229ec2b6db9c59fd872a76120eb62954ee55db259ea32ee60ff051a3259a130139cf1751ee3603345b0c80c16950d80c69d84d92042f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/roccat/roccat-0-r1.ebuild b/acct-group/roccat/roccat-0-r1.ebuild
new file mode 100644
index 000000000000..34761f2dc218
--- /dev/null
+++ b/acct-group/roccat/roccat-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-apps/roccat-tools"
+
+ACCT_GROUP_ID="203"
diff --git a/acct-group/roccat/roccat-0.ebuild b/acct-group/roccat/roccat-0.ebuild
deleted file mode 100644
index 8c8638f0a4e2..000000000000
--- a/acct-group/roccat/roccat-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-apps/roccat-tools"
-
-ACCT_GROUP_ID="203"
diff --git a/acct-group/root/Manifest b/acct-group/root/Manifest
index 945666abe38b..fd53b27396a3 100644
--- a/acct-group/root/Manifest
+++ b/acct-group/root/Manifest
@@ -1,2 +1,2 @@
-EBUILD root-0.ebuild 170 BLAKE2B 8e32ca43e41577230c3ed3f1cd6f5081ab155d4d229a4ad5727765885026ea0c5d69e1f1d98f997d1fb9e96dd824e9c4f499060029fcff3c21ec85b75a1924d2 SHA512 cfced5a1ad00972160aa5c9c426a03b9498608a7ebe679a036ff55231acbdbc2eda6106eba36486996bc3419564a045c777c68b19c00deca0eefbd46bb7653c4
+EBUILD root-0-r1.ebuild 175 BLAKE2B f0b811a24db05785a1249ebf05767b44ca7584cd2c2940cf50dd8d4ef12d2ca1f033833b458eebb00aa553bb4a43c7bdae1bb85e94406858af3dad4195acf071 SHA512 9a15f9fd18f6292207a452ca4881b14cbb690c7b537fbfaaf84124e86cb0be75c275095d7ed1deda32ddcfbcce32a0b01ff922f488cebbd966fbdcad7fd793cb
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/root/root-0-r1.ebuild b/acct-group/root/root-0-r1.ebuild
new file mode 100644
index 000000000000..731c421a20f9
--- /dev/null
+++ b/acct-group/root/root-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=0
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/root/root-0.ebuild b/acct-group/root/root-0.ebuild
deleted file mode 100644
index 4c5ed4b34698..000000000000
--- a/acct-group/root/root-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=0
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/rplayd/Manifest b/acct-group/rplayd/Manifest
index 8062d1b8bf25..bde514423cde 100644
--- a/acct-group/rplayd/Manifest
+++ b/acct-group/rplayd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rplayd-0.ebuild 198 BLAKE2B 3b693da3ec392f259a4f3311ce811de03e43aba4227f9f00569347a44ace689d802e81e68fe34dfefa22127ce30333d799b427f44f9e2cb2000ce3df8790196c SHA512 a1eb32fb45332050a918dd99bc862924fcbd769214d7a6b7dbc1f6da15af37e85ba60db8c9d38bae0e865e4c3162cc7e0553ecd9ae8602226fbaabf672e9c28e
+EBUILD rplayd-0-r1.ebuild 198 BLAKE2B 3697cffa636e3c19480ae9b53a4ab074ca305f2de82c99e79bba5861ed8ebe8e6b2d247258ec851ebeffb31696df13993da030b0e203fd4700b05a1530bdc308 SHA512 85addb45566ac74462db45a36d58d6760b9eaad6da844f0c12f018a0617f6929913667f3a7dc7df4ee96b356c81fef8018fe8a012c4c38d9982bb68acf7364bf
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-group/rplayd/rplayd-0-r1.ebuild b/acct-group/rplayd/rplayd-0-r1.ebuild
new file mode 100644
index 000000000000..39db60adba80
--- /dev/null
+++ b/acct-group/rplayd/rplayd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/rplay"
+
+ACCT_GROUP_ID="161"
diff --git a/acct-group/rplayd/rplayd-0.ebuild b/acct-group/rplayd/rplayd-0.ebuild
deleted file mode 100644
index 744523e8b26c..000000000000
--- a/acct-group/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/rplay"
-
-ACCT_GROUP_ID="161"
diff --git a/acct-group/rrdcached/Manifest b/acct-group/rrdcached/Manifest
index c413101239e7..abb3d8cdf9f4 100644
--- a/acct-group/rrdcached/Manifest
+++ b/acct-group/rrdcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD rrdcached-0.ebuild 153 BLAKE2B 312149733bf32026cb4208224efde19970ebe38256d2b47a176525275823dae8bdf00b2d839d8fa12fa9777dd9461e1cec0a97995c9906c51be3fde76a01b9eb SHA512 4b23d3518ab872e4423cfb20edc001da3cdde7ac53f359f9431f242819df9eca8904fb15ca5f76278b471a0f262e34da032120e661d7a8d1dc49d565eb33e28d
+EBUILD rrdcached-0-r1.ebuild 153 BLAKE2B 6c04bdafa3b4aa953029c8b33e9568a57959bcde3918ad83b439b29ba23ef6a03b7aa4a1aa9cca221bb041d85825ff8bc52068f2e5fef3f5eeafa69c8d2ad1bd SHA512 13fb4493707edd832818e5f5b6f56c45c6e020b38d21a3c185b62cf4df90a6a02fcd1a035e79393d306fcda1a4a63155dc418c5e8a382adc03cf14bfd11b3fc8
MISC metadata.xml 392 BLAKE2B 96d11acefa9a7cf18f9240f08a5b1c36e769f4e7000632301d3f763169fd15e20fbf3adac95e2e0463d3184ea4baf9792b0f061c95a6b79d3f95da03dfb3fb6c SHA512 c88eb6c28199d5baae394310b0ebcd6ebc186642d4700735eb1f712b176a7750acacf2c8d5a417d2c716bc43d0cdf5f3e11ceec1895f84dd1ea4f0186e3183e2
diff --git a/acct-group/rrdcached/rrdcached-0-r1.ebuild b/acct-group/rrdcached/rrdcached-0-r1.ebuild
new file mode 100644
index 000000000000..bc2e20332168
--- /dev/null
+++ b/acct-group/rrdcached/rrdcached-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="511"
diff --git a/acct-group/rrdcached/rrdcached-0.ebuild b/acct-group/rrdcached/rrdcached-0.ebuild
deleted file mode 100644
index 1f28f6225226..000000000000
--- a/acct-group/rrdcached/rrdcached-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="511"
diff --git a/acct-group/rslsync/Manifest b/acct-group/rslsync/Manifest
index dcf7f05ef93a..1293689abdba 100644
--- a/acct-group/rslsync/Manifest
+++ b/acct-group/rslsync/Manifest
@@ -1,2 +1,2 @@
-EBUILD rslsync-0.ebuild 201 BLAKE2B 43f9e602c5f5fb5a359b9ea833520b9013c398aebd5230dccf54c5cf47c3e57a7946ae002cc56f84adb0a823adce82639a2ee9c71b0a418cbc79df670bf38e4b SHA512 da5aa392f91b19c34f80aaaeedcc0bd713c0ae1b76cc942d22e6a38997e9fd077d6e8fce853dac76afaed5dbb78741f46693e45a1d5e300eba3f2345a6de4107
+EBUILD rslsync-0-r1.ebuild 201 BLAKE2B 690b8b40364859c7c4393fd928348f3ad5b5b40d592ea557221fd9e8072efc159fb40ea25a012d14e210f2e425ebae8c30420a893cf1aca4844bc0f3ab7a6ee2 SHA512 b3c19ef2e84ceb99741e45c71612b6a3a92d2489230d01a7aa7f42e0dc165c1eebe168390a03df568a6c002637131c8a178280812423370e0489e3496cfdad64
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-group/rslsync/rslsync-0-r1.ebuild b/acct-group/rslsync/rslsync-0-r1.ebuild
new file mode 100644
index 000000000000..11fec48d0d8f
--- /dev/null
+++ b/acct-group/rslsync/rslsync-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/resilio-sync"
+
+ACCT_GROUP_ID="175"
diff --git a/acct-group/rslsync/rslsync-0.ebuild b/acct-group/rslsync/rslsync-0.ebuild
deleted file mode 100644
index c4e17e79078d..000000000000
--- a/acct-group/rslsync/rslsync-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-p2p/resilio-sync"
-
-ACCT_GROUP_ID="175"
diff --git a/acct-group/rspamd/Manifest b/acct-group/rspamd/Manifest
index 4fdabb86065a..083cd73d14fa 100644
--- a/acct-group/rspamd/Manifest
+++ b/acct-group/rspamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rspamd-0-r1.ebuild 212 BLAKE2B a978ee58d3930ccd3e8202e423289d0bc1a0cc7643fe180ffb11bfa09f062e8148dd49294502bea10f16245ff94ed0f0dcc81c7d73c8a74113089699a68b67e2 SHA512 4d18a1fd8dc429fe53111a3e8999c7fbef08b0725b6a2d72658bfbc1c24e210741beb95618f65999d4225a33c12e78f19fe71c6bf1f483bd9675c60fc5f1782c
+EBUILD rspamd-0-r2.ebuild 212 BLAKE2B fcb153611b74b49edd4ac182cea02cbb64145e31d03f57ba4024dda1d17f666b15039488839c2e67b56acd32e5715b5c1625d7b652712a07b999d68dd9788b80 SHA512 accb0a26d968d1ae9765ef6c7667d487477d85e5c0b8f5a2376d60bbcb91ba4ef41ba89684546fc50e469345dbda225be2069d073af216afd90266230d11fdf3
MISC metadata.xml 403 BLAKE2B 73564783a1a9e3c1822097309be28fbfdfce03d09e2ba8b1238693ef4fb59cf01542dbecdf41ae5153550d17a39943e6e966ec1a69757f4179c2e8f756de5534 SHA512 31fe521e9638433c2c57240d7f9cdd037ba099c19f62b3b28049a730afa017107a21e5bb61603ba6aba98a11b05cfa8911404a154233269c0ced1ed53669504b
diff --git a/acct-group/rspamd/rspamd-0-r1.ebuild b/acct-group/rspamd/rspamd-0-r1.ebuild
deleted file mode 100644
index 338cfd3414a7..000000000000
--- a/acct-group/rspamd/rspamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for rspamd - Rapid spam filtering system"
-ACCT_GROUP_ID=237
diff --git a/acct-group/rspamd/rspamd-0-r2.ebuild b/acct-group/rspamd/rspamd-0-r2.ebuild
new file mode 100644
index 000000000000..2099e0d20e6a
--- /dev/null
+++ b/acct-group/rspamd/rspamd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for rspamd - Rapid spam filtering system"
+ACCT_GROUP_ID=237
diff --git a/acct-group/rstudio-server/Manifest b/acct-group/rstudio-server/Manifest
index 76afd8b32c60..120a4aecf6ad 100644
--- a/acct-group/rstudio-server/Manifest
+++ b/acct-group/rstudio-server/Manifest
@@ -1,2 +1,2 @@
-EBUILD rstudio-server-0-r1.ebuild 194 BLAKE2B fc49deab7c348330c1789ce20e0c36d598064fc02791b1b20236aac020faba189c24b16cfd0f7808015bbc25ffa7cc38e9e04431b9035935b60b18decab4ab88 SHA512 218065423074def237aa78461eacae0dfb709c050bb1aec2c1b27969ad135bc3df95325cd415d61eb319be74972e625327356b09581b28a8ac6cbcf4ea38a395
+EBUILD rstudio-server-0-r2.ebuild 199 BLAKE2B 4b50bdc7ea4e2c0888e07b82a0e48ec89268df059546935fae70132132d693de8c38d715d6fb4ff976103f5cb24e6b1ad73da0a8a5d8e8ab7d0c6155630ad8db SHA512 d29ac3633ac96eaf837f6adab8a562bf9203981c8ebbc95948850db07495103e056ac31df718a22e87ba8229b72fc918f9c2eae2d259dc884389d8bbc9987434
MISC metadata.xml 245 BLAKE2B a7cadf465163ca1df604d88e904902634f1559b696dd48e5a57ebf2b7d27917f6ebbef65492ffdf5b620df01825f242d9311161f5624adaa709eaf7eebe0f5fa SHA512 27160785fd59931535cbc1c56f34e2f7e79f477bc9157eff9a07bd7b3f49f1c8c1c20106c9a7148123dcdc3b64411b9f706d49b544eca4415d8d13152fd05c9d
diff --git a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild b/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index 1d702c365cb5..000000000000
--- a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for sci-mathematics/rstudio"
-ACCT_GROUP_ID=466
diff --git a/acct-group/rstudio-server/rstudio-server-0-r2.ebuild b/acct-group/rstudio-server/rstudio-server-0-r2.ebuild
new file mode 100644
index 000000000000..0fd60901e700
--- /dev/null
+++ b/acct-group/rstudio-server/rstudio-server-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for sci-mathematics/rstudio"
+ACCT_GROUP_ID=466
diff --git a/acct-group/rt/Manifest b/acct-group/rt/Manifest
index 85a728244134..db60da045af2 100644
--- a/acct-group/rt/Manifest
+++ b/acct-group/rt/Manifest
@@ -1,2 +1,2 @@
-EBUILD rt-0-r1.ebuild 192 BLAKE2B cb5f47a77c0b8b2a034b25ef93e2e8e01da0ccc3b2255a1d6f29c86241585a95d1141b3d61e6e5b3559b9481ecc298b83962177b702c5e2be29eccfc1f60104c SHA512 4b4cb712da5752062e1e08a737d84390df7d7079845372a316d135bff5a45a8f7f02295aaf6a20a7762ce154f8c9debbd052f768ad27d8c70516d4c50e82a22d
+EBUILD rt-0-r2.ebuild 192 BLAKE2B 1e30e224924ecf7055a9f6ac60d1a7bda25ef754423ff27ef4d753ed517087c719eb8bcc30415ff022b826bc9dddd89c488270dd231f940041d71a4b4b3bd0ff SHA512 e8c3e18f287392c14ed1140e1ec70d6dab1a6772e81a703b25ca5dd3357c0ca05ccf711be7873545f618f184b8e10b940e4c940b71b8299d74889c12921c65fc
MISC metadata.xml 365 BLAKE2B 525d0782e438a536ebb72d196efcaa8ec809b12a1aa3be17b4a1171cf3f41282ccf1a000fbeb3bbc81a296a7c97742c6c5a6c4794d10859566b2d4c927caebb2 SHA512 e527c901611d310ce54e32b4ec518477b8421cdde73dbb9b2d1e8cadf3de8ff291229556264a5275d94952c5b7e77ee7cec80febccae455b253a69b786a63c32
diff --git a/acct-group/rt/rt-0-r1.ebuild b/acct-group/rt/rt-0-r1.ebuild
deleted file mode 100644
index 5f188764ed44..000000000000
--- a/acct-group/rt/rt-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/rt"
-
-ACCT_GROUP_ID="126"
diff --git a/acct-group/rt/rt-0-r2.ebuild b/acct-group/rt/rt-0-r2.ebuild
new file mode 100644
index 000000000000..88c03248cb24
--- /dev/null
+++ b/acct-group/rt/rt-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/rt"
+
+ACCT_GROUP_ID="126"
diff --git a/acct-group/rtkit/Manifest b/acct-group/rtkit/Manifest
index ebd40aa7680e..b5e2993033e6 100644
--- a/acct-group/rtkit/Manifest
+++ b/acct-group/rtkit/Manifest
@@ -1,2 +1,2 @@
-EBUILD rtkit-0-r1.ebuild 215 BLAKE2B 55e640f1290c3e6a6e6359b7ca7262efa48049a4e53fdb9adf60c7141e2d448ed761a3fdc408a241d064336c950b95c6e7dd1ffad274917c935e28ccc94f9890 SHA512 48a295610f094822b86eef9a33fdfc36f8b5736902e0272352500a6ca751d5f86575b431c24297524dc847b70889620bf74a9a902a632b8902662941052024c9
+EBUILD rtkit-0-r2.ebuild 215 BLAKE2B f5fdab34443c659d326769a189d72f6188ea72d226cbba74dcfaeffd74cd2747ffb3b038f1de6d6137ccf4dae37062838dcdb5321e3451a748aa84f2592756c3 SHA512 236b8e874906735206a64ee920ea818c8d97a00e981bbd58a2abd2f46d5949fb8e2b701900ad2e8cebf8efe6b79e4b13520417aba91e8f4b9c2ffa0696d23d98
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-group/rtkit/rtkit-0-r1.ebuild b/acct-group/rtkit/rtkit-0-r1.ebuild
deleted file mode 100644
index 5f92c0a646b5..000000000000
--- a/acct-group/rtkit/rtkit-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
-ACCT_GROUP_ID=133
diff --git a/acct-group/rtkit/rtkit-0-r2.ebuild b/acct-group/rtkit/rtkit-0-r2.ebuild
new file mode 100644
index 000000000000..df01f1e86d78
--- /dev/null
+++ b/acct-group/rtkit/rtkit-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
+ACCT_GROUP_ID=133
diff --git a/acct-group/rundeck/Manifest b/acct-group/rundeck/Manifest
index 2b7cd2baa2e8..64b780fc7bcc 100644
--- a/acct-group/rundeck/Manifest
+++ b/acct-group/rundeck/Manifest
@@ -1,2 +1,2 @@
-EBUILD rundeck-0.ebuild 201 BLAKE2B b0f579e4be3fde229a44722c95f835fd2971588f36a3e255de8b9ba92dfbace65da2470fcca144d834bc4f89ff01181c7dee310af09d4899195aa716a9859269 SHA512 2b2ada083da1509384d184c90568ba64151c1c78b9873d62b15a78e4dafa0b66c83aaf5af04fcbdd664553f8976f027433cba8a79e9f2fdba7b0483e6f43fe16
+EBUILD rundeck-0-r1.ebuild 201 BLAKE2B f2605663a7d31d6cf055bd984996af94bda81a34b30839cb7130b9d410c329ebd86d8fa03f8a03ea8c02e19d6d00dcc6810bece9c101951493bd6daccc7e8eb0 SHA512 50691cc48ebbcfb7594c31c71b5d403a59856a5d1046e368797809c2dd8742ba76dafe51dde86d1f2c0acdbf1957abeeb9ac4a3299a2498a27b0cb847785bcbf
MISC metadata.xml 358 BLAKE2B ae5834e1df4586133cb14f64d4a664aad482c14d1daead2d84f74885c501e64fc67a63cb065b2eadefdc29cf86fc8690f9434b37cb7d41efe09baa2ae23a89dd SHA512 b710971ec9308e2511b0ef403dac067e885db8a4e5dd79a2b4bb0c8c1db7a688b969fc60493ed9bb1c0f531190cb4c1ea478a3d277dd3db20d942d68c9792fe0
diff --git a/acct-group/rundeck/rundeck-0-r1.ebuild b/acct-group/rundeck/rundeck-0-r1.ebuild
new file mode 100644
index 000000000000..1ac045423f1a
--- /dev/null
+++ b/acct-group/rundeck/rundeck-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/rundeck-bin"
+
+ACCT_GROUP_ID="109"
diff --git a/acct-group/rundeck/rundeck-0.ebuild b/acct-group/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9a51c176b28f..000000000000
--- a/acct-group/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/rundeck-bin"
-
-ACCT_GROUP_ID="109"
diff --git a/acct-group/rwhoisd/Manifest b/acct-group/rwhoisd/Manifest
index 6cd572f8d288..2c8e7c053b6b 100644
--- a/acct-group/rwhoisd/Manifest
+++ b/acct-group/rwhoisd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rwhoisd-0.ebuild 195 BLAKE2B 0f56d0ee389b2b849584bec8eaabbd60c6614309e3509f37ae12596ca72ff071ca383df04da74206edd82ef8f8594efe6dd980e9e86642c7e47180b5218b9538 SHA512 ad3ddceb1a076ae463f2d5ba89b4664a9e465ed98ad2d77f568f3e6c7785d3aea2d31b77eabadce838a9a0969e234f14204836752e48285e21230b5ab01e8540
+EBUILD rwhoisd-0-r1.ebuild 195 BLAKE2B e40a688215f03d68ef09a306cf60fdc8f3274c382455dd6cf8cd392731209453137b44d5369ffbdfb8cd3104ffc41dae7422a131d6c16c9930511311534db152 SHA512 6e1b0328f2926041fa85b3a6318fbbc56c5c12551b7645929faf86e1f0a2015f25f7fa8a17047ac637e9cb7b7a2e0f226f03c45d4084addc31644c759b986fd9
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/rwhoisd/rwhoisd-0-r1.ebuild b/acct-group/rwhoisd/rwhoisd-0-r1.ebuild
new file mode 100644
index 000000000000..90a1f5f83e76
--- /dev/null
+++ b/acct-group/rwhoisd/rwhoisd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/rwhoisd"
+
+ACCT_GROUP_ID="258"
diff --git a/acct-group/rwhoisd/rwhoisd-0.ebuild b/acct-group/rwhoisd/rwhoisd-0.ebuild
deleted file mode 100644
index efc2c2e69a79..000000000000
--- a/acct-group/rwhoisd/rwhoisd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/rwhoisd"
-
-ACCT_GROUP_ID="258"
diff --git a/acct-group/sabnzbd/Manifest b/acct-group/sabnzbd/Manifest
index 5e3cc5ec0d3e..8167cc374136 100644
--- a/acct-group/sabnzbd/Manifest
+++ b/acct-group/sabnzbd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sabnzbd-0-r1.ebuild 183 BLAKE2B a9b9a479ed75f32a3730744b719401b0e30c48ab1e58b8b3d9003217b139d2b1eef63841f019d6518884e3adc1cef38366c67832d9e64077079a530e999e17a6 SHA512 d3bda34608cda5f6cf168b409d76cec845b7cb967cd4d4a5c0057f27b2228422bdd7dadbbe6e4e9d253e79f2c0f0e6ff4e1a57890a15f2350c63e4c212cb7443
+EBUILD sabnzbd-0-r2.ebuild 188 BLAKE2B ec1e0f7cded708fb66dd3dc89dec25cdbccb3e6283effb399285d5a0cc576a2cb56b77bac2251cb1bbb773af044bc7c0811f7e9b340483026224baf1acb30ee8 SHA512 0852d048466188e9fa768ca98ca79445b033f337d390fc0a5b81872356c03005ff686fc14f1fe4ed0df64b17e1979c028d4ce7b8a6a3054d9f09a61405838b79
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild b/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
deleted file mode 100644
index 4f1a3726241b..000000000000
--- a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="SABnzbd program group"
-
-ACCT_GROUP_ID=397
diff --git a/acct-group/sabnzbd/sabnzbd-0-r2.ebuild b/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
new file mode 100644
index 000000000000..a86819cbc639
--- /dev/null
+++ b/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="SABnzbd program group"
+
+ACCT_GROUP_ID=397
diff --git a/acct-group/sagan/Manifest b/acct-group/sagan/Manifest
index 31189214d64f..12a2809c7467 100644
--- a/acct-group/sagan/Manifest
+++ b/acct-group/sagan/Manifest
@@ -1,2 +1,2 @@
-EBUILD sagan-0.ebuild 202 BLAKE2B 95fca63863e259cfe774bbb45fb941bd56206cb03944936606dff39c7c2405094a878ac5f67cec7baadb3abaa925bf2c13a785ae8b18d5efd4c12ae4c08a6efd SHA512 b7335d23cb10c9b2aac3918d182dac714f53f4ff334c38fd4ce1efa21f655ee41114797908fea06cc161249cbd3883c43db70e5189bce6547886e5ab0837c2d3
+EBUILD sagan-0-r1.ebuild 207 BLAKE2B 7246aa03af69c27085b85a20e9c7af8c3b7fb6e0bda59b9987d5dc80985ffd69f627d8610d7041c05a7b821489af8d0fc41d9d9465b27c6a04d4b3a4e532215f SHA512 9a11c8574a85e653dbbc35ada279889bf6a054dccde6012fe8b162aa701ebc359aae9602ececa6394586e66bac329d0f4ad30953780efe28cca94e199b475afe
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sagan/sagan-0-r1.ebuild b/acct-group/sagan/sagan-0-r1.ebuild
new file mode 100644
index 000000000000..01d058152a84
--- /dev/null
+++ b/acct-group/sagan/sagan-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the Sagan log monitoring system"
+ACCT_GROUP_ID=317
diff --git a/acct-group/sagan/sagan-0.ebuild b/acct-group/sagan/sagan-0.ebuild
deleted file mode 100644
index 18b52fedf006..000000000000
--- a/acct-group/sagan/sagan-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Sagan log monitoring system"
-ACCT_GROUP_ID=317
diff --git a/acct-group/samplicator/Manifest b/acct-group/samplicator/Manifest
index 2b221baa99d7..eccf9364e4a3 100644
--- a/acct-group/samplicator/Manifest
+++ b/acct-group/samplicator/Manifest
@@ -1,2 +1,2 @@
-EBUILD samplicator-0.ebuild 201 BLAKE2B 650a68d9383cef0cdbe5bfaa1ae8005894d1f9771dfa273e859b24912086353bc2b94c614f251b7974c23cd5041b823d342b87be84d5d868b9694e117b896cf3 SHA512 c447a67c7e5074c3a13bb492cb5773df3a33ba710f45ae2d62a5464cdeacc931fc6d3ce58eada4d8d8305b5e2e51f26c0672a4eb3adf607b516e079f2329c4cc
+EBUILD samplicator-0-r1.ebuild 201 BLAKE2B 3d35637a3cd8b18087215a080d3d0b35c22b216ddef0cebc7725143b137261dd5d671da0638aeb6c055359b3ce93a751151906354020cfcfe78fcdf24e1db302 SHA512 78e176a6f1bb18f0e9e2bb7b865c18af785752a5b01d761159a0fb08dcf7b62057c0bd1060692214b2807ac9bb6c7c474bccb4fe4359575fcd17e09c31df8c6c
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-group/samplicator/samplicator-0-r1.ebuild b/acct-group/samplicator/samplicator-0-r1.ebuild
new file mode 100644
index 000000000000..46a667f51ce1
--- /dev/null
+++ b/acct-group/samplicator/samplicator-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/samplicator"
+
+ACCT_GROUP_ID="179"
diff --git a/acct-group/samplicator/samplicator-0.ebuild b/acct-group/samplicator/samplicator-0.ebuild
deleted file mode 100644
index 7e5219d58e15..000000000000
--- a/acct-group/samplicator/samplicator-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/samplicator"
-
-ACCT_GROUP_ID="179"
diff --git a/acct-group/sancp/Manifest b/acct-group/sancp/Manifest
index 5e2b4ab9d77e..1b7fba6d6565 100644
--- a/acct-group/sancp/Manifest
+++ b/acct-group/sancp/Manifest
@@ -1,2 +1,2 @@
-EBUILD sancp-0.ebuild 188 BLAKE2B 46348d94d6c756e5858cf1bcadcd314a2bee6683905d89408e8071caf58cce4b793cb4b53e007219128ec977ba2925e21c1e1ad6ba90e959f480d978c07609c7 SHA512 4bc00281e8881d51539c0490eb6e1fcde569149014d67030008049991231a589bf92f0aa752c4fd58fc5bfbbc8ac10299f258d74735b6ef1c45113f5fb9132b4
+EBUILD sancp-0-r1.ebuild 193 BLAKE2B b8aa08c12e9cd585f68503f1f757a8bc1eff0bd31c064cf5db0470f6b0a25455348cc5c59d3e38bfad8f9652198602efca527b5067a38b0538059fc11b32a163 SHA512 4762626e2b010066b97fb37c0c6bcfcf9c6ed5d21b35fbedd9691154876fb2ccedc8df96d6f11ea53fdc500c35a90c7bfb832b7fe7b52df14dd4451995519974
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/sancp/sancp-0-r1.ebuild b/acct-group/sancp/sancp-0-r1.ebuild
new file mode 100644
index 000000000000..4f74e4e83817
--- /dev/null
+++ b/acct-group/sancp/sancp-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/sancp"
+
+ACCT_GROUP_ID=382
diff --git a/acct-group/sancp/sancp-0.ebuild b/acct-group/sancp/sancp-0.ebuild
deleted file mode 100644
index b273bc3c0ea2..000000000000
--- a/acct-group/sancp/sancp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/sancp"
-
-ACCT_GROUP_ID=382
diff --git a/acct-group/sanlock/Manifest b/acct-group/sanlock/Manifest
index 5703876af8f2..9364361fcc36 100644
--- a/acct-group/sanlock/Manifest
+++ b/acct-group/sanlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD sanlock-0-r1.ebuild 188 BLAKE2B 01843c38209950c66a3544e313809cc257abfa8cfb1aba2acf6ef98c19a6899fa45a4ac63d47001d766a7ef89bbf099e7447272ac3ba1a9711ad73bc7ab8f805 SHA512 95708c292555a3defa7bb66c153b979f14f15816f196e28e04e214c2de9ae6e0ed8fe06b5d02ccb6c7069234142b54600da63bd8383b5d935f3a6d70819c18ee
+EBUILD sanlock-0-r2.ebuild 193 BLAKE2B 64a6b5033ee21ca8c730786fab7302d71f0a0e3a805af9d226752e157e9d8132608c61654a1f8a992b63159f0b777ec22fb0b4acb48f924289a132d1d2de802f SHA512 a555bd273573821bede0ec7d3332da9c77fa605f88620e7535998aea6228bc0a0fe57867d1bcb0c94892ffdc250a4cac6a3ecdfaf685fea0e58348fafd16e56c
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/sanlock/sanlock-0-r1.ebuild b/acct-group/sanlock/sanlock-0-r1.ebuild
deleted file mode 100644
index c0d196eb8395..000000000000
--- a/acct-group/sanlock/sanlock-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="shared storage lock manager"
-ACCT_GROUP_ID=340
diff --git a/acct-group/sanlock/sanlock-0-r2.ebuild b/acct-group/sanlock/sanlock-0-r2.ebuild
new file mode 100644
index 000000000000..71ceac8ce503
--- /dev/null
+++ b/acct-group/sanlock/sanlock-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="shared storage lock manager"
+ACCT_GROUP_ID=340
diff --git a/acct-group/sauerbraten/Manifest b/acct-group/sauerbraten/Manifest
index 57b96c2abbb6..4b032009de33 100644
--- a/acct-group/sauerbraten/Manifest
+++ b/acct-group/sauerbraten/Manifest
@@ -1,2 +1,2 @@
-EBUILD sauerbraten-0-r1.ebuild 210 BLAKE2B 2fe2276242a31a04ff62c936f98df474b99268878d96bfef84a215c633457d1742fcc6145373cacd2390c8ffaf1d4b51cebcdd358215a48500b8eb2d48133b61 SHA512 dc9f5f67c15f10356c5ee9b625f12489c36c30b6cdccc8db526977760ef25b1b092c81d75b6658b675660710dafaac93c9883ec9a1275556ed0c78fe9aa06705
+EBUILD sauerbraten-0-r2.ebuild 215 BLAKE2B 0561a0b3ae3906edd8f70386c6c5125ae84410e34adf1955b972025b06f7f2e242461dc2b4c1d169558b7e02c0864ad8ebc6ed54822f35b50425d360903be703 SHA512 2a814030d86c0353497f08c3ae1073108d82f559a2141505e0ce44b37cd03c649a489df253ceacb28d2cbe6a6c6465db81be75aed49d62173b93ef758dbeb0ef
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild b/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
deleted file mode 100644
index 2312bc0e37e2..000000000000
--- a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
-ACCT_GROUP_ID=286
diff --git a/acct-group/sauerbraten/sauerbraten-0-r2.ebuild b/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
new file mode 100644
index 000000000000..4eb54a421250
--- /dev/null
+++ b/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
+ACCT_GROUP_ID=286
diff --git a/acct-group/scanlogd/Manifest b/acct-group/scanlogd/Manifest
index 4e5ea8c51e0e..b676909b28e9 100644
--- a/acct-group/scanlogd/Manifest
+++ b/acct-group/scanlogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanlogd-0.ebuild 202 BLAKE2B 0632a682e9aa2330f9ca0368f45ae408fea262d3eb876e18d2d0e24d3027151aed1c303dcc3486b084f8b98aef8a3e0affda5783b3f520bcf599679a2d865369 SHA512 bf86ba312bf77e5caee19c74cfdbf4f838291b3888eadb4c8b73c7789ad95589993f2e7df4d1b1926ee200a9de83d6db328b85ccef82b27db3a63e78053c6c0f
+EBUILD scanlogd-0-r1.ebuild 202 BLAKE2B 8d36db7fa52c100d6dd76dd7d277c4c1f5840acf3b1de7fc8b9fb059cd678e995acf93c44afc4d31cde09c38a40985ad4a246aa1793760505ee6791765f026ff SHA512 977606b349f6850edf6797d7781d380016ead3ec9c8c2979b47565c2382f499cfe57cf27f89da2ac325f0e8ffdf2e05c77f7e96cf5338c33cf0c2dc5f2be6c22
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/scanlogd/scanlogd-0-r1.ebuild b/acct-group/scanlogd/scanlogd-0-r1.ebuild
new file mode 100644
index 000000000000..2b6b4a16515c
--- /dev/null
+++ b/acct-group/scanlogd/scanlogd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/scanlogd"
+
+ACCT_GROUP_ID="166"
diff --git a/acct-group/scanlogd/scanlogd-0.ebuild b/acct-group/scanlogd/scanlogd-0.ebuild
deleted file mode 100644
index ba71638b34cd..000000000000
--- a/acct-group/scanlogd/scanlogd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/scanlogd"
-
-ACCT_GROUP_ID="166"
diff --git a/acct-group/scanner/Manifest b/acct-group/scanner/Manifest
index 68d1bef9367a..570b43864d9b 100644
--- a/acct-group/scanner/Manifest
+++ b/acct-group/scanner/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanner-0.ebuild 202 BLAKE2B 53f7c6c4d81079d9c78fec9793ca10cebb8f53e59b5f4003321d3280ae17152fd378b0e9bdcab91464c9c16aeefaf4a230fc47cc502d08d28cee0d58e7a2c644 SHA512 266bbf1c22b39136f7081002f21d11dddc0f4d9d09b4bda82cdcdc2386319c01d1a2e23e4d6c34c33a6e5a19fdecfef3485803068b9ed9428ab467bc0e1cf381
+EBUILD scanner-0-r1.ebuild 202 BLAKE2B 7eed3ac2e03aaa2b5f941746a5ab3705ecb71357b5adc5f77da273287ee831030beeccc45ecfec1ef840e61ef13e372ba9cd399a8c3617faf747d048c389033f SHA512 16e4abd5666e13063febcfab435fb4496ae7545670774443d46fb7a4dfe3fda2852af0df9badadab970736d4a659cb0ef4f61c9430647e52775472973bb64f5e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/scanner/scanner-0-r1.ebuild b/acct-group/scanner/scanner-0-r1.ebuild
new file mode 100644
index 000000000000..7a2254915859
--- /dev/null
+++ b/acct-group/scanner/scanner-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for media-gfx/sane-backends"
+
+ACCT_GROUP_ID="332"
diff --git a/acct-group/scanner/scanner-0.ebuild b/acct-group/scanner/scanner-0.ebuild
deleted file mode 100644
index 41c58ed07571..000000000000
--- a/acct-group/scanner/scanner-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for media-gfx/sane-backends"
-
-ACCT_GROUP_ID="332"
diff --git a/acct-group/scponly/Manifest b/acct-group/scponly/Manifest
index 24e6c6cbcc4c..3078936ec033 100644
--- a/acct-group/scponly/Manifest
+++ b/acct-group/scponly/Manifest
@@ -1,2 +1,2 @@
-EBUILD scponly-0-r1.ebuild 183 BLAKE2B 2c995e1a0a49fde7a703114e93377661507410782cdd36320cbe0fae473586adb79177895ec4d7e1a98b7640474636730d913bfe954a5db9cd49c17d9fb72029 SHA512 2900acb88e2e188cefd370a767b8a9372e50464e8fb4fe14d85a8161a321f489c71014680c7a54d9de47f3743515ea0bb736ffbd8de86288623c675e7342deae
+EBUILD scponly-0-r2.ebuild 183 BLAKE2B 6bf256a5a563334e1b748cd8867772a2999bbd91bbbd4769d879ae94f9952b432ee662b1db3fb9a7adcb6e5a7bb836b1216f714576dfe3bb2cd0daf207d0a3b1 SHA512 0ca1400d2c5dd5211ee33a46d04f89777094a9260b774aacfec1a3e783e8ed8b7f953fcf1fc9f35a54a3f0885051a2a18be58904efb89dcef73e9cfeaa6b8c35
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-group/scponly/scponly-0-r1.ebuild b/acct-group/scponly/scponly-0-r1.ebuild
deleted file mode 100644
index c0418d2599cc..000000000000
--- a/acct-group/scponly/scponly-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for scponly"
-ACCT_GROUP_ID=239
diff --git a/acct-group/scponly/scponly-0-r2.ebuild b/acct-group/scponly/scponly-0-r2.ebuild
new file mode 100644
index 000000000000..d5a704be9aec
--- /dev/null
+++ b/acct-group/scponly/scponly-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for scponly"
+ACCT_GROUP_ID=239
diff --git a/acct-group/scsi/Manifest b/acct-group/scsi/Manifest
index 6f0877912016..fe5875c0610a 100644
--- a/acct-group/scsi/Manifest
+++ b/acct-group/scsi/Manifest
@@ -1,2 +1,2 @@
-EBUILD scsi-0.ebuild 151 BLAKE2B 1cd6f3bfa70a3212d37353b74465074102d76f4c47dd5a8d3c158a5ce359adb8f1f79cbeaf911b317aefddfd5b69311c0395c58d027d30295463cbedaebc5f10 SHA512 ef325624a896d4d46463679619d4e4b5c520dad153365b53d92e80758e8f4b81dd2c512afd15756be2e9fc460a3de2cbaa9f14ac7e8f420389c13dee7b4ec310
+EBUILD scsi-0-r1.ebuild 151 BLAKE2B f232e73bc007231db73c3858c996a5611d8d3b773c66bb47d80232062716a27c47525362f01f4b355ab216313cd695d95660f226a18b5da2aee91c2a527719bb SHA512 d593e894ea51588c237360f0be7ebc31b9bd80c15b9b9137fa3c73468f23cd50c13c517e21224cb538953a605afe14486225815a31f7b38c11262d49dac431eb
MISC metadata.xml 169 BLAKE2B 4307ce25f2199f9cb772e7740a911318479c0a7c122eb2c91e5c908e1e51bde7c261d0c9681dcb5095d0c8d9dc97c5ae40787c13ca971f705c5b471bbb1ce6b1 SHA512 9d7035f8acb273b0b044a4d8d04b395ddef6d5eb62333af0c232b7bdc112d90d5fd88913a60d4e0e1206d113d5cea77b5ece4defa421af52b2bcf3bf7e35d7f1
diff --git a/acct-group/scsi/scsi-0-r1.ebuild b/acct-group/scsi/scsi-0-r1.ebuild
new file mode 100644
index 000000000000..f3ee233c3cdf
--- /dev/null
+++ b/acct-group/scsi/scsi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=415
diff --git a/acct-group/scsi/scsi-0.ebuild b/acct-group/scsi/scsi-0.ebuild
deleted file mode 100644
index e87f4b7b1c8d..000000000000
--- a/acct-group/scsi/scsi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=415
diff --git a/acct-group/sddm/Manifest b/acct-group/sddm/Manifest
index 0eeab307b808..e01f4c07433e 100644
--- a/acct-group/sddm/Manifest
+++ b/acct-group/sddm/Manifest
@@ -1,2 +1,2 @@
-EBUILD sddm-0.ebuild 194 BLAKE2B 6e9bdb2df04e69485fc61627d2fae81e40a8e922ecc87636c751587916c19ad5a601c55aa5d2c752ba7e8531ea41cf3f41af54880ffe1b1d90a1aafbb1d3ab6c SHA512 89436a12a085784fd093cce68a519eab143e04c8296613ae693aec0e7420de040721c801187beea1cf0f5d7b9188873b6ea2c1990a272e40084701690a0627c7
+EBUILD sddm-0-r1.ebuild 194 BLAKE2B fb7168344473c3e68c9af0c1ab6220c52ee9b46a5f2dd795693ad8dcd9d7dd0bf99ea71908cca8c3c11dbf035f1a23cbd4098c9d2e7f89d2c15a14723517e600 SHA512 e11bafeb6b3e33df965774f40078487dc3be1a3c8ff5e6c966690d3d3ce6762650daa5cac13ca4005becd9c4bf915d3f30d6c1d7075f0a1581055882d3d9770b
MISC metadata.xml 347 BLAKE2B d35c41092c587e21f53b8622fb40c8d2625f2ee7b71a645ec478f1e90eb2645eb87b6cb8f06b7e1a317fd9074594da44de68642de0ab45ee748aa93106dcdc89 SHA512 b9fd27f1b7465b3fdf254604066d230ce01eb1713354ed90f95f8963804d32c37e02ceeaadef01a4019abacbcabd044dab9ca0b55e9709505cbdb7d7415c2071
diff --git a/acct-group/sddm/sddm-0-r1.ebuild b/acct-group/sddm/sddm-0-r1.ebuild
new file mode 100644
index 000000000000..44ec1b3df484
--- /dev/null
+++ b/acct-group/sddm/sddm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/sddm"
+
+ACCT_GROUP_ID="219"
diff --git a/acct-group/sddm/sddm-0.ebuild b/acct-group/sddm/sddm-0.ebuild
deleted file mode 100644
index 26a7d184213b..000000000000
--- a/acct-group/sddm/sddm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/sddm"
-
-ACCT_GROUP_ID="219"
diff --git a/acct-group/seat/Manifest b/acct-group/seat/Manifest
index fecea503330c..56b6b18f2e92 100644
--- a/acct-group/seat/Manifest
+++ b/acct-group/seat/Manifest
@@ -1,2 +1,2 @@
-EBUILD seat-0.ebuild 185 BLAKE2B be6dffb8cc37a688be351ddea569584a86063fe174237965fc304cc8880ffeae0763fe3e7ea5679d474a75d1104d50f2a2ab264de13c3bd5477f2cf68388dd83 SHA512 c6c4540f630a5e0253ae8ae933629f4c361aea37d70a08de31ea9449e786311654f421336c80e101a1bd81fe1593cc6c6f26745adc4dd7abd8cd679578c72a3d
+EBUILD seat-0-r1.ebuild 190 BLAKE2B 66286d5f5aac5e3f48920b603ed9dd2f77cc90616910c8cb5ac3c39343f0205a2243e86a70f1b9608d5581c5cdb579c20077c4726f3397ac8ebc7703514a2733 SHA512 1217f1ce5915984125dc5c9f236d736b168ad9acbc0025bf549d01d4672f333ab7d40468423c6182d9d15a46e33f0a9c112414bd2563e6f4b36767c4853b5680
MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/acct-group/seat/seat-0-r1.ebuild b/acct-group/seat/seat-0-r1.ebuild
new file mode 100644
index 000000000000..5feb719c5fdb
--- /dev/null
+++ b/acct-group/seat/seat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-auth/seatd"
+ACCT_GROUP_ID=202
diff --git a/acct-group/seat/seat-0.ebuild b/acct-group/seat/seat-0.ebuild
deleted file mode 100644
index b5c12d09822b..000000000000
--- a/acct-group/seat/seat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-auth/seatd"
-ACCT_GROUP_ID=202
diff --git a/acct-group/serf/Manifest b/acct-group/serf/Manifest
index 1d4241f07e2f..877f71bfd889 100644
--- a/acct-group/serf/Manifest
+++ b/acct-group/serf/Manifest
@@ -1,2 +1,2 @@
-EBUILD serf-0.ebuild 195 BLAKE2B c16596e3e4fc2c359d0ef88e26aef34f44c759f64f0662212223e4e2f72cdd33d2cc5c387513469a386a89b2a208bdef0bb6ff52bb5491e2d1cb9b99fee039a5 SHA512 7379a298931d34356efcafe8f9227413937de82ff1e6ce32e5f51470c214c2917f2e8d1ef17e8a45a1d6685c306757216ae24093f786acf7b4005c8ec1c44346
+EBUILD serf-0-r1.ebuild 195 BLAKE2B e68f412af048567c78ab9c1f18d9c24c242f53d043b99d4b06388d01eee1d9e626690a0469b8a3359112261315f0caaa4ffc12b4743ed6ff01f716b8a842f7db SHA512 3579536781f21d580b6f616b5cbf6673f00457e3c45000ed69b7f81a3946b0b4fa451e3d81bcdc7b4a7dd8f501cacde3ffc6cc961a53ce656ecb5ee5f0105df9
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-group/serf/serf-0-r1.ebuild b/acct-group/serf/serf-0-r1.ebuild
new file mode 100644
index 000000000000..6b8c298f2eeb
--- /dev/null
+++ b/acct-group/serf/serf-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/serf"
+
+ACCT_GROUP_ID="314"
diff --git a/acct-group/serf/serf-0.ebuild b/acct-group/serf/serf-0.ebuild
deleted file mode 100644
index 00c3f9c40c85..000000000000
--- a/acct-group/serf/serf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/serf"
-
-ACCT_GROUP_ID="314"
diff --git a/acct-group/sguil/Manifest b/acct-group/sguil/Manifest
index be45f50903be..9087c6a75beb 100644
--- a/acct-group/sguil/Manifest
+++ b/acct-group/sguil/Manifest
@@ -1,2 +1,2 @@
-EBUILD sguil-0.ebuild 206 BLAKE2B 590a8f105d3f5f3c2c6cfacb60c28852c41193e94ae79ac1f5d9dc6c8c2050fb1a02b745e7ecde4343a7000205fed82fc43260bed112f9a6c606ddf3127e2255 SHA512 e696d16989f91d22e7a671ecc4d5ffcbc1dfee25a6e41ff562dd500f749e414252bf4ec2089afb60dc4e04d469d12dac761fdb9d13b0bce2651d6a5c0ae3cf30
+EBUILD sguil-0-r1.ebuild 206 BLAKE2B 2860b70370dd323e0359ec4ec2ce18352572f99cd16c5d979d4907dbce07cf8a7fc0322efa90c45043976990d8e5139d459a65570a0a6c79c7861213fde8b4aa SHA512 ba39ac9fdc5083203f261d11e3d5a5a5969436a223fb34d11f1539f8ac0e077e55c0948b829862fd460b33e20beb60150384a2143e37c46c1914c7d3db3d0c35
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/sguil/sguil-0-r1.ebuild b/acct-group/sguil/sguil-0-r1.ebuild
new file mode 100644
index 000000000000..b1085c8168b7
--- /dev/null
+++ b/acct-group/sguil/sguil-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/sguil-sensor"
+
+ACCT_GROUP_ID="165"
diff --git a/acct-group/sguil/sguil-0.ebuild b/acct-group/sguil/sguil-0.ebuild
deleted file mode 100644
index 15fbe00afd0d..000000000000
--- a/acct-group/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/sguil-sensor"
-
-ACCT_GROUP_ID="165"
diff --git a/acct-group/sgx/Manifest b/acct-group/sgx/Manifest
index f03d48d7b2fc..6e6e93119be0 100644
--- a/acct-group/sgx/Manifest
+++ b/acct-group/sgx/Manifest
@@ -1,2 +1,2 @@
-EBUILD sgx-0.ebuild 197 BLAKE2B 26ae8a395265b92149224ed49d13d1bb6eaaee69dae8e1c3a73591da2337c1005eab43700545e8c3a026652321e0dc4082211fe23a7e7e99d0d2d05d8dd33ddc SHA512 f8cff00e63c5132d3267b5228a29c674e879004d829aec10a28e87a5c412c1cf8b8620535ac7426d3ffa61515e785afd8ad7063ccdd1d83b1720ca427982b453
+EBUILD sgx-0-r1.ebuild 202 BLAKE2B f84ed6e9afd0c54d8810d0e1c30622563ec4e92c8ccd0afc85048b0f3cf08ff63ab5f12419ff8bc7f7521ea0e168f30670bf7f091a3cc0bbb3ceb747242504c8 SHA512 1a1ccf82fcf7c3e3b19223fcc0971ba685e99557cf694d6f9f365d8d3a3b16c3c181d13c2382ded7fcde8b866ca4609730cd7423a0c7994340f9e70f058f78ed
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/sgx/sgx-0-r1.ebuild b/acct-group/sgx/sgx-0-r1.ebuild
new file mode 100644
index 000000000000..dc4b0f1de0ba
--- /dev/null
+++ b/acct-group/sgx/sgx-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="System group: used for SGX enclaves"
+
+ACCT_GROUP_ID=405
diff --git a/acct-group/sgx/sgx-0.ebuild b/acct-group/sgx/sgx-0.ebuild
deleted file mode 100644
index 6a9d9ac0c9d8..000000000000
--- a/acct-group/sgx/sgx-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="System group: used for SGX enclaves"
-
-ACCT_GROUP_ID=405
diff --git a/acct-group/sigh/Manifest b/acct-group/sigh/Manifest
index 828c8049e929..ac347f575f5e 100644
--- a/acct-group/sigh/Manifest
+++ b/acct-group/sigh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sigh-0.ebuild 151 BLAKE2B 0ab7e99af571ef263ead1dd322a5f80f798927fc6551f30d39b7b428369f3688ceb5997a4d303430c027cbfbf101278741cc458a40f03f66078781ef84e21b55 SHA512 84f012812b0f710d47dd84d73ce0da3072ec6178eb5fa44518672bf52e1eac5446853c18c65baf3ff76cc80714753516da2cd85f3dd89b7a95c5a3cebd20993d
+EBUILD sigh-0-r1.ebuild 151 BLAKE2B f5878967aab38daafd5228825fab5d30439c5c0d0a69b460ccb625c34671b297e1895ca37aca69cdc4c555693c6a0105142b72cca6e87c3f957b436b1ce8332d SHA512 7e19e5386b2dfaa761bb958f8be1d53dd6889799f208707ad20b7fb97a7695157e9cca0451a79ffe9aa291d13c8deb1dfa904efd0f1bde6acf83ac76d33e6f9a
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/sigh/sigh-0-r1.ebuild b/acct-group/sigh/sigh-0-r1.ebuild
new file mode 100644
index 000000000000..e05e868d4d71
--- /dev/null
+++ b/acct-group/sigh/sigh-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=363
diff --git a/acct-group/sigh/sigh-0.ebuild b/acct-group/sigh/sigh-0.ebuild
deleted file mode 100644
index 82133b99b3ca..000000000000
--- a/acct-group/sigh/sigh-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=363
diff --git a/acct-group/simplevirt/Manifest b/acct-group/simplevirt/Manifest
index 2546b5b91fd2..4ae783bace01 100644
--- a/acct-group/simplevirt/Manifest
+++ b/acct-group/simplevirt/Manifest
@@ -1,2 +1,2 @@
-EBUILD simplevirt-0-r1.ebuild 146 BLAKE2B e3ed3ba0e82a7ffa91dcf7888de167ac11d918b0c5880ebcb38d97b7af7d8ff49371829135f02533b9ce44eea39b76366c8b642df18c1b3d81e03c44ed845283 SHA512 0710eb59efb4a20520af0ad291bb466a0abbffeb28c14335c338c2619bd3002664ac1d40eb6ac18c69e6d657a9d1621e496319f88a96ee8873d498125d33b7ba
+EBUILD simplevirt-0-r2.ebuild 151 BLAKE2B 225fdffa80d2d4cba4c9cfe6a7fc69af3704c35121cde8675cc6fa6fdf64af218ac8917875594bb124ff4a394f80110a20edf7ae34294fb33352d8fe1866a42f SHA512 bdaba8de8aa9942b08a50450c7141cebfb5ba21790e7e07441b014aa8a30b8b14e319a16ae8f302fdc010eb7ec433c3b15073df58eb0d939177749d8dfe4506e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/simplevirt/simplevirt-0-r1.ebuild b/acct-group/simplevirt/simplevirt-0-r1.ebuild
deleted file mode 100644
index 6d4d4ffbc136..000000000000
--- a/acct-group/simplevirt/simplevirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=404
diff --git a/acct-group/simplevirt/simplevirt-0-r2.ebuild b/acct-group/simplevirt/simplevirt-0-r2.ebuild
new file mode 100644
index 000000000000..ea9e10ee72d3
--- /dev/null
+++ b/acct-group/simplevirt/simplevirt-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=404
diff --git a/acct-group/sispmctl/Manifest b/acct-group/sispmctl/Manifest
index 5cbf2f36b94e..4e6a7a703bd1 100644
--- a/acct-group/sispmctl/Manifest
+++ b/acct-group/sispmctl/Manifest
@@ -1,2 +1,2 @@
-EBUILD sispmctl-0.ebuild 197 BLAKE2B 7cedb80a452bbdefbc15e95cfaa83a079b19f9b3b3e5bc311b7e2c4756a1b618f7a79714fab9d3e1e69b9788dcf40d6100c954bc134b5c32853ca6d7e061e74a SHA512 422573a06fa294d7757ab30f34fd4b5a8a771a384bafa029704234e7ef9b39ae7fea2c1b726274942d5a0d280e5d4509dd77ca8702cf62e9f8a8c0e4c1242244
+EBUILD sispmctl-0-r1.ebuild 197 BLAKE2B da019a7ffa5080e3a400294941148d4da363fa5b2027db868c577bc53fdc3ee55c5c97534e234c311ae710f0da483bc4c9292c0cd623a57a793107af51415db8 SHA512 dd3b997b70a6a624534a2c66f2a3abb46a5405fa2afa6a79dc128334ac1cea435e99962f1e628e4f7817be512d884b05ac4dc9f9936a91534e0efca85e5365d5
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sispmctl/sispmctl-0-r1.ebuild b/acct-group/sispmctl/sispmctl-0-r1.ebuild
new file mode 100644
index 000000000000..7b4269a47c0c
--- /dev/null
+++ b/acct-group/sispmctl/sispmctl-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-power/sispmctl"
+
+ACCT_GROUP_ID="173"
diff --git a/acct-group/sispmctl/sispmctl-0.ebuild b/acct-group/sispmctl/sispmctl-0.ebuild
deleted file mode 100644
index 1dcdaedb2271..000000000000
--- a/acct-group/sispmctl/sispmctl-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-power/sispmctl"
-
-ACCT_GROUP_ID="173"
diff --git a/acct-group/sks/Manifest b/acct-group/sks/Manifest
index 1fde2191eadb..854ec1264c12 100644
--- a/acct-group/sks/Manifest
+++ b/acct-group/sks/Manifest
@@ -1,2 +1,2 @@
-EBUILD sks-0.ebuild 192 BLAKE2B cde6513c6f7e065059acc3a29b9f755e39c2de842503109a0a71e4b54e991ba0ba6ee851008b25f58a1addcb183b08b80a346577b5e624341f6d414dd1391a61 SHA512 0488ed39591f3e880616d7fdb1cf052cc456d0131ed9c45c9cf942ebe30fa88e373f89b3847811a51ceb1870f068e21239e661713f9066b73838de3236487a8c
+EBUILD sks-0-r1.ebuild 197 BLAKE2B ab85e0c0217d5dfdb69ef907d608683178eac24b1f4cb6563090947148392c183149ffaedebe9354dbaec298b960e87123f11dadf24c2133a692e558727e6737 SHA512 b7785d6e2acd733e4087e58248f0fb28cdaff0fc5d8221c94effab9a5aac2c78f9a07985f34152a4966ab63f2a5e885246db8717af58c27cb25ae893dc89de11
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sks/sks-0-r1.ebuild b/acct-group/sks/sks-0-r1.ebuild
new file mode 100644
index 000000000000..27cc84dd7259
--- /dev/null
+++ b/acct-group/sks/sks-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for SKS OpenPGP keyserver"
+ACCT_GROUP_ID=370
diff --git a/acct-group/sks/sks-0.ebuild b/acct-group/sks/sks-0.ebuild
deleted file mode 100644
index 0304197a7063..000000000000
--- a/acct-group/sks/sks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SKS OpenPGP keyserver"
-ACCT_GROUP_ID=370
diff --git a/acct-group/slurm/Manifest b/acct-group/slurm/Manifest
index 09f96d24b28b..6d8d0df69e2d 100644
--- a/acct-group/slurm/Manifest
+++ b/acct-group/slurm/Manifest
@@ -1,2 +1,2 @@
-EBUILD slurm-0-r1.ebuild 222 BLAKE2B 4b25eb6f204c63252a4e551964c31849e82dc1a09e57250d140742372a8f884749d0ea8f0d2e674cc73be8c250d8d39838f3d8a1d151c94d59f67973873bd814 SHA512 704e8e2002e73d09521bd4fb64b0ed82844c638608a3e7cd2f468d4f7c3d1e431a9e874befc82acb6ecd6271a75803acb2ec8a302f3034902099fd7b06bb1570
+EBUILD slurm-0-r2.ebuild 222 BLAKE2B 26cbd503117d77bc7cb7fff93f9e46e3e8b4d3a760395da9b27b9e180bea98023645cab749ef091d133e5037b6cc23a0dfb28ec6c9b64a4930e75611f2c4bce4 SHA512 4d073c8a785930f0e80518a8272f63f0de078f0b62f7bc933053e64bb28fe5105e8e5b0ad1f64fc1d7f3ee5115305d42684dd6cac1bdc9a9811ecbf985c10949
MISC metadata.xml 367 BLAKE2B f7377cc4c8ab6161736e0b676f04156059b020ebb1bce3eba0277b419458a520c595dc43dcc2ac7545bd91a93630d5809ab8194757dbdb092d06473ebbdc9bdc SHA512 07ecc9173013e5b0d47c90f5c5fda05bbb127e4401ccc2bc2c92ca04c4e300f1b6fef8f40f12ea58db212e3f66f7f9085af42ca8e0c6fb1e7be5d193a8a09831
diff --git a/acct-group/slurm/slurm-0-r1.ebuild b/acct-group/slurm/slurm-0-r1.ebuild
deleted file mode 100644
index a77214a6d765..000000000000
--- a/acct-group/slurm/slurm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
-ACCT_GROUP_ID=400
diff --git a/acct-group/slurm/slurm-0-r2.ebuild b/acct-group/slurm/slurm-0-r2.ebuild
new file mode 100644
index 000000000000..4d77700fd816
--- /dev/null
+++ b/acct-group/slurm/slurm-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
+ACCT_GROUP_ID=400
diff --git a/acct-group/smmsp/Manifest b/acct-group/smmsp/Manifest
index c16293c11109..127092b4d4d4 100644
--- a/acct-group/smmsp/Manifest
+++ b/acct-group/smmsp/Manifest
@@ -1,2 +1,2 @@
-EBUILD smmsp-0-r1.ebuild 146 BLAKE2B c592d38d99685bb681f580f911c7995dca6f3a70edcda02491e5bee816c06f1382f241c8250d2f954b518180de72e8ef92173592a3c517c6790f7a5082b41473 SHA512 2c20a79e4dc2af45ca56fc8241b6965911c7a8c7132dce385c5a7ecce5683349012986abd06a65b7e5740ce0029b400b1f7bc2b36f6c42cdb54b99377eef8980
+EBUILD smmsp-0-r2.ebuild 151 BLAKE2B 631eeb908cf76df13ba171d5dcbf187ba592dc597dc6c68d54078be9abf2e8b012b24ec175c7ce69063221d9b9117631d3dad9610df4164266b069a5e7e7649d SHA512 a95b06e4e65baa649633adbdf6da73a164bc4c415d299955f88217bb431fff71405f975ed4762e2bbb41a4c4b52f2f722317a9997dff4d0020ff7771e891b8c1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/smmsp/smmsp-0-r1.ebuild b/acct-group/smmsp/smmsp-0-r1.ebuild
deleted file mode 100644
index 8e0821713295..000000000000
--- a/acct-group/smmsp/smmsp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=209
diff --git a/acct-group/smmsp/smmsp-0-r2.ebuild b/acct-group/smmsp/smmsp-0-r2.ebuild
new file mode 100644
index 000000000000..1b08887f6648
--- /dev/null
+++ b/acct-group/smmsp/smmsp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=209
diff --git a/acct-group/smokeping/Manifest b/acct-group/smokeping/Manifest
index 8e140d75788f..6ad82a7b1aa3 100644
--- a/acct-group/smokeping/Manifest
+++ b/acct-group/smokeping/Manifest
@@ -1,2 +1,2 @@
-EBUILD smokeping-0.ebuild 203 BLAKE2B 6a1784d9b0d200ffb64008cfa9eb33a03767fd9c186711b04f3c15860f58007eb3a829ecae3201d83d4906b8debe74cddd78e6e4845ba83e53d6236840c295f9 SHA512 c8544454f12dbb11f28aab193b3dbf9563f548ea71a892c6f5ffe59261e604d0cf8a5e37955d335bba7572ac42d6ef56322cf9f73784b2bd8323014c1ba0726e
+EBUILD smokeping-0-r1.ebuild 203 BLAKE2B e26adb53879a07fd216706ddb23eb6e2749bc4ce3508371688eb191b426fefa035e0d0270b65d064212399d336ff6582503e45f65ed9f1c1f9ba41a1fd09d828 SHA512 20987ee173eb06384ab975046ebfecb394a0ca1e3c1127205d7bee658131097526c2a398e12a064f903bcec6b868adec3b71c5fb4dd5254bcf42046c59fb8d58
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-group/smokeping/smokeping-0-r1.ebuild b/acct-group/smokeping/smokeping-0-r1.ebuild
new file mode 100644
index 000000000000..8a12dbb3875a
--- /dev/null
+++ b/acct-group/smokeping/smokeping-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/smokeping"
+
+ACCT_GROUP_ID="164"
diff --git a/acct-group/smokeping/smokeping-0.ebuild b/acct-group/smokeping/smokeping-0.ebuild
deleted file mode 100644
index 0d00bb46fcb0..000000000000
--- a/acct-group/smokeping/smokeping-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/smokeping"
-
-ACCT_GROUP_ID="164"
diff --git a/acct-group/sms/Manifest b/acct-group/sms/Manifest
index e4c7973969a8..818712591f51 100644
--- a/acct-group/sms/Manifest
+++ b/acct-group/sms/Manifest
@@ -1,2 +1,2 @@
-EBUILD sms-0.ebuild 151 BLAKE2B 2bac3d7ad2382918520dadd6fc79f1a62d8e4884e2fc5d5b024a8924483b19fbc49ce23be9ec2c74e173ec20737579f7bb6e41a25685ad1c6aa0ff2139f33918 SHA512 dbf0a22ff61cb231cb369e6532dae36b613b2f9601d22e30d6d8735289499c9a250b1f3fc3bc7601690d239c2c52b79710fc3692cc17c6c664c4faa2ea2581fb
+EBUILD sms-0-r1.ebuild 151 BLAKE2B 976cab984911cf08824ba78de251139ad7cb78608fd15c0c327e031e117f3e107524571f3c412667f580dcf6ecd0b66231ee913b4d0b5e720542a69dd75e48a3 SHA512 41aa77a9a98782f7e51c0f0e87cce90280a03b44e7e6a166aa35d5361178a25663d71d6a021495268483953300753842134039853be4f1934804cf88cd6a0256
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sms/sms-0-r1.ebuild b/acct-group/sms/sms-0-r1.ebuild
new file mode 100644
index 000000000000..5de57373dacf
--- /dev/null
+++ b/acct-group/sms/sms-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=359
diff --git a/acct-group/sms/sms-0.ebuild b/acct-group/sms/sms-0.ebuild
deleted file mode 100644
index dea788cbae76..000000000000
--- a/acct-group/sms/sms-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=359
diff --git a/acct-group/smtpd/Manifest b/acct-group/smtpd/Manifest
index d5da98d590c0..d3751b46c33d 100644
--- a/acct-group/smtpd/Manifest
+++ b/acct-group/smtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpd-0-r1.ebuild 182 BLAKE2B 9672093f68123084b19669cb5f5d0b6805211245059ba3c0f2745e8ed9a028a517740cb8a6672b11865a606400411d6d823fa67a73cfa54b6c9343db7f655804 SHA512 4cb094e58b3413fb8103b85993958d5a66c8bb6c60b06e882ff222d71fde026da94acf4722ee5c352d9de2634259341a64e3ad9320f7a3aa9d70b0877bc16add
+EBUILD smtpd-0-r2.ebuild 187 BLAKE2B 847e763b2bb6e641c089d0fb9780b06caf02c4a02c9008cce09da0d519eea477a94b8a8f0e2f83ea931255d0be3a5b3eefed8bb81179c49e58a320620e078318 SHA512 8831f90e5ffb95d75dfc05a939ffcdb1a16ec7a512ea61cdc38358ef1e51469a33696012520eae86b7d539b13e3f84a3580f13836bd6fd9fdebc2ddb8dcd74fc
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-group/smtpd/smtpd-0-r1.ebuild b/acct-group/smtpd/smtpd-0-r1.ebuild
deleted file mode 100644
index b09abd76d858..000000000000
--- a/acct-group/smtpd/smtpd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="daemon group for smtpd"
-ACCT_GROUP_ID=25
diff --git a/acct-group/smtpd/smtpd-0-r2.ebuild b/acct-group/smtpd/smtpd-0-r2.ebuild
new file mode 100644
index 000000000000..7c6daeb449a8
--- /dev/null
+++ b/acct-group/smtpd/smtpd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="daemon group for smtpd"
+ACCT_GROUP_ID=25
diff --git a/acct-group/smtpq/Manifest b/acct-group/smtpq/Manifest
index 4b7f8c1a6eca..317513080681 100644
--- a/acct-group/smtpq/Manifest
+++ b/acct-group/smtpq/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpq-0-r1.ebuild 182 BLAKE2B 9c22945347df6d29b6b655840d4585a59854a7976bafd1f52c9bf0fe9dfc6f6c900639ffd76700c968587363664b08be4b65aa4b9cc189c9b190d3fc83a162cf SHA512 e9b0f7adfda94d49455f6f6e7fd0fdc937b9544d61220a1ba7363ee9ad04e45efcb3754fa3e4441249419b4f8ca95db03405fc938ae6247da88d170bad3eff0a
+EBUILD smtpq-0-r2.ebuild 187 BLAKE2B 33489d5794405aa9ac21c614a253e00da5af06e4ddad8724b8ab20581fff3c1e1f4de2f1e6aaad32b8d906c1f57243aa11c8eaabc3542b34faac72845d7aaf0f SHA512 4bfc674e8392bd53c1f67893ddf80407b360f0548002fb9489ee2ea305c2958fb4463bd6c1f00c97d5eb32acf39dcf192f62550f46e71375d24c319b40bce84d
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-group/smtpq/smtpq-0-r1.ebuild b/acct-group/smtpq/smtpq-0-r1.ebuild
deleted file mode 100644
index 8797fef847fb..000000000000
--- a/acct-group/smtpq/smtpq-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="queue group for smtpd"
-ACCT_GROUP_ID=252
diff --git a/acct-group/smtpq/smtpq-0-r2.ebuild b/acct-group/smtpq/smtpq-0-r2.ebuild
new file mode 100644
index 000000000000..1bc8ae7786bb
--- /dev/null
+++ b/acct-group/smtpq/smtpq-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="queue group for smtpd"
+ACCT_GROUP_ID=252
diff --git a/acct-group/snapserver/Manifest b/acct-group/snapserver/Manifest
index badc77eabdeb..97a127ea3384 100644
--- a/acct-group/snapserver/Manifest
+++ b/acct-group/snapserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapserver-0.ebuild 198 BLAKE2B 1028bd8dccb6520b37a1de03b2ed964cd7d7f4e7a3aa456ff03af0048c00c4e03814b0cdf79185157e4fc8941276ff46dd9e96ef4f363a7cbb82f512efaacb50 SHA512 eb6169e1a13c0bf7f922d643e2c14c847f790c813602df99358a2b176c75f9cfad68de671cc876bb4099474ce1a44a0fb522659181f06767cf80ddbbff1a6b45
+EBUILD snapserver-0-r1.ebuild 203 BLAKE2B f6bbc96d20358390eecf073829719cf8ec2cec81d031a909a84c4c6a882caf8665a633e375f33f290cde18f8cd2fb95226c77b0c318917287605713c1e89a5d7 SHA512 33b76d985c3eeee588b7a390e941ffdc0159004ef73e96e7fff1b07801ea2d5d79e876677c2300381ddc7d8462a3ce5776c3fe59b3a0a0df5faabc81b7e077cb
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/acct-group/snapserver/snapserver-0-r1.ebuild b/acct-group/snapserver/snapserver-0-r1.ebuild
new file mode 100644
index 000000000000..4742c6cf0de7
--- /dev/null
+++ b/acct-group/snapserver/snapserver-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Server group for media-sound/snapcast"
+ACCT_GROUP_ID=374
diff --git a/acct-group/snapserver/snapserver-0.ebuild b/acct-group/snapserver/snapserver-0.ebuild
deleted file mode 100644
index 7a224e941124..000000000000
--- a/acct-group/snapserver/snapserver-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Server group for media-sound/snapcast"
-ACCT_GROUP_ID=374
diff --git a/acct-group/sniproxy/Manifest b/acct-group/sniproxy/Manifest
index 55a68610fcd1..9625b28e158e 100644
--- a/acct-group/sniproxy/Manifest
+++ b/acct-group/sniproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD sniproxy-0.ebuild 151 BLAKE2B 35f8c5e3a14bf946acda2a2a4ad7b640b7038c5fb230fdcb41ece3b715b0813f8aa6d005969fe65f4b536df8df21a590884c229787bef3c1868aca331c1bc562 SHA512 bb8db76e5d95374e5549757bb7931c1f154f01f82fb61c816f0877813ea420b292ad80678c787abfd07221ce268e0ca9485bf7197897e5fc2385ebdbd35373fe
+EBUILD sniproxy-0-r1.ebuild 151 BLAKE2B be39028ff064e61af597f99d207b65671a0150e8b5b995347882052757fad29c06a33b47390d6a9d223e612355b4526cce7f83151e201d4553d20be10613e5a7 SHA512 4dc8765e65c676b17e8eabcb044ec0362a003381e30230d95502236f1e6ef2ea3a2e8148788e689f1d3719ff96342568f80f70edbc5ee23de3a1fc1861601a59
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
diff --git a/acct-group/sniproxy/sniproxy-0-r1.ebuild b/acct-group/sniproxy/sniproxy-0-r1.ebuild
new file mode 100644
index 000000000000..0858202737dc
--- /dev/null
+++ b/acct-group/sniproxy/sniproxy-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=366
diff --git a/acct-group/sniproxy/sniproxy-0.ebuild b/acct-group/sniproxy/sniproxy-0.ebuild
deleted file mode 100644
index 526eb45957e2..000000000000
--- a/acct-group/sniproxy/sniproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=366
diff --git a/acct-group/snmp_exporter/Manifest b/acct-group/snmp_exporter/Manifest
index 634be54f595b..c95f2c11dd56 100644
--- a/acct-group/snmp_exporter/Manifest
+++ b/acct-group/snmp_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD snmp_exporter-0.ebuild 206 BLAKE2B b83bfceeccdf6167771d4286816727164688c25dfc73e683b825c1d242e33f4bc2b5e7f364c5f4ba29a5a942100e886bdad69db0110256a8b8bb7694bf37edae SHA512 6483e633e558569d1fb500c06697a2f93de2771705d2d45dab11863c0378356ce229a936f3ad8562210ef25a3f59fb57f6362ff22b4114e312d6a055ec68c89f
+EBUILD snmp_exporter-0-r1.ebuild 206 BLAKE2B e583223ae1346e89340723f70324a82b84d2ef9c34c89b62f8c01141a46c4e61370c87c52043c585bc62da1588d88420a5e8fde71821966b8ee675dce620aa25 SHA512 7bf3f11a795f260aaf3415c5665e2007686a6935ed50dccdb7c40b4fe7a598b07a9a9a16d1cce7270ca7a1ac109c3ae8c77333ed35239d6d639cd7474ef727f5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild b/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..d5970e69065a
--- /dev/null
+++ b/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/snmp_exporter"
+
+ACCT_GROUP_ID="108"
diff --git a/acct-group/snmp_exporter/snmp_exporter-0.ebuild b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
deleted file mode 100644
index 52cf4f2d532e..000000000000
--- a/acct-group/snmp_exporter/snmp_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/snmp_exporter"
-
-ACCT_GROUP_ID="108"
diff --git a/acct-group/snort/Manifest b/acct-group/snort/Manifest
index 3bd548062a6d..54bad12ec3c9 100644
--- a/acct-group/snort/Manifest
+++ b/acct-group/snort/Manifest
@@ -1,2 +1,2 @@
-EBUILD snort-0.ebuild 146 BLAKE2B 005f9cdceb0dc59cc49721fded69e56a6b23e4c66a9fe1b12319aec9a73d9158ecebf00f67d98c8e4b06ac4217f50c1a3fedfd7debb5ecb5f7cccd9c68acf1cc SHA512 06eed08d803f36aabd9b1eaffc6207bf2c5be87a2696acd64d019a6c2248a1561ed8b28c249e019f638b6ce1022edd91d82aae099518fa3beb9e4f619e3a6b2b
+EBUILD snort-0-r1.ebuild 151 BLAKE2B aee311c453167531018ccca5c9468d2399b8e1b5af18eacf41d33ba5ecee878d10fc030f99c0000ffbd78ae5b77fd8cd0774442493e88e0eb36aae3cc3f8bd0b SHA512 85716b7613961341721b31effb95ec7e6ca225a2d71b072af0e2d9f8ee02f0628d3a7220621de95489a895d40d1fea851bb3a0d548b8b15f4b60e934748e0d8d
MISC metadata.xml 389 BLAKE2B b2f0c48986e152a58902a98acda9b6ebc253156c5ac3d13bd16b71ea428ffd7456bbe58a8565c5900a581242c11ea482b4f71a65b30962c96c4b7f26c292a86f SHA512 bd0a333026d7f5448f2451950ec3c2dae9a8fbeac03faf2fa9f516c331913e5eb6bcb8c43bc935d25cae1df5a275cc43df301e8834e585ba174fef4d336f8392
diff --git a/acct-group/snort/snort-0-r1.ebuild b/acct-group/snort/snort-0-r1.ebuild
new file mode 100644
index 000000000000..0ad19e1d8cc9
--- /dev/null
+++ b/acct-group/snort/snort-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=328
diff --git a/acct-group/snort/snort-0.ebuild b/acct-group/snort/snort-0.ebuild
deleted file mode 100644
index 95dcdd566680..000000000000
--- a/acct-group/snort/snort-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=328
diff --git a/acct-group/sobby/Manifest b/acct-group/sobby/Manifest
index cb8ff73e195d..8de0a2c1e2e6 100644
--- a/acct-group/sobby/Manifest
+++ b/acct-group/sobby/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobby-0.ebuild 151 BLAKE2B b5cd4ed3d1f1b5a3758baf46d53ef4e7af5825b6e3dbcd6ecd593e0e151eca3e0561efbf7d588dbe7b05741f88409269dd901bda041b9a7aa8b7fe82d2900c23 SHA512 7fcebb1ca9fa2e6467f272d8a593ad6b970069af45a5203b5ede9b572dd717f96e43326db88569201c5a5100fb4f5fc6de2595d12b7acdc0966c754850751e6a
+EBUILD sobby-0-r1.ebuild 151 BLAKE2B 62a3ee546ee9fd86d1860da14a4191add1cc6356778caacd63f5778a3388132024c6589c65be3bf019de2532525a72649601e319a8dea0a2b1028fd37083457b SHA512 c268e4bdca1a351b82f241dff347807d92b5a4a8b1c02446a6ad27236f532e415450ff5c879a393040e3e9f4020dfc0f38475bef3fe641cdbf2c85f9467b3b0c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sobby/sobby-0-r1.ebuild b/acct-group/sobby/sobby-0-r1.ebuild
new file mode 100644
index 000000000000..021a16065541
--- /dev/null
+++ b/acct-group/sobby/sobby-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=322
diff --git a/acct-group/sobby/sobby-0.ebuild b/acct-group/sobby/sobby-0.ebuild
deleted file mode 100644
index 0f95a3ce6461..000000000000
--- a/acct-group/sobby/sobby-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=322
diff --git a/acct-group/sobexsrv/Manifest b/acct-group/sobexsrv/Manifest
index 0a8d00b26034..c564faabe00d 100644
--- a/acct-group/sobexsrv/Manifest
+++ b/acct-group/sobexsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobexsrv-0.ebuild 203 BLAKE2B 5218b235c505dddcd3c99916f21bbe46963d968312e44d128502fe9fbac8648eef109c4f11832beed6335bff50c691e4abefd942bcffa1ecf10a339acc59189a SHA512 285a5dbe6b3bd07b543445c3b3319e386c3526deba245006f18005e2d2a0d4e57928fb299de2ebabc1345c14845192be3b9c76e94b8ab94384cf8091b15050fc
+EBUILD sobexsrv-0-r1.ebuild 208 BLAKE2B eb64c13702518de31f2c436f2f7b9d3661b07063e3b666c417c68fd29544d2b198032e8b1d0fde1ffa9a541c7ce6b90e593f134e925e6d5a3ae43e45fccd0d47 SHA512 7d5049401d0afd1c4bcb9c279ce0336d44d45945cdf07d4f47630ca6b93391b7fa1eccb1b137853497adf2c839316baa72a34984ca3355151674bd7444781807
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-group/sobexsrv/sobexsrv-0-r1.ebuild b/acct-group/sobexsrv/sobexsrv-0-r1.ebuild
new file mode 100644
index 000000000000..7f01a21751cc
--- /dev/null
+++ b/acct-group/sobexsrv/sobexsrv-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sobexsrv: a secure OBEX server"
+ACCT_GROUP_ID=387
diff --git a/acct-group/sobexsrv/sobexsrv-0.ebuild b/acct-group/sobexsrv/sobexsrv-0.ebuild
deleted file mode 100644
index a91907f84e21..000000000000
--- a/acct-group/sobexsrv/sobexsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sobexsrv: a secure OBEX server"
-ACCT_GROUP_ID=387
diff --git a/acct-group/sockd/Manifest b/acct-group/sockd/Manifest
index dcc206654e43..ddb3cd9a1c9c 100644
--- a/acct-group/sockd/Manifest
+++ b/acct-group/sockd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sockd-0.ebuild 196 BLAKE2B d0c5b212d64591a95031c10cc93bd604870ef164d8da3cce4e0cb90160f6f3a276f2f3e3edc4f1f95aadadd60778cdb8904223e0cd3eba6a108bceff350613f9 SHA512 51976f99d68693914731611917f6a62be7969ee61e7de67a78686b1905bbad7739d81cbc4ff84887756acec662cee5e40f36838fa7cc3e39d0bfccab5060d163
+EBUILD sockd-0-r1.ebuild 196 BLAKE2B b93e855bfa19ec6f08cfdc0d46a2085282a540594cd5b48d707111ebc7184331bea376207a28ef957d162cc1cd61dc2a492002533b47e3196037c57e775f8e35 SHA512 cacd55e2cdb9024944f56c91b38d7439c32ff51f7f33815057301b1912ffe13c969f538a6c582f89fe2e38b382514efa8208afa0d5addd9c0b9ee5ae13fee415
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-group/sockd/sockd-0-r1.ebuild b/acct-group/sockd/sockd-0-r1.ebuild
new file mode 100644
index 000000000000..d72ccb7e0e9e
--- /dev/null
+++ b/acct-group/sockd/sockd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/dante"
+
+ACCT_GROUP_ID="214"
diff --git a/acct-group/sockd/sockd-0.ebuild b/acct-group/sockd/sockd-0.ebuild
deleted file mode 100644
index deebd843ff19..000000000000
--- a/acct-group/sockd/sockd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-proxy/dante"
-
-ACCT_GROUP_ID="214"
diff --git a/acct-group/sogo/Manifest b/acct-group/sogo/Manifest
index 8337d096d92a..6ba2825df55c 100644
--- a/acct-group/sogo/Manifest
+++ b/acct-group/sogo/Manifest
@@ -1,2 +1,2 @@
-EBUILD sogo-0-r1.ebuild 193 BLAKE2B 4a33c860f9ac6ae29ef15ed47a0671140a4905fa86577cbeeab6c509cbc313968e71b34450e067c704640a80da91e8c364ae2122cc60b0dc2eeeb72dbd674f88 SHA512 ba44543f8e8e9e2e0674f55f6aa53a6076acfdb7640e7c1494ea09542f069dc26c85bbc3b6fae3481099022773e9a5ac7200fd162948b9e2a4db7ea93ecebb2a
+EBUILD sogo-0-r2.ebuild 193 BLAKE2B 276777bb9cafc56739252f6fce69ba6d5426cfd77adf4d72e74c465aa1a1e6a658291daa7ec6ce0319531528ea83d2130db5e575d779e4e7720a0a6d8c9f73d2 SHA512 5820a31161b4b5a28cdfca1ac5d85b4a13f4b0b6174d56a64d57fa7ad5b295d606502fb635798fc6b532ac38568d638ae002d1375880e465297ca0dfeb5da2a3
MISC metadata.xml 254 BLAKE2B e0f44b5b45dfaee5d78327c0a786de9629c29eb26b6ef1e06e499f8ebc1c72c0d0cee20d68992fe79df2498d1664a49f2bae19b5a115b97896300d741cb4a0d1 SHA512 48119cf18eaf9e217ca2203ccbfcd28aa8c6d2f7de7b21e347ba3c4d5f23147908620d158fab2bf0b0211670d091949b5ee3bed0044d4c86656703d20bdc6ee1
diff --git a/acct-group/sogo/sogo-0-r1.ebuild b/acct-group/sogo/sogo-0-r1.ebuild
deleted file mode 100644
index d23c3bef7ff9..000000000000
--- a/acct-group/sogo/sogo-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for gnustep-apps/sogo"
-ACCT_GROUP_ID=475
diff --git a/acct-group/sogo/sogo-0-r2.ebuild b/acct-group/sogo/sogo-0-r2.ebuild
new file mode 100644
index 000000000000..46692a2b3bdb
--- /dev/null
+++ b/acct-group/sogo/sogo-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for gnustep-apps/sogo"
+ACCT_GROUP_ID=475
diff --git a/acct-group/soju/Manifest b/acct-group/soju/Manifest
index 71e04cdf75cf..5c4b62f7f44f 100644
--- a/acct-group/soju/Manifest
+++ b/acct-group/soju/Manifest
@@ -1,2 +1,2 @@
-EBUILD soju-0.ebuild 198 BLAKE2B 476fb3db0c91f8567e8b08528e00a7f7d0a409f5119c6d58b1f4a84122a36366e0cb703fa7b2a9535c48160eee2b946b1364c6dfafa8da82cad24d805f542a51 SHA512 e6a7309b899fb58270d7f19e46b04a49753fd551e4c668bf925c53d8600db44c49fcc958f2ceb3dd7062985941746e998b2d6296a1c0d14757a1ced46f533f50
+EBUILD soju-0-r1.ebuild 203 BLAKE2B 4a2e43da67699564b17da8c7028a660ba3f7c14139d2934f882effa8cedfbb660a3e10eed7d61ee396b2bdcdf0e507920de3ce33ae7f86ac2b19899550c572b5 SHA512 d8f9660d58fade106460791b7ecaa43f812ef4dad330c9b8d138be5aec8a0a53840c9415d95f644495cb72ede75cd7fa44660ddb26f0a17675f4d579879066ab
MISC metadata.xml 422 BLAKE2B fe4d62d0b24cded0b5aa967f6a05c6ed0bf70dfe8a50910194ef9d6de170b9e9f696854839207417e6f4bc4cab2d807133efbbbdf9c6ab30c743bda5bc749e2e SHA512 c3375b49d2d26fafa1bfbd91f4ff00c0c57f9bc0def840ee2e20c8f2f45ecb5e1d857c8170261fa32faa1afc6b72b2a975e9a6b11d38d6f8e9cd3243951fd41b
diff --git a/acct-group/soju/soju-0-r1.ebuild b/acct-group/soju/soju-0-r1.ebuild
new file mode 100644
index 000000000000..66cd1ad30d26
--- /dev/null
+++ b/acct-group/soju/soju-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_GROUP_ID=526
diff --git a/acct-group/soju/soju-0.ebuild b/acct-group/soju/soju-0.ebuild
deleted file mode 100644
index e5be123ff93f..000000000000
--- a/acct-group/soju/soju-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="User for the net-irc/soju IRC bouncer"
-ACCT_GROUP_ID=526
diff --git a/acct-group/sonarr/Manifest b/acct-group/sonarr/Manifest
index 0a9841eb1211..323cce9aa178 100644
--- a/acct-group/sonarr/Manifest
+++ b/acct-group/sonarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD sonarr-0.ebuild 151 BLAKE2B 8a0fe293449c1a6093c01edee1bcf2de66cd1ff3da1ff7009c0aefa599fb806b4e0f0f21df4ae22d18462646191bca8c385505d443424c50050ca1c41022d25b SHA512 1e8ff835c84e9d182f4a8477c4a0f33ca528eae0faaf2c4760e8718530cfea54bdb6e769c44beab590edb09e4893c58eedc65f3ad32dd8400b0eda07c9b7e5ec
+EBUILD sonarr-0-r1.ebuild 151 BLAKE2B 10521c1e4195b376fb0fbd62a2703c9848cb4a19dfa60636a82376b9379bcd796ba7de242f9ffe714169fabde41a83198d9c8bc944f050a54e41fab5b109f755 SHA512 1d54be500115258021938518d49645327b81964e543638dfe94c6d71ec985c6b470b0d990b2e8cf20400ddf83c5f344e9b1944ec784a7d18267c60db5189112b
MISC metadata.xml 689 BLAKE2B d4cc28788adc55219df30bab3de5d17ffd2fbc6cde4b8c08693f66d493a26850cad7cc0f586a4345b90b095acdaa7a9dd31c98ed3f1e06f57f5fd31f92ec3e75 SHA512 9d601fac9272d2fe27faff86ae960dd6e40e6d6941fa0abaf8e211ca03660169aaa81bb55e582598cd0d235d7a9c8ab9f603c20f9f8c862e974170d6fb3d927b
diff --git a/acct-group/sonarr/sonarr-0-r1.ebuild b/acct-group/sonarr/sonarr-0-r1.ebuild
new file mode 100644
index 000000000000..bea9a228c69b
--- /dev/null
+++ b/acct-group/sonarr/sonarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=515
diff --git a/acct-group/sonarr/sonarr-0.ebuild b/acct-group/sonarr/sonarr-0.ebuild
deleted file mode 100644
index c40efb6d7a67..000000000000
--- a/acct-group/sonarr/sonarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=515
diff --git a/acct-group/spamd/Manifest b/acct-group/spamd/Manifest
index e05e4b68b12f..c37cff2e3b6a 100644
--- a/acct-group/spamd/Manifest
+++ b/acct-group/spamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD spamd-0-r1.ebuild 199 BLAKE2B 0093025869e6c67b61727b0eb7019227598de142f0e1fa21bf51c86acea15f2abecdf2816f392d9dfe4aa10ba06b65345890c24013a478ca3161561e2338de36 SHA512 03532b212f3dc3058e811df44c45e69adce3753beaf40ac96281aa2879105bf18b855f2bc3659d509c2e4ff3bb56f24d8f8900696f897306c2afbc45e6b54e80
+EBUILD spamd-0-r2.ebuild 199 BLAKE2B a63633c111920baac3b17faf152fdddf67899b02d1d0a99ad82efbd29840c83e160007f7ce4a437d1ef7534580b02e1256c6456e76bb085e8ac10f0fc46f26b6 SHA512 56d0fea61384d5cc7e768d42d3f57d2c271b8dfef937f5fc117872ee66f2a810e214c3f25061fed21ff6a2bb6e1eaf2418322e25b28353370b71f6e826cc7c38
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-group/spamd/spamd-0-r1.ebuild b/acct-group/spamd/spamd-0-r1.ebuild
deleted file mode 100644
index d995a905a5ce..000000000000
--- a/acct-group/spamd/spamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the SpamAssassin daemon"
-ACCT_GROUP_ID=337
diff --git a/acct-group/spamd/spamd-0-r2.ebuild b/acct-group/spamd/spamd-0-r2.ebuild
new file mode 100644
index 000000000000..05d1b1f0d616
--- /dev/null
+++ b/acct-group/spamd/spamd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the SpamAssassin daemon"
+ACCT_GROUP_ID=337
diff --git a/acct-group/spectrum/Manifest b/acct-group/spectrum/Manifest
index e9dfac1122ce..02310bd8abfa 100644
--- a/acct-group/spectrum/Manifest
+++ b/acct-group/spectrum/Manifest
@@ -1,2 +1,2 @@
-EBUILD spectrum-0-r1.ebuild 213 BLAKE2B accbbad9effbbca4e25cc4de30e4045ad2da9feac1ff09fa5e06b1d2f200e75e13f61d66d1b3364d343190c2314676fdb4b95e86dd3d8d7047de21a1a98e39cd SHA512 faad24f637140349c62ca437e14a9e3d7a440296f201ab39bc8fad72accb00851799eab670c354c3c8b0f158c810f57608967b70f4d1e88dc234e71db1069425
+EBUILD spectrum-0-r2.ebuild 213 BLAKE2B 830f0c0ee6466e9fa6f4d4bee2eeacb483dfc7688d62eb1a9667b96fbc7ae7cb330073421c0348ce3bc2069e897cb9995f0f9266df09ea041be69f9cca42e27d SHA512 f79406afc269180e29bfec6a76bca5b0d588f7052efb9f9af49780d1738d27b72d10e49c0e21f5341a4f3c0048a7c2e295cb40b05dbedb52d433120a30b7c9bc
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/spectrum/spectrum-0-r1.ebuild b/acct-group/spectrum/spectrum-0-r1.ebuild
deleted file mode 100644
index be11afecfee1..000000000000
--- a/acct-group/spectrum/spectrum-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Spectrum messaging transport"
-
-ACCT_GROUP_ID="486"
diff --git a/acct-group/spectrum/spectrum-0-r2.ebuild b/acct-group/spectrum/spectrum-0-r2.ebuild
new file mode 100644
index 000000000000..ca2ce6dd11b6
--- /dev/null
+++ b/acct-group/spectrum/spectrum-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Spectrum messaging transport"
+
+ACCT_GROUP_ID="486"
diff --git a/acct-group/spi/Manifest b/acct-group/spi/Manifest
index cb8db231263b..6767e0b92abd 100644
--- a/acct-group/spi/Manifest
+++ b/acct-group/spi/Manifest
@@ -1,2 +1,2 @@
-EBUILD spi-0.ebuild 153 BLAKE2B c94a6f2b549c998dc8197e39bda6fb050cb009b5cf508f67f5e3c68a1e0d21327bf39ec22cc62309148cbd258b20d088f04e5cae94eabd0b5b8da7cb87df95c4 SHA512 a7d6084894132a3a8968bdd45ba6d1eabd7d31cbb76b96562c66e21aabba6e0c07d794355ea68f93ee1bc65c0cef4ebd42e0d039fb02ea59a2d883bc4de0b86f
+EBUILD spi-0-r1.ebuild 153 BLAKE2B a62f4c21c6d002385318058c065d633eca2fce95bc4fffad8070f5293b0ef98483f42bf8c07630cf5bdfd6a17e226d47360ff3405d910f488ab47f0fb06b3ef9 SHA512 bf8ebafeafcba80977b209637b68eda583d1ef5e3e457433dde6cfcd08345a107fc4720188f3fe3cf05d692d3f72119f7b5ed35ecdaae544db0d4ae66d09a991
MISC metadata.xml 409 BLAKE2B 6a6baebac33f399b23cd4590a69ddb17a3057d8613b02f7091a6d9f61608bc13668bd5fb213381af1c33c98f7af44a44595c27a10b643968e4498263b7f71191 SHA512 8df55146c11610024c0f330375b071b8e548d7e7a4d6c46e363fd505a8feadc6921f6e0badb5a49a214e0be46f483b776ca71ba6c4e5f6c6b727818116a6c889
diff --git a/acct-group/spi/spi-0-r1.ebuild b/acct-group/spi/spi-0-r1.ebuild
new file mode 100644
index 000000000000..5e2962ae7212
--- /dev/null
+++ b/acct-group/spi/spi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="227"
diff --git a/acct-group/spi/spi-0.ebuild b/acct-group/spi/spi-0.ebuild
deleted file mode 100644
index 88be21fa31f0..000000000000
--- a/acct-group/spi/spi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="227"
diff --git a/acct-group/spire/Manifest b/acct-group/spire/Manifest
index e1321ff23425..2451f1ea1972 100644
--- a/acct-group/spire/Manifest
+++ b/acct-group/spire/Manifest
@@ -1,2 +1,2 @@
-EBUILD spire-0-r1.ebuild 151 BLAKE2B f11011fa65f3d9ab363dfcc79aa532dda2a6c466df0f15b86d632e29063fdb4258a604150be31a75e91a98861541ada770a44d49e88d06e555b4723f432e9752 SHA512 34214a89cc2b8e59a8ddbed1afadfe17ee40ca030cd4dff1de1d267d3a203d92f6e00254cdfd79b8b811a1abe17fc2c7cede8d0563a9c5b2223ef2f5033feb43
+EBUILD spire-0-r2.ebuild 151 BLAKE2B a31246f5b0dba7becf0c0f70e0d05d313d13ecf23c792b2aac6e9579f212ad3d9a9c36cbc152e5aa9931ca148daed891c38ae77b7e57dce6e3f3d0e03e233dc5 SHA512 3a0890ee421b9f359c5fe065d2915615f07da3565cf7b6458c7e9ea531611eb48d37d68bb972e0e84c12dd6f401be9df2aa04bc37dcedec9bead435022f426ad
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/spire/spire-0-r1.ebuild b/acct-group/spire/spire-0-r1.ebuild
deleted file mode 100644
index 6bb96c368ca5..000000000000
--- a/acct-group/spire/spire-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=271
diff --git a/acct-group/spire/spire-0-r2.ebuild b/acct-group/spire/spire-0-r2.ebuild
new file mode 100644
index 000000000000..493d68009803
--- /dev/null
+++ b/acct-group/spire/spire-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=271
diff --git a/acct-group/spread/Manifest b/acct-group/spread/Manifest
index b488ec36ab9e..a10a2e0bff90 100644
--- a/acct-group/spread/Manifest
+++ b/acct-group/spread/Manifest
@@ -1,2 +1,2 @@
-EBUILD spread-0.ebuild 196 BLAKE2B 887fdafacaf92e3b4cafa7f0c1992e3cccaafd7f6719e7adbad1bbe044e924181c7c0286f7b0a6510620e511bfddd00aaefdd6f639ffa0ba8e7ab03c0bcb169b SHA512 af939665ed6b8ea9d56c54ccea9629e221786a95d534af7408a7a8b3fd7be9c64517d96a8e8bdfceb0a4ffef2561686a34d7a925a9be7faa29cf2ccf5ffc47a0
+EBUILD spread-0-r1.ebuild 196 BLAKE2B a386b43ad0597fdd64b5a0fc00edfde77c1d9c402663458c04a602bc94acce98541f650768f4e4180504ead7c207dd01c6a186957e6adafafa882dd4c1e0e242 SHA512 e3416a2503c8c2b3f6e67fe5791bd0d3cb527ee8f27eaebd4f476c2f6d6cda8af697c798dc7686f15c8d6575e7b650890ba4680be4da939ab12e4d9387be1373
MISC metadata.xml 246 BLAKE2B 8c6c4ab0f28d2c1596e95ac77be8fc6cf749d8729b00dd5020e45d3ffd91fc171e6785bb8d4669d3ba6384acac52ab891092fe4b02b70d04241a346e5af23c78 SHA512 ab9a981b4aff83ec5b1f003eddd7768a0d74a7701ce47ea0f813be72552450e02493c8705561b02975776537d0896539537bd95b89921b15cd2faa501339998d
diff --git a/acct-group/spread/spread-0-r1.ebuild b/acct-group/spread/spread-0-r1.ebuild
new file mode 100644
index 000000000000..900b78116d63
--- /dev/null
+++ b/acct-group/spread/spread-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/spread"
+
+ACCT_GROUP_ID="159"
diff --git a/acct-group/spread/spread-0.ebuild b/acct-group/spread/spread-0.ebuild
deleted file mode 100644
index 7bbdd3539cd6..000000000000
--- a/acct-group/spread/spread-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/spread"
-
-ACCT_GROUP_ID="159"
diff --git a/acct-group/sqlgrey/Manifest b/acct-group/sqlgrey/Manifest
index 118882752f07..2251410c4944 100644
--- a/acct-group/sqlgrey/Manifest
+++ b/acct-group/sqlgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD sqlgrey-0-r1.ebuild 183 BLAKE2B 09078308be11e29fceccd07fc3925c9e678ea3166928a0f63154a8833aa6a9afce3498a9803d0afc335d2c3f3a93111776fe76a292987f9b904e91e5932846ae SHA512 a4bec61f6bfe1494b2a46c4a9853875fa0549f2ec7f214a6962274e079cc603c87ac9105248adbf0f255b912c57000231e0e223625db6aff2f33b309379f6244
+EBUILD sqlgrey-0-r2.ebuild 183 BLAKE2B 04881c0bcee9b238f91fc591097969f63f60df0d599fa7d1633cd26593587c4319457928cbdbc26e75539479d6043ecde82188dc67bb7f283c3d38971717a518 SHA512 1e6a15d8a94c6c7169e8301d121a36627fb79e90513082d6a0566fd2e8a3418c60107f871a929b8a344398729ccc7b73a199c81f98b5c49709d03fcb02e2b0f0
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild b/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
deleted file mode 100644
index 895ee6873352..000000000000
--- a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SQLGrey"
-ACCT_GROUP_ID=336
diff --git a/acct-group/sqlgrey/sqlgrey-0-r2.ebuild b/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
new file mode 100644
index 000000000000..fb26a5e012d1
--- /dev/null
+++ b/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for SQLGrey"
+ACCT_GROUP_ID=336
diff --git a/acct-group/squid/Manifest b/acct-group/squid/Manifest
index 111c447a868a..c11ad0cd9bd6 100644
--- a/acct-group/squid/Manifest
+++ b/acct-group/squid/Manifest
@@ -1,2 +1,2 @@
-EBUILD squid-0-r1.ebuild 146 BLAKE2B 97e33f7c900973579aa8f30605a6ffc083cbcd212def08ba2cb4be2b6cb589a4576806e49a083d8d87a2cce9ccaeb2d32018aef06e7f130cc70cf4dbb7bcec41 SHA512 3e27a860e4cb3fe8c25c752e55530ce9d1cecae28a8785f143aba640e68687f04f4b054cd98dffb73a6d434f1db585ad4a7575a3f0925a351177bbae24b0dc79
+EBUILD squid-0-r2.ebuild 151 BLAKE2B 086d19e24ee9d19794a7cc4e1790c9f6a8a66f8bfed35e272b299c88080c505f61f9c3d8d67fa82fe0ddecf9e8c0cc0143ad6460648bfc3e4ab3ce15fcf3354b SHA512 6b7b379518b10237361d6dc02c38944308942b59fff50f823f6694af0b083aff21c080f805945c01eb47286cfacd755203e838454c46c2278fc03158ad84147d
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-group/squid/squid-0-r1.ebuild b/acct-group/squid/squid-0-r1.ebuild
deleted file mode 100644
index 7295f3099cd9..000000000000
--- a/acct-group/squid/squid-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=301
diff --git a/acct-group/squid/squid-0-r2.ebuild b/acct-group/squid/squid-0-r2.ebuild
new file mode 100644
index 000000000000..4aaa19a79641
--- /dev/null
+++ b/acct-group/squid/squid-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=301
diff --git a/acct-group/sshd/Manifest b/acct-group/sshd/Manifest
index 511e7edce07f..6be4cf79ae6a 100644
--- a/acct-group/sshd/Manifest
+++ b/acct-group/sshd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sshd-0-r1.ebuild 145 BLAKE2B 12585bcfe8e0ae18b50915a423db065088bc6a0b6ce45cdc44802ada20d2d4d53a742c6847754d6bcaf064a0027c47f92feb98123cdd45bfea2f649801bb1355 SHA512 7bcb27e5642e006d78c530aabe1eda1bc89bf4dcb36f9fe765188dde9374c659185aaceed0c54e115cc6f47bafa22062c296011433a54aecab67c028bb369e8b
+EBUILD sshd-0-r2.ebuild 150 BLAKE2B 79144ff7cae6f447120dfef13c4ff1670993acd93143399f00ea2a0152ed8d82b3331df623be2dda5f6ef3d3f144b6b2a33f01886f0ee92ebbde644c25560e7c SHA512 ae3b9334d5fe6f39836b7af29ff42590f3b5b82901d283aa408a5a718fabfad2c3c83ef4754865f935bf07e22877e53bf02be1593f358bf05d3cbad69644159a
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
diff --git a/acct-group/sshd/sshd-0-r1.ebuild b/acct-group/sshd/sshd-0-r1.ebuild
deleted file mode 100644
index d54032fc8a6b..000000000000
--- a/acct-group/sshd/sshd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=22
diff --git a/acct-group/sshd/sshd-0-r2.ebuild b/acct-group/sshd/sshd-0-r2.ebuild
new file mode 100644
index 000000000000..fbe8efaf9c1b
--- /dev/null
+++ b/acct-group/sshd/sshd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=22
diff --git a/acct-group/ssmtp/Manifest b/acct-group/ssmtp/Manifest
index 5d119973af67..2104a9a3ddf7 100644
--- a/acct-group/ssmtp/Manifest
+++ b/acct-group/ssmtp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ssmtp-0.ebuild 193 BLAKE2B afb8d2ef3955f71e2c91c56985134acf1ddd28ef80b13b91400252cbea3a0bddde2cd78e41968b176943672f5b53d9fc94e402bb36cbc14905ecfee1dc87cc00 SHA512 f73c33cbc35b8f23b825482fb45de6f377c7b77ff783016e13a98057447007eaf976eb4c71f84edf597d4dd9e16a46756a10dedb3937f06942c2a7ae5d430863
+EBUILD ssmtp-0-r1.ebuild 193 BLAKE2B 16bdeadedc9f4069c9daa0f14bc3b0ccecfad6a855f181e92fcdcf81408a558d610821e8a390bdf00ed7ae33893e9cb38c94edf084402006eb00f7935986219c SHA512 d59dfd0641bcd303ad5d9bccc0a39d0ddc5daf49ce875ea3a09fc454dd9cb60ac142fd960ca7f2f8d5162ddc864d66346d02e6acc4dc8bf711ecc37da223c7a4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/ssmtp/ssmtp-0-r1.ebuild b/acct-group/ssmtp/ssmtp-0-r1.ebuild
new file mode 100644
index 000000000000..dd67498912e9
--- /dev/null
+++ b/acct-group/ssmtp/ssmtp-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-mta/ssmtp"
+
+ACCT_GROUP_ID="299"
diff --git a/acct-group/ssmtp/ssmtp-0.ebuild b/acct-group/ssmtp/ssmtp-0.ebuild
deleted file mode 100644
index 6ad46f6347f0..000000000000
--- a/acct-group/ssmtp/ssmtp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-mta/ssmtp"
-
-ACCT_GROUP_ID="299"
diff --git a/acct-group/sstpc/Manifest b/acct-group/sstpc/Manifest
index 0e5eafe864b9..29e3c9d9fcf6 100644
--- a/acct-group/sstpc/Manifest
+++ b/acct-group/sstpc/Manifest
@@ -1,2 +1,2 @@
-EBUILD sstpc-0.ebuild 199 BLAKE2B 2d02f7a97fe0035637fd23a87bf1542b338bb49a40829d2d25dd038aca0b7a50debd47d2fee86957a76ef434644932890da2a62141c7435f8a2d9478e312d81b SHA512 157a3987d1adf915437972a5ed263b8cac47ac98114a9ec62f59a4adbec86fad04d9b46be72629a226f242264fa284f03c0996e0129f43ee1ebd9991e7ae4d55
+EBUILD sstpc-0-r1.ebuild 199 BLAKE2B 623d3062bca2b2ad5268488597309851a154f3ef05cbc6ce7b20ef79200061988f37ccc1f5d3cca76e18e33c1c4169f14f2bdd748e07ac85095813ba04dde2fe SHA512 524dfd0921da648825db4bc1e2e5dc3d1d7e3c4464f81ea6b82afadd2cc71d6798711bea0fb9b984916cf6ac5ce32948b7b322d8dd9e5696f6ec7ef156c1d7db
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/sstpc/sstpc-0-r1.ebuild b/acct-group/sstpc/sstpc-0-r1.ebuild
new file mode 100644
index 000000000000..3a0e888cd978
--- /dev/null
+++ b/acct-group/sstpc/sstpc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/sstp-client"
+
+ACCT_GROUP_ID="257"
diff --git a/acct-group/sstpc/sstpc-0.ebuild b/acct-group/sstpc/sstpc-0.ebuild
deleted file mode 100644
index 6d41098780cd..000000000000
--- a/acct-group/sstpc/sstpc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/sstp-client"
-
-ACCT_GROUP_ID="257"
diff --git a/acct-group/stapdev/Manifest b/acct-group/stapdev/Manifest
index cb3e98d6dbaa..47891150841b 100644
--- a/acct-group/stapdev/Manifest
+++ b/acct-group/stapdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapdev-0.ebuild 146 BLAKE2B 4c033fdf329bd36419a5a36ff6cb36ee3115c9028042da3471bfe8414b49ec91f16cf5bd25d72c734e85101a3ff95f07beab7c1a8c3327688d4564373141df48 SHA512 124925efe3ab847b566611ca10906712a2c716d7486a9ce566bcf209ff81c31a5b62eb710b8a0c3523870d22aad09bab7e0214049169903186fa39f1aa38cd55
+EBUILD stapdev-0-r1.ebuild 151 BLAKE2B 72b4e18748bf09d197e7b22df463d19057304750a43136585d443f5f020cff40a6bfdf0c4025bb19521b33c4f05184cc3e05612d7a99cfe75413c99cd9a45a8c SHA512 903f195c082a272f2d43b5af83e4519b2d456889b16c57ac9592038f849d37de0a5238a728a5e2066c8b834f6b02f64d48b7375096f123e393c1763b48cce03e
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
diff --git a/acct-group/stapdev/stapdev-0-r1.ebuild b/acct-group/stapdev/stapdev-0-r1.ebuild
new file mode 100644
index 000000000000..8e55b5a002f7
--- /dev/null
+++ b/acct-group/stapdev/stapdev-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=158
diff --git a/acct-group/stapdev/stapdev-0.ebuild b/acct-group/stapdev/stapdev-0.ebuild
deleted file mode 100644
index b964a19dcabe..000000000000
--- a/acct-group/stapdev/stapdev-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=158
diff --git a/acct-group/stapsys/Manifest b/acct-group/stapsys/Manifest
index 2d1fc0825d09..ef4673541a7d 100644
--- a/acct-group/stapsys/Manifest
+++ b/acct-group/stapsys/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapsys-0.ebuild 146 BLAKE2B f34a8baf708a89dc1b24bfc488e492f5aa4dcdd282fbb63e1fc7ce5e4970853e9320fec98f15c067fa3b2a9411a2fae5717b25bad635460f289b388ae1357883 SHA512 5f3e9a836692172222ff6415ec254a05a7680ad258b64013262f24d58ae37c2207719cbea7551427eda7c4c2c7529f44254872758e86bcf3dfeeda49c3e3ba01
+EBUILD stapsys-0-r1.ebuild 151 BLAKE2B 9dac690ff017f30ccaf78c0f1540694f0900a90c5d3829380b561087aa2389eecd9aedd008c03ab7bcaf6006080bd2ef8d50aca6e09e39960a304e8433fc22b2 SHA512 6bb736955fe457e4300b48afb051bcd7d8f99af1a31296c220ef7b2b972d1e089200d1cd036b719984de695fd070db37d56ad74f2c071eee961c13631f5879fc
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
diff --git a/acct-group/stapsys/stapsys-0-r1.ebuild b/acct-group/stapsys/stapsys-0-r1.ebuild
new file mode 100644
index 000000000000..60dd89044f9b
--- /dev/null
+++ b/acct-group/stapsys/stapsys-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=157
diff --git a/acct-group/stapsys/stapsys-0.ebuild b/acct-group/stapsys/stapsys-0.ebuild
deleted file mode 100644
index 82e1d15cc0b8..000000000000
--- a/acct-group/stapsys/stapsys-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=157
diff --git a/acct-group/stapusr/Manifest b/acct-group/stapusr/Manifest
index 5a56f3e907dc..4df12e523436 100644
--- a/acct-group/stapusr/Manifest
+++ b/acct-group/stapusr/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapusr-0.ebuild 146 BLAKE2B 556ee4f474c158303cd0971d1230c63974de5f43f01f4f1f0be3767942cdc4fa01347071377be5de64fee4eac68617746d95e8d881dc86def102fc1cebf2d1b1 SHA512 e20fb49869e37ff4f99aed70842f73bb687024f02402d5e08658e78631bd4e5c7d4b4bd17fa2e8a849d5ec957d76771acf4424d39e4bc5ec7b902e1ea06acc3c
+EBUILD stapusr-0-r1.ebuild 151 BLAKE2B 68d5d9ae9a47325776aa7b9549926e1398d378636993934649b67143614bc28ea68064da9c48f69767ffffe91a34b07505b7150c024ac65981e1c786387907bc SHA512 4ab3e1c8492b9b4e4ac9df2ded025f909afc8e6c906067440d807f0156e0453271d042887c02d73fb2961e2f60bf803c3ace10369fb59d57f347c50d4d837957
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
diff --git a/acct-group/stapusr/stapusr-0-r1.ebuild b/acct-group/stapusr/stapusr-0-r1.ebuild
new file mode 100644
index 000000000000..5e1a0850f61a
--- /dev/null
+++ b/acct-group/stapusr/stapusr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=156
diff --git a/acct-group/stapusr/stapusr-0.ebuild b/acct-group/stapusr/stapusr-0.ebuild
deleted file mode 100644
index 386b74e9c57b..000000000000
--- a/acct-group/stapusr/stapusr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=156
diff --git a/acct-group/steamcmd/Manifest b/acct-group/steamcmd/Manifest
index 283c70a9af76..d5ad39bd0f00 100644
--- a/acct-group/steamcmd/Manifest
+++ b/acct-group/steamcmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD steamcmd-0-r1.ebuild 200 BLAKE2B f0bb7082d6217f43fa48e8e44a903f487e200a02d9983044ba93619cd9119e825b51de3ecbd363298e3ebbcca6bf5c10bf12a36c051c2577508b37ab3843371a SHA512 50d9fa9c75d0163c5c070b16eeac95d3ebd3776a5d988af2c7dac3b6c84b3d1982e9cd2532256647711638e98ec9f4f87e2c869324b701509493c22ce1b5f64c
+EBUILD steamcmd-0-r2.ebuild 200 BLAKE2B 45f2b501ac929a5614a40bb14ffa72f8c97845097188bd176c5dbee62d4bf4bc9d325cfc4f66532404280ce9b118f3f98589da9ab77aa6412393d1e7eb74f984 SHA512 4435784d2295085afe36938fe95a60f151da2341b4409809de39cf4b6eb7fa576b3ffb52091d1012f347a96d3756b555e556e57e94105e1c14cc911cf6743532
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/steamcmd/steamcmd-0-r1.ebuild b/acct-group/steamcmd/steamcmd-0-r1.ebuild
deleted file mode 100644
index f2ddf2b44fb6..000000000000
--- a/acct-group/steamcmd/steamcmd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the SteamCMD server"
-
-ACCT_GROUP_ID="489"
diff --git a/acct-group/steamcmd/steamcmd-0-r2.ebuild b/acct-group/steamcmd/steamcmd-0-r2.ebuild
new file mode 100644
index 000000000000..0857f379a59f
--- /dev/null
+++ b/acct-group/steamcmd/steamcmd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the SteamCMD server"
+
+ACCT_GROUP_ID="489"
diff --git a/acct-group/stg/Manifest b/acct-group/stg/Manifest
index fd6aee6be9ef..cdc28719ad22 100644
--- a/acct-group/stg/Manifest
+++ b/acct-group/stg/Manifest
@@ -1,2 +1,2 @@
-EBUILD stg-0.ebuild 199 BLAKE2B fe5bc757fb0d02df0ac0e70da2a2020475e67edb9e6188dbf557faffb04e1f9e7b505ae133a70ecac77857574b7b2c48db359a74d254b862eb3c8ca78b42e9a7 SHA512 c24f9acc3c44da232e29e890ae3a396a961e75284072ff732f0095424f6a3d86913213bfa324c21430e48126dd2c7f5410637767c83da5861b3ac20b2148c20b
+EBUILD stg-0-r1.ebuild 199 BLAKE2B 364bd8ee7ba632258f9db9c18b32f4b415e6e432f77acf4f5c87cca54c0e8971ff4401f1c21abb6206ed74572a0ef59bc2cc0e162d39aa2c2c89097a7ab82098 SHA512 d1c222b09bd872fb9613719c7bcc0a5b84f830e25f78872e15ffc4b76f8868233e55b49f522506518711bea177534a438406b586a7ac82a5f65fb0117870fad3
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-group/stg/stg-0-r1.ebuild b/acct-group/stg/stg-0-r1.ebuild
new file mode 100644
index 000000000000..5364e086d229
--- /dev/null
+++ b/acct-group/stg/stg-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/stargazer"
+
+ACCT_GROUP_ID="176"
diff --git a/acct-group/stg/stg-0.ebuild b/acct-group/stg/stg-0.ebuild
deleted file mode 100644
index cd405cbaf857..000000000000
--- a/acct-group/stg/stg-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/stargazer"
-
-ACCT_GROUP_ID="176"
diff --git a/acct-group/stubby/Manifest b/acct-group/stubby/Manifest
index f3939ff02f29..63f0a07bfa82 100644
--- a/acct-group/stubby/Manifest
+++ b/acct-group/stubby/Manifest
@@ -1,2 +1,2 @@
-EBUILD stubby-0-r1.ebuild 208 BLAKE2B 507eb959e9c422cfff963e27cf3a1f8a2b06f8787fb7c78d311fe67ecd80fcbeeca6848d5b9a3974045341783dda28efdb83700d614e5e42efd15a5b2531d8ff SHA512 bd7495bb141c65b72a1ca646f3a5ecaef205cd9316f0bf19f6cdbf58ee05b40e6de818d48c0e7470967873c5778f7f0b01e4ca170577f400f956f00605345b57
+EBUILD stubby-0-r2.ebuild 208 BLAKE2B fc464d97fe409c314ed36386c29698a300dd06e6a153be3cb74566c74a81c565c69d08abd3beee4b174ae2b38d3aedb50f1e4bc0bbc6fbe5eb7062cad86ac7cd SHA512 3cf24c6d0b21e350d4b957fad95e79d1fa03ce682de0e0a165ef52a3943e01ed806a29addfb7f53ab11a391c4ecddf9c8b37da918386445d852d7c0a5c7f583f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/stubby/stubby-0-r1.ebuild b/acct-group/stubby/stubby-0-r1.ebuild
deleted file mode 100644
index 13e45d99fbec..000000000000
--- a/acct-group/stubby/stubby-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Stubby program group (from net-dns/getdns)"
-ACCT_GROUP_ID=476
diff --git a/acct-group/stubby/stubby-0-r2.ebuild b/acct-group/stubby/stubby-0-r2.ebuild
new file mode 100644
index 000000000000..c87d37f3702a
--- /dev/null
+++ b/acct-group/stubby/stubby-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Stubby program group (from net-dns/getdns)"
+ACCT_GROUP_ID=476
diff --git a/acct-group/stunnel/Manifest b/acct-group/stunnel/Manifest
index 17e7a6e4a149..853ef5388990 100644
--- a/acct-group/stunnel/Manifest
+++ b/acct-group/stunnel/Manifest
@@ -1,2 +1,2 @@
-EBUILD stunnel-0-r1.ebuild 183 BLAKE2B 492fd8dd125ec4c6276d295f3fceace435187704355ce098087c6198be10d9c853debae44cd6008f2eff4768878fcae59fac0b3742a68c674679c3111f474469 SHA512 3694a4f2bed34bfa0758d34141593600625906df1597132ba4cc1369d64ccf687a5a409e0b404f8beb4443ee3ee835fa2825261682d93bdf41d5413acc26a2e8
+EBUILD stunnel-0-r2.ebuild 183 BLAKE2B 994446851a385671a0f66857ffdc172ddf8b53333e02974bf861d35d8f69d299eeaf4eba1939ae006befcab66df530736230495f0b5e4de345a73e8c5168a7e8 SHA512 6807d7a25b9d0feca96ef87e53875a53229b6e6b5219becbed46dd176da337939d340eafc27c3849395665cbd7a358884e9fbe21cebb8be8d883db8ce3e205cf
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/stunnel/stunnel-0-r1.ebuild b/acct-group/stunnel/stunnel-0-r1.ebuild
deleted file mode 100644
index 47360c73c9b6..000000000000
--- a/acct-group/stunnel/stunnel-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for stunnel"
-ACCT_GROUP_ID=341
diff --git a/acct-group/stunnel/stunnel-0-r2.ebuild b/acct-group/stunnel/stunnel-0-r2.ebuild
new file mode 100644
index 000000000000..39785b30995e
--- /dev/null
+++ b/acct-group/stunnel/stunnel-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for stunnel"
+ACCT_GROUP_ID=341
diff --git a/acct-group/subsonic/Manifest b/acct-group/subsonic/Manifest
index 4016b22fa0cb..414156cd4bb1 100644
--- a/acct-group/subsonic/Manifest
+++ b/acct-group/subsonic/Manifest
@@ -1,2 +1,2 @@
-EBUILD subsonic-0.ebuild 205 BLAKE2B 2f8febacb48638a2ddaa1b7b24a9e0ade43327bbc800d3fc50a3fe9c9cf15b8c4627596528b94680c9192364fa145c59ee012656c1cd15554de1b054946679d5 SHA512 6867a68856f7e0b62de69e0af1ab01b6cfe38f02f1cf6494cc10435ae5cedfc1b29dd6aa4c9402200fecb847329e3ea7ad708c0ff8ad83826bd978674b2fbfcd
+EBUILD subsonic-0-r1.ebuild 205 BLAKE2B 787fe139cf7faece2ac0d901a2f26b922a9292724b0c3850be1c53ce921da5de2dfa86be7448d3baaea88c114af0ef1a04b22567c392fe4abb6a293bf1a79708 SHA512 3c4da8ee17416366f9358d7c3459efc4c5045fe598bc2b222b5db28f7b139aa5dbd9f42f43a36fc90090635fdf92f7fd7336434b2831f467034d8828b44cb688
MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/acct-group/subsonic/subsonic-0-r1.ebuild b/acct-group/subsonic/subsonic-0-r1.ebuild
new file mode 100644
index 000000000000..d4297cbcd2e8
--- /dev/null
+++ b/acct-group/subsonic/subsonic-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/subsonic-bin"
+
+ACCT_GROUP_ID="136"
diff --git a/acct-group/subsonic/subsonic-0.ebuild b/acct-group/subsonic/subsonic-0.ebuild
deleted file mode 100644
index 95e9e9317296..000000000000
--- a/acct-group/subsonic/subsonic-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/subsonic-bin"
-
-ACCT_GROUP_ID="136"
diff --git a/acct-group/supervisor/Manifest b/acct-group/supervisor/Manifest
index 27d2185b1a64..a358de1d4afd 100644
--- a/acct-group/supervisor/Manifest
+++ b/acct-group/supervisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD supervisor-0-r1.ebuild 219 BLAKE2B 94b65ca671f06db6d454819a953757d163f6a69b7ff3993979765517591f9de974b07e1aac38f069a2e3c64a5670b8c3eb3909195c65869201ac8f072396914f SHA512 ad113d17efda9b41ba018cb85f50a5fae31e082a45e4f7cdd92b014b135f6e57836619a87726424edd0910248c843ec50862c6c8edbfba7b822c36f6bde417f2
+EBUILD supervisor-0-r2.ebuild 224 BLAKE2B 0c1d7aff1c1664315387b705d8508e9401f90cba0b11126dc3c88fbdb6d592cb2aba20623f243199efac4e6ac95c06b64981885125d787b9081b0e094f9ff8b9 SHA512 15c2d2cec0dab6e068a67d1c1e2d88e572bcb2a34ea0776ab5a1934bac12d148b217afb6573b024ea22896bcd3e44effc1cadb8221ec80616bcd9b8d368bde2f
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-group/supervisor/supervisor-0-r1.ebuild b/acct-group/supervisor/supervisor-0-r1.ebuild
deleted file mode 100644
index 4890748ecbfe..000000000000
--- a/acct-group/supervisor/supervisor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group to grant access to app-admin/supervisor's management"
-ACCT_GROUP_ID=463
diff --git a/acct-group/supervisor/supervisor-0-r2.ebuild b/acct-group/supervisor/supervisor-0-r2.ebuild
new file mode 100644
index 000000000000..c617112584e2
--- /dev/null
+++ b/acct-group/supervisor/supervisor-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group to grant access to app-admin/supervisor's management"
+ACCT_GROUP_ID=463
diff --git a/acct-group/suricata/Manifest b/acct-group/suricata/Manifest
index 49491e48619e..b088eb34a4f4 100644
--- a/acct-group/suricata/Manifest
+++ b/acct-group/suricata/Manifest
@@ -1,2 +1,2 @@
-EBUILD suricata-0-r1.ebuild 188 BLAKE2B 743497eb05006786d0ca3b801fca1ccca67a8b83b60db46e593fc18acf7cbbc17c89954d732d1ec7edd07428d90651b2806e6becff1811a6a01df679eb9b4196 SHA512 519c0dc4858962ed82955f52453b630a8a435214fdc5e393340d78cb78726b5c788f482a2880b40712314728710b79b971412b0b07894166bb8702b992532f53
+EBUILD suricata-0-r2.ebuild 188 BLAKE2B fa04c4d4147e3d6585cbeef8fc4b586e00bde8f8362041a67615069a205a8b9fed482be3365eb9a098a2f175dbc5a83eec487903c77c72a52762e9ebff93b6fc SHA512 13d0366aa2555d3e08654c1aaf7f35a072fef559103174c0c33f686ba5f2781bf5d10f30530e5d2d145fcd23a56d528ddead97e27f99025e11ec149ea0f6ea3e
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-group/suricata/suricata-0-r1.ebuild b/acct-group/suricata/suricata-0-r1.ebuild
deleted file mode 100644
index c9ad4e167661..000000000000
--- a/acct-group/suricata/suricata-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Suricata IDS"
-ACCT_GROUP_ID=477
diff --git a/acct-group/suricata/suricata-0-r2.ebuild b/acct-group/suricata/suricata-0-r2.ebuild
new file mode 100644
index 000000000000..93bfdc32e360
--- /dev/null
+++ b/acct-group/suricata/suricata-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Suricata IDS"
+ACCT_GROUP_ID=477
diff --git a/acct-group/svnusers/Manifest b/acct-group/svnusers/Manifest
index 6db46230f2f9..c2b88be5c2d1 100644
--- a/acct-group/svnusers/Manifest
+++ b/acct-group/svnusers/Manifest
@@ -1,2 +1,2 @@
-EBUILD svnusers-0-r1.ebuild 151 BLAKE2B 8f9f0856526b5b0122b0d9de8159cc979e90845e75b3d93f3c3ed00483cc7d8a769f5c399d7be737d8cdd361d6b92de1d05d9209404674658011138ef7d5babb SHA512 c2ebc113e415e10458aeb9268aba7079c32db64ca768566ec9f3b723c6c0696ee9ab0eece6827a5af47d155f81077c37f8b86039884043430a9e2460f267ab7c
+EBUILD svnusers-0-r2.ebuild 151 BLAKE2B d8cadc511c84fd7f9e4522ffe70ab4e9992f4a60e585dfcb051f8a05b0fd876beaf906b7dac56a299090fcb8d816cb84c092e3070431780f2550903d1597f0eb SHA512 758b514e382e47af334a68c1533041151fefa4a704290f3d2da5dd232424db89c40903a54e5ba9abeb49a6e182bc24bb9df1f67a9eb2000c6cbcbee3bc61b798
MISC metadata.xml 255 BLAKE2B 6d9704c53f3cb2feb306acb4fda9d377fd979897237080046e5e5285bdf057281bbb32309764e654c06cce3f6690196f39896508ae6c1dc937e5d3e632fa3cd3 SHA512 ec50c1a81ca10bd96a826462eaec981359cbc400462e7ba7c3d0ded5edcefda5433c21be5df7644adf567e518bd865775e298e48f7d13c92740a80e5be044be4
diff --git a/acct-group/svnusers/svnusers-0-r1.ebuild b/acct-group/svnusers/svnusers-0-r1.ebuild
deleted file mode 100644
index 0a1c980c6503..000000000000
--- a/acct-group/svnusers/svnusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=399
diff --git a/acct-group/svnusers/svnusers-0-r2.ebuild b/acct-group/svnusers/svnusers-0-r2.ebuild
new file mode 100644
index 000000000000..5f1ff202b155
--- /dev/null
+++ b/acct-group/svnusers/svnusers-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=399
diff --git a/acct-group/svxlink/Manifest b/acct-group/svxlink/Manifest
index 6cc3b5b03385..31ef4cc1839b 100644
--- a/acct-group/svxlink/Manifest
+++ b/acct-group/svxlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD svxlink-0.ebuild 196 BLAKE2B 2a89a3e52566f7345934150680974bcde6e707ae82aa579e7fba7a2fa8df65c337fbf6c71bfb2875e3fc0da98295694811ba4c65bcbdfbe3c333856748dd7e23 SHA512 b28a3075fb8b540161998d208ec38051bed3e5f03f573f5ecef8021a0f0356eeb1d853dd30d86c3b154d34432a093b0a9044ed69997c26184ebb0a015768aed9
+EBUILD svxlink-0-r1.ebuild 196 BLAKE2B 93fc7952c2c2f9fbe32bed27e3816ce0724ce6cc3bc4d6fd5e44e10246043831b5cfac837cb9c247a40f9f53fa3f4f5c6c6763714cc0d8426d4ea986c6ee9958 SHA512 2f9268c53afdfa51fa1e3fb12f7b8a21c2ee9b0f7bde33e1f0d092165c7f3c5259f4db897ead65371588709a5bed4aa4d9aed3c67eabd6da25c4a106d0612c4c
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/acct-group/svxlink/svxlink-0-r1.ebuild b/acct-group/svxlink/svxlink-0-r1.ebuild
new file mode 100644
index 000000000000..85c420295f38
--- /dev/null
+++ b/acct-group/svxlink/svxlink-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the svxlink server"
+ACCT_GROUP_ID=247
diff --git a/acct-group/svxlink/svxlink-0.ebuild b/acct-group/svxlink/svxlink-0.ebuild
deleted file mode 100644
index 73dbcd6e5c15..000000000000
--- a/acct-group/svxlink/svxlink-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the svxlink server"
-ACCT_GROUP_ID=247
diff --git a/acct-group/swift/Manifest b/acct-group/swift/Manifest
index 954d67964ef5..3f49278f9613 100644
--- a/acct-group/swift/Manifest
+++ b/acct-group/swift/Manifest
@@ -1,2 +1,2 @@
-EBUILD swift-0-r1.ebuild 146 BLAKE2B 8c55a2522e6a6db4ad75dc605dc2a8d84fef0d8df4c13a0d64ad4bebb9e4d675a31ab6fecb2ec55f8f46b5851705e58f105ec0c5b535b804bada33e2910f9efc SHA512 50a1bf79d6d542119163dbbe3af425dc3bc579e98b82591105d50b897645edc74e643c73b32f43f3629c5125d0232875b63ea1be4380be0fd03f49fe5b015eb3
+EBUILD swift-0-r2.ebuild 151 BLAKE2B c5849461cc8ee82d17c4fd3e2ee624e3fa6b8277094b8c6de6a10c27869e37ee2a5f8ddad2ce14983471c454bc461f996af5732b10dbeea784130e090cf79093 SHA512 8085296c64fb969c1dda8651f21ebc60fdefaa5bc4d11259971f19496d7ee65c2c266179c3ad56d74d0078aff542873bcc9f2273bba3c3db928e2c775f647d95
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-group/swift/swift-0-r1.ebuild b/acct-group/swift/swift-0-r1.ebuild
deleted file mode 100644
index 02bd773b31ab..000000000000
--- a/acct-group/swift/swift-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=449
diff --git a/acct-group/swift/swift-0-r2.ebuild b/acct-group/swift/swift-0-r2.ebuild
new file mode 100644
index 000000000000..bc62cfafcc2a
--- /dev/null
+++ b/acct-group/swift/swift-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=449
diff --git a/acct-group/synapse/Manifest b/acct-group/synapse/Manifest
index 66398db05d5f..ad9bb0dc24bc 100644
--- a/acct-group/synapse/Manifest
+++ b/acct-group/synapse/Manifest
@@ -1,2 +1,2 @@
-EBUILD synapse-0.ebuild 187 BLAKE2B 5c4f0280e094c40338c44499f56faf75baa25822270b4f125428472c418b577eb081e6f8cf05b30c6d804efed77c1fa5986d857a1995497da6864b67265762d2 SHA512 e165bfe799cf162ed76cdc6083f53c266fd01eaff2ef7f6ecc7f5cd369cc51412a9cf3d352d81348690a59da472b241ee81a2537d87ab1c0479cf620a9f2ac8f
+EBUILD synapse-0-r1.ebuild 192 BLAKE2B 3056aad4e01f564273f1f74875ed9360cbbd9f3bcd421d296162f6d4c41408a51acf24462c2f225230bf9048e71c4bb3b0cbf8186fb2cf55457e794a4c0c902e SHA512 ed280abe194226209cc4d7899bcf46dfbee87fc4d3741fd1480710fb971b09e45fff406cf4c555b9554a00f455ada3661da180b33ccf63e7b71db9b094d3ad2f
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
diff --git a/acct-group/synapse/synapse-0-r1.ebuild b/acct-group/synapse/synapse-0-r1.ebuild
new file mode 100644
index 000000000000..ce4c5e9bfbf0
--- /dev/null
+++ b/acct-group/synapse/synapse-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/synapse"
+ACCT_GROUP_ID=519
diff --git a/acct-group/synapse/synapse-0.ebuild b/acct-group/synapse/synapse-0.ebuild
deleted file mode 100644
index 0f7e576bb55a..000000000000
--- a/acct-group/synapse/synapse-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/synapse"
-ACCT_GROUP_ID=519
diff --git a/acct-group/syncthing/Manifest b/acct-group/syncthing/Manifest
index 4f04154b4b51..de700ed0c1ba 100644
--- a/acct-group/syncthing/Manifest
+++ b/acct-group/syncthing/Manifest
@@ -1,2 +1,2 @@
-EBUILD syncthing-0-r1.ebuild 216 BLAKE2B b0b06cf17a5a10341865a4b193d317b10ff9b4374a244faecb4758677d0209ed7888772b204a01d5062411c9bed9b07e9e3d0818f5cc0ee331ea2efeb2f62e9a SHA512 81b583732e3b461962dd96650ef3179530b0d1007f2344f0cb9e5ac82bd5cda1faa8fab4807cc39f3427b51743d7b3cc12f5a4a2b094d86f666cacf9c3fb2255
+EBUILD syncthing-0-r2.ebuild 216 BLAKE2B 48ae3599fcaf34c207b87e2f94c470b721b971daed3ca7ee5cda0279adc6be98a2b85563cd1e0995ea58765a5f01d83e8c159c8def0f6ad2a59628c6c09128a0 SHA512 a7ccb4e558dd0b7ef8b373acd55ece3b6532cf61c3d5556227ee04bd400e2bb75a8359f4f912666d7d36ceee05aa0fe2f4b56358b3653b4f4a75b1407cec7139
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-group/syncthing/syncthing-0-r1.ebuild b/acct-group/syncthing/syncthing-0-r1.ebuild
deleted file mode 100644
index 2c7a7840c246..000000000000
--- a/acct-group/syncthing/syncthing-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
-ACCT_GROUP_ID=499
diff --git a/acct-group/syncthing/syncthing-0-r2.ebuild b/acct-group/syncthing/syncthing-0-r2.ebuild
new file mode 100644
index 000000000000..d97c9cd968c7
--- /dev/null
+++ b/acct-group/syncthing/syncthing-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
+ACCT_GROUP_ID=499
diff --git a/acct-group/systemd-coredump/Manifest b/acct-group/systemd-coredump/Manifest
index e1cef957fa7c..d0fff5f3298e 100644
--- a/acct-group/systemd-coredump/Manifest
+++ b/acct-group/systemd-coredump/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-coredump-0-r1.ebuild 151 BLAKE2B 3b0b39889e41759867d07958f99afc7862323dd08d51fdb325bd893bc79707f48246bcd026b013715fcd6a1139186590cb1bee7892e8765f5aa640ccd2a27777 SHA512 2127bd3cc1d314cfdb12bd51ef390c5e0702558bdc1840bf3b7276b66fb0e5a45203166a1907861547d5e4b3de34dad00cea93e330f7a5aae05cfd1229a53ffe
+EBUILD systemd-coredump-0-r2.ebuild 151 BLAKE2B 4ea3a13f639d4cdc6f97f0f69bf541a6444fb96d653357f7400f9f5f8b829ef93b9dd3a9283eaedb1955ef175b56243e2aa247165fcc0dc3abc6ed20ac2b1da7 SHA512 a0069a6017f81c8c51ddb2413f3c25b5ae54a82ea433ce3e934560c4cbaa20e7c2ff35dab4c32b4ce8a6a89889ec7bfc8d85ab3de7878abd5e52435f064eaa43
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
deleted file mode 100644
index 118999609538..000000000000
--- a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
new file mode 100644
index 000000000000..1d7bb6544080
--- /dev/null
+++ b/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-hostname/Manifest b/acct-group/systemd-hostname/Manifest
index 9e7027c167b5..7a09f5ddc889 100644
--- a/acct-group/systemd-hostname/Manifest
+++ b/acct-group/systemd-hostname/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-hostname-0-r1.ebuild 146 BLAKE2B 1c0a3afc7af703ac926a78d66cf1968b27fcf36df2861428482d451eabc69c176e02ff69f7891bb458143cc8d6bcf848bff075c2adecd7e3fa7c0d31b923718d SHA512 59be2e9cc4bf052f475499cec0e2ab568873ac294809b9a23c8559a80a23090129c2b1ffdac2c43f6177c9296001641e914ca2316df2b90909e859baba106922
+EBUILD systemd-hostname-0-r2.ebuild 151 BLAKE2B 3bd2778cb9d55a77ec519eef0af3c744994b13012056d98f6cab0d2bca15b4bd8650991cf8bcc41bee8e1c511aecb7727e0594a1f9d41a1b30a62d94c6471281 SHA512 afc8253f56accc3864725367ab8a5d96e6dfcd6b3585713752fbab754b01f550862e3961818c8a9cd33463a9ee864f2274716412c408d9dc6d6cc0ef41e76c24
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild b/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
deleted file mode 100644
index 24f44986f516..000000000000
--- a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=505
diff --git a/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild b/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
new file mode 100644
index 000000000000..d6954f22835e
--- /dev/null
+++ b/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=505
diff --git a/acct-group/systemd-journal-remote/Manifest b/acct-group/systemd-journal-remote/Manifest
index 0fd0a74ff7f1..74a41f2caa3c 100644
--- a/acct-group/systemd-journal-remote/Manifest
+++ b/acct-group/systemd-journal-remote/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-remote-0-r1.ebuild 151 BLAKE2B 7fefc318385453312b75ce31a5eda7e1a0ffc5539f081480c15746beff9e04f447977ce8ad904a524f302552ee4d2aeee2397ec03e593f26e8f93be0ae925124 SHA512 0a64b85dc12a482804e3e9885e0975c1bb3bdb1eccec5d52bdae3761ae8af9b49f26c0d837c8aa758bbe24fb8623cd6aabadbc4f8d64631b12e0efed67ca85b7
+EBUILD systemd-journal-remote-0-r2.ebuild 151 BLAKE2B 44c33c505d2228efa8f62facd9ffd8d70e7bd37c4b6f8dcfed14e374452f82fb06cb01371ac2a3e8a6f0bb7947f8c4fe5b326b4023e8ab93f6e5a33143e23404 SHA512 5900dfe994df089fe65e10048a3da1bac07bb7faba42f18671b0a319f83dff2e92be4cb5e79e20cedd75517512c0d10f0f679285e8bbe5a160f8d86b4079e217
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
deleted file mode 100644
index 8ddee6ec320f..000000000000
--- a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
new file mode 100644
index 000000000000..85c381bd53ea
--- /dev/null
+++ b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal/Manifest b/acct-group/systemd-journal/Manifest
index bc442bab0a98..a2b6feb61aa0 100644
--- a/acct-group/systemd-journal/Manifest
+++ b/acct-group/systemd-journal/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-0-r1.ebuild 151 BLAKE2B 1ccb1f5a7bd26314b864c55a129db6fa316a5075fdfb77c63d17cc4fdbba2978fc3115cefd6421b4a4ca172eca97a958f876573bcac20908f56e1a2f9b8bdde3 SHA512 dd6e0ea32c71c1fe8c8fbafda30e23bcc94da490b8b970d0d1c4b2d2d59c0c73e7cc744026db2d879013b71960557d7d8f2598c63340bce291b3f48050b1ce09
+EBUILD systemd-journal-0-r2.ebuild 151 BLAKE2B e0627ceced92e707852e820b3505f928d15f96b72f74580a5092e97b08440ad01ba048ca2d2bb69b62c2305263c38386a9296835db2d91250f68d8c021a966d0 SHA512 e7172b47ecfe205811c3af31b094c493a3fe7cacd2ef56756f61256b98b1ed0c6737c3d7425a34a646314a6643e31ecfa2fb0f449b40c237117177648be1e5f2
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild b/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
deleted file mode 100644
index c439156e2f63..000000000000
--- a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-journal/systemd-journal-0-r2.ebuild b/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
new file mode 100644
index 000000000000..fa6af68a04c4
--- /dev/null
+++ b/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-network/Manifest b/acct-group/systemd-network/Manifest
index 991d5aa83051..2e9876ca709c 100644
--- a/acct-group/systemd-network/Manifest
+++ b/acct-group/systemd-network/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-network-0-r1.ebuild 151 BLAKE2B e7ab0b006ab91772624dfbb88e00866f7b7303873550526027ff70cde214c549ab1c0bd727f8ce3a8f9c0c5cbf0ce717651409c51580a7f7d9848b1578c8eba2 SHA512 0835e4fb71a73651ac4effe983bdde93b421a6672abf67ffd4ec676e5263ef2074364c1afd716c0ecce2031bbb44f33fb77f42f81fb349698c58dc015611bada
+EBUILD systemd-network-0-r2.ebuild 151 BLAKE2B d600976caa02c880a538fee0c462616f94b3dc49e856f3ab1668e03f3acc8737365c26dcdaa0de5c32da4cf082e9b00d9c373b646d865dfa14a84f3905fdc483 SHA512 346a81ee81f37036bdbd57cc7ca88ffdfd7057f59de8b47a0dbddc5e464281301887c6c94f8b5621f8451ece5d894e0c11e2368390663c945169e2cecd98a5c6
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-network/systemd-network-0-r1.ebuild b/acct-group/systemd-network/systemd-network-0-r1.ebuild
deleted file mode 100644
index 6f88d3ca9895..000000000000
--- a/acct-group/systemd-network/systemd-network-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-network/systemd-network-0-r2.ebuild b/acct-group/systemd-network/systemd-network-0-r2.ebuild
new file mode 100644
index 000000000000..bb6b7af62bb3
--- /dev/null
+++ b/acct-group/systemd-network/systemd-network-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-oom/Manifest b/acct-group/systemd-oom/Manifest
index 13d800ad899b..117007794ec1 100644
--- a/acct-group/systemd-oom/Manifest
+++ b/acct-group/systemd-oom/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-oom-0.ebuild 146 BLAKE2B a0f6bd5e26033be3839f680dac57055fa29507309bd27296fe9c7c58cf4b64be03a4f455538593c0f74aeebb5a846e8565f10c1f4f6e80e6183fa2244b1d7933 SHA512 d59ffe68875adb95294a1291877a40733b0b50186312e02b30789ff1c0c2b03e94354ac61d8760258ae33663d7ed5efc92666f7ed20dd763fb814531cb7342f2
+EBUILD systemd-oom-0-r1.ebuild 151 BLAKE2B d2d65dc6de36c11031447499f619fcfb58e4ab0d10741215994ce376a37b77a4b41bc8828aad165683138cff64f42ef5b4f65620239a69bf9dc5e2e33f54a2e9 SHA512 b92144c103e3757739b5b57eaa00bbc940884d955badc42deb33131da6d9b8c3b557e60127664b2d10c4ba9222e94d2aeab47ac522acae7f6f6afe744d1f6337
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-oom/systemd-oom-0-r1.ebuild b/acct-group/systemd-oom/systemd-oom-0-r1.ebuild
new file mode 100644
index 000000000000..9d1b0e6de967
--- /dev/null
+++ b/acct-group/systemd-oom/systemd-oom-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-oom/systemd-oom-0.ebuild b/acct-group/systemd-oom/systemd-oom-0.ebuild
deleted file mode 100644
index 175d26d66eb5..000000000000
--- a/acct-group/systemd-oom/systemd-oom-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-resolve/Manifest b/acct-group/systemd-resolve/Manifest
index 5bbf637a7d3c..a183d1ac2f17 100644
--- a/acct-group/systemd-resolve/Manifest
+++ b/acct-group/systemd-resolve/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-resolve-0-r1.ebuild 151 BLAKE2B e185d4c71572cdcea5ef346f443ded85bb2281cbadd7374acb85f5a06731bd39bd4c0d1fd150f30f6b68c0525d6c631648df5d7de8b9da92032a041bca997b4a SHA512 4d6d558fd8d1acb9b865e59e8aacfc9015627b00f408c95da253112564eec0465478252b7bce8612bec2bb74816a5560637d5b5f0beeebe69f6d2e1a33c106eb
+EBUILD systemd-resolve-0-r2.ebuild 151 BLAKE2B a146f51d1cf9ca9eb2ee266df8b46c6b01d0daf3acc1389790f72fce8b74e2b05b53bc14c2028ed52e9f56ac69c712e5998f9d48e7c60d15af64024bfa4955eb SHA512 481d7c657fa37db95f8b43af69730b0ef172236b228cd8c3411eceb9ef842fb993346d212783119bd40684a7bced500a4facc663fb1ef1dec965b51f3e944d1a
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
deleted file mode 100644
index 903603df6230..000000000000
--- a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
new file mode 100644
index 000000000000..d5a49e0df40a
--- /dev/null
+++ b/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-timesync/Manifest b/acct-group/systemd-timesync/Manifest
index adf7867a8c22..bca0ed2f2193 100644
--- a/acct-group/systemd-timesync/Manifest
+++ b/acct-group/systemd-timesync/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-timesync-0-r1.ebuild 151 BLAKE2B 76a25c18a6cbe86e8d8db3e49409867ec6941571c4612d7ec2ecec00cf2cf4a6ffc3e52639f135852871eef2f1aeaebad35267752eabad73262feee953f76a4d SHA512 e68e4d3deaa3f0b44c5f5681dee1a083bb9ee6ebd0b2cd0e15b689aa4175d852d220cc63ffa9630342da29aba3d1105135f91e2aa074c03cf0985f1f1711059d
+EBUILD systemd-timesync-0-r2.ebuild 151 BLAKE2B 2b2c8138994aad2189601ed5b22b02964532c6bd79a07f0aa30251609a0c77d2ebc170f7fb7095e377fd1ee57d3af2a39ebebc9afa69f8e890c65da02101db61 SHA512 a16bfd2df40aae66a0eacb7118d12d877eff474f856ab09223b3fb09393a3b85a89475d68fe61f968bf43a4da8e14d12b2ac645f110659372a94efed073da780
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
deleted file mode 100644
index 50abd9371502..000000000000
--- a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=195
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
new file mode 100644
index 000000000000..b3acdb6f39cd
--- /dev/null
+++ b/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=195
diff --git a/acct-group/tape/Manifest b/acct-group/tape/Manifest
index a8947a26dad9..e2a04261d81a 100644
--- a/acct-group/tape/Manifest
+++ b/acct-group/tape/Manifest
@@ -1,2 +1,2 @@
-EBUILD tape-0-r1.ebuild 150 BLAKE2B aa9ce2978051cd5f1328e5ddeef5be59d9cf64cff2dbb5ad75dec7a99f3e5b02ff0eab63a2119a929c2fe87475f2f2e511b1faa7355663ddd4f75f7372a63b9b SHA512 0d216fa99d58841aace66170f0c6f0d7daebbc722b2123fba535c881ba81def723bfa04f66ef55ef15367a63d582ac3868d00b8737535dfa6bac8d65c7ca22a6
+EBUILD tape-0-r2.ebuild 150 BLAKE2B 8837eb6612772caa5893cfb8aad601b65ba452520795a91e2dd256723e110b76fcad7b59cb895ad55c8af44e57fbaf1839d9a1efd1a82601829be750116eae22 SHA512 af89d6217d68c0853af0aa8c16905127e8c23803531b09891dd7ffd3c0bdab167ca976d4867cd0179d61a25ea4976fc1206b2edc310cb708bc9122780312357a
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/tape/tape-0-r1.ebuild b/acct-group/tape/tape-0-r1.ebuild
deleted file mode 100644
index e7aa561286dd..000000000000
--- a/acct-group/tape/tape-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=26
diff --git a/acct-group/tape/tape-0-r2.ebuild b/acct-group/tape/tape-0-r2.ebuild
new file mode 100644
index 000000000000..87743a734062
--- /dev/null
+++ b/acct-group/tape/tape-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=26
diff --git a/acct-group/taskd/Manifest b/acct-group/taskd/Manifest
index 860726172501..6ee6c68b6a12 100644
--- a/acct-group/taskd/Manifest
+++ b/acct-group/taskd/Manifest
@@ -1,2 +1,2 @@
-EBUILD taskd-0.ebuild 195 BLAKE2B 9ed344a17f1a4febaf83b45f5bb2e6e415d6a99a23ee6e9aa4b6c073e560e1461763e4ff703d03fa4d66791e9055182b7482d960951e76ca09a783036f2f8ffc SHA512 53603cbaadbfe27fb848a5353b958532fa7ed23aa52a6afbc753c0b472b5c9af28549ed86de1c58586a37e75c4070039a1ff74119e577aea2100cbfd6243d8ef
+EBUILD taskd-0-r1.ebuild 195 BLAKE2B 811973d86e393d626a3092381b40bfdaf966c10ae8fc3e5dc1c5c0bc5f9b0f7664649fb3417efcc0ca5a60285e81e2ea3baa56cfbeb43c5ef88671bd7e26c24c SHA512 def45afb18bf9b4bbef2b950bd55c834214c2bbd38dd26303acae94ab9e787c2ba79f0f66d18ef6b1d1817318ec98a581b821b31d160d83b9edc1f81a42b081a
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/taskd/taskd-0-r1.ebuild b/acct-group/taskd/taskd-0-r1.ebuild
new file mode 100644
index 000000000000..65a47cc845e3
--- /dev/null
+++ b/acct-group/taskd/taskd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/taskd"
+
+ACCT_GROUP_ID="152"
diff --git a/acct-group/taskd/taskd-0.ebuild b/acct-group/taskd/taskd-0.ebuild
deleted file mode 100644
index 16ca38a8ade9..000000000000
--- a/acct-group/taskd/taskd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/taskd"
-
-ACCT_GROUP_ID="152"
diff --git a/acct-group/teamspeak/Manifest b/acct-group/teamspeak/Manifest
index 4113474c69be..2db42c9160bb 100644
--- a/acct-group/teamspeak/Manifest
+++ b/acct-group/teamspeak/Manifest
@@ -1,2 +1,2 @@
-EBUILD teamspeak-0-r1.ebuild 201 BLAKE2B 96289dadc78f99e79f6e682b3e2f2c428f1be5ce0642791daa7e58ecb84dd2fc7afb596532fba6d7cde96bb9788a36d76648881ea331ad95cc28eaa84b64d90c SHA512 b12dd6832bca06c4a0f1710bf52a4716b436fbc4797bd7424a305aa416c10b4893c130806c9b1bcb10ec0761753887d48f77f89061161b8a06eb35d855a409d2
+EBUILD teamspeak-0-r2.ebuild 201 BLAKE2B 9954ad269e8d3ff904300cef195f1b378e8eea7b0343b6bd08e8ff4baaca8cfdcd144b1cada40a5b3a4cac64d8c873fe96070825550918c2849cef437a10d150 SHA512 105c3aa3ca6de3678816e503e95e8fc4a47ce9e9b979e77dd418b8a90b833fe236e1502bf18cf54b6535a2a4375aa6ab9171c0319d989ac169784ad80a5339d2
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/teamspeak/teamspeak-0-r1.ebuild b/acct-group/teamspeak/teamspeak-0-r1.ebuild
deleted file mode 100644
index 05f5b6fd1ea8..000000000000
--- a/acct-group/teamspeak/teamspeak-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the TeamSpeak server"
-
-ACCT_GROUP_ID="488"
diff --git a/acct-group/teamspeak/teamspeak-0-r2.ebuild b/acct-group/teamspeak/teamspeak-0-r2.ebuild
new file mode 100644
index 000000000000..3387dde0dba0
--- /dev/null
+++ b/acct-group/teamspeak/teamspeak-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the TeamSpeak server"
+
+ACCT_GROUP_ID="488"
diff --git a/acct-group/telegraf/Manifest b/acct-group/telegraf/Manifest
index 21fb8f4f03e9..c05f34987c63 100644
--- a/acct-group/telegraf/Manifest
+++ b/acct-group/telegraf/Manifest
@@ -1,2 +1,2 @@
-EBUILD telegraf-0-r1.ebuild 146 BLAKE2B de107f39862925fc34cf82300a80071679df72e4d016f5c864b951d4e15f49341d777a9395a16ba36e3ff3fe79c971cf4956ad1feef744492646785d9c10a680 SHA512 cba7b6141024a9026e59cfc2a3bc4fe768e8cb71026643aabf4c09556add5bd57288d67ff44bd79bc48d1be3cc5dca23b071dcc99830edb306b0c10d09683cf2
+EBUILD telegraf-0-r2.ebuild 151 BLAKE2B 7197afea3b7e95d5455d83b36a528ffb962697363b114483ef1abc5dc78700221c2607f39891f902adc97ae8f397a611c872b51363b7b061da89239b862ff8c2 SHA512 1f6bc299f35097682589b173be60857bdae380596cbd2114b751370d13d5fb08684a033552dcd7be60496b34c8220f21a7954a4b604bc469329c5f8bad82059e
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/telegraf/telegraf-0-r1.ebuild b/acct-group/telegraf/telegraf-0-r1.ebuild
deleted file mode 100644
index c7a063da8332..000000000000
--- a/acct-group/telegraf/telegraf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=428
diff --git a/acct-group/telegraf/telegraf-0-r2.ebuild b/acct-group/telegraf/telegraf-0-r2.ebuild
new file mode 100644
index 000000000000..593c2d977184
--- /dev/null
+++ b/acct-group/telegraf/telegraf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=428
diff --git a/acct-group/tenshi/Manifest b/acct-group/tenshi/Manifest
index f0fcb8dc6fbb..c05a0f77655f 100644
--- a/acct-group/tenshi/Manifest
+++ b/acct-group/tenshi/Manifest
@@ -1,2 +1,2 @@
-EBUILD tenshi-0.ebuild 195 BLAKE2B a5b035ee0b2c9da5727bee55590dac7c8b9272434c9791d621bf05830bb845e9142e9120bbaa3efc6045cd4dda14f23fb5193ae75250bca9dc080694bf5eb28f SHA512 65f9d1491a84198c6441de367f5dc409886e5a37ad456a924e8a89819196b57c1ba6a2f73d4f45f0ea0dec0e75dd4d78492910c97f7a46b50c7b84bb50a14eaf
+EBUILD tenshi-0-r1.ebuild 195 BLAKE2B e8c2564c93742297ce038ec86e3c87b6c6f3fd9233ceba809693737caa5c0a651c2cff9f03af4547eae78d2d030afcf5fdb2d9cab2ab5789306c24079f5fbcee SHA512 3b61dfd27d5c0e7695640f29768915a9a3d85e6c01c07298f285d19beca97046de7a8c974f5db753282bb56d2741dbad595b90da17841e5622078845fccee99b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/tenshi/tenshi-0-r1.ebuild b/acct-group/tenshi/tenshi-0-r1.ebuild
new file mode 100644
index 000000000000..577b6e34ee6b
--- /dev/null
+++ b/acct-group/tenshi/tenshi-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/tenshi"
+
+ACCT_GROUP_ID="283"
diff --git a/acct-group/tenshi/tenshi-0.ebuild b/acct-group/tenshi/tenshi-0.ebuild
deleted file mode 100644
index 4ca858e2c78d..000000000000
--- a/acct-group/tenshi/tenshi-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/tenshi"
-
-ACCT_GROUP_ID="283"
diff --git a/acct-group/thttpd/Manifest b/acct-group/thttpd/Manifest
index cb3be3066959..7fbd1d76b622 100644
--- a/acct-group/thttpd/Manifest
+++ b/acct-group/thttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD thttpd-0.ebuild 199 BLAKE2B b74105cf658b121c1e5e6ec9cc59f46ad699d60b2562e295adfb1b7ed8e1705401adee59b2dd3b5cda4d890fab10658e779c07d733bcae6198d543fa0133904a SHA512 fdcbf9892cf372fe3fce0cec357950106ec79749cdafb1d56f8577f7699bc01163b6d4a540ba588e3cd2beee3ce053e9ae7ce4d5e71668fedb2f5ff7178fff6b
+EBUILD thttpd-0-r1.ebuild 199 BLAKE2B 6b895b73e8c7cc661d7864eecfd3da7c53ad9dbcaf5141be41d5f92e69ee4ef825b4a25b1204b9141f7d4456cf5eb5367ae24ba6f0a857b8cb21e34895703b0e SHA512 c6de2f64d0e1abfaf5d3806602aec98293d5f9c21b1608dabf9ce35c903a37424fd8d33b4bd1eed563e68d8242a26457f0a14bd2a4ba10b7de001035d902d8ae
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/thttpd/thttpd-0-r1.ebuild b/acct-group/thttpd/thttpd-0-r1.ebuild
new file mode 100644
index 000000000000..ecd4915fa384
--- /dev/null
+++ b/acct-group/thttpd/thttpd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/thttpd"
+
+ACCT_GROUP_ID="155"
diff --git a/acct-group/thttpd/thttpd-0.ebuild b/acct-group/thttpd/thttpd-0.ebuild
deleted file mode 100644
index f30403a01946..000000000000
--- a/acct-group/thttpd/thttpd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/thttpd"
-
-ACCT_GROUP_ID="155"
diff --git a/acct-group/tinyproxy/Manifest b/acct-group/tinyproxy/Manifest
index f3d35d634d45..da12eb22ec89 100644
--- a/acct-group/tinyproxy/Manifest
+++ b/acct-group/tinyproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinyproxy-0.ebuild 189 BLAKE2B 4a19ebe0433b2cd553b5f842368016d75091c84e0a1f2419a597b8232448f374f9547e25e9a2b8b8a5ade65c05b2108562c74308d9551ab74c0bf717444cc562 SHA512 c1d166c2253f11ad27570cbc2a9ac3cfc32872e5f2b8d82d573c5ea44cbbd673b40fc95b2a5d98b10cadcfd425701541ee27faf0258a6e5fc41395dac040d0c0
+EBUILD tinyproxy-0-r1.ebuild 194 BLAKE2B 5931d01745e1a994d64a91360072e0f57551f43593dd8a65de479b60076c21e99fa39e225cb5740eec604979ec060ef0cc8b0a8c27c11e6ac871b04cdd30a9bd SHA512 72eac8f4abf5feffc0063f65bec2e665a07b1f5a645757a53f5f6e05176f919245dcd19fc70a51de26f32299bf16c072c2bfea1261d967aedd08a4dcc20a8d1b
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/acct-group/tinyproxy/tinyproxy-0-r1.ebuild b/acct-group/tinyproxy/tinyproxy-0-r1.ebuild
new file mode 100644
index 000000000000..6f7689c3c3df
--- /dev/null
+++ b/acct-group/tinyproxy/tinyproxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-proxy/tinyproxy"
+
+ACCT_GROUP_ID=186
diff --git a/acct-group/tinyproxy/tinyproxy-0.ebuild b/acct-group/tinyproxy/tinyproxy-0.ebuild
deleted file mode 100644
index 24a884b47c59..000000000000
--- a/acct-group/tinyproxy/tinyproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-proxy/tinyproxy"
-
-ACCT_GROUP_ID=186
diff --git a/acct-group/tomcat/Manifest b/acct-group/tomcat/Manifest
index e4988291e97e..e06db9f1b56d 100644
--- a/acct-group/tomcat/Manifest
+++ b/acct-group/tomcat/Manifest
@@ -1,2 +1,2 @@
-EBUILD tomcat-0.ebuild 189 BLAKE2B 419a27f9dbf2fe8498e1c08d5b08ab3f91f3c13cff0e25fe62e8ebd6c3717e427618ab8bdaf640d52b4f169d9b95f9e0fb35e211ecf3248d9c1a4cbd187e42d4 SHA512 a7f0e2bd4d70e2084ab60db76458a673771be91b2c84b24445a9ca5630650428f787b530fd7076e9e90c285c7eb0ef24f59780a012fc84fe54d644135c04e4be
+EBUILD tomcat-0-r1.ebuild 189 BLAKE2B 5d512a8428fc19e9bc25236b4c6d0da5b4c350fb8a7884bfbba382469be76db8bb8670afa2b949f3735cdd179637fb6086bce2d306dbcd24496fc66282e88f15 SHA512 798ba9736d4531e7c035b993b2e5b3dad988bf6f8856cf69d21df4e192d90439e9711a86b2c9b5451cd62291213ef84dfab7aa996a11e663f23df9ad9aca6db8
MISC metadata.xml 252 BLAKE2B e978e2d30d81f57b533bc3620751605e0fd123c669e280af424c68ebeba5f7e61391fc59ddea55598107aaf3c9f901e38de6bfd4da55e926a9d3567de08e7d2d SHA512 e509c95968c64f0f3cb9c16a437f100e3d1f64ee8e1d412baac733f4698b7a0f0c91136c480a9078eab6c3c6497eb93b7fe891f9a28e43e31f0bdb73eb3ea9a4
diff --git a/acct-group/tomcat/tomcat-0-r1.ebuild b/acct-group/tomcat/tomcat-0-r1.ebuild
new file mode 100644
index 000000000000..d9b3c7ed3296
--- /dev/null
+++ b/acct-group/tomcat/tomcat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Apache Tomcat"
+ACCT_GROUP_ID=265
diff --git a/acct-group/tomcat/tomcat-0.ebuild b/acct-group/tomcat/tomcat-0.ebuild
deleted file mode 100644
index ddef1fa45694..000000000000
--- a/acct-group/tomcat/tomcat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Apache Tomcat"
-ACCT_GROUP_ID=265
diff --git a/acct-group/tor/Manifest b/acct-group/tor/Manifest
index 2702f1e91cb3..b46b5dcfd61e 100644
--- a/acct-group/tor/Manifest
+++ b/acct-group/tor/Manifest
@@ -1,2 +1,2 @@
-EBUILD tor-0-r1.ebuild 185 BLAKE2B 4d38190adc96128f24a61d75b17a581e56670c23933a92ed16377ed59634ee366e8560184844f3177e307e1acf23f76a727bff4048d5b2435b28fae74eaf0201 SHA512 26fdab0dd7d894392ec8d45f2a1d8762e95cca413bd2fc3a0d5c2de551b5acae86523cb8cba66f14b1f6773cd7d072873523835a0c012fe6335d9794ddc5417b
+EBUILD tor-0-r2.ebuild 185 BLAKE2B ed654ca647d3fdb313791bd9c2f0f464ed75fa7357489b970f0b0ff8e4c89e1ab7cebab1d181c1260dc56a3f98af8f82e72b3b3da738ad2b2a4a21ac5f567840 SHA512 490b0b9c8b1a7424ed364fa9952e771645a91740f4ee32e885fdb97569417eb9b299940ee917ffb52174cfa12d4c75efd0c2d9ba2915bec8185462a53101cbef
MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/acct-group/tor/tor-0-r1.ebuild b/acct-group/tor/tor-0-r1.ebuild
deleted file mode 100644
index 0fe44e122b31..000000000000
--- a/acct-group/tor/tor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for tor daemon"
-ACCT_GROUP_ID=43
diff --git a/acct-group/tor/tor-0-r2.ebuild b/acct-group/tor/tor-0-r2.ebuild
new file mode 100644
index 000000000000..cb5343bcbdc3
--- /dev/null
+++ b/acct-group/tor/tor-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for tor daemon"
+ACCT_GROUP_ID=43
diff --git a/acct-group/tox/Manifest b/acct-group/tox/Manifest
index 2168da6086e2..42c8bdcb0237 100644
--- a/acct-group/tox/Manifest
+++ b/acct-group/tox/Manifest
@@ -1,2 +1,2 @@
-EBUILD tox-0-r1.ebuild 250 BLAKE2B b69c209571bcb7fc76376f409e85e5a4bf596d58b4e45ebf9b901a1905ba315b1334615efc3845d77f65870a90702b127eb4ab0b92ea032c4e770f867f928782 SHA512 0f448b925bfebf2b9a0d5432e58eeabe5d2eee67b9aae14f40fad889d422744fb99f21421af28a0c45219adeef9937cbd970899ee9f72371960bc7081b82010d
+EBUILD tox-0-r2.ebuild 250 BLAKE2B c85ffd39d442bc96690958d5ec4ffaff801dd4df3b3a2dd9684d1ea3838bb896f1781a847e035a289d249deb2e1163f1e16ebd0a8c5c7acb36613289631bb7a1 SHA512 338077b194bc6092fa9492dd580d83aaa02b6de74bb1d56a9345485a33ef2db4a2829cb351203af08567deb55f0135f91207da29cecd6defafe60ca934a0b4e5
MISC metadata.xml 401 BLAKE2B 0a0d5a25868d5ad4b1b9b6212ab038e94628f9b2428fc62dcaf1e0fa672a6a4ef4b555767dd6d1ae1e58f82e31a194e6ac5f914fcb21b7a4a5f52bee97ad2eb4 SHA512 58b858736e5503593517b113c9e5417306caf20137303fc03afb43071c088ad5314495f6203e401544e48a87793a0d09d8d231d6f6740639836415c4857a22a2
diff --git a/acct-group/tox/tox-0-r1.ebuild b/acct-group/tox/tox-0-r1.ebuild
deleted file mode 100644
index e50b936945ed..000000000000
--- a/acct-group/tox/tox-0-r1.ebuild
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-group
-DESCRIPTION="Group management for package net-libs/tox"
-ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tox/tox-0-r2.ebuild b/acct-group/tox/tox-0-r2.ebuild
new file mode 100644
index 000000000000..e0df3c1427c9
--- /dev/null
+++ b/acct-group/tox/tox-0-r2.ebuild
@@ -0,0 +1,7 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-group
+DESCRIPTION="Group management for package net-libs/tox"
+ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tpm/Manifest b/acct-group/tpm/Manifest
index ea113b8fcef1..fdcf90d453d3 100644
--- a/acct-group/tpm/Manifest
+++ b/acct-group/tpm/Manifest
@@ -1,2 +1,2 @@
-EBUILD tpm-0.ebuild 146 BLAKE2B e6ca31414dee6de893fcefdd2eeeb1d7bbb50166091a5540e4accd6ea05a98f452bd8d1fa99ac86711688ca3b23af30f18988a9d408d7f60951f24e2422af95a SHA512 85c14d81dbc74bb0b78f79517fc233d1a29406b1298a53cdae07dd9f1e6dcfd5aa8d25ce52fa810627b79c5b5c928b0cdd7cf23ae02a32cbbc466c71072e7425
+EBUILD tpm-0-r1.ebuild 151 BLAKE2B fcbb42e888b8a1655f58596035b8c49401d48a05ec63c5119f8a3ba7787749361f7aed8305d3177605aa598601c4a31e29b8fe41daa7d932b347a238989fb091 SHA512 1487f44ff864442c0c56bc67c0e3a8af7c5a47a9d25405e7f0b7f2a499ef540ec8172f7639d64350986585d8f9291027ac400e0094c462835c557cc204647499
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/tpm/tpm-0-r1.ebuild b/acct-group/tpm/tpm-0-r1.ebuild
new file mode 100644
index 000000000000..42ec8b85c14e
--- /dev/null
+++ b/acct-group/tpm/tpm-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=347
diff --git a/acct-group/tpm/tpm-0.ebuild b/acct-group/tpm/tpm-0.ebuild
deleted file mode 100644
index 78bf604298a0..000000000000
--- a/acct-group/tpm/tpm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=347
diff --git a/acct-group/transmission/Manifest b/acct-group/transmission/Manifest
index ae83f7785d13..77e2ee62b05f 100644
--- a/acct-group/transmission/Manifest
+++ b/acct-group/transmission/Manifest
@@ -1,2 +1,2 @@
-EBUILD transmission-0-r1.ebuild 151 BLAKE2B f243fc8f45f6efa1a67c2bfffa8623b929834ae2832735d47e7efba04bcd4a2728c331a5a3391b9c594e8a2384b3a5c9d547ecf9866caf085f0ac6f9d7348cb4 SHA512 14d35d596429142738a866f043da8da01bb902768fb2d600b94ab81693bc02dc6d1622ab78923e2057882f60fe7cb470066579043e6c91c8cf1d568431b8e361
+EBUILD transmission-0-r2.ebuild 151 BLAKE2B 92f6efb13c384b365c8d4f105bb2ac7570a4fff57564b6a5b5007380148b805bdd98858bb20e8544cffabe65cc01f28afb95386fbcb5bff2d81fbd906c628c1f SHA512 fe61b89ef80e081c9940d0f1c809520d18f7f17a30e8f1257339f8da97e9da2a6db9d90fa8767c29931d394dde77cbfe82991cc4880ec9c1000d5660aa69375d
MISC metadata.xml 247 BLAKE2B 9dcf90d404c84f0ce3da367274c25984b6497a2d8fb68496f497e76c7061c9c7ca7f444f7e4ccb62ba06223caaf0eea4d6aebbb2409ba1f08bb57123e72f0836 SHA512 4681b02c210bf3f869157694af1f80cb3e9b2dd619283a249aaafa85d3bc328c1306af5d61c69040fc503feb3271490bdd2e38e61479a94940fa225810b9e8cb
diff --git a/acct-group/transmission/transmission-0-r1.ebuild b/acct-group/transmission/transmission-0-r1.ebuild
deleted file mode 100644
index 682145cd09be..000000000000
--- a/acct-group/transmission/transmission-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=169
diff --git a/acct-group/transmission/transmission-0-r2.ebuild b/acct-group/transmission/transmission-0-r2.ebuild
new file mode 100644
index 000000000000..ea7be7a6a2bd
--- /dev/null
+++ b/acct-group/transmission/transmission-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=169
diff --git a/acct-group/trickster/Manifest b/acct-group/trickster/Manifest
index 9005276f86db..873c1af730fa 100644
--- a/acct-group/trickster/Manifest
+++ b/acct-group/trickster/Manifest
@@ -1,2 +1,2 @@
-EBUILD trickster-0.ebuild 199 BLAKE2B 459f60815906d19191ec56ac0cb854cfed5be34cb67c7a8fc97e639f75ceb67bb3ddeb5306d54573a9d6f01d7191e76626a0ed10b73b588079d00370605c1fcc SHA512 589173af42c5bb1d365d9a731730ede3b1b75dc812a86c36db89fe952ac0269efa67487f7497e667e4b51bb9cef7c34b7e57d7615c1496c5333c502094ea8151
+EBUILD trickster-0-r1.ebuild 199 BLAKE2B 5f6ba7e91daa719f819184ae9206c3c7acf54e8137e19159eaf2fab45ff620c8d9609cfb044334f012f8d66b83c179c5455889a14635e20a6f7561e63023dca1 SHA512 61e1d8de5a7032a49539f854550845a2096afcf17717ab31982e0cb1145839ecf0d863420e205b22f14912693087968ceec3c88cbeb32dad5695311dd063f8d5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/trickster/trickster-0-r1.ebuild b/acct-group/trickster/trickster-0-r1.ebuild
new file mode 100644
index 000000000000..f52d9309fbfc
--- /dev/null
+++ b/acct-group/trickster/trickster-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/trickster"
+
+ACCT_GROUP_ID="119"
diff --git a/acct-group/trickster/trickster-0.ebuild b/acct-group/trickster/trickster-0.ebuild
deleted file mode 100644
index fa5e88995312..000000000000
--- a/acct-group/trickster/trickster-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/trickster"
-
-ACCT_GROUP_ID="119"
diff --git a/acct-group/trojan/Manifest b/acct-group/trojan/Manifest
index f38e1de993c1..613fa563af3c 100644
--- a/acct-group/trojan/Manifest
+++ b/acct-group/trojan/Manifest
@@ -1,2 +1,2 @@
-EBUILD trojan-0.ebuild 146 BLAKE2B 63e13088f28df4d993958f214b770c184816a7ac30d11e6eb7d3604ae567bcc8884e98a4c2cafed427d2d9a376159ae7ee6feb639e12d9670ca54f8c66a65bd7 SHA512 7a8c1450ef540aa44c949f581facf894268e25904b7e391bbcae77bceaf220509d87f3a1a2cedfd7f7d4e207483ea96234e4962f8f1703e5f04abff7b644c10c
+EBUILD trojan-0-r1.ebuild 151 BLAKE2B b0caf43bfd078a1ab3faf1d47188da3810fd15a7612292341cadb8ff76297347dbecd75f12864474ca80f987a0b22c8278f61218a3c30cfa5f2af6c28727a526 SHA512 fecccbda1cd9f70733853aa5316c0e4b25a2c8f4e82d79725caabd5bb8bd62c1c00aec01065fe55698c7e45e2195d03c7f7f8630760cc0dbfa3b4ad069aff146
MISC metadata.xml 243 BLAKE2B 4dab510dfc22f0316308b8d483b8e96c7c0653d3bc091820de0d8208213f39c165322c661abfa6fafa50977beb3839a0439079f949cd6a3f590122dbc59e53a4 SHA512 917ed98b7482f15c8444aaec331a88ef97bf689d708489c3bd68ccc1f2f4093a8739930081dcae9db5eac912c638c0ff286015b8bd9d51da866878e64e0f7248
diff --git a/acct-group/trojan/trojan-0-r1.ebuild b/acct-group/trojan/trojan-0-r1.ebuild
new file mode 100644
index 000000000000..8c754f0d94e6
--- /dev/null
+++ b/acct-group/trojan/trojan-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=326
diff --git a/acct-group/trojan/trojan-0.ebuild b/acct-group/trojan/trojan-0.ebuild
deleted file mode 100644
index e3af9f513f48..000000000000
--- a/acct-group/trojan/trojan-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=326
diff --git a/acct-group/tsm/Manifest b/acct-group/tsm/Manifest
index 0bc0b33ff0b3..042c68a3252c 100644
--- a/acct-group/tsm/Manifest
+++ b/acct-group/tsm/Manifest
@@ -1,2 +1,2 @@
-EBUILD tsm-0-r1.ebuild 151 BLAKE2B e6457ed32c91ddc0ea5ac8412c2885ccfd1e74b63558e0c511716a68dc007c18f6cfe2d2d8c77c697fb43294dc43af2524909fc09e973d875e42f4a0b9c018df SHA512 88e4eb80cbccee365f80a008311a9451983f0d1cb3fc2dab1072ee73b4a67f840025f3319cb51f7dac8a90db0fdfff638ac6b5ec62db02311b89476918f37090
+EBUILD tsm-0-r2.ebuild 151 BLAKE2B 53a3824ad1c2302b6aa7dc8906d83e4be3e6c55e91a4e53a0017e1531267653c3a6127584f9a04cca3ab026337626983e43496c10eff1517270aba2ba7adfd2d SHA512 e0fc00398574603111d67135374d5263fd8bbfc88644ac829ffd661f3adf0dd85ed0d621258fb464324cd5826966ce03b3a9f3883596ea50e7dd614414242cee
MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
diff --git a/acct-group/tsm/tsm-0-r1.ebuild b/acct-group/tsm/tsm-0-r1.ebuild
deleted file mode 100644
index 117a3a3bde45..000000000000
--- a/acct-group/tsm/tsm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=465
diff --git a/acct-group/tsm/tsm-0-r2.ebuild b/acct-group/tsm/tsm-0-r2.ebuild
new file mode 100644
index 000000000000..e992130a445e
--- /dev/null
+++ b/acct-group/tsm/tsm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=465
diff --git a/acct-group/tss/Manifest b/acct-group/tss/Manifest
index ba436384b1df..e18d54f389e8 100644
--- a/acct-group/tss/Manifest
+++ b/acct-group/tss/Manifest
@@ -1,2 +1,2 @@
-EBUILD tss-0-r1.ebuild 202 BLAKE2B a04de6601efb2ee966caadd3e4c5f6897dde07d40d6995cd5b3475d21e37bf62a3fdf4524fd93285ee2b0aefc40dc38adc282d20251c48ceb1a1f600b88a9b86 SHA512 0038f0b3f1d8d83d7d2791eef108f9c92f1fe544c25e1b04a135e22b6082a8f026a6cca5c9ac0bbb90b80b4b592f19d773135d064e2d1c17eb186a6f2cab2ef8
+EBUILD tss-0-r2.ebuild 202 BLAKE2B e8ee01b70a82c4bce6e80f41e1aa6bacbc2fc3d63431e4f290221aaa78e4a8345461b13d04e08bdd7796e02257b5239a3adba396deb9f3dd61261c20c1616ac0 SHA512 0286df408299ea0d411b978bc85eb8b20f71a762b99ce872d59d85a0da875c340ab238825e77b8209ad89350cd8cf06a3c2853bda24782bcdd4d9fcd1ffa7e90
MISC metadata.xml 404 BLAKE2B 08ad2d09bfd3697b69bcfd85280cb3965aff26e91a49f0840c2fe81d02a5795254a283b95124bfc97a610034e668332d06abae1db1c34657d7aab8ed6963654b SHA512 9b8ca2c33c33a1f4e3f30244069486fb1dd970555c9bb719a5bb8c4e2bc979745e0511216ec70481f0c3b1e716dd631662a1986e1c89628b29b0a85d6b4b9f76
diff --git a/acct-group/tss/tss-0-r1.ebuild b/acct-group/tss/tss-0-r1.ebuild
deleted file mode 100644
index 3ecc4e54949c..000000000000
--- a/acct-group/tss/tss-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Trusted Software Stack for TPMs group"
-ACCT_GROUP_ID=59
diff --git a/acct-group/tss/tss-0-r2.ebuild b/acct-group/tss/tss-0-r2.ebuild
new file mode 100644
index 000000000000..24626e201848
--- /dev/null
+++ b/acct-group/tss/tss-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Trusted Software Stack for TPMs group"
+ACCT_GROUP_ID=59
diff --git a/acct-group/ttrssd/Manifest b/acct-group/ttrssd/Manifest
index 03d7908511f0..79836a6397a4 100644
--- a/acct-group/ttrssd/Manifest
+++ b/acct-group/ttrssd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttrssd-0.ebuild 186 BLAKE2B 5724e778f961f3f86223e43d20fb8ccaedeabd42fd9489680753970ec952a92b9dc8ecfdb4ec9069f984a73781e06928fabadb73a8db91366231e752f024e29d SHA512 0dab9558571e6fa1a25a4b33551e68da79a7f982077fc82011f66ae1c8f895d495335fe8e5babacdb8752dc2ebd40823a0393a7d9f4c48c0c13b278cb703a59d
+EBUILD ttrssd-0-r1.ebuild 191 BLAKE2B a887dad328b21a8a5defd3e2a5d2413e539a9c1fa8fedef6f886eb7fe9e55bd3ccecb2c68055afee98c7d91a21d5c9fa105b7006f49b66372aabcc20d9eecd54 SHA512 836c814a6341f548c86f5d3ace96a8137fd74de90a71f1421819222e0fdcdf8737b42c6f3b09f968d49863508ff12ad20bfb0b718e146b23cbd287a2edf4d5db
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/acct-group/ttrssd/ttrssd-0-r1.ebuild b/acct-group/ttrssd/ttrssd-0-r1.ebuild
new file mode 100644
index 000000000000..a42e44e4631c
--- /dev/null
+++ b/acct-group/ttrssd/ttrssd-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-apps/tt-rss"
+ACCT_GROUP_ID=386
diff --git a/acct-group/ttrssd/ttrssd-0.ebuild b/acct-group/ttrssd/ttrssd-0.ebuild
deleted file mode 100644
index 1d5fcc70b9ab..000000000000
--- a/acct-group/ttrssd/ttrssd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-apps/tt-rss"
-ACCT_GROUP_ID=386
diff --git a/acct-group/tty/Manifest b/acct-group/tty/Manifest
index 7e087536d01f..bbb52a6c6060 100644
--- a/acct-group/tty/Manifest
+++ b/acct-group/tty/Manifest
@@ -1,2 +1,2 @@
-EBUILD tty-0-r1.ebuild 149 BLAKE2B 7ca4dcd292411317d564914738a42b537e6edeb0c47aecdfd4ff56567ae8c6acb542c0680ae0a7e87ee1e7e86ad18c49c8211af74acc992bec4a64e1455ae9af SHA512 825341aac5bbaf2dc5f2653bf7a9a3282f62121012d056b96b71a5542779842d6cebba163b8df6871630168c83fde61570b668084174438855ee3452beb477c4
+EBUILD tty-0-r2.ebuild 149 BLAKE2B a640cb1baa5b4c90c0e3124bcb97ec60a1c3f516dd28c516fadafc964e278ab49a01b9cc541562a9f0d4a27559260d23678d44b5b1ce8edb2c3ea204d8ae17a0 SHA512 37b805e9fdee538e0ef6509346e9a60749894aef5ab57e2780feabc403ee9594c7f00b56e4db4fed90b600eb3493edf875568ee77595c9b2c9d0f7dc0b81b831
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/tty/tty-0-r1.ebuild b/acct-group/tty/tty-0-r1.ebuild
deleted file mode 100644
index 2133d92cfa3b..000000000000
--- a/acct-group/tty/tty-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=5
diff --git a/acct-group/tty/tty-0-r2.ebuild b/acct-group/tty/tty-0-r2.ebuild
new file mode 100644
index 000000000000..b6a00ae485fb
--- /dev/null
+++ b/acct-group/tty/tty-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=5
diff --git a/acct-group/turnserver/Manifest b/acct-group/turnserver/Manifest
index ac48e8873ac2..7c00e3e2fd29 100644
--- a/acct-group/turnserver/Manifest
+++ b/acct-group/turnserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD turnserver-0-r1.ebuild 201 BLAKE2B f07bc806cca463a2f3742a44d1ffacc74815cbf74bdfe88bcc0fa2b85d6ea1769cbca0ff799bf5cad3bc696c65f9665c3fcf4f438a986f8068d73b29be3c9713 SHA512 8a2379cf27af14efc367360508fee63c2673309a14ac711bfb0d5ffe85fa7d5deb0a3055a34bdd87131e946c2c5608bcff44f74233e7d45cfc02b521d125bdd0
+EBUILD turnserver-0-r2.ebuild 206 BLAKE2B 24c74a3cd1672dc137163dd3e8916afe7d76924c78cedb165a28f738b817360dbc18ed3ac100a1954de642373b4c82510e78d121ecc5b07b6790997efa266f5c SHA512 66c125c68f4f23bb285048725381baf1b11cd6a8ce8fbbbb37db575d6dbfdecc1990d0b9839f9d30d38784989988ab7022c51d24c21e8a9ed40db00ed3688a36
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
diff --git a/acct-group/turnserver/turnserver-0-r1.ebuild b/acct-group/turnserver/turnserver-0-r1.ebuild
deleted file mode 100644
index 37a44ee01058..000000000000
--- a/acct-group/turnserver/turnserver-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for a turn server like coturn"
-
-ACCT_GROUP_ID="235"
diff --git a/acct-group/turnserver/turnserver-0-r2.ebuild b/acct-group/turnserver/turnserver-0-r2.ebuild
new file mode 100644
index 000000000000..557eba9e0b1b
--- /dev/null
+++ b/acct-group/turnserver/turnserver-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for a turn server like coturn"
+
+ACCT_GROUP_ID="235"
diff --git a/acct-group/ubridge/Manifest b/acct-group/ubridge/Manifest
index 03351c452447..8e0d9dff0d78 100644
--- a/acct-group/ubridge/Manifest
+++ b/acct-group/ubridge/Manifest
@@ -1,2 +1,2 @@
-EBUILD ubridge-0-r1.ebuild 187 BLAKE2B d7907dd0015888404d921a85019b989e7a0f408e76a05cd610e6060d6a09b8fd77e0a7e7a0dd6302ca788e4ca5721bd5a60ad7268b60f4ab8b855cb08b0f79a5 SHA512 83cb6b5a8016b949381b1113c9d850e5590a8ca3d29e75c55ec79d25e94cf1a20377c7667d38a9c78fe75ce09d28e74002cd0f7902b83edcf5e33a341eacad34
+EBUILD ubridge-0-r2.ebuild 192 BLAKE2B 91d9ca9e2a4d379d6100b762dcc3663cad57d232a1afa5b52c0525a3afa2da0bfe5901e95c4c7fdda46db281e003dabd88f3c0c8e595985ba3cfa9ab97e34fa8 SHA512 001827a7c6b2accfc0e07a79c7c08a05a12c1e55f710a133061ecd351299fdb39a5980c11dbb6241532843a0b04a16a260239f716bd64652b815880aca460064
MISC metadata.xml 403 BLAKE2B 540d7c483a9186f4ca9978cdd0d0bb3dc1a2746819e3dc895bf415c42ec19205649caa3a930c9db9f4efbfb913eef7eddc3e1b51ce7b483d3ed0ba0a25d1feb4 SHA512 440a7f7342142224f72f63e887d8fb1071dd2446fd16ee68074f2a08255eba500de9865f48427da8d215c644a1cc6206052940b4ad3a0131dca4b9582c443426
diff --git a/acct-group/ubridge/ubridge-0-r1.ebuild b/acct-group/ubridge/ubridge-0-r1.ebuild
deleted file mode 100644
index 6d79fba1f383..000000000000
--- a/acct-group/ubridge/ubridge-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/ubridge"
-ACCT_GROUP_ID=461
diff --git a/acct-group/ubridge/ubridge-0-r2.ebuild b/acct-group/ubridge/ubridge-0-r2.ebuild
new file mode 100644
index 000000000000..20ab07a4c9e4
--- /dev/null
+++ b/acct-group/ubridge/ubridge-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/ubridge"
+ACCT_GROUP_ID=461
diff --git a/acct-group/ulogd/Manifest b/acct-group/ulogd/Manifest
index 795ef1144dfd..01ac76464881 100644
--- a/acct-group/ulogd/Manifest
+++ b/acct-group/ulogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ulogd-0.ebuild 181 BLAKE2B 97910a15b3d03ca8ac63d251489474e9c4f832f79f628d9235788b3a21e738162f36edb81132637fccd5ab12fc3710f275e1384e835d50b91c5c98d42c9c40c8 SHA512 a0c71601200d074d93be7622c12134d293bb876f2fb351b54d44d7a44549d296b1610918f07f114a473241846bfcbd55c83d1f7f22beb7bc361c671e12ea2522
+EBUILD ulogd-0-r1.ebuild 181 BLAKE2B 6c30def491d8da2aafe8b404f6b02eef11063550e3aabb6e30ffbc5f24c60610e76596d1539d420878a5a5dbf7784b181f5aa590e8e1fe1f05a45cf9f1c0cfe8 SHA512 6abe409cec070791bbcb8598135bc98f8693e20e74b55ae5f8d054d5ca6412d909ce7b37021520b4862d610b398d9f63325609ad178903aaa8fc7f4f35726359
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/ulogd/ulogd-0-r1.ebuild b/acct-group/ulogd/ulogd-0-r1.ebuild
new file mode 100644
index 000000000000..15b7a3bf99fc
--- /dev/null
+++ b/acct-group/ulogd/ulogd-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ulogd"
+ACCT_GROUP_ID=311
diff --git a/acct-group/ulogd/ulogd-0.ebuild b/acct-group/ulogd/ulogd-0.ebuild
deleted file mode 100644
index d9c49c9aff0e..000000000000
--- a/acct-group/ulogd/ulogd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ulogd"
-ACCT_GROUP_ID=311
diff --git a/acct-group/ultimaker/Manifest b/acct-group/ultimaker/Manifest
index c53e5bc8ee5e..3e1ab96494f6 100644
--- a/acct-group/ultimaker/Manifest
+++ b/acct-group/ultimaker/Manifest
@@ -1,2 +1,2 @@
-EBUILD ultimaker-0-r1.ebuild 180 BLAKE2B 221924b4974142fedbfc22ef83fca119cfb646efe5c03ea9d61c00daa7e82ac0fdcdece5eacdc1f49dbc8b7edbbdbb774538758729cac7c932ab72400aa2ca81 SHA512 96eafc76d57d004466d3205ea6714e89f90cf466068f275eb11470d7ff141188c532c7f1c1235624ba65bd67ea1c4060d07346b870f846adbf3efd1bfd178519
+EBUILD ultimaker-0-r2.ebuild 185 BLAKE2B 2364a54d483cb5820bbfc9b208acdf0c5d17f8ad2f2a86e79eed76d0e9ba9f9785b909dc85c155ebfc323267a6d47e6b8715444cce6a25e5a4e0ce15492f1dcf SHA512 c256e146a00d820d17af92f4ed58e6991a63172221828eb41def99bf1b199eca6f970de80576fbf9b2e6df6a489e6aa537af2a8e65282497445112332df38456
MISC metadata.xml 261 BLAKE2B b411d17d40b41f8f5f79ed195f3d7ca29655c5c6a7da8284c4d111b1ce405f2a881bcd675081561a606bb37df59e3344892ed4277cd5a0fc06f9138595c30f80 SHA512 5cb7f83ca6a8b52b542c4060c67615c400556b98837f9e6fa989cf60999446c7e14c91a3d335734f835652019ef64fee3f9ef57a403657df21b09f843462598f
diff --git a/acct-group/ultimaker/ultimaker-0-r1.ebuild b/acct-group/ultimaker/ultimaker-0-r1.ebuild
deleted file mode 100644
index af415ea3785f..000000000000
--- a/acct-group/ultimaker/ultimaker-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ultimaker"
-ACCT_GROUP_ID=369
diff --git a/acct-group/ultimaker/ultimaker-0-r2.ebuild b/acct-group/ultimaker/ultimaker-0-r2.ebuild
new file mode 100644
index 000000000000..a69acd173bf8
--- /dev/null
+++ b/acct-group/ultimaker/ultimaker-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ultimaker"
+ACCT_GROUP_ID=369
diff --git a/acct-group/unbound-telemetry/Manifest b/acct-group/unbound-telemetry/Manifest
index 44901279065f..575c24dbe1a2 100644
--- a/acct-group/unbound-telemetry/Manifest
+++ b/acct-group/unbound-telemetry/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-telemetry-0.ebuild 146 BLAKE2B 5870072ea522f91c3cd138953f2090cbfdd493d8111055a7fd00fb066ada9d6f283777b2d34c92a064731320059a04cac998f75339a63d00c1733594a8510964 SHA512 932473aaf22aa3faef94169e435ea42a04e35d9b68773c5755729d8c36ec1959c86aab01615095be728db448bf3c91f36f0583f08df5bbd81771060b3ab4757c
+EBUILD unbound-telemetry-0-r1.ebuild 151 BLAKE2B 1ae4b254ddff8bb6dc5d710daefa9ae93dd9e9da76c5221660d1ee0695c52d9fb623ea50b0991579e9e8e0c6dbf16fc547ba1f2221c1007c733be912f43c5028 SHA512 197f24b6159729e4a25a4b8217661b7cfb539f327d444bfaea9142a5c15998eb1eeae1e92626ea575b0a58b8d700a0a5bfc8bfd8f74d61e8b42a2e38fea5d913
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild
new file mode 100644
index 000000000000..59e9459f0fdb
--- /dev/null
+++ b/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=279
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
deleted file mode 100644
index 7cf4cee045e4..000000000000
--- a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=279
diff --git a/acct-group/unbound/Manifest b/acct-group/unbound/Manifest
index f11e4b20eda6..a1f605ab1203 100644
--- a/acct-group/unbound/Manifest
+++ b/acct-group/unbound/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-0-r1.ebuild 183 BLAKE2B 1ee8a392311cf7447df33283b232ea23af7b5f544d51379867f399482991527c8bf9ed2b1dda98f7f500776b4f5fe788677f2a1962a05a653e3781a96b08dd35 SHA512 b823dd2f2d38a3795a3ecd5f32ada5d0484dea74726cc71b1888b8e959677706e1e055ed44490330ce6a01f82d28393642fd30d747a61cbe1b99c391d928668c
+EBUILD unbound-0-r2.ebuild 188 BLAKE2B 808f48587fda39d06045820bc1cf24ef86b6303e35c77a2e60bc4f9c004628c9482ee03a1c67492750ebe46b20be5877880bc4578d9ea1b5772731715ac393ed SHA512 6a3461755e88819b83afa32cc28312f4081806b34ceb012f57d201adf1a37347c44164735cb45817b1c9cac1451d7cc9c6e99928e83c931bffbb61f423d5196a
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-group/unbound/unbound-0-r1.ebuild b/acct-group/unbound/unbound-0-r1.ebuild
deleted file mode 100644
index 4a2eab027793..000000000000
--- a/acct-group/unbound/unbound-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="unbound program group"
-
-ACCT_GROUP_ID=391
diff --git a/acct-group/unbound/unbound-0-r2.ebuild b/acct-group/unbound/unbound-0-r2.ebuild
new file mode 100644
index 000000000000..a9047bfb0b5f
--- /dev/null
+++ b/acct-group/unbound/unbound-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="unbound program group"
+
+ACCT_GROUP_ID=391
diff --git a/acct-group/unifi-video/Manifest b/acct-group/unifi-video/Manifest
index f2bfec3a8fe5..4be02fc4e125 100644
--- a/acct-group/unifi-video/Manifest
+++ b/acct-group/unifi-video/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-video-0.ebuild 182 BLAKE2B acdde57c8ca76b2af1b269728498e4a82209e4bb9d74bff4384a9b40b08f49713cc5db1464dc1c46b58b10ea3806bb2b666df4d4723cd3ff6d04db085829f4b2 SHA512 51fdeaa4c241f45a7fd39bd22d39dfa71d631bbbf9e5141748f4d080e49b837c114dc50572e4bc0da355c886c9e0fa77011f88ebc969bb18205c4cdcb07666fc
+EBUILD unifi-video-0-r1.ebuild 187 BLAKE2B 973851f1f48af6337f34b79cc8e5766a253f347d404b343b84740dbfa4d8069039a72d4ae49d860086f0018f7c1eb1e63c0517ed8efba8b8008db691df9898d0 SHA512 76962ed1fc0928f67affa7af5fe9e6a02f9e9ad0fcee51ecd76d9480bd4c729afc6bfe396694afa0dda2f26e64cc6203f89431d8df413213f2e814cf7b46feb4
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/acct-group/unifi-video/unifi-video-0-r1.ebuild b/acct-group/unifi-video/unifi-video-0-r1.ebuild
new file mode 100644
index 000000000000..21165892f5b5
--- /dev/null
+++ b/acct-group/unifi-video/unifi-video-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Unifi Video"
+ACCT_GROUP_ID=348
diff --git a/acct-group/unifi-video/unifi-video-0.ebuild b/acct-group/unifi-video/unifi-video-0.ebuild
deleted file mode 100644
index 39344e103ea3..000000000000
--- a/acct-group/unifi-video/unifi-video-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Unifi Video"
-ACCT_GROUP_ID=348
diff --git a/acct-group/unifi/Manifest b/acct-group/unifi/Manifest
index 975fbb95590d..685fb7822117 100644
--- a/acct-group/unifi/Manifest
+++ b/acct-group/unifi/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-0-r1.ebuild 201 BLAKE2B 5564f0f9ff927ac5bac654ec2caac1e7b445c4b8c451a11e1fda18eb6a7aae9d2f1e49a3514cf13bf4ee7412152ea21e8f1668c5eeb9928b7340305545ea79bc SHA512 f159f2aca0d6cfff3646564c6342d4c68747a75467f1d0efb7883448dbc6586cb2a2dca181074fe1dac1ee7c9d02466f02367c137dd528dd264c104d7bc6e045
+EBUILD unifi-0-r2.ebuild 201 BLAKE2B 2e17de492122e7abd80443864bdd212fc2f53a7ae57578cac8ef5efe339171b9c5884af97322cbdcde84577fb9fab2e0bf329513d9bee51af3d79e75474e52fc SHA512 b3e41bb8039921425c1c6b2331629523bd642561796f49b631354b29c62222f5b2aabdb358b3f6569af7c5e679c057abe5ead9647592033fed436926a2ff467c
MISC metadata.xml 580 BLAKE2B 29e2c3d6f265a80010ab1c110bddcf2b32d0609c6cba665096ef1842d1f964f26672fe4f1fb051861115b7796888c98b8f458cdce4b5bdbc1ee94d5c2ea69c47 SHA512 87b708f2edca5e9b1bdbecf9ff34ab59ac4c2523840dd011e86fcdc91c7fa9cc7a908ae55b11eb09f3dd435124cd5689c1d370eeaf62ca163722ad75b9bf1e98
diff --git a/acct-group/unifi/unifi-0-r1.ebuild b/acct-group/unifi/unifi-0-r1.ebuild
deleted file mode 100644
index f4db39318eb5..000000000000
--- a/acct-group/unifi/unifi-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the UniFi controller"
-
-ACCT_GROUP_ID="113"
diff --git a/acct-group/unifi/unifi-0-r2.ebuild b/acct-group/unifi/unifi-0-r2.ebuild
new file mode 100644
index 000000000000..8cc4b89e2b27
--- /dev/null
+++ b/acct-group/unifi/unifi-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the UniFi controller"
+
+ACCT_GROUP_ID="113"
diff --git a/acct-group/unrealircd/Manifest b/acct-group/unrealircd/Manifest
index 0c009e1d33ef..e3577bc14121 100644
--- a/acct-group/unrealircd/Manifest
+++ b/acct-group/unrealircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD unrealircd-0-r1.ebuild 151 BLAKE2B 1e245b890815920593de450281f7c4b3122e21d39648bb0a5ab8de807ac6fc208e049cb42f72a6d5f8b85fff109bdfb4225c5e6643c7e31e9e5b01dcaa67d0bf SHA512 89e8e8bbe7d8e4e350894c1078cfcb5bde9d6cd0461fdc21768e070a53476739d6c97cb18b10bf46d925702c592e28a0e8b47c71140acddef3ee5c7957e20f2c
+EBUILD unrealircd-0-r2.ebuild 151 BLAKE2B 1bfb0067b3888df1088f9f08f8b484d0107e17e11038d9ac8be449eec7c38fd48d4e62a0f32e05ee1849815503c0ab690a69c695c844a833f73caff8ef4e641f SHA512 87cb82c8919aa8c808200d5953a8cbabfd2bd8d0beb0387f5144b31d45685c798c990f2d0c92a9e10160355542aa89705122fa9a5039862d1834925c86a0459e
MISC metadata.xml 354 BLAKE2B e6293be3ab53054ee019e6f1ffb7d9708ac9c484222a3c8246f071fdf330f5a55209e5795b94bf54ceac52d914aa769fb8be9516133531eb656079efe5f8b507 SHA512 3e73bc21404a047c69d7144e7c1daa0bb1b2203778bb1f98d0de1e6298b6641fb1e02c3dff88ef9ea11f60198a4fe2cbb6e884bb914cdfb0277c018f4406538f
diff --git a/acct-group/unrealircd/unrealircd-0-r1.ebuild b/acct-group/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index 70f925a3cf58..000000000000
--- a/acct-group/unrealircd/unrealircd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=494
diff --git a/acct-group/unrealircd/unrealircd-0-r2.ebuild b/acct-group/unrealircd/unrealircd-0-r2.ebuild
new file mode 100644
index 000000000000..6e9905dda3ca
--- /dev/null
+++ b/acct-group/unrealircd/unrealircd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=494
diff --git a/acct-group/upmpdcli/Manifest b/acct-group/upmpdcli/Manifest
index 951618163f5c..36b8595fab1f 100644
--- a/acct-group/upmpdcli/Manifest
+++ b/acct-group/upmpdcli/Manifest
@@ -1,2 +1,2 @@
-EBUILD upmpdcli-0.ebuild 179 BLAKE2B e3044b852f3e13f33a7a7dd7bfb8e288979011b24bb12920086e984ae9e152977704c29bc147b2bb8f0171432b8626708832a01406f3adbf07e169f837868723 SHA512 293d269e5d88841a759fe71042c31ed80d485f80c33a271c02b5b3e25c5ecd0ad265cb5e06b9ab9055898dd32e83a8bccd0d8741f1ae62b9055fb0222393ac30
+EBUILD upmpdcli-0-r1.ebuild 184 BLAKE2B 3517baea465a902eac2e35adfdeb536819a3f2718cfd9a79ebf34822fc996bc32ee64cac5b68891fb0575ae58b4cd710974e34e06fb5b31daed6ac590cfd73cd SHA512 190a825e5a0ee959d9981d57d22e520311211b1708d8b459a095213dbfc2623a757d4de5f3d43f6191d5cb9c93bd5be33bd4574a1c6a81b84994837e44ae160a
MISC metadata.xml 221 BLAKE2B 2d476ee9b4f837c436a8d48ccf3e1701c26fa9425db522f35db7eb9900b4b138e44d9f268157ad2158798ed289514445a8d67215d52276a040273bb390f54a77 SHA512 8ebc577b68909c54481d68bac9ad40cf736dd58107bc714adef6782eca59cdde7aca08edf3dd8f595138c6a5cacb8c7ff6af9633321f7dbf37a7e865da37bf0a
diff --git a/acct-group/upmpdcli/upmpdcli-0-r1.ebuild b/acct-group/upmpdcli/upmpdcli-0-r1.ebuild
new file mode 100644
index 000000000000..ad99f3ce7935
--- /dev/null
+++ b/acct-group/upmpdcli/upmpdcli-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for upmpdcli"
+ACCT_GROUP_ID=372
diff --git a/acct-group/upmpdcli/upmpdcli-0.ebuild b/acct-group/upmpdcli/upmpdcli-0.ebuild
deleted file mode 100644
index 1b73dccb8d2f..000000000000
--- a/acct-group/upmpdcli/upmpdcli-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for upmpdcli"
-ACCT_GROUP_ID=372
diff --git a/acct-group/uptimed/Manifest b/acct-group/uptimed/Manifest
index bb58fd5aa905..ee8431b9e70d 100644
--- a/acct-group/uptimed/Manifest
+++ b/acct-group/uptimed/Manifest
@@ -1,2 +1,2 @@
-EBUILD uptimed-0-r2.ebuild 153 BLAKE2B 88defd41b3bf2e8b89c32a7d25af3dd0181606b689b7af49198bf5f2920209760e7975b6d11327f4d794c3095e16c2227e189304d0eb4c8f582bacff3f761f22 SHA512 6f95959dbed87ac79d61f97150e447d9eca3bf7b9742cb17d118d62fbded185f1af7ed6ca2389fe7cc1756c634031ece6bd6251adb2c3ac735e005b27a2e0ff5
+EBUILD uptimed-0-r3.ebuild 153 BLAKE2B 378b9a48d791c9f169773bd0bef7365acee9e44d6b0038aa3f7f7a197343ec02e38266b793ee6d326d6b7bcab04710710583b84f0d65c12a02f599bf7cdf2a1d SHA512 7449d052b153cf69c4314e841941cdfd8fd1574a3fcf3298ff1484711ee06d54c51b93b1f533ef94c3aaef21d8b13f76b204cfa50ca2338b6116ba74d6df30a1
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/uptimed/uptimed-0-r2.ebuild b/acct-group/uptimed/uptimed-0-r2.ebuild
deleted file mode 100644
index 1934484e34a1..000000000000
--- a/acct-group/uptimed/uptimed-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="220"
diff --git a/acct-group/uptimed/uptimed-0-r3.ebuild b/acct-group/uptimed/uptimed-0-r3.ebuild
new file mode 100644
index 000000000000..9e862e5c5de5
--- /dev/null
+++ b/acct-group/uptimed/uptimed-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="220"
diff --git a/acct-group/usb/Manifest b/acct-group/usb/Manifest
index 858d7df1090e..386f72ac86af 100644
--- a/acct-group/usb/Manifest
+++ b/acct-group/usb/Manifest
@@ -1,2 +1,2 @@
-EBUILD usb-0-r1.ebuild 145 BLAKE2B 2ab1c3e22cd30c143d93686c4a7e071213e81b40d4ec213b75ed1020d665cfb5eeacc707e8e1a57034532712e081e94fb750c49539d7f3954a6d68d3739224a6 SHA512 963759fd019b9e749f48d13d953b2b78fab11b8a78a65ceee698c5dcf369472c243d4cce5559bd4eaf72375688a1e62b28e26d91232361e0fd46adcd04c48169
+EBUILD usb-0-r2.ebuild 150 BLAKE2B e4008cf7dbf83d2d9cafa1c5e91e47f137a49a977f61313a56d21e5b3e1274559306a834ac7a17ad2e0209646217c812c4e8f8710ef660cf8f1e7765d9695b53 SHA512 d7b2eeda566a681bd0fd6e9bd102bbc047611d299b284b23bd5460eda0478e299b4d908f3d2340616e8a58a09e4d13435b86a607944c5dfc8d7dfde947cdf2f6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/usb/usb-0-r1.ebuild b/acct-group/usb/usb-0-r1.ebuild
deleted file mode 100644
index 4655512049db..000000000000
--- a/acct-group/usb/usb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=85
diff --git a/acct-group/usb/usb-0-r2.ebuild b/acct-group/usb/usb-0-r2.ebuild
new file mode 100644
index 000000000000..8f739063b3e6
--- /dev/null
+++ b/acct-group/usb/usb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=85
diff --git a/acct-group/users/Manifest b/acct-group/users/Manifest
index e1399f053ce9..787e86cbe311 100644
--- a/acct-group/users/Manifest
+++ b/acct-group/users/Manifest
@@ -1,2 +1,2 @@
-EBUILD users-0.ebuild 146 BLAKE2B c4a4aaeaf3584733632091bf7d3a96c52070aa29cd251e328d0bae55fe63e10bbebfb18204a24046bdd2c0d5c0284de5569baf9f777bdc4b24e4332ec63ab5cd SHA512 731c8799c865e542f265563327786445fe9651fd9e598aeeb532a86f699c50190915b5998caaef1b4c81fe536e0380ad6033768530ff23d728c16e2925ddaef3
+EBUILD users-0-r1.ebuild 151 BLAKE2B 2d7ef6ea09a7705d6fe03b621364f658f9821c19c1e2f6197239f3f321c7bf8ad08e3e09e96a31693f8f62b87bef35fe915805e24d00fe09021340a9e633e859 SHA512 b9fb583bee7c842945eddbd1afe6709b29aacd2836980403fc439ef293ddc978e271763281064b55a6cec175ee2047204ead2302f52d7daf0c33d34ce0bfd81c
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/users/users-0-r1.ebuild b/acct-group/users/users-0-r1.ebuild
new file mode 100644
index 000000000000..c0c91d1e11a8
--- /dev/null
+++ b/acct-group/users/users-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=100
diff --git a/acct-group/users/users-0.ebuild b/acct-group/users/users-0.ebuild
deleted file mode 100644
index 50b573c2629d..000000000000
--- a/acct-group/users/users-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=100
diff --git a/acct-group/ushare/Manifest b/acct-group/ushare/Manifest
index 9a4d0c477e2d..27e475fdf384 100644
--- a/acct-group/ushare/Manifest
+++ b/acct-group/ushare/Manifest
@@ -1,2 +1,2 @@
-EBUILD ushare-0.ebuild 177 BLAKE2B 4bcb1e5aaa22ba3ce775f66c9274ad41cb8232805bd65d3a361eb45c7b84dd88d0282c2ea5acc3668112b20a0c9c60a844bf7bc9725b0ec596c87ed2fb33361c SHA512 2217e74204046f01a20397d9dd4e8f74a5a3012641b34fd9ec1f041c1a3678ccb9bf6b395a25b191f68e0a8f47b1757ecdcab38c4964e6edb6e17030cb4c897a
+EBUILD ushare-0-r1.ebuild 182 BLAKE2B c8455c24a937da477950b97ef6e2a861d264e8e2f069d06912b6c65ac8455c7c21cebb3696147c2ec3682f49304713d5bf97df5eea4ea978511c051c0871d5ad SHA512 3781596c0471938d0d7237580090ab698c95b2bd328900326a3a35131f0195c3a5fb1488a3c2b9db350848746cfe569779a05f30aad8f28293500b54bfda7ec6
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/acct-group/ushare/ushare-0-r1.ebuild b/acct-group/ushare/ushare-0-r1.ebuild
new file mode 100644
index 000000000000..3cfb444c312f
--- /dev/null
+++ b/acct-group/ushare/ushare-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for uShare"
+ACCT_GROUP_ID=349
diff --git a/acct-group/ushare/ushare-0.ebuild b/acct-group/ushare/ushare-0.ebuild
deleted file mode 100644
index 43678d459806..000000000000
--- a/acct-group/ushare/ushare-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for uShare"
-ACCT_GROUP_ID=349
diff --git a/acct-group/utmp/Manifest b/acct-group/utmp/Manifest
index 162bf8b18a22..b69fbd58238d 100644
--- a/acct-group/utmp/Manifest
+++ b/acct-group/utmp/Manifest
@@ -1,2 +1,2 @@
-EBUILD utmp-0-r1.ebuild 151 BLAKE2B a51cec78adb0f69d3df26fcac2a84e642ed9cfe5f1cf1589d70c9ac65f776ee17cd64fec33fbe79bb73e53d4a02f4fbf6b3a167a7ce13d2a7c62fe1fae6eace4 SHA512 52616c17a5b00bbaff9f25b49ecfb34630d79bea3cac153b2639a7804092d574f5309cda690a9c890c5ee8d04adf0dff4fd27393922a5e1425d74ea5cb367767
+EBUILD utmp-0-r2.ebuild 151 BLAKE2B 1b0455e23248d518445789208048755d495b4ed0230018cf26efae0a79a417ae250e8d2b1f9179176e0a8ae258365c9beb56c9bd9d5ed3ca9f562372c15d1288 SHA512 bf65da29c7ecf0d6dd23e429755fdfba37258ed5e4f3469ec0bd9f201f04978a56606c3f879bde7ccd1449fab4f1727279871d7882cff5ec7c723f58683003f7
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/utmp/utmp-0-r1.ebuild b/acct-group/utmp/utmp-0-r1.ebuild
deleted file mode 100644
index 24664616643a..000000000000
--- a/acct-group/utmp/utmp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=406
diff --git a/acct-group/utmp/utmp-0-r2.ebuild b/acct-group/utmp/utmp-0-r2.ebuild
new file mode 100644
index 000000000000..023d71c363c8
--- /dev/null
+++ b/acct-group/utmp/utmp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=406
diff --git a/acct-group/uucp/Manifest b/acct-group/uucp/Manifest
index 516cfdb694df..816f17f4018a 100644
--- a/acct-group/uucp/Manifest
+++ b/acct-group/uucp/Manifest
@@ -1,2 +1,2 @@
-EBUILD uucp-0-r1.ebuild 150 BLAKE2B 20579c48bbf7052848baee0a3d968e212b564a9f47619388bb7dd26e52890d4f934ab220eb6cb767020ad0a0319960135f2822afe3b2f46a5a65a0bb5029c770 SHA512 df7377e23327832ebbc055c2f05983da5cf52f2a0a5d2b220f7cae28585c36f2df8efbff96f92255364b95b438d0ce1b478b261d0c0cc39278cd2c5a19fbd7c2
+EBUILD uucp-0-r2.ebuild 150 BLAKE2B decbbb641e19e96fb1cb2c63cd527d4b00707300eb839eb3cedfcfc9f2c861f93e80fedeb7795ca58ccce3f732fd08e85295ac35795ee32604f5a2d39a3c6964 SHA512 287d6ab34c410f269a7750d8d344e4f6f0eea95e450a1dd2fa557c5a3724d15528195b88194493f1920aebc81fcf21daafad66eae9c263a45452324e9db4ee9b
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/uucp/uucp-0-r1.ebuild b/acct-group/uucp/uucp-0-r1.ebuild
deleted file mode 100644
index e2e32b62e410..000000000000
--- a/acct-group/uucp/uucp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=14
diff --git a/acct-group/uucp/uucp-0-r2.ebuild b/acct-group/uucp/uucp-0-r2.ebuild
new file mode 100644
index 000000000000..4a2dba7d1e89
--- /dev/null
+++ b/acct-group/uucp/uucp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=14
diff --git a/acct-group/uwsgi_exporter/Manifest b/acct-group/uwsgi_exporter/Manifest
index f4181bec3e9a..4d985d5ce24b 100644
--- a/acct-group/uwsgi_exporter/Manifest
+++ b/acct-group/uwsgi_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD uwsgi_exporter-0.ebuild 207 BLAKE2B 80cc391b4c0d7ee7e5119e0bd02a9078cbaadca69cbc70078ee597c1c645e32a2a24628d0a9562f37b3a28ba4b1e3287f01c11ad46b50ae3e1a45ab69735ce29 SHA512 a616c801d56e29b68f541d3d7059be1627b088314818bd6a060620a9656cb244a2d619858a92e72fef4b18b1e42258ea47af5021ef71aaa2c1ad76d96464e28d
+EBUILD uwsgi_exporter-0-r1.ebuild 207 BLAKE2B 9a306afaab5a91d464ce55917670fa8c4d5ea43a79503b2333ab0250e9c18e2048e4fca00ab908944a062cdf338be5e32159bfc3aadd546befdb3a363d729db4 SHA512 1d49291fbf3eccfde79a394ea20797c69e5447686e11a37c1b7df12f73880d08bf191221daba527db9b762bd74e435790fa4c753f1fc66a9a4927cfec8b66c92
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..2d2d1d5b3ec5
--- /dev/null
+++ b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/uwsgi_exporter"
+
+ACCT_GROUP_ID="289"
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
deleted file mode 100644
index 4c7c20d457ec..000000000000
--- a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/uwsgi_exporter"
-
-ACCT_GROUP_ID="289"
diff --git a/acct-group/vacation/Manifest b/acct-group/vacation/Manifest
index aa2d80014839..55a9ea515a82 100644
--- a/acct-group/vacation/Manifest
+++ b/acct-group/vacation/Manifest
@@ -1,2 +1,2 @@
-EBUILD vacation-0.ebuild 202 BLAKE2B 9d5a031f8918f93846e9e7ad53b988b47f0fabf2a8d31b1f94fdaf0b8d28f80c65cc4455ecea1b1378e5495e334077242302a3ec411588f413eafdb0881b718c SHA512 46296c551ab2d2b112589d84039a9a7dceb6820b75fe3545e37e1da6aa51f491db4d633cbd5c5be7ca62bc2c085ec35871a4550448d3a643e7cce20062720777
+EBUILD vacation-0-r1.ebuild 202 BLAKE2B ec3d19e0a87a65491d9c0500b4619fad2074de1c931fed82c1b11ed9485716904a2cad082cd61ec72c22118437ee744beb97f2fc662ea83027dbbf87021a75be SHA512 c6eb275c2da76d4317c0fb269a3ec26418597ed72057709abb9911fd27df49c8881fc76fcddc5b7d32a114a080274ce2ecf7980a7b3e5afc4b2a5d4b9fb5459d
MISC metadata.xml 365 BLAKE2B 525d0782e438a536ebb72d196efcaa8ec809b12a1aa3be17b4a1171cf3f41282ccf1a000fbeb3bbc81a296a7c97742c6c5a6c4794d10859566b2d4c927caebb2 SHA512 e527c901611d310ce54e32b4ec518477b8421cdde73dbb9b2d1e8cadf3de8ff291229556264a5275d94952c5b7e77ee7cec80febccae455b253a69b786a63c32
diff --git a/acct-group/vacation/vacation-0-r1.ebuild b/acct-group/vacation/vacation-0-r1.ebuild
new file mode 100644
index 000000000000..6214a9b58c91
--- /dev/null
+++ b/acct-group/vacation/vacation-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/postfixadmin"
+
+ACCT_GROUP_ID="125"
diff --git a/acct-group/vacation/vacation-0.ebuild b/acct-group/vacation/vacation-0.ebuild
deleted file mode 100644
index 94ef2caa53ed..000000000000
--- a/acct-group/vacation/vacation-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/postfixadmin"
-
-ACCT_GROUP_ID="125"
diff --git a/acct-group/varnish/Manifest b/acct-group/varnish/Manifest
index c4f8db8f946f..eb607d6d594e 100644
--- a/acct-group/varnish/Manifest
+++ b/acct-group/varnish/Manifest
@@ -1,2 +1,2 @@
-EBUILD varnish-0-r1.ebuild 183 BLAKE2B 24a0307f9bf440d43d020f593224e5c445d216218a598bdf3d144967a583fef8c36825778700649c6260836217bd4e7ec036bf449e040da08f322afb499b9bdb SHA512 4f46403ce1002ce697108debaf7695521be283db40cdf1abf393cc08910b777639a55dbc5692b9f805c39d10868bdf7cb12e1b858f0ec1169c1445fc65e274b5
+EBUILD varnish-0-r2.ebuild 183 BLAKE2B 6f8733fb61f7c9521c0f9f9442c54b1c7a9eb46bcfd1ccd0e243bb218e69eead01951a6cd4c598cec0e1e59c6467048d2e007ea6143d7fe347681db0f4859b4b SHA512 3a5922dff413fab90e408525880266e98a8991c2cefb989af2b1dd4f33802d4002274518913d8aec5a2e5144bbc96beb122e2e13360bf7d447ca13802412f25e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/varnish/varnish-0-r1.ebuild b/acct-group/varnish/varnish-0-r1.ebuild
deleted file mode 100644
index 9fbcc6472b4e..000000000000
--- a/acct-group/varnish/varnish-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for varnish"
-ACCT_GROUP_ID=474
diff --git a/acct-group/varnish/varnish-0-r2.ebuild b/acct-group/varnish/varnish-0-r2.ebuild
new file mode 100644
index 000000000000..78dafd64efae
--- /dev/null
+++ b/acct-group/varnish/varnish-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for varnish"
+ACCT_GROUP_ID=474
diff --git a/acct-group/vault/Manifest b/acct-group/vault/Manifest
index e856e9542fa0..c43d46851972 100644
--- a/acct-group/vault/Manifest
+++ b/acct-group/vault/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault-0-r1.ebuild 146 BLAKE2B 12c2f95581e51f868012852d249670a5fdf52dda2aee8367e214df15511aefc769b10943ed157058d4f744b9a146e84a0b3ead7a65944cda727b56fe143157cf SHA512 893aeb6273528b04128e6e20a4a1ea7cf26fca9dd80fc891ebcabda0b9fda00c46229fcd490ab5f1854462263594df8f0029982de669c613352d84024bd29931
+EBUILD vault-0-r2.ebuild 151 BLAKE2B 70410d1bfb12d8cb811c8ca35991da974791ba397d97c47dc1ceacb7b0c08671adc5da2ad6527eb8d139d7ba282071c296efec2fd79e25e41080e0482a46f848 SHA512 e712b1d284054785ca2e7206d69753a942fff2720483f77d5aea3eb9e18c5cc58cd311f8bfa9b086cf0b330178f6ed7c06f641bb7610fb440eb19604e07ea15d
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-group/vault/vault-0-r1.ebuild b/acct-group/vault/vault-0-r1.ebuild
deleted file mode 100644
index 518aa5cb3111..000000000000
--- a/acct-group/vault/vault-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=410
diff --git a/acct-group/vault/vault-0-r2.ebuild b/acct-group/vault/vault-0-r2.ebuild
new file mode 100644
index 000000000000..bd459568b12e
--- /dev/null
+++ b/acct-group/vault/vault-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=410
diff --git a/acct-group/vault_exporter/Manifest b/acct-group/vault_exporter/Manifest
index c8a4c8a8a26e..729befaae5e6 100644
--- a/acct-group/vault_exporter/Manifest
+++ b/acct-group/vault_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault_exporter-0.ebuild 207 BLAKE2B 9f72438ef4a298e48d9ea94dd02eeb2842170394394bd26793ee523187ed4c1bd8ac36f65821c634ec4aa1d863515be67aba81d51980ff0089a29346eaf9c2e3 SHA512 c352021660d01de67065361f3cc78136d4221e8ab449768e29a524adad894787b160bfd4db4617077ffb4ebcf9dc970a186352cf90c9f302dfb48c61ce3ce1cb
+EBUILD vault_exporter-0-r1.ebuild 207 BLAKE2B 33029b82bdb9520c4da9abd68c58af54874f346db8b5cdc5fa19c3c75652c4e0286a82684a2a991324f5d1afa900cf3f7b732bc612c22f7a67140b2b4e510761 SHA512 e455408cddc43e81348f7b7758c52ec0a110bb0b2c11f69b9eafaa92b0e8cd418374ee938c40b1e6d4faaa7230d27fa58061807e8331c8b5bb002d3faeddb7ba
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-group/vault_exporter/vault_exporter-0-r1.ebuild b/acct-group/vault_exporter/vault_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..75c5cf1352b1
--- /dev/null
+++ b/acct-group/vault_exporter/vault_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/vault_exporter"
+
+ACCT_GROUP_ID="323"
diff --git a/acct-group/vault_exporter/vault_exporter-0.ebuild b/acct-group/vault_exporter/vault_exporter-0.ebuild
deleted file mode 100644
index e808ce81aad1..000000000000
--- a/acct-group/vault_exporter/vault_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/vault_exporter"
-
-ACCT_GROUP_ID="323"
diff --git a/acct-group/vboxguest/Manifest b/acct-group/vboxguest/Manifest
index 94599d7d7aa9..96745e60f191 100644
--- a/acct-group/vboxguest/Manifest
+++ b/acct-group/vboxguest/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxguest-0-r1.ebuild 151 BLAKE2B 142aa03f577f4cb0bc5c3d9f00f0170024b0931e96bcdec32f0298a0f2eefd1f204fa99c99951f8c21c729d357cea8b5f6503ba654a2dd29ee3a82c4e8bf317c SHA512 ebefbfdca1bee6e6cf26022ada080cea2b3aae751a0b47b15474ea983c7318baea6d3bc81779b61b09ad31600108238dd833c1ccb12c1edede7c32e2b9cb4acb
+EBUILD vboxguest-0-r2.ebuild 151 BLAKE2B 33728c89d068713d432e646c1acad58287eae12e61753bc9b2827f77347049ee3ef7fa5d38db322808006615d580eb2561720fbace767182ba3409cc5013e39a SHA512 8d621f4a59a8cdbd91a216bf1988b6b1a69a509418afbb4b5121a7e0a2ed7b84636f20b529cd8ab8950bdd34a6cf2cb8e2691511841a02b1323b437d821e11ab
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/vboxguest/vboxguest-0-r1.ebuild b/acct-group/vboxguest/vboxguest-0-r1.ebuild
deleted file mode 100644
index 8f7c117f5882..000000000000
--- a/acct-group/vboxguest/vboxguest-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=305
diff --git a/acct-group/vboxguest/vboxguest-0-r2.ebuild b/acct-group/vboxguest/vboxguest-0-r2.ebuild
new file mode 100644
index 000000000000..41282da59a0f
--- /dev/null
+++ b/acct-group/vboxguest/vboxguest-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=305
diff --git a/acct-group/vboxsf/Manifest b/acct-group/vboxsf/Manifest
index e0d269fb903c..829ee89ec027 100644
--- a/acct-group/vboxsf/Manifest
+++ b/acct-group/vboxsf/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxsf-0-r1.ebuild 151 BLAKE2B 937e9d5e2c72dfbee04c0079b7aff13a19a076652edd81dada10484d8d0c0e3a3e81fff01eb175cafcd268f8e0d8b108318ee9e34db62f1d17f3ca836478a933 SHA512 0b2ce1453edae56057c6aa6a3be6f0b11251fd7d708572a988c43d927a008cc83f84e6d0141b2ec24c98452af4974b42d694d054f29cb64d23b0547779bc6848
+EBUILD vboxsf-0-r2.ebuild 151 BLAKE2B 12f6fd40af950124d9508fb38cec43bf4e82b661e806e7ab40a5b579271c7386b408ae66aa9c97a92377cf0f768bffdfeff02aa93ccb366c25e3a1bc2a472915 SHA512 7601139026acdaa7e7c35a93a5e1c156c2ee3ddf7c08c62c2579f8823417eb352fe26efe323cb56b16846ac1f308dd6744592912202da82c4678d5dfd9fa6573
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/vboxsf/vboxsf-0-r1.ebuild b/acct-group/vboxsf/vboxsf-0-r1.ebuild
deleted file mode 100644
index 6b6336afa19f..000000000000
--- a/acct-group/vboxsf/vboxsf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=306
diff --git a/acct-group/vboxsf/vboxsf-0-r2.ebuild b/acct-group/vboxsf/vboxsf-0-r2.ebuild
new file mode 100644
index 000000000000..2b8cd4dfef06
--- /dev/null
+++ b/acct-group/vboxsf/vboxsf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=306
diff --git a/acct-group/vboxusers/Manifest b/acct-group/vboxusers/Manifest
index e54d12894a94..f546fdc8a8d7 100644
--- a/acct-group/vboxusers/Manifest
+++ b/acct-group/vboxusers/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxusers-0-r1.ebuild 151 BLAKE2B 4c973b9fd6f057d27376cad70f9186dbece01c7ba137167cf833e7925f206799629e8f791c702c451d057767e67290dae1b37224c0a05dec3f8e2e4d3f7a68f2 SHA512 53a1823c8212f61efacced2ac67a157a5def80a08678976a26ae33b160d47655cbada330d91b30a3863ec37200b0f509e0192aa9d0f394a0c479ef89956a93c2
+EBUILD vboxusers-0-r2.ebuild 151 BLAKE2B 29345d8ee8afcb19a6142e33b755a6e00c24b7bad4c7ed698155937e82ef9613ca09df71b8fc77d45761573969765e9a0e800adb02139599959c7164f32384c0 SHA512 588748d5268c5a9ef92a6d2ea6447dfebdfd8902e594533f1233f85d7cccb2b921481b59bf4d2c1b39b7af58b4b999ccc9320b59e5c409c0a4b3636610d0dbd6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/vboxusers/vboxusers-0-r1.ebuild b/acct-group/vboxusers/vboxusers-0-r1.ebuild
deleted file mode 100644
index ce349b0fcdf7..000000000000
--- a/acct-group/vboxusers/vboxusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=304
diff --git a/acct-group/vboxusers/vboxusers-0-r2.ebuild b/acct-group/vboxusers/vboxusers-0-r2.ebuild
new file mode 100644
index 000000000000..81e73edb6bba
--- /dev/null
+++ b/acct-group/vboxusers/vboxusers-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=304
diff --git a/acct-group/vdr/Manifest b/acct-group/vdr/Manifest
index ceabc276633d..668373976a86 100644
--- a/acct-group/vdr/Manifest
+++ b/acct-group/vdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdr-0-r1.ebuild 208 BLAKE2B a55bd513896ec5b08e9a8eb9d1ebf8b7ae925aa5614f4c786cb4933e40d897e1e8a44ff61a723d411b2c0cfeda40794eb7cbe94b7755ef5ec14ac2798caed7b3 SHA512 d6be4ca4431c873ba1c733bf2c36e6ed9cfb5883cca934926574508bc076ca1322a135845cb917461c4b574d84b84790ccbd96f75b6df08c072ec66790317745
+EBUILD vdr-0-r2.ebuild 208 BLAKE2B 0db8986d109ff819b6e39f77330cfb9c89b0006348f359bcee3b352b03aac923bfee1cb31188dcd7fbf8ee1d1ef99f66059fb926d5bd21f5941ac0ce7424b466 SHA512 f2ccddf86e748881cb2aa9a5da7926a69edefe14ee5bc65169c2b4a10d8e7d30f0ae3526636b9a00ef165a9f2d636fc2142fe169ee65f3e29c63d16e8300221c
MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
diff --git a/acct-group/vdr/vdr-0-r1.ebuild b/acct-group/vdr/vdr-0-r1.ebuild
deleted file mode 100644
index b150a48a3abe..000000000000
--- a/acct-group/vdr/vdr-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
-
-ACCT_GROUP_ID="452"
diff --git a/acct-group/vdr/vdr-0-r2.ebuild b/acct-group/vdr/vdr-0-r2.ebuild
new file mode 100644
index 000000000000..edc442a09c5e
--- /dev/null
+++ b/acct-group/vdr/vdr-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
+
+ACCT_GROUP_ID="452"
diff --git a/acct-group/vdradmin/Manifest b/acct-group/vdradmin/Manifest
index 156b89443a39..e3e5b5ba215d 100644
--- a/acct-group/vdradmin/Manifest
+++ b/acct-group/vdradmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdradmin-0-r1.ebuild 192 BLAKE2B a76f6b3faa0ba02e4ada02bd864d3355bf7f2e58670ed3c6316e58f3af7b1538dd6e09885aaa928d895f503580e05643fcc5c36a4d16357569acd5f81903000b SHA512 e5a6ef898ce8c250a20d5296072e39389b5c225cee124fe6c4a49b2ad2011478c1880551de0b8c80f4e87504d43cb134c7334a27aefb7031895d8ee707d97c70
+EBUILD vdradmin-0-r2.ebuild 197 BLAKE2B dd5c45c1a8a084d7d8d1c37976077b77d9000a736ffefefb7b0e42031b2007378bb5d82c532a820d58ce1001c250de7eaa7db58d23d410a100acebaea0da7a35 SHA512 2210e0818fd3a251b9b21e7d0ce3246b4ecb0e6aae624b1d00d73a7adc36a1c20bb9c615b23ec1d7ef3a5a4572784f139af71f267dbe5ee08adde0d59fd59604
MISC metadata.xml 246 BLAKE2B fa708d64ea2840e21fa1a00402de140be19ef4c1cf90b00fcd40f2ab10fe5e1397e5bd0a259162c3571a01056535d42d4cb492e97e6ae1756d38831019463db0 SHA512 503c7151fa63101f3a082546d033ecabb7f5ac47f752200d450faaa46c2cd6dfdfc387aa029ad8cb5786d91f7217a3ba64d92dc21ce9268de823fd58feed7db6
diff --git a/acct-group/vdradmin/vdradmin-0-r1.ebuild b/acct-group/vdradmin/vdradmin-0-r1.ebuild
deleted file mode 100644
index 458e6b888862..000000000000
--- a/acct-group/vdradmin/vdradmin-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-misc/vdradmin-am"
-
-ACCT_GROUP_ID=453
diff --git a/acct-group/vdradmin/vdradmin-0-r2.ebuild b/acct-group/vdradmin/vdradmin-0-r2.ebuild
new file mode 100644
index 000000000000..88460ab332c4
--- /dev/null
+++ b/acct-group/vdradmin/vdradmin-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-misc/vdradmin-am"
+
+ACCT_GROUP_ID=453
diff --git a/acct-group/video/Manifest b/acct-group/video/Manifest
index a2a443ddc797..055b62e8bd83 100644
--- a/acct-group/video/Manifest
+++ b/acct-group/video/Manifest
@@ -1,2 +1,2 @@
-EBUILD video-0-r1.ebuild 150 BLAKE2B be60f47b441ae5cf16f55b9e63d6f2b086c0692cd72be81e3fe993b4b3e12ab448ac52098a382704f6a225796a8ce03dc2187ebd7238ea84f5f891a114a253f1 SHA512 5aa1647de8517f1374c0b1728c6970f7475cdd47e80e23b9bfeba7e783768bd06ad0a80cf7cf7768e5cc168a0db8aaf03361ec211723f40e71e327bdd186c95d
+EBUILD video-0-r2.ebuild 150 BLAKE2B e19a3d6161d312b898d0464864fb02109950b183f703069fd71c81d3601b9eaa458b473efbed8d31d53b0912376b886717b23ae10a8baafc49b621a38c2a8b67 SHA512 4a28cf20576a27380ee5ab02101b16fadd0f5fe8d12be4a67a2f2838976bac7c7972d0858e2ec589105fef816a28090bbb9b40befc7198765fded99a9ae03b28
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/video/video-0-r1.ebuild b/acct-group/video/video-0-r1.ebuild
deleted file mode 100644
index 3b06b5be9d79..000000000000
--- a/acct-group/video/video-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=27
diff --git a/acct-group/video/video-0-r2.ebuild b/acct-group/video/video-0-r2.ebuild
new file mode 100644
index 000000000000..cbcaf294640b
--- /dev/null
+++ b/acct-group/video/video-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=27
diff --git a/acct-group/vlock/Manifest b/acct-group/vlock/Manifest
index 5003a2c87fdb..cb70aa170c8a 100644
--- a/acct-group/vlock/Manifest
+++ b/acct-group/vlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD vlock-0.ebuild 195 BLAKE2B 941304bbe86c06e31bad40820f3adad16ee4237de3984e0119c7941b87bd51559ead361fe25b7796c7e77e2634f8467421f708f841c49564f3268940f12f735a SHA512 cb357cdf25e2e02dadfd14452eeae047f484ce2adb17f699c4c730016902bbe8095ea439ccab0a428b879db6aef8231265dd5aa9fdd828bc6b0b930aa9b9587f
+EBUILD vlock-0-r1.ebuild 195 BLAKE2B be39c82a52657adf0d7f320e18d0d7824df3e1a6a2a2de2c1c0a86711a7c4353d67272021c4e8875a08ed25ba993d4e6d3ebe40d67227ab8d16211b55f1268aa SHA512 17e25e209c226d14711f6fab13d579379b8456efeb91985c6de018c88129a9d55929ef673867af5f11a4125359997f7dfc4a99dcc116c5372d213c58aa662889
MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/acct-group/vlock/vlock-0-r1.ebuild b/acct-group/vlock/vlock-0-r1.ebuild
new file mode 100644
index 000000000000..086049300d62
--- /dev/null
+++ b/acct-group/vlock/vlock-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/vlock"
+
+ACCT_GROUP_ID="178"
diff --git a/acct-group/vlock/vlock-0.ebuild b/acct-group/vlock/vlock-0.ebuild
deleted file mode 100644
index 5f73550404af..000000000000
--- a/acct-group/vlock/vlock-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/vlock"
-
-ACCT_GROUP_ID="178"
diff --git a/acct-group/vnstat/Manifest b/acct-group/vnstat/Manifest
index d125949420e9..2adb1ac11c1a 100644
--- a/acct-group/vnstat/Manifest
+++ b/acct-group/vnstat/Manifest
@@ -1,2 +1,2 @@
-EBUILD vnstat-0.ebuild 196 BLAKE2B 489a1d3517b03f3b20c854aa7a05e130723a686a23e7692a500a684c83ff38046d9aa302480fe064bce8ba1621fc4fd08332221126752201ead937df397cebb4 SHA512 84ba2a5a2d67e3e9b3581ad9a5bae116b3135ffd8404d06a8ad7f6002748b244c69a271bfe16211291054f291361513b4514cd9342337362aa9bd9a11112bf09
+EBUILD vnstat-0-r1.ebuild 201 BLAKE2B c70292a26ee3444688c9cd508c6276f4064933feddf12482c9a739075328a7d088d08c36a38f9edcefffcf78f89a1c5d2ef14209d34aa048422e497a1c68eaba SHA512 991a5df1efa3634a93a1d0152471beaea88595a438bdab50960590a604a12362c35bfd444f2157e8ab3e249128903a951f7abfff6e3c551ff228d12424fc1238
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/vnstat/vnstat-0-r1.ebuild b/acct-group/vnstat/vnstat-0-r1.ebuild
new file mode 100644
index 000000000000..d33a0de72d50
--- /dev/null
+++ b/acct-group/vnstat/vnstat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for vnstat network monitoring"
+ACCT_GROUP_ID=229
diff --git a/acct-group/vnstat/vnstat-0.ebuild b/acct-group/vnstat/vnstat-0.ebuild
deleted file mode 100644
index 9eba86cbc629..000000000000
--- a/acct-group/vnstat/vnstat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for vnstat network monitoring"
-ACCT_GROUP_ID=229
diff --git a/acct-group/vpopmail/Manifest b/acct-group/vpopmail/Manifest
index ed251f96e992..2481536eb926 100644
--- a/acct-group/vpopmail/Manifest
+++ b/acct-group/vpopmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD vpopmail-0-r1.ebuild 150 BLAKE2B 388466bd112e73a95baba51483e3b5372b8d9c6a6e7a354df14445feea59b910e15b991c57f4a5da4110bf3365e15aa42f479445e74ab8419fc56310671ffe88 SHA512 06a3012d292fe0029e7686781186df86bd6a9a578b9b2885c968f88f8fb78f84caf4e5308aed3305112b76957ed9cf1ba9628ea9a2e7fdb74338ca921b78c16e
+EBUILD vpopmail-0-r2.ebuild 150 BLAKE2B 31279202a990e3137ff476fde27265c6eabf82b2b08fad162a26c0a20e4d25378c4fa9a3300d40f65065a8b3171b33b5bf7acb91b7b52a11e5c9f6eafa922d97 SHA512 573fd8827efc4ec8ddbbe36cdff8e360322aa3c779f6b4ce13b397ffd0ea4b54ef2f4880a5a7cbbcd17c0a5e4659227a6245603a0590fb10cae03a7a5a31e53f
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-group/vpopmail/vpopmail-0-r1.ebuild b/acct-group/vpopmail/vpopmail-0-r1.ebuild
deleted file mode 100644
index 05fca0f655ee..000000000000
--- a/acct-group/vpopmail/vpopmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=89
diff --git a/acct-group/vpopmail/vpopmail-0-r2.ebuild b/acct-group/vpopmail/vpopmail-0-r2.ebuild
new file mode 100644
index 000000000000..970296853684
--- /dev/null
+++ b/acct-group/vpopmail/vpopmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=89
diff --git a/acct-group/wesnoth/Manifest b/acct-group/wesnoth/Manifest
index c6d75673af1a..35297f7153e8 100644
--- a/acct-group/wesnoth/Manifest
+++ b/acct-group/wesnoth/Manifest
@@ -1,2 +1,2 @@
-EBUILD wesnoth-0-r1.ebuild 151 BLAKE2B b74a6c0b84fcb0ee35b9f981a7f45cd30590101f287a93320617006b57e1cbf87b2f9c0965b8e62b0f9f1f2e1a16618db0e9439c91f1a46ecc1571e7feeb0ec4 SHA512 660f65c0abff8147dfd8d641d7e4f978fc38df473fe9ed70506b8b1d445da71931f95c25f3a74abef3269ac78e0e877988e025e4aa0502fbf2ff00cc215b1632
+EBUILD wesnoth-0-r2.ebuild 151 BLAKE2B 6b4930d92187d8371551aa565659df41487ca6fa292a0ea56511bca7ceee4147c6e5097559927ddc9233e47744d68331843552fb7c29bd36edc2bc03ad1e3ffd SHA512 be2a7e02f2b9ebb5d95e3ed1cb1428cc3e8baf7e389cd246f7c2a129380bd5dd441bfa44e33793adb498de7d697038a9fcbb2542116682be66b4ec6b9e98547f
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-group/wesnoth/wesnoth-0-r1.ebuild b/acct-group/wesnoth/wesnoth-0-r1.ebuild
deleted file mode 100644
index 434362fd312c..000000000000
--- a/acct-group/wesnoth/wesnoth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=419
diff --git a/acct-group/wesnoth/wesnoth-0-r2.ebuild b/acct-group/wesnoth/wesnoth-0-r2.ebuild
new file mode 100644
index 000000000000..b5b457394987
--- /dev/null
+++ b/acct-group/wesnoth/wesnoth-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=419
diff --git a/acct-group/wheel/Manifest b/acct-group/wheel/Manifest
index 45d24ebf7bc5..33f131062524 100644
--- a/acct-group/wheel/Manifest
+++ b/acct-group/wheel/Manifest
@@ -1,2 +1,2 @@
-EBUILD wheel-0-r1.ebuild 150 BLAKE2B 50ab84c5ab7a6e7d4e55b343e79a976a6d0a6c244195d5fd72602184fcdf69b61fc64588ac20c1c0160065aee4c7cecb6b8c2c9af5d75e2062ae6e153e65290e SHA512 6c80c6291689cd671307f3ec07b36019668197b5b739f40a35230a3386ac0f3dfc9ff9631b2cc81bcd7847845432178db93140daea86a2be15ab13fcd594cfad
+EBUILD wheel-0-r2.ebuild 150 BLAKE2B e37344d28cec22235dabd50c52fbe54478cc14f35715b2bc138c3a19259bc3c2ddb9ea4a486f03d1eb95aa0954437a41f27115eed0b73e0322b89e39972882b8 SHA512 868f1e1442cd9dabb74f4ad1a25d56b07eba7ef954daebc52bfa3f14577f7cfc0bf4f6596c4d216e367c55111bcf918c1bb1688c85538755c2ae23ea885f4775
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-group/wheel/wheel-0-r1.ebuild b/acct-group/wheel/wheel-0-r1.ebuild
deleted file mode 100644
index 8f5f3e4f88b7..000000000000
--- a/acct-group/wheel/wheel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=10
diff --git a/acct-group/wheel/wheel-0-r2.ebuild b/acct-group/wheel/wheel-0-r2.ebuild
new file mode 100644
index 000000000000..b1925f5da53b
--- /dev/null
+++ b/acct-group/wheel/wheel-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=10
diff --git a/acct-group/wwwoffle/Manifest b/acct-group/wwwoffle/Manifest
index 18fedba18be4..2af1231be790 100644
--- a/acct-group/wwwoffle/Manifest
+++ b/acct-group/wwwoffle/Manifest
@@ -1,2 +1,2 @@
-EBUILD wwwoffle-0.ebuild 197 BLAKE2B 215dff4c0217e70de4392824eca8e1a44768e085a3063988bd260e60df0c7aa2b3ff5a6dd62d968c67314ccd00742dc43aaf0270a07a2f9cc8f0ea4894ab1dfa SHA512 8862fddbbeb164d21004585ae84997748fb4d092bb0c3f930685771850e8426a81fff2342ae36e9baf51ae310ff536fe72b64027b60e5a188a0237be2c8769b7
+EBUILD wwwoffle-0-r1.ebuild 197 BLAKE2B 48561f60bc2b23145c105b82933842d495b85e4bd0b0c3b7c491c8d2a6a7c95da13464d65b44ba850247569d20632302b9a3b24fc84f119a44bb3ec7316d7d6d SHA512 77685f0059a401d5093427494ca219d7f4594ca35d3d5d54d964c261e25b87dde1d9ed5d0337a75b461751ad00f6574c4e76741c58fcdc53655896df71c1fbd3
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/wwwoffle/wwwoffle-0-r1.ebuild b/acct-group/wwwoffle/wwwoffle-0-r1.ebuild
new file mode 100644
index 000000000000..56285ff1380c
--- /dev/null
+++ b/acct-group/wwwoffle/wwwoffle-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/wwwoffle"
+
+ACCT_GROUP_ID="251"
diff --git a/acct-group/wwwoffle/wwwoffle-0.ebuild b/acct-group/wwwoffle/wwwoffle-0.ebuild
deleted file mode 100644
index 05d1c23d5ebb..000000000000
--- a/acct-group/wwwoffle/wwwoffle-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/wwwoffle"
-
-ACCT_GROUP_ID="251"
diff --git a/acct-group/x2goprint/Manifest b/acct-group/x2goprint/Manifest
index fdb1540ebeb4..d74aeb7b491c 100644
--- a/acct-group/x2goprint/Manifest
+++ b/acct-group/x2goprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2goprint-0-r1.ebuild 195 BLAKE2B eb89af7ead842785ec65956fa4bbe93e22b5445e74e50b227140d2d57e579de0893f5344f163ed6c3d5598885b4e63893a6a3d4071b2bd364f8a10d62395adf9 SHA512 bd6a238a1b70ac205d7b486279324b619842c2803bcaf4b8368908399c3471b354569d6fe6c524e881014adbefe612840cd2af50c6e868b984b52ca0bae5ae47
+EBUILD x2goprint-0-r2.ebuild 195 BLAKE2B b21efe9c46f49ee2fd8f3079b3cae493b0d3c5e5450c26c3549e401b4c83c9f6dfb0e7b16dcbba9800f70dbdae59dbb801ea749c20c7a49afcc91fb45f95f5fb SHA512 71ea1ece28193deef03f30875c321ee779eced0d531c9cfd6a561b8c1fd6d44e4f16506432784a2349ef161e606692e711018ccfdf694e696a22761b48c347a1
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-group/x2goprint/x2goprint-0-r1.ebuild b/acct-group/x2goprint/x2goprint-0-r1.ebuild
deleted file mode 100644
index c81c3e3ac695..000000000000
--- a/acct-group/x2goprint/x2goprint-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=292
diff --git a/acct-group/x2goprint/x2goprint-0-r2.ebuild b/acct-group/x2goprint/x2goprint-0-r2.ebuild
new file mode 100644
index 000000000000..16275e07002d
--- /dev/null
+++ b/acct-group/x2goprint/x2goprint-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=292
diff --git a/acct-group/x2gouser/Manifest b/acct-group/x2gouser/Manifest
index eaac52d795a4..675f48a9398f 100644
--- a/acct-group/x2gouser/Manifest
+++ b/acct-group/x2gouser/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2gouser-0-r1.ebuild 195 BLAKE2B 9fddaaee53f6406e7f99247f58eb4b0ac773681979b5567438d2886a37ad6b06ef183da45babfd75c625baf6147d1beca46dc7502e3d6450b9921b6890ba2dd6 SHA512 2bbdc10327c27c73047bfed62e47bfc688b6a4787d28f9e89dc36bcbb743251587e811fee770de7fe28b06466a868f26b8f7819ed4e50ab13f4d494c0b230589
+EBUILD x2gouser-0-r2.ebuild 195 BLAKE2B 5dcc59ca83ac2c17e3262edf0f47b9d88b650dc7a87535905b961156f0f5b8f36d36b5d8a60a70dba3d36992039817e9c8bf80a2e1a326c16da0ea4562749a9a SHA512 ffc86c567c9fa68c2b0210aa564b4e6149fe985b7ae73dbcfdea127465c9e7f3e10658a08bf6823eba38aa92d72356b48a9efdd3255348bfb5ce6d3bc133e605
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-group/x2gouser/x2gouser-0-r1.ebuild b/acct-group/x2gouser/x2gouser-0-r1.ebuild
deleted file mode 100644
index 7e838501eee0..000000000000
--- a/acct-group/x2gouser/x2gouser-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=291
diff --git a/acct-group/x2gouser/x2gouser-0-r2.ebuild b/acct-group/x2gouser/x2gouser-0-r2.ebuild
new file mode 100644
index 000000000000..800125020e8b
--- /dev/null
+++ b/acct-group/x2gouser/x2gouser-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=291
diff --git a/acct-group/xpra/Manifest b/acct-group/xpra/Manifest
index 14f84233e7af..4c50e68876c1 100644
--- a/acct-group/xpra/Manifest
+++ b/acct-group/xpra/Manifest
@@ -1,2 +1,2 @@
-EBUILD xpra-0.ebuild 187 BLAKE2B 94c5219981840a108943dea842656d6807a9914558b529ee8875953f34ebe48f63b7808cf6b9f1aec5952cb2df15d5e33c2ade172e8cf3ddcccd9783b834e94d SHA512 8b7342a1df54ebe54d41742de7782e0d5da308aaea6e8464a94f7af0f162bfcd041631268c49c7b6df811452b7fb76bdb2def7cb8779331f22e24d6d4762008e
+EBUILD xpra-0-r1.ebuild 187 BLAKE2B a10e3487a7099c7c5b763a0d39ebde79f59c49f4aab5b57b273e1795a0fdbddbd0413851bb41eb9a7e9ecdce90779c3b705bfb81f081c1186e64000607f4192f SHA512 41216fe41818c41e39dfc245c5233da6364aa46fcd1736a2a1ce59ef94ce8d04977f0edb5191625655358ca149e068e5e90a164172bb7b67584d0aa46a39fe3d
MISC metadata.xml 497 BLAKE2B 3160546ef489170b7625293a23d168cd6ad1a3539f63b70a740dbca26059fa1a391c4c39e59e50d2e60ff3d84a3e2664ee59f24db5cc87190acfa7b0a729b8b8 SHA512 66a88d31c810a2e4c7571d0ba924a23de871b4e1defba2245573a2273fdf5152902083d91b16974367b75f0beaeedb8e9f290676a5481532e4e80f65bab44ed5
diff --git a/acct-group/xpra/xpra-0-r1.ebuild b/acct-group/xpra/xpra-0-r1.ebuild
new file mode 100644
index 000000000000..0f163b260c1f
--- /dev/null
+++ b/acct-group/xpra/xpra-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for x11-wm/xpra"
+ACCT_GROUP_ID=462
diff --git a/acct-group/xpra/xpra-0.ebuild b/acct-group/xpra/xpra-0.ebuild
deleted file mode 100644
index 282cee0f5757..000000000000
--- a/acct-group/xpra/xpra-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for x11-wm/xpra"
-ACCT_GROUP_ID=462
diff --git a/acct-group/xrootd/Manifest b/acct-group/xrootd/Manifest
index 3dcfc499e1b9..a2d2f27c9179 100644
--- a/acct-group/xrootd/Manifest
+++ b/acct-group/xrootd/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrootd-0-r1.ebuild 193 BLAKE2B a23be42c1d56170259b4ded27d4e080cf047c609d247a57f3829af79db26efcfdf1b658d83c6b9b343fcbccb6d5772784e2fb69fbe57736baf3f45ac221d074d SHA512 52e5f5617be7ab5c61887178b93bc6247ff0a5d80342d91a646c0d61e791c6fdc3208e603a65778a464b0ef3ea6361265d0d86b45acd040f976feb47ade312b8
+EBUILD xrootd-0-r2.ebuild 193 BLAKE2B 6f30133d56fa41a5d59bb667f0921900899c4b9b107627e888750b055e22c73574c0d15a4b60f6f0a6c994953d2077f5ab7d6df15eeb1672f04878df77d8b9b3 SHA512 75f1ef96f384626328e8e5177dc4cad12a6ae8331c17f897ed6292bddaf913fd4f78efd314f63335bc343fac8fbd71820dcf0bc5108d6d829263eb60a54c1742
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
diff --git a/acct-group/xrootd/xrootd-0-r1.ebuild b/acct-group/xrootd/xrootd-0-r1.ebuild
deleted file mode 100644
index 15cdbba956eb..000000000000
--- a/acct-group/xrootd/xrootd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the XRootD server"
-ACCT_GROUP_ID=469
diff --git a/acct-group/xrootd/xrootd-0-r2.ebuild b/acct-group/xrootd/xrootd-0-r2.ebuild
new file mode 100644
index 000000000000..37258ac9342c
--- /dev/null
+++ b/acct-group/xrootd/xrootd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the XRootD server"
+ACCT_GROUP_ID=469
diff --git a/acct-group/xwax/Manifest b/acct-group/xwax/Manifest
index 377d1115a509..29d6537374cc 100644
--- a/acct-group/xwax/Manifest
+++ b/acct-group/xwax/Manifest
@@ -1,2 +1,2 @@
-EBUILD xwax-0.ebuild 197 BLAKE2B 7c8e274d1cb9b1c055600e4e08c891e90860cad19d0b6427ca75d0f8372ac04b84c8ead0fa37d736949eaad439041b79266f08e966b8f6f9c4925d411d881029 SHA512 867331da7ae6accbcc81e2b6def0999822f18297c1bd7895cfd172b7ec8046bd8454c11f61524e917153ce64e06880671c80f6046d99619816e7e308dba7229c
+EBUILD xwax-0-r1.ebuild 197 BLAKE2B ffb900c27e12a38895bda02e6647f73570a2d18f230cf1d632e848ccc1f749945e907bafdc751ec39bd91b394630f33c78059f80e01fb3be80c3081484624eb0 SHA512 5aa88923d7461f329723c1f0987b62ded7ef2367bbc9eb4d01cf15ce02759eb35ea8d7c99a1d312e624b2eaadf0499d07fe2ecc2bca0549fd0fc75557dedee49
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-group/xwax/xwax-0-r1.ebuild b/acct-group/xwax/xwax-0-r1.ebuild
new file mode 100644
index 000000000000..9f208e62f068
--- /dev/null
+++ b/acct-group/xwax/xwax-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/xwax"
+
+ACCT_GROUP_ID="205"
diff --git a/acct-group/xwax/xwax-0.ebuild b/acct-group/xwax/xwax-0.ebuild
deleted file mode 100644
index fa5f01bc8577..000000000000
--- a/acct-group/xwax/xwax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/xwax"
-
-ACCT_GROUP_ID="205"
diff --git a/acct-group/yubihsm-connector/Manifest b/acct-group/yubihsm-connector/Manifest
index 3cf3f82d18f6..351f3dc20330 100644
--- a/acct-group/yubihsm-connector/Manifest
+++ b/acct-group/yubihsm-connector/Manifest
@@ -1,2 +1,2 @@
-EBUILD yubihsm-connector-0.ebuild 146 BLAKE2B 4368844bd47a59fe1a52a3ecdaabd0f72572fb690aa5ec27c52bc0d3cc04ba6f94623c667050a1e6bed586285f59d2293d626890843e6c520dc9f8e144b2ec42 SHA512 de76c06a3970805c4ac4b3c4f9669061e571dc0bae10ebd61b9cdc668cac9e843fbf81a0464ed303d439d8799dec645200ae209deb89588663910f35f2dd251a
+EBUILD yubihsm-connector-0-r1.ebuild 146 BLAKE2B 4368844bd47a59fe1a52a3ecdaabd0f72572fb690aa5ec27c52bc0d3cc04ba6f94623c667050a1e6bed586285f59d2293d626890843e6c520dc9f8e144b2ec42 SHA512 de76c06a3970805c4ac4b3c4f9669061e571dc0bae10ebd61b9cdc668cac9e843fbf81a0464ed303d439d8799dec645200ae209deb89588663910f35f2dd251a
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-group/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
index 8f606cd32c80..8f606cd32c80 100644
--- a/acct-group/yubihsm-connector/yubihsm-connector-0.ebuild
+++ b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
diff --git a/acct-group/zabbix/Manifest b/acct-group/zabbix/Manifest
index 29797c1eac01..80b902dffab5 100644
--- a/acct-group/zabbix/Manifest
+++ b/acct-group/zabbix/Manifest
@@ -1,2 +1,2 @@
-EBUILD zabbix-0.ebuild 182 BLAKE2B 419b09c8812ced7f2b33ee9eb600bfb32ca92d3064ffec7578dea7f17f54ca1694b744b8f14d6a150f1cfba2b003dfbd2ac4d62faaa3f92d5bcbac853011363c SHA512 43e0f645a1f1218a51155072fb4e82c825b3884a9a0772acf6881fa79a9202b8938128ed44fb3225c8bc52c4b800c0c0e40b77ebee8dc0efce2b98556d0aa901
+EBUILD zabbix-0-r1.ebuild 182 BLAKE2B d374b5320d1e2a73bcbb02aa2bfb56824c8e51e5c27a70de55705344797eac17e0048ed623228595264409f18de9256b3140ab6cf0b7be1c823861032a562a4d SHA512 2c6adc9769f6ce456acfa4e0ad3cd01056607f7867134dc6017ceced991b517c012e52b78658173321e179fb3c72d3973460e22c2599838a2d39faf616c2013f
MISC metadata.xml 250 BLAKE2B 2bd2a200020745da1f097ec123623682c370bf39f88991aed60c1682b0c18f56a698812a65e2f63699cf61fb6f433bcfc91de65b77290fe6053ac122a3ee21cd SHA512 bda67aad1f4c4e8949671e4a7a0e757359b53050f6873aca15fdaeea73064e1523143a8e5132e2f665770489442f0f6aca1d061577f6a5befbc59f2bb52ce62c
diff --git a/acct-group/zabbix/zabbix-0-r1.ebuild b/acct-group/zabbix/zabbix-0-r1.ebuild
new file mode 100644
index 000000000000..0d2ced4b507b
--- /dev/null
+++ b/acct-group/zabbix/zabbix-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Zabbix"
+ACCT_GROUP_ID=329
diff --git a/acct-group/zabbix/zabbix-0.ebuild b/acct-group/zabbix/zabbix-0.ebuild
deleted file mode 100644
index 73561e628222..000000000000
--- a/acct-group/zabbix/zabbix-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Zabbix"
-ACCT_GROUP_ID=329
diff --git a/acct-group/zeppelin/Manifest b/acct-group/zeppelin/Manifest
index b2f409c5f3c0..708b6ab9decf 100644
--- a/acct-group/zeppelin/Manifest
+++ b/acct-group/zeppelin/Manifest
@@ -1,2 +1,2 @@
-EBUILD zeppelin-0-r1.ebuild 209 BLAKE2B 7617b1d57d5e9b6d735e575906fd90e503991ea1d0f5eed0404144d1fd6fe7f93d999c90a55362aa1284000445c7582f10fa4561c2642c1b311502f6393fd526 SHA512 76ec83cfb99b0e632a6eb5523a4a0a3df7d637294c296f2548073311c605c225063ec3abce4acc7283b3eed94763c889adaa7100ea688ee8fac3a95da585d506
+EBUILD zeppelin-0-r2.ebuild 209 BLAKE2B 4806febd9d884ebdb29d961de2a920ee34ef5d48b32d3c0aa9305af168baabaeb487dd7f316b1d2c45b593fb45e76e624fb74e420e644cd285ad19365ba1d6ee SHA512 861dd34473d13f99f3ed85167e744ac80d5dd02f0e09eb9cf9d03fe1f34c09afe8c57e1c221498a49b834230906ece72d93628de0e9e7cbdce7727f3b99fd272
MISC metadata.xml 342 BLAKE2B 1684316dabed0d0d2468052855244c3bb2504173b417c5b6f9ff9d2263ed3adf90d406201e19ca132d46ef7a5f072e571e8f16f9f5dc0a95ef0e0723c229ec5e SHA512 cb9dd8f18c328d49b61d1de97b20bebbd1261e944f7a56949e1ce72e7b62413716d83d77f72bce4387fa245d3414fe1b379f0d283487f7be55f2e2c256718a68
diff --git a/acct-group/zeppelin/zeppelin-0-r1.ebuild b/acct-group/zeppelin/zeppelin-0-r1.ebuild
deleted file mode 100644
index d65d1aed6485..000000000000
--- a/acct-group/zeppelin/zeppelin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
-ACCT_GROUP_ID=224
diff --git a/acct-group/zeppelin/zeppelin-0-r2.ebuild b/acct-group/zeppelin/zeppelin-0-r2.ebuild
new file mode 100644
index 000000000000..96d38d3b6e2b
--- /dev/null
+++ b/acct-group/zeppelin/zeppelin-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
+ACCT_GROUP_ID=224
diff --git a/acct-group/zetcd/Manifest b/acct-group/zetcd/Manifest
index 7b9ef55afca3..97a10667296f 100644
--- a/acct-group/zetcd/Manifest
+++ b/acct-group/zetcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD zetcd-0.ebuild 196 BLAKE2B 882a1c20e19dede45d563c1e5892335eed0f0195af0490b83cf072d83e4251c293e82fc730f5ddd2d6954df7f323a809200080a74c34389ee28845b52611a738 SHA512 f600c9e57df59561f21c41fbdd266548d85781b05dc1335e25db149c274fad176dba45c2848dca9a0f5bd134f23669e793dd2bba10551743d2ae69bd3acac3e4
+EBUILD zetcd-0-r1.ebuild 196 BLAKE2B a616092d4c23965db6fb37fd35d8f8153b495cef36c52630cfa45aaa3f9d2ca91957265042c1933ab430ace6d0da367719be21fb13b6b6de37023b0a4e6d95f2 SHA512 646694ca46c575900785b00b54e7303ece5a398be737681e489709c8bba16b3ffd6fdbd3a32920d1435e689e492749c4b2bb40644f3272d7fd69b756eb64ce35
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/zetcd/zetcd-0-r1.ebuild b/acct-group/zetcd/zetcd-0-r1.ebuild
new file mode 100644
index 000000000000..7b5d55eac3bd
--- /dev/null
+++ b/acct-group/zetcd/zetcd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-cluster/zetcd"
+
+ACCT_GROUP_ID="253"
diff --git a/acct-group/zetcd/zetcd-0.ebuild b/acct-group/zetcd/zetcd-0.ebuild
deleted file mode 100644
index 1c35fc9add9a..000000000000
--- a/acct-group/zetcd/zetcd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-cluster/zetcd"
-
-ACCT_GROUP_ID="253"
diff --git a/acct-group/ziproxy/Manifest b/acct-group/ziproxy/Manifest
index 8f5b2c7a7887..ca54945cfdbc 100644
--- a/acct-group/ziproxy/Manifest
+++ b/acct-group/ziproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ziproxy-0.ebuild 151 BLAKE2B 567688f6e05f9c5d396fa8cb2e885a9ac033a4d274518c0aef852dae9b6d5ecbbbea4cdebcac7df13ba31c7796cd0444dbec40127059591bfef65d0209e30d1c SHA512 107adfd461a983162bc95b23b9216587ac5e45caff893eb41cac913db1e82370bdf5c1315adee5f60e480d4e39487385204a5567e5f3eeefeb751004044b430e
+EBUILD ziproxy-0-r1.ebuild 151 BLAKE2B 9a1589cf0c76bda8f4d85b1a0654cd1a59d300def2c23f56fb983a2e29efc6104e67ac19856c292a2d8bb5e32a83dd36b08bc2d4c20088e639471bd4ce549904 SHA512 818a4131d4b7a89d484a49fdfc5ba1ea484bc6a8d750a9f4f56f301d8e28358f838aecaea6bb8a30b4e565007f0395f20fb50e3fa3c157b3c1a1b17cbd8c9878
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/ziproxy/ziproxy-0-r1.ebuild b/acct-group/ziproxy/ziproxy-0-r1.ebuild
new file mode 100644
index 000000000000..c9060c781154
--- /dev/null
+++ b/acct-group/ziproxy/ziproxy-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=367
diff --git a/acct-group/ziproxy/ziproxy-0.ebuild b/acct-group/ziproxy/ziproxy-0.ebuild
deleted file mode 100644
index 2a615442577d..000000000000
--- a/acct-group/ziproxy/ziproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=367
diff --git a/acct-group/znc/Manifest b/acct-group/znc/Manifest
index d9385474be4a..9aefebc8e5d6 100644
--- a/acct-group/znc/Manifest
+++ b/acct-group/znc/Manifest
@@ -1,2 +1,2 @@
-EBUILD znc-0-r1.ebuild 182 BLAKE2B b69171086e9a3d7282ffd1c917be1ddd046ef04dde299718a91a6dc69023942fc60b56d19ac56514f8f9289e0d9aacb9ae0ad30553d5123b62d3361c41ffd9e5 SHA512 be9d7421b716474345c7c4539b00c300bcf8b7dd82089876604c3021013690f03484f5f6f703e52d96f95ed7972bc326247a9de907c12d7c9dabb6f893755fed
+EBUILD znc-0-r2.ebuild 187 BLAKE2B f1e0a024421ae57821c627330e8376b982982b9b3986af25dc505d5fd3d95863bf61ad994cf40de3d2cd828d9eca9cbaa8861984542a268d4ea05cc43fb8c1a4 SHA512 d289c3333469c6bffafbf783bfb40ac82b4853bb92f53317768a912b5ffc744cd7b86ddd1be07611010ce47d927c6df82cf12296f29d2eb6c0cd54877b493c54
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-group/znc/znc-0-r1.ebuild b/acct-group/znc/znc-0-r1.ebuild
deleted file mode 100644
index 513803e86f5c..000000000000
--- a/acct-group/znc/znc-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/znc"
-ACCT_GROUP_ID=421
diff --git a/acct-group/znc/znc-0-r2.ebuild b/acct-group/znc/znc-0-r2.ebuild
new file mode 100644
index 000000000000..7475710c30af
--- /dev/null
+++ b/acct-group/znc/znc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/znc"
+ACCT_GROUP_ID=421
diff --git a/acct-group/zookeeper/Manifest b/acct-group/zookeeper/Manifest
index 294bf037a2f6..5d93ef035662 100644
--- a/acct-group/zookeeper/Manifest
+++ b/acct-group/zookeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD zookeeper-0.ebuild 206 BLAKE2B f4a8c46360a9e9e30d13adee603aac09bb7b702975701ff0e6709df016c1c7594c2016d78e6c2dc5f1f84b65370e06f37640376f42b5eec7487e829208d21b5d SHA512 bce9e65d513043d165671a460c070363cb29c3b012e64895fa8865b5ec89b32476cd1aac50c1ab958bdf44848060e0154dcb931f2af2489e255368cdb0881a83
+EBUILD zookeeper-0-r1.ebuild 206 BLAKE2B 3cb11ed011df3b06a471b3bb8b22cc01aef534fcc40070be89653f5bfee0390b71f04af66a821d92f939055f4f38a886425a84f9f768d55302931eb991e7b02c SHA512 e62652d90b7dc750592bc19b870b04a28308caf8411582ddb96f5d09b96087e83928830c59815528402f4215206979c1636d868c82a64fab47efc7a950072ea2
MISC metadata.xml 366 BLAKE2B cade4c3fba00dbf1cb9357bf0fcb0347ed6f6162584250545c4c426a86c71cc82de6f7ae39571943d15e8ea32330e86b546c2135c265316ba5dd127472015451 SHA512 5fafae2b9877b5d46da31662ef3b76ed51604131f23548e945014c73431af0462f169b9dde330a2d3be1f079acdda204df351f3784bda51f14a089bdca2887d8
diff --git a/acct-group/zookeeper/zookeeper-0-r1.ebuild b/acct-group/zookeeper/zookeeper-0-r1.ebuild
new file mode 100644
index 000000000000..23e22ef66749
--- /dev/null
+++ b/acct-group/zookeeper/zookeeper-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/zookeeper-bin"
+
+ACCT_GROUP_ID="211"
diff --git a/acct-group/zookeeper/zookeeper-0.ebuild b/acct-group/zookeeper/zookeeper-0.ebuild
deleted file mode 100644
index c45af2d2d110..000000000000
--- a/acct-group/zookeeper/zookeeper-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-cluster/zookeeper-bin"
-
-ACCT_GROUP_ID="211"