summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2023-07-09 12:58:57 -0400
committerMike Gilbert <floppym@gentoo.org>2023-07-09 13:38:23 -0400
commit124ad96264f65068e5d1a4865d40562b0569266b (patch)
tree9596584690b07822bc8f731dcbaeaf41d85d91a5
parentdev-python/time-machine: Stabilize 2.10.0 x86, #910155 (diff)
downloadgentoo-124ad96264f65068e5d1a4865d40562b0569266b.tar.gz
gentoo-124ad96264f65068e5d1a4865d40562b0569266b.tar.bz2
gentoo-124ad96264f65068e5d1a4865d40562b0569266b.zip
Revbump all acct-group and acct-user packages
user-info.eclass was modified to fix a bug in egetent. Revbump everything to ensure that binpkgs get regenerated. Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-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/adm-0-r1.ebuild8
-rw-r--r--acct-group/adm/adm-0-r2.ebuild8
-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/airdcppd-0-r1.ebuild9
-rw-r--r--acct-group/airdcppd/airdcppd-0-r2.ebuild9
-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/amanda-0-r1.ebuild8
-rw-r--r--acct-group/amanda/amanda-0.ebuild8
-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/amule-0-r1.ebuild9
-rw-r--r--acct-group/amule/amule-0-r2.ebuild9
-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/anope-0-r1.ebuild9
-rw-r--r--acct-group/anope/anope-0-r2.ebuild9
-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/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/argus-0-r1.ebuild10
-rw-r--r--acct-group/argus/argus-0.ebuild10
-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/artifactory-0-r1.ebuild10
-rw-r--r--acct-group/artifactory/artifactory-0.ebuild10
-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/asterisk-0-r1.ebuild9
-rw-r--r--acct-group/asterisk/asterisk-0-r2.ebuild9
-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/atheme-services-0-r1.ebuild9
-rw-r--r--acct-group/atheme-services/atheme-services-0-r2.ebuild9
-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/automatic-0-r1.ebuild8
-rw-r--r--acct-group/automatic/automatic-0.ebuild8
-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/avahi-autoipd-0-r1.ebuild9
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild9
-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/axtls-0-r1.ebuild10
-rw-r--r--acct-group/axtls/axtls-0.ebuild10
-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/bacula-0-r1.ebuild9
-rw-r--r--acct-group/bacula/bacula-0-r2.ebuild9
-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/beanstalk-0-r1.ebuild10
-rw-r--r--acct-group/beanstalk/beanstalk-0.ebuild10
-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/biboumi-0-r1.ebuild8
-rw-r--r--acct-group/biboumi/biboumi-0.ebuild8
-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/bird-0-r1.ebuild9
-rw-r--r--acct-group/bird/bird-0.ebuild9
-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/bitflu-0-r1.ebuild10
-rw-r--r--acct-group/bitflu/bitflu-0.ebuild10
-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/blackbox_exporter-0-r1.ebuild8
-rw-r--r--acct-group/blackbox_exporter/blackbox_exporter-0.ebuild8
-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/brlapi-0-r1.ebuild8
-rw-r--r--acct-group/brlapi/brlapi-0.ebuild8
-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/buildbot-0-r1.ebuild10
-rw-r--r--acct-group/buildbot/buildbot-0-r2.ebuild10
-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/burp-0-r1.ebuild9
-rw-r--r--acct-group/burp/burp-0-r2.ebuild9
-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/cadvisor-0-r1.ebuild8
-rw-r--r--acct-group/cadvisor/cadvisor-0-r2.ebuild8
-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/carbon-0-r1.ebuild8
-rw-r--r--acct-group/carbon/carbon-0-r2.ebuild8
-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/ceph-0-r1.ebuild8
-rw-r--r--acct-group/ceph/ceph-0-r2.ebuild8
-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/chronograf-0-r1.ebuild8
-rw-r--r--acct-group/chronograf/chronograf-0-r2.ebuild8
-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/clair-0-r1.ebuild8
-rw-r--r--acct-group/clair/clair-0-r2.ebuild8
-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/cntlm-0-r1.ebuild10
-rw-r--r--acct-group/cntlm/cntlm-0.ebuild10
-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/collectd-0-r1.ebuild10
-rw-r--r--acct-group/collectd/collectd-0.ebuild10
-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/consul-template-0-r1.ebuild8
-rw-r--r--acct-group/consul-template/consul-template-0-r2.ebuild8
-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/consul_exporter-0-r1.ebuild8
-rw-r--r--acct-group/consul_exporter/consul_exporter-0.ebuild8
-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/croc-0-r1.ebuild9
-rw-r--r--acct-group/croc/croc-0.ebuild9
-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/crontab-0-r1.ebuild8
-rw-r--r--acct-group/crontab/crontab-0.ebuild8
-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/davfs2-0-r1.ebuild8
-rw-r--r--acct-group/davfs2/davfs2-0-r2.ebuild8
-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/dbskkd-0-r1.ebuild10
-rw-r--r--acct-group/dbskkd/dbskkd-0.ebuild10
-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/defang-0-r1.ebuild10
-rw-r--r--acct-group/defang/defang-0.ebuild10
-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/deluge-0-r1.ebuild8
-rw-r--r--acct-group/deluge/deluge-0-r2.ebuild8
-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/dhcpcd-0-r1.ebuild8
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r2.ebuild8
-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/dictd-0-r1.ebuild10
-rw-r--r--acct-group/dictd/dictd-0.ebuild10
-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/disk-0-r1.ebuild8
-rw-r--r--acct-group/disk/disk-0-r2.ebuild8
-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/dnrd-0-r1.ebuild10
-rw-r--r--acct-group/dnrd/dnrd-0.ebuild10
-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/dnsdist-0-r1.ebuild10
-rw-r--r--acct-group/dnsdist/dnsdist-0-r2.ebuild10
-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/dnsmasq_exporter-0-r1.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild8
-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/docker_auth-0-r1.ebuild8
-rw-r--r--acct-group/docker_auth/docker_auth-0-r2.ebuild8
-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/dovenull-0-r1.ebuild8
-rw-r--r--acct-group/dovenull/dovenull-0-r2.ebuild8
-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/ejabberd-0-r1.ebuild10
-rw-r--r--acct-group/ejabberd/ejabberd-0.ebuild10
-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/elasticsearch_exporter-0-r1.ebuild10
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild10
-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/epam-0-r1.ebuild9
-rw-r--r--acct-group/epam/epam-0.ebuild9
-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/err-0-r1.ebuild8
-rw-r--r--acct-group/err/err-0.ebuild8
-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/exabgp-0-r1.ebuild8
-rw-r--r--acct-group/exabgp/exabgp-0-r2.ebuild8
-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/fax-0-r1.ebuild10
-rw-r--r--acct-group/fax/fax-0.ebuild10
-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/fdm-0-r1.ebuild10
-rw-r--r--acct-group/fdm/fdm-0.ebuild10
-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/fhem-0-r1.ebuild10
-rw-r--r--acct-group/fhem/fhem-0-r2.ebuild10
-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/firebird-0-r1.ebuild10
-rw-r--r--acct-group/firebird/firebird-0-r2.ebuild10
-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/floppy-0-r1.ebuild (renamed from acct-group/floppy/floppy-0.ebuild)0
-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/fluentd-0-r1.ebuild10
-rw-r--r--acct-group/fluentd/fluentd-0-r2.ebuild10
-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/fp-multiuser-0-r1.ebuild10
-rw-r--r--acct-group/fp-multiuser/fp-multiuser-0.ebuild10
-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/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/frr-0-r1.ebuild8
-rw-r--r--acct-group/frr/frr-0.ebuild8
-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/ftpproxy-0-r1.ebuild10
-rw-r--r--acct-group/ftpproxy/ftpproxy-0.ebuild10
-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/gamemode-0-r1.ebuild9
-rw-r--r--acct-group/gamemode/gamemode-0.ebuild9
-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/gatling-0-r1.ebuild8
-rw-r--r--acct-group/gatling/gatling-0-r2.ebuild8
-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/gdm-0-r1.ebuild8
-rw-r--r--acct-group/gdm/gdm-0.ebuild8
-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/geoclue-0-r1.ebuild8
-rw-r--r--acct-group/geoclue/geoclue-0.ebuild8
-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/git-0-r1.ebuild8
-rw-r--r--acct-group/git/git-0-r2.ebuild8
-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/gitlab-runner-1-r1.ebuild8
-rw-r--r--acct-group/gitlab-runner/gitlab-runner-1.ebuild8
-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/glance-0-r1.ebuild8
-rw-r--r--acct-group/glance/glance-0-r2.ebuild8
-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/gns3-0-r1.ebuild8
-rw-r--r--acct-group/gns3/gns3-0.ebuild8
-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/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/gnupg-pkcs11-0-r1.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild10
-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/gopher-0-r1.ebuild8
-rw-r--r--acct-group/gopher/gopher-0.ebuild8
-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/gpib-0-r1.ebuild8
-rw-r--r--acct-group/gpib/gpib-0-r2.ebuild8
-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/grafana-0-r1.ebuild10
-rw-r--r--acct-group/grafana/grafana-0-r2.ebuild10
-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/greetd-0-r1.ebuild9
-rw-r--r--acct-group/greetd/greetd-0-r2.ebuild9
-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/groonga-0-r1.ebuild10
-rw-r--r--acct-group/groonga/groonga-0.ebuild10
-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/h2o-0-r1.ebuild10
-rw-r--r--acct-group/h2o/h2o-0.ebuild10
-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/haproxy-0-r1.ebuild8
-rw-r--r--acct-group/haproxy/haproxy-0-r2.ebuild8
-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/headscale-0-r1.ebuild8
-rw-r--r--acct-group/headscale/headscale-0.ebuild8
-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/hsqldb-0-r1.ebuild9
-rw-r--r--acct-group/hsqldb/hsqldb-0.ebuild9
-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/i2c-0-r1.ebuild8
-rw-r--r--acct-group/i2c/i2c-0.ebuild8
-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/i2pd-0-r1.ebuild9
-rw-r--r--acct-group/i2pd/i2pd-0-r2.ebuild9
-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/icecream-0-r1.ebuild10
-rw-r--r--acct-group/icecream/icecream-0.ebuild10
-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/icinga-0-r1.ebuild8
-rw-r--r--acct-group/icinga/icinga-0-r2.ebuild8
-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/icingaweb2-0-r1.ebuild8
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r2.ebuild8
-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/influxdb-0-r1.ebuild8
-rw-r--r--acct-group/influxdb/influxdb-0-r2.ebuild8
-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/inspircd-0-r1.ebuild9
-rw-r--r--acct-group/inspircd/inspircd-0-r2.ebuild9
-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/ipsec-0-r1.ebuild10
-rw-r--r--acct-group/ipsec/ipsec-0.ebuild10
-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/iroffer-0-r1.ebuild8
-rw-r--r--acct-group/iroffer/iroffer-0.ebuild8
-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/jenkins-0-r1.ebuild10
-rw-r--r--acct-group/jenkins/jenkins-0.ebuild10
-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/kapacitor-0-r1.ebuild8
-rw-r--r--acct-group/kapacitor/kapacitor-0-r2.ebuild8
-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/keystone-0-r1.ebuild8
-rw-r--r--acct-group/keystone/keystone-0-r2.ebuild8
-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/kismet-0-r1.ebuild9
-rw-r--r--acct-group/kismet/kismet-0-r2.ebuild9
-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/knot-resolver-0-r1.ebuild8
-rw-r--r--acct-group/knot-resolver/knot-resolver-0.ebuild8
-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/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/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/kube-scheduler-0-r1.ebuild8
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild8
-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/ldap-0-r1.ebuild8
-rw-r--r--acct-group/ldap/ldap-0.ebuild8
-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/libvirt-0-r1.ebuild8
-rw-r--r--acct-group/libvirt/libvirt-0-r2.ebuild8
-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/lighttpd-0-r1.ebuild8
-rw-r--r--acct-group/lighttpd/lighttpd-0-r2.ebuild8
-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/lldpd-0-r1.ebuild8
-rw-r--r--acct-group/lldpd/lldpd-0-r2.ebuild8
-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/logcheck-0-r1.ebuild10
-rw-r--r--acct-group/logcheck/logcheck-0.ebuild10
-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/logsurfer-0-r1.ebuild10
-rw-r--r--acct-group/logsurfer/logsurfer-0.ebuild10
-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/lpadmin-0-r1.ebuild8
-rw-r--r--acct-group/lpadmin/lpadmin-0-r2.ebuild8
-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/lxd-0-r1.ebuild9
-rw-r--r--acct-group/lxd/lxd-0-r2.ebuild9
-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/man-0-r1.ebuild8
-rw-r--r--acct-group/man/man-0-r2.ebuild8
-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/memcached-0-r1.ebuild8
-rw-r--r--acct-group/memcached/memcached-0-r2.ebuild8
-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/messagebus-0-r1.ebuild8
-rw-r--r--acct-group/messagebus/messagebus-0-r2.ebuild8
-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/milter-regex-0-r1.ebuild9
-rw-r--r--acct-group/milter-regex/milter-regex-0-r2.ebuild9
-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/minecraft-0-r1.ebuild10
-rw-r--r--acct-group/minecraft/minecraft-0-r2.ebuild10
-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/minidlna-0-r1.ebuild8
-rw-r--r--acct-group/minidlna/minidlna-0.ebuild8
-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/mogile-0-r1.ebuild9
-rw-r--r--acct-group/mogile/mogile-0.ebuild9
-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/mongodb_exporter-0-r1.ebuild8
-rw-r--r--acct-group/mongodb_exporter/mongodb_exporter-0.ebuild8
-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/monkeyd-0-r1.ebuild10
-rw-r--r--acct-group/monkeyd/monkeyd-0.ebuild10
-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/mosquitto-0-r1.ebuild9
-rw-r--r--acct-group/mosquitto/mosquitto-0-r2.ebuild9
-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/msmtpd-0-r1.ebuild8
-rw-r--r--acct-group/msmtpd/msmtpd-0-r2.ebuild8
-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/munin-0-r1.ebuild8
-rw-r--r--acct-group/munin/munin-0-r2.ebuild8
-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/mysql-0-r1.ebuild10
-rw-r--r--acct-group/mysql/mysql-0-r2.ebuild10
-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/mythtv-0-r1.ebuild10
-rw-r--r--acct-group/mythtv/mythtv-0-r2.ebuild10
-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/named-0-r1.ebuild8
-rw-r--r--acct-group/named/named-0-r2.ebuild8
-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/netdata-0-r1.ebuild8
-rw-r--r--acct-group/netdata/netdata-0-r2.ebuild8
-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/netperf-0-r1.ebuild10
-rw-r--r--acct-group/netperf/netperf-0.ebuild10
-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/nginx-unit-0-r1.ebuild (renamed from acct-group/nginx-unit/nginx-unit-0.ebuild)0
-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/nginx-0-r1.ebuild10
-rw-r--r--acct-group/nginx/nginx-0-r2.ebuild10
-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/ngrep-0-r1.ebuild10
-rw-r--r--acct-group/ngrep/ngrep-0-r2.ebuild10
-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/nm-openvpn-0-r1.ebuild10
-rw-r--r--acct-group/nm-openvpn/nm-openvpn-0.ebuild10
-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/node_exporter-0-r1.ebuild8
-rw-r--r--acct-group/node_exporter/node_exporter-0-r2.ebuild8
-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/notary-0-r1.ebuild10
-rw-r--r--acct-group/notary/notary-0.ebuild10
-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/nsd-0-r1.ebuild8
-rw-r--r--acct-group/nsd/nsd-0-r2.ebuild8
-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/ntopng-0-r1.ebuild8
-rw-r--r--acct-group/ntopng/ntopng-0.ebuild8
-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/nullmail-0-r1.ebuild10
-rw-r--r--acct-group/nullmail/nullmail-0.ebuild10
-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/nzbget-0-r1.ebuild9
-rw-r--r--acct-group/nzbget/nzbget-0.ebuild9
-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/openct-0-r1.ebuild8
-rw-r--r--acct-group/openct/openct-0-r2.ebuild8
-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/opendmarc-1-r1.ebuild9
-rw-r--r--acct-group/opendmarc/opendmarc-1.ebuild9
-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/openntpd-0-r1.ebuild8
-rw-r--r--acct-group/openntpd/openntpd-0-r2.ebuild8
-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/openttd-0-r1.ebuild10
-rw-r--r--acct-group/openttd/openttd-0.ebuild10
-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/openvpn_exporter-0-r1.ebuild8
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild8
-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/oprofile-0-r1.ebuild9
-rw-r--r--acct-group/oprofile/oprofile-0-r2.ebuild9
-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/ossec-0-r1.ebuild9
-rw-r--r--acct-group/ossec/ossec-0-r2.ebuild9
-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/p2p-0-r1.ebuild9
-rw-r--r--acct-group/p2p/p2p-0.ebuild9
-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/pcap-0-r1.ebuild9
-rw-r--r--acct-group/pcap/pcap-0.ebuild9
-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/pdns-0-r1.ebuild8
-rw-r--r--acct-group/pdns/pdns-0-r2.ebuild8
-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/pgagent-0-r1.ebuild10
-rw-r--r--acct-group/pgagent/pgagent-0.ebuild10
-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/pkcs11-0-r1.ebuild10
-rw-r--r--acct-group/pkcs11/pkcs11-0.ebuild10
-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/plex-0-r1.ebuild9
-rw-r--r--acct-group/plex/plex-0-r2.ebuild9
-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/polkitd-0-r1.ebuild8
-rw-r--r--acct-group/polkitd/polkitd-0-r2.ebuild8
-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/popa3d-0-r1.ebuild9
-rw-r--r--acct-group/popa3d/popa3d-0.ebuild9
-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/postdrop-0-r1.ebuild8
-rw-r--r--acct-group/postdrop/postdrop-0-r2.ebuild8
-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/postfix_exporter-0-r1.ebuild8
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild8
-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/postgres-0-r1.ebuild10
-rw-r--r--acct-group/postgres/postgres-0-r2.ebuild10
-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/postgrey-0-r1.ebuild9
-rw-r--r--acct-group/postgrey/postgrey-0.ebuild9
-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/prometheus-0-r1.ebuild8
-rw-r--r--acct-group/prometheus/prometheus-0-r2.ebuild8
-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/prowlarr-0-r1.ebuild8
-rw-r--r--acct-group/prowlarr/prowlarr-0.ebuild8
-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/pulse-access-0-r1.ebuild8
-rw-r--r--acct-group/pulse-access/pulse-access-0.ebuild8
-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/puppet-0-r1.ebuild8
-rw-r--r--acct-group/puppet/puppet-0-r2.ebuild8
-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/pushgateway-0-r1.ebuild10
-rw-r--r--acct-group/pushgateway/pushgateway-0.ebuild10
-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/qemu-0-r1.ebuild8
-rw-r--r--acct-group/qemu/qemu-0-r2.ebuild8
-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/quagga-0-r1.ebuild8
-rw-r--r--acct-group/quagga/quagga-0-r2.ebuild8
-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/rabbitmq-0-r1.ebuild10
-rw-r--r--acct-group/rabbitmq/rabbitmq-0.ebuild10
-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/radarr-0-r1.ebuild8
-rw-r--r--acct-group/radarr/radarr-0.ebuild8
-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/radius-0-r1.ebuild9
-rw-r--r--acct-group/radius/radius-0-r2.ebuild9
-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/rbldns-0-r1.ebuild8
-rw-r--r--acct-group/rbldns/rbldns-0-r2.ebuild8
-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/readarr-0-r1.ebuild8
-rw-r--r--acct-group/readarr/readarr-0.ebuild8
-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/redis-0-r1.ebuild9
-rw-r--r--acct-group/redis/redis-0-r2.ebuild9
-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/redmine-0-r1.ebuild8
-rw-r--r--acct-group/redmine/redmine-0-r2.ebuild8
-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/reg-0-r1.ebuild10
-rw-r--r--acct-group/reg/reg-0-r2.ebuild10
-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/render-0-r1.ebuild8
-rw-r--r--acct-group/render/render-0-r2.ebuild8
-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/root-0-r1.ebuild9
-rw-r--r--acct-group/root/root-0.ebuild9
-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/rrdcached-0-r1.ebuild8
-rw-r--r--acct-group/rrdcached/rrdcached-0.ebuild8
-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/rspamd-0-r1.ebuild9
-rw-r--r--acct-group/rspamd/rspamd-0-r2.ebuild9
-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/rt-0-r1.ebuild10
-rw-r--r--acct-group/rt/rt-0-r2.ebuild10
-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/rundeck-0-r1.ebuild10
-rw-r--r--acct-group/rundeck/rundeck-0.ebuild10
-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/sabnzbd-0-r1.ebuild10
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r2.ebuild10
-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/samplicator-0-r1.ebuild10
-rw-r--r--acct-group/samplicator/samplicator-0.ebuild10
-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/sanlock-0-r1.ebuild9
-rw-r--r--acct-group/sanlock/sanlock-0-r2.ebuild9
-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/scanlogd-0-r1.ebuild10
-rw-r--r--acct-group/scanlogd/scanlogd-0.ebuild10
-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/scponly-0-r1.ebuild9
-rw-r--r--acct-group/scponly/scponly-0-r2.ebuild9
-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/sddm-0-r1.ebuild10
-rw-r--r--acct-group/sddm/sddm-0.ebuild10
-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/serf-0-r1.ebuild10
-rw-r--r--acct-group/serf/serf-0.ebuild10
-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/sgx-0-r1.ebuild10
-rw-r--r--acct-group/sgx/sgx-0.ebuild10
-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/simplevirt-0-r1.ebuild8
-rw-r--r--acct-group/simplevirt/simplevirt-0-r2.ebuild8
-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/sks-0-r1.ebuild9
-rw-r--r--acct-group/sks/sks-0.ebuild9
-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/smmsp-0-r1.ebuild8
-rw-r--r--acct-group/smmsp/smmsp-0-r2.ebuild8
-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/sms-0-r1.ebuild8
-rw-r--r--acct-group/sms/sms-0.ebuild8
-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/smtpq-0-r1.ebuild9
-rw-r--r--acct-group/smtpq/smtpq-0-r2.ebuild9
-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/sniproxy-0-r1.ebuild8
-rw-r--r--acct-group/sniproxy/sniproxy-0.ebuild8
-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/snort-0-r1.ebuild8
-rw-r--r--acct-group/snort/snort-0.ebuild8
-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/sobexsrv-0-r1.ebuild9
-rw-r--r--acct-group/sobexsrv/sobexsrv-0.ebuild9
-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/sogo-0-r1.ebuild9
-rw-r--r--acct-group/sogo/sogo-0-r2.ebuild9
-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/sonarr-0-r1.ebuild8
-rw-r--r--acct-group/sonarr/sonarr-0.ebuild8
-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/spectrum-0-r1.ebuild10
-rw-r--r--acct-group/spectrum/spectrum-0-r2.ebuild10
-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/spire-0-r1.ebuild8
-rw-r--r--acct-group/spire/spire-0-r2.ebuild8
-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/sqlgrey-0-r1.ebuild9
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r2.ebuild9
-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/sshd-0-r1.ebuild8
-rw-r--r--acct-group/sshd/sshd-0-r2.ebuild8
-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/sstpc-0-r1.ebuild10
-rw-r--r--acct-group/sstpc/sstpc-0.ebuild10
-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/stapsys-0-r1.ebuild8
-rw-r--r--acct-group/stapsys/stapsys-0.ebuild8
-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/steamcmd-0-r1.ebuild10
-rw-r--r--acct-group/steamcmd/steamcmd-0-r2.ebuild10
-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/stubby-0-r1.ebuild9
-rw-r--r--acct-group/stubby/stubby-0-r2.ebuild9
-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/subsonic-0-r1.ebuild10
-rw-r--r--acct-group/subsonic/subsonic-0.ebuild10
-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/suricata-0-r1.ebuild9
-rw-r--r--acct-group/suricata/suricata-0-r2.ebuild9
-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/svxlink-0-r1.ebuild9
-rw-r--r--acct-group/svxlink/svxlink-0.ebuild9
-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/synapse-0-r1.ebuild9
-rw-r--r--acct-group/synapse/synapse-0.ebuild9
-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/systemd-coredump-0-r1.ebuild8
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild8
-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/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/systemd-journal-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r2.ebuild8
-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/systemd-oom-0-r1.ebuild8
-rw-r--r--acct-group/systemd-oom/systemd-oom-0.ebuild8
-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/systemd-timesync-0-r1.ebuild8
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild8
-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/taskd-0-r1.ebuild10
-rw-r--r--acct-group/taskd/taskd-0.ebuild10
-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/telegraf-0-r1.ebuild8
-rw-r--r--acct-group/telegraf/telegraf-0-r2.ebuild8
-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/thttpd-0-r1.ebuild10
-rw-r--r--acct-group/thttpd/thttpd-0.ebuild10
-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/tomcat-0-r1.ebuild9
-rw-r--r--acct-group/tomcat/tomcat-0.ebuild9
-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/tox-0-r1.ebuild7
-rw-r--r--acct-group/tox/tox-0-r2.ebuild7
-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/transmission-0-r1.ebuild8
-rw-r--r--acct-group/transmission/transmission-0-r2.ebuild8
-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/trojan-0-r1.ebuild8
-rw-r--r--acct-group/trojan/trojan-0.ebuild8
-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/tss-0-r1.ebuild9
-rw-r--r--acct-group/tss/tss-0-r2.ebuild9
-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/tty-0-r1.ebuild8
-rw-r--r--acct-group/tty/tty-0-r2.ebuild8
-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/ubridge-0-r1.ebuild9
-rw-r--r--acct-group/ubridge/ubridge-0-r2.ebuild9
-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/ultimaker-0-r1.ebuild9
-rw-r--r--acct-group/ultimaker/ultimaker-0-r2.ebuild9
-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/unbound-0-r1.ebuild10
-rw-r--r--acct-group/unbound/unbound-0-r2.ebuild10
-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/unifi-0-r1.ebuild10
-rw-r--r--acct-group/unifi/unifi-0-r2.ebuild10
-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/upmpdcli-0-r1.ebuild9
-rw-r--r--acct-group/upmpdcli/upmpdcli-0.ebuild9
-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/usb-0-r1.ebuild8
-rw-r--r--acct-group/usb/usb-0-r2.ebuild8
-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/ushare-0-r1.ebuild9
-rw-r--r--acct-group/ushare/ushare-0.ebuild9
-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/uucp-0-r1.ebuild8
-rw-r--r--acct-group/uucp/uucp-0-r2.ebuild8
-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/vacation-0-r1.ebuild10
-rw-r--r--acct-group/vacation/vacation-0.ebuild10
-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/vault-0-r1.ebuild8
-rw-r--r--acct-group/vault/vault-0-r2.ebuild8
-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/vboxguest-0-r1.ebuild8
-rw-r--r--acct-group/vboxguest/vboxguest-0-r2.ebuild8
-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/vboxusers-0-r1.ebuild8
-rw-r--r--acct-group/vboxusers/vboxusers-0-r2.ebuild8
-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/vdradmin-0-r1.ebuild10
-rw-r--r--acct-group/vdradmin/vdradmin-0-r2.ebuild10
-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/vlock-0-r1.ebuild10
-rw-r--r--acct-group/vlock/vlock-0.ebuild10
-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/vpopmail-0-r1.ebuild8
-rw-r--r--acct-group/vpopmail/vpopmail-0-r2.ebuild8
-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/wheel-0-r1.ebuild8
-rw-r--r--acct-group/wheel/wheel-0-r2.ebuild8
-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/x2goprint-0-r1.ebuild9
-rw-r--r--acct-group/x2goprint/x2goprint-0-r2.ebuild9
-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/xpra-0-r1.ebuild9
-rw-r--r--acct-group/xpra/xpra-0.ebuild9
-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/xwax-0-r1.ebuild10
-rw-r--r--acct-group/xwax/xwax-0.ebuild10
-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/zabbix-0-r1.ebuild9
-rw-r--r--acct-group/zabbix/zabbix-0.ebuild9
-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/zetcd-0-r1.ebuild10
-rw-r--r--acct-group/zetcd/zetcd-0.ebuild10
-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/znc-0-r1.ebuild9
-rw-r--r--acct-group/znc/znc-0-r2.ebuild9
-rw-r--r--acct-group/zookeeper/zookeeper-0-r1.ebuild10
-rw-r--r--acct-group/zookeeper/zookeeper-0.ebuild10
-rw-r--r--acct-user/_cron-failure/_cron-failure-0-r1.ebuild12
-rw-r--r--acct-user/_cron-failure/_cron-failure-0.ebuild12
-rw-r--r--acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild13
-rw-r--r--acct-user/aerospike-amc/aerospike-amc-0.ebuild13
-rw-r--r--acct-user/airdcppd/airdcppd-0-r1.ebuild16
-rw-r--r--acct-user/airdcppd/airdcppd-0-r2.ebuild16
-rw-r--r--acct-user/alertmanager/alertmanager-0-r1.ebuild12
-rw-r--r--acct-user/alertmanager/alertmanager-0.ebuild12
-rw-r--r--acct-user/alias/alias-0-r1.ebuild18
-rw-r--r--acct-user/alias/alias-0-r2.ebuild18
-rw-r--r--acct-user/amanda/amanda-0-r1.ebuild12
-rw-r--r--acct-user/amanda/amanda-0.ebuild12
-rw-r--r--acct-user/amavis/amavis-0-r1.ebuild13
-rw-r--r--acct-user/amavis/amavis-0-r2.ebuild13
-rw-r--r--acct-user/amule/amule-0-r2.ebuild14
-rw-r--r--acct-user/amule/amule-0-r3.ebuild14
-rw-r--r--acct-user/anope/anope-0-r1.ebuild12
-rw-r--r--acct-user/anope/anope-0-r2.ebuild12
-rw-r--r--acct-user/apache/apache-0-r2.ebuild12
-rw-r--r--acct-user/apache/apache-0-r3.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild12
-rw-r--r--acct-user/argus/argus-0-r1.ebuild13
-rw-r--r--acct-user/argus/argus-0.ebuild13
-rw-r--r--acct-user/arpwatch/arpwatch-0-r1.ebuild13
-rw-r--r--acct-user/arpwatch/arpwatch-0.ebuild13
-rw-r--r--acct-user/artifactory/artifactory-0-r1.ebuild14
-rw-r--r--acct-user/artifactory/artifactory-0.ebuild14
-rw-r--r--acct-user/aspnet/aspnet-0-r1.ebuild13
-rw-r--r--acct-user/aspnet/aspnet-0.ebuild13
-rw-r--r--acct-user/asterisk/asterisk-0-r1.ebuild12
-rw-r--r--acct-user/asterisk/asterisk-0-r2.ebuild12
-rw-r--r--acct-user/at/at-0-r1.ebuild12
-rw-r--r--acct-user/at/at-0.ebuild12
-rw-r--r--acct-user/atheme-services/atheme-services-0-r1.ebuild12
-rw-r--r--acct-user/atheme-services/atheme-services-0-r2.ebuild12
-rw-r--r--acct-user/automatic/automatic-0-r1.ebuild (renamed from acct-user/automatic/automatic-0.ebuild)0
-rw-r--r--acct-user/automx2/automx2-0-r1.ebuild14
-rw-r--r--acct-user/automx2/automx2-0-r2.ebuild14
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild12
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild12
-rw-r--r--acct-user/avahi/avahi-0-r1.ebuild12
-rw-r--r--acct-user/avahi/avahi-0-r2.ebuild12
-rw-r--r--acct-user/axtls/axtls-0-r1.ebuild13
-rw-r--r--acct-user/axtls/axtls-0.ebuild13
-rw-r--r--acct-user/backuppc/backuppc-0-r1.ebuild15
-rw-r--r--acct-user/backuppc/backuppc-0.ebuild15
-rw-r--r--acct-user/bacula/bacula-0-r1.ebuild13
-rw-r--r--acct-user/bacula/bacula-0-r2.ebuild13
-rw-r--r--acct-user/bareos/bareos-0-r1.ebuild13
-rw-r--r--acct-user/bareos/bareos-0-r2.ebuild13
-rw-r--r--acct-user/beanstalk/beanstalk-0-r1.ebuild14
-rw-r--r--acct-user/beanstalk/beanstalk-0.ebuild14
-rw-r--r--acct-user/bedrock/bedrock-0-r1.ebuild13
-rw-r--r--acct-user/bedrock/bedrock-0-r2.ebuild13
-rw-r--r--acct-user/biboumi/biboumi-0-r1.ebuild12
-rw-r--r--acct-user/biboumi/biboumi-0.ebuild12
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r1.ebuild12
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r2.ebuild12
-rw-r--r--acct-user/bird/bird-0-r1.ebuild13
-rw-r--r--acct-user/bird/bird-0.ebuild13
-rw-r--r--acct-user/bitcoin/bitcoin-0-r1.ebuild12
-rw-r--r--acct-user/bitcoin/bitcoin-0-r2.ebuild12
-rw-r--r--acct-user/bitflu/bitflu-0-r1.ebuild14
-rw-r--r--acct-user/bitflu/bitflu-0.ebuild14
-rw-r--r--acct-user/bitlbee/bitlbee-0-r1.ebuild12
-rw-r--r--acct-user/bitlbee/bitlbee-0-r2.ebuild12
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild12
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0.ebuild12
-rw-r--r--acct-user/boinc/boinc-0-r1.ebuild14
-rw-r--r--acct-user/boinc/boinc-0.ebuild14
-rw-r--r--acct-user/brltty/brltty-0-r1.ebuild13
-rw-r--r--acct-user/brltty/brltty-0.ebuild13
-rw-r--r--acct-user/buildbot/buildbot-0-r1.ebuild12
-rw-r--r--acct-user/buildbot/buildbot-0-r2.ebuild12
-rw-r--r--acct-user/burp/burp-0-r1.ebuild12
-rw-r--r--acct-user/burp/burp-0-r2.ebuild12
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild12
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild12
-rw-r--r--acct-user/cadvisor/cadvisor-0-r1.ebuild12
-rw-r--r--acct-user/cadvisor/cadvisor-0-r2.ebuild12
-rw-r--r--acct-user/cancd/cancd-0-r1.ebuild13
-rw-r--r--acct-user/cancd/cancd-0-r2.ebuild13
-rw-r--r--acct-user/carbon/carbon-0-r1.ebuild12
-rw-r--r--acct-user/carbon/carbon-0-r2.ebuild12
-rw-r--r--acct-user/ceph/ceph-0-r2.ebuild (renamed from acct-user/ceph/ceph-0-r1.ebuild)0
-rw-r--r--acct-user/cgit/cgit-0-r1.ebuild13
-rw-r--r--acct-user/cgit/cgit-0.ebuild13
-rw-r--r--acct-user/chronograf/chronograf-0-r1.ebuild13
-rw-r--r--acct-user/chronograf/chronograf-0-r2.ebuild13
-rw-r--r--acct-user/cinder/cinder-0-r1.ebuild14
-rw-r--r--acct-user/cinder/cinder-0-r2.ebuild14
-rw-r--r--acct-user/clair/clair-0-r1.ebuild12
-rw-r--r--acct-user/clair/clair-0-r2.ebuild12
-rw-r--r--acct-user/clamav/clamav-0-r1.ebuild11
-rw-r--r--acct-user/clamav/clamav-0-r2.ebuild11
-rw-r--r--acct-user/cntlm/cntlm-0-r1.ebuild13
-rw-r--r--acct-user/cntlm/cntlm-0.ebuild13
-rw-r--r--acct-user/cockroach/cockroach-0-r1.ebuild15
-rw-r--r--acct-user/cockroach/cockroach-0.ebuild15
-rw-r--r--acct-user/collectd/collectd-0-r1.ebuild14
-rw-r--r--acct-user/collectd/collectd-0.ebuild14
-rw-r--r--acct-user/colord/colord-0-r1.ebuild13
-rw-r--r--acct-user/colord/colord-0.ebuild13
-rw-r--r--acct-user/consul-template/consul-template-0-r1.ebuild12
-rw-r--r--acct-user/consul-template/consul-template-0-r2.ebuild12
-rw-r--r--acct-user/consul/consul-0-r1.ebuild13
-rw-r--r--acct-user/consul/consul-0-r2.ebuild13
-rw-r--r--acct-user/consul_exporter/consul_exporter-0-r1.ebuild12
-rw-r--r--acct-user/consul_exporter/consul_exporter-0.ebuild12
-rw-r--r--acct-user/coredns/coredns-0-r1.ebuild14
-rw-r--r--acct-user/coredns/coredns-0.ebuild14
-rw-r--r--acct-user/croc/croc-0-r1.ebuild12
-rw-r--r--acct-user/croc/croc-0.ebuild12
-rw-r--r--acct-user/cron/cron-0-r1.ebuild14
-rw-r--r--acct-user/cron/cron-0.ebuild14
-rw-r--r--acct-user/cvmfs/cvmfs-0-r1.ebuild12
-rw-r--r--acct-user/cvmfs/cvmfs-0-r2.ebuild12
-rw-r--r--acct-user/cyrus/cyrus-0-r2.ebuild12
-rw-r--r--acct-user/cyrus/cyrus-0-r3.ebuild12
-rw-r--r--acct-user/darkstat/darkstat-0-r1.ebuild12
-rw-r--r--acct-user/darkstat/darkstat-0.ebuild12
-rw-r--r--acct-user/davfs2/davfs2-0-r1.ebuild11
-rw-r--r--acct-user/davfs2/davfs2-0-r2.ebuild11
-rw-r--r--acct-user/dbmail/dbmail-0-r1.ebuild11
-rw-r--r--acct-user/dbmail/dbmail-0.ebuild11
-rw-r--r--acct-user/dbskkd/dbskkd-0-r1.ebuild13
-rw-r--r--acct-user/dbskkd/dbskkd-0.ebuild13
-rw-r--r--acct-user/ddclient/ddclient-0-r1.ebuild13
-rw-r--r--acct-user/ddclient/ddclient-0-r2.ebuild13
-rw-r--r--acct-user/defang/defang-0-r1.ebuild13
-rw-r--r--acct-user/defang/defang-0.ebuild13
-rw-r--r--acct-user/dehydrated/dehydrated-0-r1.ebuild14
-rw-r--r--acct-user/dehydrated/dehydrated-0.ebuild14
-rw-r--r--acct-user/deluge/deluge-0-r2.ebuild (renamed from acct-user/deluge/deluge-0-r1.ebuild)0
-rw-r--r--acct-user/dhcp/dhcp-0-r1.ebuild12
-rw-r--r--acct-user/dhcp/dhcp-0-r2.ebuild12
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r1.ebuild13
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r2.ebuild13
-rw-r--r--acct-user/dictd/dictd-0-r1.ebuild12
-rw-r--r--acct-user/dictd/dictd-0.ebuild12
-rw-r--r--acct-user/dirsrv/dirsrv-0-r1.ebuild12
-rw-r--r--acct-user/dirsrv/dirsrv-0.ebuild12
-rw-r--r--acct-user/distcc/distcc-1-r1.ebuild12
-rw-r--r--acct-user/distcc/distcc-1.ebuild12
-rw-r--r--acct-user/dnrd/dnrd-0-r1.ebuild13
-rw-r--r--acct-user/dnrd/dnrd-0.ebuild13
-rw-r--r--acct-user/dnscache/dnscache-0-r1.ebuild11
-rw-r--r--acct-user/dnscache/dnscache-0.ebuild11
-rw-r--r--acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild12
-rw-r--r--acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild12
-rw-r--r--acct-user/dnsdist/dnsdist-0-r1.ebuild13
-rw-r--r--acct-user/dnsdist/dnsdist-0-r2.ebuild13
-rw-r--r--acct-user/dnslog/dnslog-0-r1.ebuild11
-rw-r--r--acct-user/dnslog/dnslog-0.ebuild11
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r1.ebuild13
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r2.ebuild13
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild12
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild12
-rw-r--r--acct-user/docker_auth/docker_auth-0-r1.ebuild12
-rw-r--r--acct-user/docker_auth/docker_auth-0-r2.ebuild12
-rw-r--r--acct-user/dovecot/dovecot-0-r1.ebuild12
-rw-r--r--acct-user/dovecot/dovecot-0-r2.ebuild12
-rw-r--r--acct-user/dovenull/dovenull-0-r1.ebuild12
-rw-r--r--acct-user/dovenull/dovenull-0-r2.ebuild12
-rw-r--r--acct-user/drone/drone-0-r1.ebuild14
-rw-r--r--acct-user/drone/drone-0.ebuild14
-rw-r--r--acct-user/duende/duende-0-r1.ebuild14
-rw-r--r--acct-user/duende/duende-0-r2.ebuild14
-rw-r--r--acct-user/ejabberd/ejabberd-2-r1.ebuild22
-rw-r--r--acct-user/ejabberd/ejabberd-2.ebuild22
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r1.ebuild13
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r2.ebuild13
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild12
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild12
-rw-r--r--acct-user/energi3/energi3-0-r1.ebuild12
-rw-r--r--acct-user/energi3/energi3-0.ebuild12
-rw-r--r--acct-user/epmd/epmd-0-r1.ebuild12
-rw-r--r--acct-user/epmd/epmd-0-r2.ebuild12
-rw-r--r--acct-user/err/err-0-r1.ebuild11
-rw-r--r--acct-user/err/err-0.ebuild11
-rw-r--r--acct-user/etcd/etcd-0-r1.ebuild14
-rw-r--r--acct-user/etcd/etcd-0-r2.ebuild14
-rw-r--r--acct-user/exabgp/exabgp-0-r1.ebuild13
-rw-r--r--acct-user/exabgp/exabgp-0-r2.ebuild13
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild14
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0.ebuild14
-rw-r--r--acct-user/fax/fax-0-r1.ebuild13
-rw-r--r--acct-user/fax/fax-0.ebuild13
-rw-r--r--acct-user/fcron/fcron-0-r1.ebuild13
-rw-r--r--acct-user/fcron/fcron-0.ebuild13
-rw-r--r--acct-user/fdm/fdm-0-r1.ebuild13
-rw-r--r--acct-user/fdm/fdm-0.ebuild13
-rw-r--r--acct-user/fetchmail/fetchmail-0-r1.ebuild14
-rw-r--r--acct-user/fetchmail/fetchmail-0-r2.ebuild14
-rw-r--r--acct-user/fhem/fhem-0-r1.ebuild14
-rw-r--r--acct-user/fhem/fhem-0-r2.ebuild14
-rw-r--r--acct-user/firebird/firebird-0-r2.ebuild18
-rw-r--r--acct-user/firebird/firebird-0-r3.ebuild18
-rw-r--r--acct-user/flatpak/flatpak-0-r1.ebuild10
-rw-r--r--acct-user/flatpak/flatpak-0.ebuild10
-rw-r--r--acct-user/flows/flows-0-r1.ebuild13
-rw-r--r--acct-user/flows/flows-0.ebuild13
-rw-r--r--acct-user/fluentd/fluentd-0-r1.ebuild12
-rw-r--r--acct-user/fluentd/fluentd-0-r2.ebuild12
-rw-r--r--acct-user/fnord/fnord-0-r1.ebuild14
-rw-r--r--acct-user/fnord/fnord-0.ebuild14
-rw-r--r--acct-user/fnordlog/fnordlog-0-r1.ebuild14
-rw-r--r--acct-user/fnordlog/fnordlog-0.ebuild14
-rw-r--r--acct-user/foldingathome/foldingathome-0-r1.ebuild14
-rw-r--r--acct-user/foldingathome/foldingathome-0.ebuild14
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild14
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0.ebuild14
-rw-r--r--acct-user/freenet/freenet-0-r1.ebuild14
-rw-r--r--acct-user/freenet/freenet-0.ebuild14
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild13
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild13
-rw-r--r--acct-user/frr/frr-0-r1.ebuild11
-rw-r--r--acct-user/frr/frr-0.ebuild11
-rw-r--r--acct-user/ftp/ftp-0-r3.ebuild15
-rw-r--r--acct-user/ftp/ftp-0-r4.ebuild15
-rw-r--r--acct-user/ftpproxy/ftpproxy-0-r1.ebuild15
-rw-r--r--acct-user/ftpproxy/ftpproxy-0.ebuild15
-rw-r--r--acct-user/gatling/gatling-0-r1.ebuild12
-rw-r--r--acct-user/gatling/gatling-0-r2.ebuild12
-rw-r--r--acct-user/gauth/gauth-0-r1.ebuild13
-rw-r--r--acct-user/gauth/gauth-0.ebuild13
-rw-r--r--acct-user/gdm/gdm-0-r1.ebuild13
-rw-r--r--acct-user/gdm/gdm-0.ebuild13
-rw-r--r--acct-user/geneweb/geneweb-0-r1.ebuild14
-rw-r--r--acct-user/geneweb/geneweb-0-r2.ebuild14
-rw-r--r--acct-user/geoclue/geoclue-0-r1.ebuild13
-rw-r--r--acct-user/geoclue/geoclue-0.ebuild13
-rw-r--r--acct-user/gerbera/gerbera-0-r1.ebuild13
-rw-r--r--acct-user/gerbera/gerbera-0-r2.ebuild13
-rw-r--r--acct-user/git/git-0-r3.ebuild (renamed from acct-user/git/git-0-r2.ebuild)0
-rw-r--r--acct-user/github-exporter/github-exporter-0-r1.ebuild12
-rw-r--r--acct-user/github-exporter/github-exporter-0.ebuild12
-rw-r--r--acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild16
-rw-r--r--acct-user/gitlab-runner/gitlab-runner-1.ebuild16
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r1.ebuild12
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r2.ebuild12
-rw-r--r--acct-user/glance/glance-0-r1.ebuild14
-rw-r--r--acct-user/glance/glance-0-r2.ebuild14
-rw-r--r--acct-user/gluster/gluster-0-r1.ebuild14
-rw-r--r--acct-user/gluster/gluster-0-r2.ebuild14
-rw-r--r--acct-user/gns3/gns3-0-r1.ebuild12
-rw-r--r--acct-user/gns3/gns3-0.ebuild12
-rw-r--r--acct-user/gnump3d/gnump3d-0-r1.ebuild13
-rw-r--r--acct-user/gnump3d/gnump3d-0.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild13
-rw-r--r--acct-user/goaccess/goaccess-0-r1.ebuild (renamed from acct-user/goaccess/goaccess-0.ebuild)0
-rw-r--r--acct-user/gopher/gopher-0-r1.ebuild12
-rw-r--r--acct-user/gopher/gopher-0.ebuild12
-rw-r--r--acct-user/gopherd/gopherd-0-r1.ebuild14
-rw-r--r--acct-user/gopherd/gopherd-0.ebuild14
-rw-r--r--acct-user/gpsd/gpsd-0-r2.ebuild13
-rw-r--r--acct-user/gpsd/gpsd-0-r3.ebuild13
-rw-r--r--acct-user/grafana/grafana-0-r1.ebuild13
-rw-r--r--acct-user/grafana/grafana-0-r2.ebuild13
-rw-r--r--acct-user/graylog/graylog-0-r1.ebuild11
-rw-r--r--acct-user/graylog/graylog-0-r2.ebuild11
-rw-r--r--acct-user/greetd/greetd-0-r1.ebuild12
-rw-r--r--acct-user/greetd/greetd-0-r2.ebuild12
-rw-r--r--acct-user/grok_exporter/grok_exporter-0-r1.ebuild12
-rw-r--r--acct-user/grok_exporter/grok_exporter-0.ebuild12
-rw-r--r--acct-user/groonga/groonga-0-r1.ebuild13
-rw-r--r--acct-user/groonga/groonga-0.ebuild13
-rw-r--r--acct-user/gvm/gvm-0-r1.ebuild13
-rw-r--r--acct-user/gvm/gvm-0-r2.ebuild13
-rw-r--r--acct-user/h2o/h2o-0-r1.ebuild13
-rw-r--r--acct-user/h2o/h2o-0.ebuild13
-rw-r--r--acct-user/hacluster/hacluster-0-r1.ebuild14
-rw-r--r--acct-user/hacluster/hacluster-0.ebuild14
-rw-r--r--acct-user/haproxy/haproxy-0-r1.ebuild11
-rw-r--r--acct-user/haproxy/haproxy-0-r2.ebuild11
-rw-r--r--acct-user/havp/havp-0-r2.ebuild (renamed from acct-user/havp/havp-0-r1.ebuild)0
-rw-r--r--acct-user/headscale/headscale-0-r1.ebuild (renamed from acct-user/headscale/headscale-0.ebuild)0
-rw-r--r--acct-user/heat/heat-0-r1.ebuild14
-rw-r--r--acct-user/heat/heat-0-r2.ebuild14
-rw-r--r--acct-user/hsqldb/hsqldb-0-r1.ebuild12
-rw-r--r--acct-user/hsqldb/hsqldb-0.ebuild12
-rw-r--r--acct-user/http/http-0-r1.ebuild14
-rw-r--r--acct-user/http/http-0.ebuild14
-rw-r--r--acct-user/i2p/i2p-0-r1.ebuild13
-rw-r--r--acct-user/i2p/i2p-0-r2.ebuild13
-rw-r--r--acct-user/i2pd/i2pd-0-r1.ebuild14
-rw-r--r--acct-user/i2pd/i2pd-0-r2.ebuild14
-rw-r--r--acct-user/icecast/icecast-0-r1.ebuild13
-rw-r--r--acct-user/icecast/icecast-0.ebuild13
-rw-r--r--acct-user/icecream/icecream-0-r1.ebuild14
-rw-r--r--acct-user/icecream/icecream-0.ebuild14
-rw-r--r--acct-user/ices/ices-0-r1.ebuild13
-rw-r--r--acct-user/ices/ices-0.ebuild13
-rw-r--r--acct-user/icinga/icinga-0-r1.ebuild13
-rw-r--r--acct-user/icinga/icinga-0-r2.ebuild13
-rw-r--r--acct-user/icingadirector/icingadirector-0-r1.ebuild13
-rw-r--r--acct-user/icingadirector/icingadirector-0.ebuild13
-rw-r--r--acct-user/inadyn/inadyn-0-r1.ebuild (renamed from acct-user/inadyn/inadyn-0.ebuild)0
-rw-r--r--acct-user/influxdb/influxdb-0-r1.ebuild13
-rw-r--r--acct-user/influxdb/influxdb-0-r2.ebuild13
-rw-r--r--acct-user/inspircd/inspircd-0-r1.ebuild12
-rw-r--r--acct-user/inspircd/inspircd-0-r2.ebuild12
-rw-r--r--acct-user/ipfs/ipfs-0-r1.ebuild14
-rw-r--r--acct-user/ipfs/ipfs-0-r2.ebuild14
-rw-r--r--acct-user/ippl/ippl-0-r1.ebuild12
-rw-r--r--acct-user/ippl/ippl-0-r2.ebuild12
-rw-r--r--acct-user/ipsec/ipsec-0-r1.ebuild13
-rw-r--r--acct-user/ipsec/ipsec-0.ebuild13
-rw-r--r--acct-user/ipsentinel/ipsentinel-0-r1.ebuild13
-rw-r--r--acct-user/ipsentinel/ipsentinel-0.ebuild13
-rw-r--r--acct-user/iroffer/iroffer-0-r1.ebuild11
-rw-r--r--acct-user/iroffer/iroffer-0.ebuild11
-rw-r--r--acct-user/jellyfin/jellyfin-0-r1.ebuild12
-rw-r--r--acct-user/jellyfin/jellyfin-0-r2.ebuild12
-rw-r--r--acct-user/jenkins/jenkins-0-r1.ebuild14
-rw-r--r--acct-user/jenkins/jenkins-0.ebuild14
-rw-r--r--acct-user/kafka/kafka-0-r1.ebuild15
-rw-r--r--acct-user/kafka/kafka-0-r2.ebuild15
-rw-r--r--acct-user/kapacitor/kapacitor-0-r1.ebuild13
-rw-r--r--acct-user/kapacitor/kapacitor-0-r2.ebuild13
-rw-r--r--acct-user/karma/karma-0-r1.ebuild13
-rw-r--r--acct-user/karma/karma-0.ebuild13
-rw-r--r--acct-user/keystone/keystone-0-r1.ebuild14
-rw-r--r--acct-user/keystone/keystone-0-r2.ebuild14
-rw-r--r--acct-user/kibana/kibana-0-r1.ebuild13
-rw-r--r--acct-user/kibana/kibana-0-r2.ebuild13
-rw-r--r--acct-user/kismet/kismet-0-r1.ebuild15
-rw-r--r--acct-user/kismet/kismet-0-r2.ebuild15
-rw-r--r--acct-user/knot-resolver/knot-resolver-0-r1.ebuild12
-rw-r--r--acct-user/knot-resolver/knot-resolver-0.ebuild12
-rw-r--r--acct-user/knot/knot-0-r1.ebuild13
-rw-r--r--acct-user/knot/knot-0-r2.ebuild13
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild12
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild12
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild12
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild12
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild12
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild12
-rw-r--r--acct-user/ldap/ldap-0-r1.ebuild16
-rw-r--r--acct-user/ldap/ldap-0.ebuild16
-rw-r--r--acct-user/libreoffice/libreoffice-0-r1.ebuild14
-rw-r--r--acct-user/libreoffice/libreoffice-0.ebuild14
-rw-r--r--acct-user/lightdm/lightdm-0-r1.ebuild14
-rw-r--r--acct-user/lightdm/lightdm-0.ebuild14
-rw-r--r--acct-user/lighttpd/lighttpd-0-r1.ebuild12
-rw-r--r--acct-user/lighttpd/lighttpd-0-r2.ebuild12
-rw-r--r--acct-user/litecoin/litecoin-0-r1.ebuild14
-rw-r--r--acct-user/litecoin/litecoin-0.ebuild14
-rw-r--r--acct-user/lldpd/lldpd-0-r1.ebuild13
-rw-r--r--acct-user/lldpd/lldpd-0-r2.ebuild13
-rw-r--r--acct-user/logcheck/logcheck-0-r1.ebuild13
-rw-r--r--acct-user/logcheck/logcheck-0.ebuild13
-rw-r--r--acct-user/logstash/logstash-0-r1.ebuild13
-rw-r--r--acct-user/logstash/logstash-0-r2.ebuild13
-rw-r--r--acct-user/logsurfer/logsurfer-0-r1.ebuild13
-rw-r--r--acct-user/logsurfer/logsurfer-0.ebuild13
-rw-r--r--acct-user/lxc/lxc-0-r1.ebuild12
-rw-r--r--acct-user/lxc/lxc-0.ebuild12
-rw-r--r--acct-user/mail/mail-0-r1.ebuild15
-rw-r--r--acct-user/mail/mail-0-r2.ebuild15
-rw-r--r--acct-user/man/man-1-r1.ebuild11
-rw-r--r--acct-user/man/man-1-r2.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r1.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r2.ebuild11
-rw-r--r--acct-user/memcached/memcached-0-r1.ebuild12
-rw-r--r--acct-user/memcached/memcached-0-r2.ebuild12
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild12
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0.ebuild12
-rw-r--r--acct-user/messagebus/messagebus-0-r1.ebuild11
-rw-r--r--acct-user/messagebus/messagebus-0-r2.ebuild11
-rw-r--r--acct-user/mgraph/mgraph-0-r1.ebuild14
-rw-r--r--acct-user/mgraph/mgraph-0.ebuild14
-rw-r--r--acct-user/milter-regex/milter-regex-0-r1.ebuild13
-rw-r--r--acct-user/milter-regex/milter-regex-0-r2.ebuild13
-rw-r--r--acct-user/minbif/minbif-0-r1.ebuild14
-rw-r--r--acct-user/minbif/minbif-0.ebuild14
-rw-r--r--acct-user/minecraft/minecraft-0-r1.ebuild14
-rw-r--r--acct-user/minecraft/minecraft-0-r2.ebuild14
-rw-r--r--acct-user/minetest/minetest-1-r1.ebuild14
-rw-r--r--acct-user/minetest/minetest-1-r2.ebuild14
-rw-r--r--acct-user/minidlna/minidlna-0-r1.ebuild11
-rw-r--r--acct-user/minidlna/minidlna-0.ebuild11
-rw-r--r--acct-user/miniflux/miniflux-0-r1.ebuild12
-rw-r--r--acct-user/miniflux/miniflux-0.ebuild12
-rw-r--r--acct-user/minio/minio-0-r1.ebuild13
-rw-r--r--acct-user/minio/minio-0.ebuild13
-rw-r--r--acct-user/mogile/mogile-0-r1.ebuild13
-rw-r--r--acct-user/mogile/mogile-0.ebuild13
-rw-r--r--acct-user/mongodb/mongodb-0-r1.ebuild13
-rw-r--r--acct-user/mongodb/mongodb-0-r2.ebuild13
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild12
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0.ebuild12
-rw-r--r--acct-user/monitorix/monitorix-0-r1.ebuild12
-rw-r--r--acct-user/monitorix/monitorix-0-r2.ebuild12
-rw-r--r--acct-user/monkeyd/monkeyd-0-r1.ebuild15
-rw-r--r--acct-user/monkeyd/monkeyd-0.ebuild15
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r1.ebuild16
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r2.ebuild16
-rw-r--r--acct-user/mosquitto/mosquitto-0-r1.ebuild12
-rw-r--r--acct-user/mosquitto/mosquitto-0-r2.ebuild12
-rw-r--r--acct-user/motion/motion-0-r1.ebuild12
-rw-r--r--acct-user/motion/motion-0-r2.ebuild12
-rw-r--r--acct-user/mpd/mpd-0-r1.ebuild13
-rw-r--r--acct-user/mpd/mpd-0-r2.ebuild13
-rw-r--r--acct-user/msmtpd/msmtpd-0-r1.ebuild12
-rw-r--r--acct-user/msmtpd/msmtpd-0-r2.ebuild12
-rw-r--r--acct-user/munge/munge-0-r1.ebuild14
-rw-r--r--acct-user/munge/munge-0.ebuild14
-rw-r--r--acct-user/munin-async/munin-async-0-r2.ebuild (renamed from acct-user/munin-async/munin-async-0-r1.ebuild)0
-rw-r--r--acct-user/munin/munin-0-r2.ebuild (renamed from acct-user/munin/munin-0-r1.ebuild)0
-rw-r--r--acct-user/murmur/murmur-0-r1.ebuild15
-rw-r--r--acct-user/murmur/murmur-0-r2.ebuild15
-rw-r--r--acct-user/mysql/mysql-0-r1.ebuild12
-rw-r--r--acct-user/mysql/mysql-0-r2.ebuild12
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild14
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild14
-rw-r--r--acct-user/mythtv/mythtv-0-r1.ebuild14
-rw-r--r--acct-user/mythtv/mythtv-0-r2.ebuild14
-rw-r--r--acct-user/nagios/nagios-0-r1.ebuild11
-rw-r--r--acct-user/nagios/nagios-0-r2.ebuild11
-rw-r--r--acct-user/named/named-0-r2.ebuild (renamed from acct-user/named/named-0-r1.ebuild)0
-rw-r--r--acct-user/netbox/netbox-0-r1.ebuild13
-rw-r--r--acct-user/netbox/netbox-0-r2.ebuild13
-rw-r--r--acct-user/netdata/netdata-1-r1.ebuild13
-rw-r--r--acct-user/netdata/netdata-1.ebuild13
-rw-r--r--acct-user/netperf/netperf-0-r1.ebuild13
-rw-r--r--acct-user/netperf/netperf-0.ebuild13
-rw-r--r--acct-user/neutron/neutron-0-r1.ebuild14
-rw-r--r--acct-user/neutron/neutron-0-r2.ebuild14
-rw-r--r--acct-user/nginx-unit/nginx-unit-0-r1.ebuild (renamed from acct-user/nginx-unit/nginx-unit-0.ebuild)0
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild12
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild12
-rw-r--r--acct-user/nginx/nginx-0-r1.ebuild12
-rw-r--r--acct-user/nginx/nginx-0.ebuild12
-rw-r--r--acct-user/ngircd/ngircd-0-r1.ebuild12
-rw-r--r--acct-user/ngircd/ngircd-0-r2.ebuild12
-rw-r--r--acct-user/ngrep/ngrep-0-r1.ebuild13
-rw-r--r--acct-user/ngrep/ngrep-0-r2.ebuild13
-rw-r--r--acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild13
-rw-r--r--acct-user/nm-openconnect/nm-openconnect-0.ebuild13
-rw-r--r--acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild13
-rw-r--r--acct-user/nm-openvpn/nm-openvpn-0.ebuild13
-rw-r--r--acct-user/nobody/nobody-0-r1.ebuild17
-rw-r--r--acct-user/nobody/nobody-0.ebuild17
-rw-r--r--acct-user/node_exporter/node_exporter-0-r1.ebuild12
-rw-r--r--acct-user/node_exporter/node_exporter-0-r2.ebuild12
-rw-r--r--acct-user/notary/notary-0-r1.ebuild13
-rw-r--r--acct-user/notary/notary-0.ebuild13
-rw-r--r--acct-user/nova/nova-0-r1.ebuild14
-rw-r--r--acct-user/nova/nova-0-r2.ebuild14
-rw-r--r--acct-user/nsd/nsd-0-r1.ebuild12
-rw-r--r--acct-user/nsd/nsd-0-r2.ebuild12
-rw-r--r--acct-user/nslcd/nslcd-0-r1.ebuild13
-rw-r--r--acct-user/nslcd/nslcd-0-r2.ebuild13
-rw-r--r--acct-user/ntopng/ntopng-0-r1.ebuild12
-rw-r--r--acct-user/ntopng/ntopng-0.ebuild12
-rw-r--r--acct-user/ntp/ntp-0-r1.ebuild12
-rw-r--r--acct-user/ntp/ntp-0-r2.ebuild12
-rw-r--r--acct-user/nullmail/nullmail-0-r1.ebuild14
-rw-r--r--acct-user/nullmail/nullmail-0.ebuild14
-rw-r--r--acct-user/nut/nut-0-r1.ebuild14
-rw-r--r--acct-user/nut/nut-0-r2.ebuild14
-rw-r--r--acct-user/nvpd/nvpd-0-r1.ebuild12
-rw-r--r--acct-user/nvpd/nvpd-0.ebuild12
-rw-r--r--acct-user/nzbget/nzbget-0-r1.ebuild16
-rw-r--r--acct-user/nzbget/nzbget-0.ebuild16
-rw-r--r--acct-user/oidentd/oidentd-0-r1.ebuild11
-rw-r--r--acct-user/oidentd/oidentd-0-r2.ebuild11
-rw-r--r--acct-user/openctd/openctd-0-r1.ebuild13
-rw-r--r--acct-user/openctd/openctd-0.ebuild13
-rw-r--r--acct-user/opendkim/opendkim-0-r1.ebuild13
-rw-r--r--acct-user/opendkim/opendkim-0-r2.ebuild13
-rw-r--r--acct-user/opendmarc/opendmarc-0-r1.ebuild16
-rw-r--r--acct-user/opendmarc/opendmarc-0.ebuild16
-rw-r--r--acct-user/opendnssec/opendnssec-0-r1.ebuild13
-rw-r--r--acct-user/opendnssec/opendnssec-0.ebuild13
-rw-r--r--acct-user/openntpd/openntpd-0-r1.ebuild14
-rw-r--r--acct-user/openntpd/openntpd-0-r2.ebuild14
-rw-r--r--acct-user/openrct2/openrct2-0-r1.ebuild13
-rw-r--r--acct-user/openrct2/openrct2-0-r2.ebuild13
-rw-r--r--acct-user/openttd/openttd-0-r1.ebuild14
-rw-r--r--acct-user/openttd/openttd-0.ebuild14
-rw-r--r--acct-user/openvpn/openvpn-0-r1.ebuild13
-rw-r--r--acct-user/openvpn/openvpn-0-r2.ebuild13
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild13
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild13
-rw-r--r--acct-user/opm/opm-0-r1.ebuild12
-rw-r--r--acct-user/opm/opm-0-r2.ebuild12
-rw-r--r--acct-user/oprofile/oprofile-0-r1.ebuild12
-rw-r--r--acct-user/oprofile/oprofile-0-r2.ebuild12
-rw-r--r--acct-user/oragono/oragono-0-r1.ebuild12
-rw-r--r--acct-user/oragono/oragono-0.ebuild12
-rw-r--r--acct-user/ossec/ossec-0-r1.ebuild13
-rw-r--r--acct-user/ossec/ossec-0-r2.ebuild13
-rw-r--r--acct-user/ossecm/ossecm-0-r1.ebuild12
-rw-r--r--acct-user/ossecm/ossecm-0-r2.ebuild12
-rw-r--r--acct-user/ossecr/ossecr-0-r1.ebuild12
-rw-r--r--acct-user/ossecr/ossecr-0-r2.ebuild12
-rw-r--r--acct-user/owntracks/owntracks-0-r1.ebuild12
-rw-r--r--acct-user/owntracks/owntracks-0.ebuild12
-rw-r--r--acct-user/p2p/p2p-0-r1.ebuild12
-rw-r--r--acct-user/p2p/p2p-0.ebuild12
-rw-r--r--acct-user/partimag/partimag-0-r1.ebuild14
-rw-r--r--acct-user/partimag/partimag-0.ebuild14
-rw-r--r--acct-user/pcap/pcap-0-r1.ebuild12
-rw-r--r--acct-user/pcap/pcap-0.ebuild12
-rw-r--r--acct-user/pcscd/pcscd-0-r1.ebuild12
-rw-r--r--acct-user/pcscd/pcscd-0-r2.ebuild12
-rw-r--r--acct-user/pdns/pdns-0-r1.ebuild11
-rw-r--r--acct-user/pdns/pdns-0-r2.ebuild11
-rw-r--r--acct-user/pdnsd/pdnsd-0-r1.ebuild14
-rw-r--r--acct-user/pdnsd/pdnsd-0-r2.ebuild14
-rw-r--r--acct-user/pgagent/pgagent-0-r1.ebuild22
-rw-r--r--acct-user/pgagent/pgagent-0.ebuild22
-rw-r--r--acct-user/pgbouncer/pgbouncer-0-r1.ebuild12
-rw-r--r--acct-user/pgbouncer/pgbouncer-0.ebuild12
-rw-r--r--acct-user/pgpool/pgpool-0-r1.ebuild13
-rw-r--r--acct-user/pgpool/pgpool-0.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-0-r1.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-0.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-1-r1.ebuild (renamed from acct-user/pipewire/pipewire-1.ebuild)0
-rw-r--r--acct-user/placement/placement-0-r1.ebuild14
-rw-r--r--acct-user/placement/placement-0-r2.ebuild14
-rw-r--r--acct-user/plex/plex-0-r1.ebuild13
-rw-r--r--acct-user/plex/plex-0-r2.ebuild13
-rw-r--r--acct-user/polkitd/polkitd-0-r1.ebuild12
-rw-r--r--acct-user/polkitd/polkitd-0-r2.ebuild12
-rw-r--r--acct-user/polw/polw-0-r1.ebuild13
-rw-r--r--acct-user/polw/polw-0.ebuild13
-rw-r--r--acct-user/popa3d/popa3d-0-r1.ebuild12
-rw-r--r--acct-user/popa3d/popa3d-0.ebuild12
-rw-r--r--acct-user/portage/portage-0-r2.ebuild (renamed from acct-user/portage/portage-0-r1.ebuild)0
-rw-r--r--acct-user/postfix/postfix-0-r1.ebuild12
-rw-r--r--acct-user/postfix/postfix-0-r2.ebuild12
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild13
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild13
-rw-r--r--acct-user/postfwd/postfwd-0-r1.ebuild13
-rw-r--r--acct-user/postfwd/postfwd-0.ebuild13
-rw-r--r--acct-user/postgres/postgres-0-r1.ebuild15
-rw-r--r--acct-user/postgres/postgres-0-r2.ebuild15
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild12
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0.ebuild12
-rw-r--r--acct-user/postgrey/postgrey-0-r1.ebuild12
-rw-r--r--acct-user/postgrey/postgrey-0.ebuild12
-rw-r--r--acct-user/postmaster/postmaster-0-r1.ebuild15
-rw-r--r--acct-user/postmaster/postmaster-0-r2.ebuild15
-rw-r--r--acct-user/privoxy/privoxy-0-r1.ebuild12
-rw-r--r--acct-user/privoxy/privoxy-0-r2.ebuild12
-rw-r--r--acct-user/prometheus/prometheus-0-r1.ebuild13
-rw-r--r--acct-user/prometheus/prometheus-0-r2.ebuild13
-rw-r--r--acct-user/prosody/prosody-0-r1.ebuild13
-rw-r--r--acct-user/prosody/prosody-0.ebuild13
-rw-r--r--acct-user/prowlarr/prowlarr-0-r1.ebuild13
-rw-r--r--acct-user/prowlarr/prowlarr-0.ebuild13
-rw-r--r--acct-user/psybnc/psybnc-0-r1.ebuild14
-rw-r--r--acct-user/psybnc/psybnc-0.ebuild14
-rw-r--r--acct-user/pulse/pulse-0-r1.ebuild13
-rw-r--r--acct-user/pulse/pulse-0.ebuild13
-rw-r--r--acct-user/puppet/puppet-0-r1.ebuild14
-rw-r--r--acct-user/puppet/puppet-0-r2.ebuild14
-rw-r--r--acct-user/puppetdb/puppetdb-0-r1.ebuild14
-rw-r--r--acct-user/puppetdb/puppetdb-0-r2.ebuild14
-rw-r--r--acct-user/pushgateway/pushgateway-0-r1.ebuild13
-rw-r--r--acct-user/pushgateway/pushgateway-0.ebuild13
-rw-r--r--acct-user/pvpgn/pvpgn-0-r1.ebuild12
-rw-r--r--acct-user/pvpgn/pvpgn-0.ebuild12
-rw-r--r--acct-user/qemu/qemu-0-r1.ebuild11
-rw-r--r--acct-user/qemu/qemu-0-r2.ebuild11
-rw-r--r--acct-user/qmaild/qmaild-0-r1.ebuild12
-rw-r--r--acct-user/qmaild/qmaild-0-r2.ebuild12
-rw-r--r--acct-user/qmaill/qmaill-0-r1.ebuild12
-rw-r--r--acct-user/qmaill/qmaill-0-r2.ebuild12
-rw-r--r--acct-user/qmailp/qmailp-0-r1.ebuild12
-rw-r--r--acct-user/qmailp/qmailp-0-r2.ebuild12
-rw-r--r--acct-user/qmailq/qmailq-0-r1.ebuild12
-rw-r--r--acct-user/qmailq/qmailq-0-r2.ebuild12
-rw-r--r--acct-user/qmailr/qmailr-0-r1.ebuild12
-rw-r--r--acct-user/qmailr/qmailr-0-r2.ebuild12
-rw-r--r--acct-user/qmails/qmails-0-r1.ebuild12
-rw-r--r--acct-user/qmails/qmails-0-r2.ebuild12
-rw-r--r--acct-user/quagga/quagga-0-r1.ebuild11
-rw-r--r--acct-user/quagga/quagga-0-r2.ebuild11
-rw-r--r--acct-user/quassel/quassel-0-r1.ebuild12
-rw-r--r--acct-user/quassel/quassel-0-r2.ebuild12
-rw-r--r--acct-user/rabbitmq/rabbitmq-0-r1.ebuild15
-rw-r--r--acct-user/rabbitmq/rabbitmq-0.ebuild15
-rw-r--r--acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild12
-rw-r--r--acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild12
-rw-r--r--acct-user/radarr/radarr-0-r1.ebuild13
-rw-r--r--acct-user/radarr/radarr-0.ebuild13
-rw-r--r--acct-user/radicale/radicale-0-r2.ebuild13
-rw-r--r--acct-user/radicale/radicale-0-r3.ebuild13
-rw-r--r--acct-user/radius/radius-0-r1.ebuild11
-rw-r--r--acct-user/radius/radius-0-r2.ebuild11
-rw-r--r--acct-user/radvd/radvd-0-r1.ebuild13
-rw-r--r--acct-user/radvd/radvd-0.ebuild13
-rw-r--r--acct-user/rbldns/rbldns-0-r1.ebuild11
-rw-r--r--acct-user/rbldns/rbldns-0-r2.ebuild11
-rw-r--r--acct-user/rbot/rbot-0-r1.ebuild14
-rw-r--r--acct-user/rbot/rbot-0.ebuild14
-rw-r--r--acct-user/readarr/readarr-0-r1.ebuild13
-rw-r--r--acct-user/readarr/readarr-0.ebuild13
-rw-r--r--acct-user/redis/redis-0-r1.ebuild11
-rw-r--r--acct-user/redis/redis-0-r2.ebuild11
-rw-r--r--acct-user/redis_exporter/redis_exporter-0-r1.ebuild14
-rw-r--r--acct-user/redis_exporter/redis_exporter-0.ebuild14
-rw-r--r--acct-user/redmine/redmine-0-r1.ebuild11
-rw-r--r--acct-user/redmine/redmine-0-r2.ebuild11
-rw-r--r--acct-user/redsocks/redsocks-0-r1.ebuild13
-rw-r--r--acct-user/redsocks/redsocks-0-r2.ebuild13
-rw-r--r--acct-user/reg/reg-0-r1.ebuild13
-rw-r--r--acct-user/reg/reg-0-r2.ebuild13
-rw-r--r--acct-user/registry/registry-0-r1.ebuild13
-rw-r--r--acct-user/registry/registry-0.ebuild13
-rw-r--r--acct-user/root/root-0-r1.ebuild24
-rw-r--r--acct-user/root/root-0-r2.ebuild24
-rw-r--r--acct-user/rplayd/rplayd-0-r1.ebuild13
-rw-r--r--acct-user/rplayd/rplayd-0.ebuild13
-rw-r--r--acct-user/rrdcached/rrdcached-0-r1.ebuild14
-rw-r--r--acct-user/rrdcached/rrdcached-0.ebuild14
-rw-r--r--acct-user/rslsync/rslsync-0-r1.ebuild15
-rw-r--r--acct-user/rslsync/rslsync-0.ebuild15
-rw-r--r--acct-user/rspamd/rspamd-0-r1.ebuild12
-rw-r--r--acct-user/rspamd/rspamd-0-r2.ebuild12
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r1.ebuild12
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r2.ebuild12
-rw-r--r--acct-user/rt/rt-0-r1.ebuild13
-rw-r--r--acct-user/rt/rt-0.ebuild13
-rw-r--r--acct-user/rtkit/rtkit-0-r1.ebuild12
-rw-r--r--acct-user/rtkit/rtkit-0-r2.ebuild12
-rw-r--r--acct-user/rundeck/rundeck-0-r1.ebuild14
-rw-r--r--acct-user/rundeck/rundeck-0.ebuild14
-rw-r--r--acct-user/rwhoisd/rwhoisd-0-r1.ebuild14
-rw-r--r--acct-user/rwhoisd/rwhoisd-0.ebuild14
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r1.ebuild15
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r2.ebuild15
-rw-r--r--acct-user/sagan/sagan-0-r1.ebuild12
-rw-r--r--acct-user/sagan/sagan-0-r2.ebuild12
-rw-r--r--acct-user/samplicator/samplicator-0-r1.ebuild14
-rw-r--r--acct-user/samplicator/samplicator-0.ebuild14
-rw-r--r--acct-user/sancp/sancp-0-r1.ebuild12
-rw-r--r--acct-user/sancp/sancp-0.ebuild12
-rw-r--r--acct-user/saned/saned-0-r1.ebuild13
-rw-r--r--acct-user/saned/saned-0.ebuild13
-rw-r--r--acct-user/sanlock/sanlock-0-r1.ebuild13
-rw-r--r--acct-user/sanlock/sanlock-0-r2.ebuild13
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r1.ebuild12
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r2.ebuild12
-rw-r--r--acct-user/scanlogd/scanlogd-0-r1.ebuild13
-rw-r--r--acct-user/scanlogd/scanlogd-0.ebuild13
-rw-r--r--acct-user/scponly/scponly-0-r1.ebuild15
-rw-r--r--acct-user/scponly/scponly-0-r2.ebuild15
-rw-r--r--acct-user/sddm/sddm-0-r1.ebuild14
-rw-r--r--acct-user/sddm/sddm-0.ebuild14
-rw-r--r--acct-user/sendpage/sendpage-0-r1.ebuild13
-rw-r--r--acct-user/sendpage/sendpage-0.ebuild13
-rw-r--r--acct-user/serf/serf-0-r1.ebuild14
-rw-r--r--acct-user/serf/serf-0.ebuild14
-rw-r--r--acct-user/sguil/sguil-0-r1.ebuild14
-rw-r--r--acct-user/sguil/sguil-0.ebuild14
-rw-r--r--acct-user/sigh/sigh-0-r1.ebuild11
-rw-r--r--acct-user/sigh/sigh-0.ebuild11
-rw-r--r--acct-user/sks/sks-0-r1.ebuild12
-rw-r--r--acct-user/sks/sks-0.ebuild12
-rw-r--r--acct-user/slurm/slurm-0-r1.ebuild14
-rw-r--r--acct-user/slurm/slurm-0-r2.ebuild14
-rw-r--r--acct-user/smmsp/smmsp-0-r2.ebuild12
-rw-r--r--acct-user/smmsp/smmsp-0-r3.ebuild12
-rw-r--r--acct-user/smokeping/smokeping-0-r1.ebuild14
-rw-r--r--acct-user/smokeping/smokeping-0.ebuild14
-rw-r--r--acct-user/smsd/smsd-0-r1.ebuild12
-rw-r--r--acct-user/smsd/smsd-0.ebuild12
-rw-r--r--acct-user/smtpd/smtpd-0-r1.ebuild13
-rw-r--r--acct-user/smtpd/smtpd-0-r2.ebuild13
-rw-r--r--acct-user/smtpq/smtpq-0-r1.ebuild13
-rw-r--r--acct-user/smtpq/smtpq-0-r2.ebuild13
-rw-r--r--acct-user/snapclient/snapclient-0-r1.ebuild15
-rw-r--r--acct-user/snapclient/snapclient-0.ebuild15
-rw-r--r--acct-user/snapserver/snapserver-0-r1.ebuild (renamed from acct-user/snapserver/snapserver-0.ebuild)0
-rw-r--r--acct-user/sndiod/sndiod-0-r1.ebuild12
-rw-r--r--acct-user/sndiod/sndiod-0.ebuild12
-rw-r--r--acct-user/sniproxy/sniproxy-0-r1.ebuild11
-rw-r--r--acct-user/sniproxy/sniproxy-0.ebuild11
-rw-r--r--acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild12
-rw-r--r--acct-user/snmp_exporter/snmp_exporter-0.ebuild12
-rw-r--r--acct-user/snort/snort-0-r1.ebuild12
-rw-r--r--acct-user/snort/snort-0.ebuild12
-rw-r--r--acct-user/sobby/sobby-0-r1.ebuild14
-rw-r--r--acct-user/sobby/sobby-0.ebuild14
-rw-r--r--acct-user/sobexsrv/sobexsrv-0-r1.ebuild13
-rw-r--r--acct-user/sobexsrv/sobexsrv-0.ebuild13
-rw-r--r--acct-user/sockd/sockd-0-r1.ebuild13
-rw-r--r--acct-user/sockd/sockd-0-r2.ebuild13
-rw-r--r--acct-user/sogo/sogo-0-r1.ebuild14
-rw-r--r--acct-user/sogo/sogo-0-r2.ebuild14
-rw-r--r--acct-user/soju/soju-0-r1.ebuild14
-rw-r--r--acct-user/soju/soju-0.ebuild14
-rw-r--r--acct-user/sonarr/sonarr-0-r1.ebuild13
-rw-r--r--acct-user/sonarr/sonarr-0.ebuild13
-rw-r--r--acct-user/spamd/spamd-0-r1.ebuild25
-rw-r--r--acct-user/spamd/spamd-0-r2.ebuild25
-rw-r--r--acct-user/spectrum/spectrum-0-r1.ebuild14
-rw-r--r--acct-user/spectrum/spectrum-0-r2.ebuild14
-rw-r--r--acct-user/spire/spire-0-r1.ebuild12
-rw-r--r--acct-user/spire/spire-0-r2.ebuild12
-rw-r--r--acct-user/spread/spread-0-r1.ebuild13
-rw-r--r--acct-user/spread/spread-0.ebuild13
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r1.ebuild14
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r2.ebuild14
-rw-r--r--acct-user/squid/squid-0-r1.ebuild13
-rw-r--r--acct-user/squid/squid-0-r2.ebuild13
-rw-r--r--acct-user/sshd/sshd-0-r1.ebuild15
-rw-r--r--acct-user/sshd/sshd-0-r2.ebuild15
-rw-r--r--acct-user/sstpc/sstpc-0-r1.ebuild13
-rw-r--r--acct-user/sstpc/sstpc-0.ebuild13
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild27
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-1.ebuild27
-rw-r--r--acct-user/steamcmd/steamcmd-0-r1.ebuild14
-rw-r--r--acct-user/steamcmd/steamcmd-0-r2.ebuild14
-rw-r--r--acct-user/stg/stg-0-r1.ebuild13
-rw-r--r--acct-user/stg/stg-0.ebuild13
-rw-r--r--acct-user/strelaysrv/strelaysrv-1-r1.ebuild27
-rw-r--r--acct-user/strelaysrv/strelaysrv-1.ebuild27
-rw-r--r--acct-user/stubby/stubby-0-r1.ebuild12
-rw-r--r--acct-user/stubby/stubby-0-r2.ebuild12
-rw-r--r--acct-user/stunnel/stunnel-0-r1.ebuild12
-rw-r--r--acct-user/stunnel/stunnel-0-r2.ebuild12
-rw-r--r--acct-user/subsonic/subsonic-0-r1.ebuild14
-rw-r--r--acct-user/subsonic/subsonic-0-r2.ebuild14
-rw-r--r--acct-user/suricata/suricata-0-r1.ebuild12
-rw-r--r--acct-user/suricata/suricata-0-r2.ebuild12
-rw-r--r--acct-user/svn/svn-0-r1.ebuild11
-rw-r--r--acct-user/svn/svn-0-r2.ebuild11
-rw-r--r--acct-user/svxlink/svxlink-0-r1.ebuild12
-rw-r--r--acct-user/svxlink/svxlink-0.ebuild12
-rw-r--r--acct-user/swift/swift-0-r1.ebuild12
-rw-r--r--acct-user/swift/swift-0-r2.ebuild12
-rw-r--r--acct-user/synapse/synapse-0-r1.ebuild12
-rw-r--r--acct-user/synapse/synapse-0.ebuild12
-rw-r--r--acct-user/syncthing/syncthing-0-r1.ebuild14
-rw-r--r--acct-user/syncthing/syncthing-0-r2.ebuild14
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild11
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild11
-rw-r--r--acct-user/systemd-network/systemd-network-0-r1.ebuild11
-rw-r--r--acct-user/systemd-network/systemd-network-0-r2.ebuild11
-rw-r--r--acct-user/systemd-oom/systemd-oom-0-r1.ebuild11
-rw-r--r--acct-user/systemd-oom/systemd-oom-0.ebuild11
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild11
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild11
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild11
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild11
-rw-r--r--acct-user/taskd/taskd-0-r1.ebuild15
-rw-r--r--acct-user/taskd/taskd-0.ebuild15
-rw-r--r--acct-user/teamspeak/teamspeak-0-r1.ebuild14
-rw-r--r--acct-user/teamspeak/teamspeak-0-r2.ebuild14
-rw-r--r--acct-user/telegraf/telegraf-0-r1.ebuild12
-rw-r--r--acct-user/telegraf/telegraf-0-r2.ebuild12
-rw-r--r--acct-user/tenshi/tenshi-0-r1.ebuild14
-rw-r--r--acct-user/tenshi/tenshi-0.ebuild14
-rw-r--r--acct-user/thttpd/thttpd-0-r1.ebuild13
-rw-r--r--acct-user/thttpd/thttpd-0.ebuild13
-rw-r--r--acct-user/timidity/timidity-0-r1.ebuild15
-rw-r--r--acct-user/timidity/timidity-0.ebuild15
-rw-r--r--acct-user/tinydns/tinydns-0-r1.ebuild11
-rw-r--r--acct-user/tinydns/tinydns-0.ebuild11
-rw-r--r--acct-user/tinyproxy/tinyproxy-0-r1.ebuild12
-rw-r--r--acct-user/tinyproxy/tinyproxy-0.ebuild12
-rw-r--r--acct-user/tomcat/tomcat-0-r1.ebuild12
-rw-r--r--acct-user/tomcat/tomcat-0.ebuild12
-rw-r--r--acct-user/tor/tor-0-r1.ebuild12
-rw-r--r--acct-user/tor/tor-0-r2.ebuild12
-rw-r--r--acct-user/tox/tox-0-r1.ebuild13
-rw-r--r--acct-user/tox/tox-0-r2.ebuild13
-rw-r--r--acct-user/tpm/tpm-0-r1.ebuild12
-rw-r--r--acct-user/tpm/tpm-0.ebuild12
-rw-r--r--acct-user/transmission/transmission-1-r1.ebuild11
-rw-r--r--acct-user/transmission/transmission-1-r2.ebuild11
-rw-r--r--acct-user/trickster/trickster-0-r1.ebuild13
-rw-r--r--acct-user/trickster/trickster-0.ebuild13
-rw-r--r--acct-user/trojan/trojan-0-r1.ebuild12
-rw-r--r--acct-user/trojan/trojan-0.ebuild12
-rw-r--r--acct-user/tss/tss-0-r1.ebuild12
-rw-r--r--acct-user/tss/tss-0-r2.ebuild12
-rw-r--r--acct-user/ttrssd/ttrssd-0-r1.ebuild12
-rw-r--r--acct-user/ttrssd/ttrssd-0.ebuild12
-rw-r--r--acct-user/turnserver/turnserver-0-r1.ebuild13
-rw-r--r--acct-user/turnserver/turnserver-0-r2.ebuild13
-rw-r--r--acct-user/tvheadend/tvheadend-0-r1.ebuild14
-rw-r--r--acct-user/tvheadend/tvheadend-0-r2.ebuild14
-rw-r--r--acct-user/ulogd/ulogd-0-r1.ebuild12
-rw-r--r--acct-user/ulogd/ulogd-0.ebuild12
-rw-r--r--acct-user/ultimaker/ultimaker-0-r1.ebuild12
-rw-r--r--acct-user/ultimaker/ultimaker-0-r2.ebuild12
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild12
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1.ebuild12
-rw-r--r--acct-user/unbound/unbound-0-r1.ebuild16
-rw-r--r--acct-user/unbound/unbound-0-r2.ebuild16
-rw-r--r--acct-user/unifi-video/unifi-video-0-r1.ebuild12
-rw-r--r--acct-user/unifi-video/unifi-video-0.ebuild12
-rw-r--r--acct-user/unifi/unifi-0-r2.ebuild (renamed from acct-user/unifi/unifi-0-r1.ebuild)0
-rw-r--r--acct-user/unrealircd/unrealircd-0-r1.ebuild11
-rw-r--r--acct-user/unrealircd/unrealircd-0-r2.ebuild11
-rw-r--r--acct-user/upmpdcli/upmpdcli-0-r1.ebuild12
-rw-r--r--acct-user/upmpdcli/upmpdcli-0.ebuild12
-rw-r--r--acct-user/uptimed/uptimed-0-r2.ebuild13
-rw-r--r--acct-user/uptimed/uptimed-0-r3.ebuild13
-rw-r--r--acct-user/usbmux/usbmux-0-r1.ebuild12
-rw-r--r--acct-user/usbmux/usbmux-0-r2.ebuild12
-rw-r--r--acct-user/ushare/ushare-0-r1.ebuild12
-rw-r--r--acct-user/ushare/ushare-0.ebuild12
-rw-r--r--acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild13
-rw-r--r--acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild13
-rw-r--r--acct-user/vacation/vacation-0-r1.ebuild13
-rw-r--r--acct-user/vacation/vacation-0.ebuild13
-rw-r--r--acct-user/varnish/varnish-0-r1.ebuild14
-rw-r--r--acct-user/varnish/varnish-0-r2.ebuild14
-rw-r--r--acct-user/vault/vault-0-r1.ebuild12
-rw-r--r--acct-user/vault/vault-0-r2.ebuild12
-rw-r--r--acct-user/vault_exporter/vault_exporter-0-r1.ebuild13
-rw-r--r--acct-user/vault_exporter/vault_exporter-0.ebuild13
-rw-r--r--acct-user/vboxguest/vboxguest-0-r1.ebuild13
-rw-r--r--acct-user/vboxguest/vboxguest-0-r2.ebuild13
-rw-r--r--acct-user/vdr/vdr-0-r1.ebuild63
-rw-r--r--acct-user/vdr/vdr-0-r2.ebuild63
-rw-r--r--acct-user/vdradmin/vdradmin-0-r1.ebuild16
-rw-r--r--acct-user/vdradmin/vdradmin-0-r2.ebuild16
-rw-r--r--acct-user/vnstat/vnstat-0-r1.ebuild12
-rw-r--r--acct-user/vnstat/vnstat-0.ebuild12
-rw-r--r--acct-user/vpopmail/vpopmail-0-r1.ebuild13
-rw-r--r--acct-user/vpopmail/vpopmail-0-r2.ebuild13
-rw-r--r--acct-user/wesnoth/wesnoth-0-r1.ebuild13
-rw-r--r--acct-user/wesnoth/wesnoth-0-r2.ebuild13
-rw-r--r--acct-user/wwwoffle/wwwoffle-0-r1.ebuild14
-rw-r--r--acct-user/wwwoffle/wwwoffle-0.ebuild14
-rw-r--r--acct-user/x2goprint/x2goprint-0-r1.ebuild13
-rw-r--r--acct-user/x2goprint/x2goprint-0-r2.ebuild13
-rw-r--r--acct-user/x2gouser/x2gouser-0-r1.ebuild13
-rw-r--r--acct-user/x2gouser/x2gouser-0-r2.ebuild13
-rw-r--r--acct-user/xrootd/xrootd-0-r1.ebuild12
-rw-r--r--acct-user/xrootd/xrootd-0-r2.ebuild12
-rw-r--r--acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild (renamed from acct-user/yubihsm-connector/yubihsm-connector-0.ebuild)0
-rw-r--r--acct-user/zabbix/zabbix-0-r1.ebuild15
-rw-r--r--acct-user/zabbix/zabbix-0.ebuild15
-rw-r--r--acct-user/zeppelin/zeppelin-0-r1.ebuild14
-rw-r--r--acct-user/zeppelin/zeppelin-0-r2.ebuild14
-rw-r--r--acct-user/zetcd/zetcd-0-r1.ebuild13
-rw-r--r--acct-user/zetcd/zetcd-0.ebuild13
-rw-r--r--acct-user/ziproxy/ziproxy-0-r1.ebuild11
-rw-r--r--acct-user/ziproxy/ziproxy-0.ebuild11
-rw-r--r--acct-user/znc/znc-0-r1.ebuild16
-rw-r--r--acct-user/znc/znc-0-r2.ebuild16
-rw-r--r--acct-user/zookeeper/zookeeper-0-r1.ebuild14
-rw-r--r--acct-user/zookeeper/zookeeper-0.ebuild14
1790 files changed, 9643 insertions, 9643 deletions
diff --git a/acct-group/_cron-failure/_cron-failure-0-r1.ebuild b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..037c180ae1e4
--- /dev/null
+++ b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/systemd-cron failure emails"
+
+ACCT_GROUP_ID="520"
diff --git a/acct-group/_cron-failure/_cron-failure-0.ebuild b/acct-group/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index b453d5218442..000000000000
--- a/acct-group/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/systemd-cron failure emails"
-
-ACCT_GROUP_ID="520"
diff --git a/acct-group/adm/adm-0-r1.ebuild b/acct-group/adm/adm-0-r1.ebuild
deleted file mode 100644
index 7aecab7fd00e..000000000000
--- a/acct-group/adm/adm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=4
diff --git a/acct-group/adm/adm-0-r2.ebuild b/acct-group/adm/adm-0-r2.ebuild
new file mode 100644
index 000000000000..3e0853baca96
--- /dev/null
+++ b/acct-group/adm/adm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=4
diff --git a/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild b/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild
new file mode 100644
index 000000000000..afe329ac705f
--- /dev/null
+++ b/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/aerospike-amc-community"
+
+ACCT_GROUP_ID="210"
diff --git a/acct-group/aerospike-amc/aerospike-amc-0.ebuild b/acct-group/aerospike-amc/aerospike-amc-0.ebuild
deleted file mode 100644
index a3028d0e5a2a..000000000000
--- a/acct-group/aerospike-amc/aerospike-amc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/aerospike-amc-community"
-
-ACCT_GROUP_ID="210"
diff --git a/acct-group/airdcppd/airdcppd-0-r1.ebuild b/acct-group/airdcppd/airdcppd-0-r1.ebuild
deleted file mode 100644
index a88d85d58cfb..000000000000
--- a/acct-group/airdcppd/airdcppd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/airdcpp-webclient"
-ACCT_GROUP_ID=464
diff --git a/acct-group/airdcppd/airdcppd-0-r2.ebuild b/acct-group/airdcppd/airdcppd-0-r2.ebuild
new file mode 100644
index 000000000000..6021954f07fc
--- /dev/null
+++ b/acct-group/airdcppd/airdcppd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/airdcpp-webclient"
+ACCT_GROUP_ID=464
diff --git a/acct-group/alertmanager/alertmanager-0-r1.ebuild b/acct-group/alertmanager/alertmanager-0-r1.ebuild
new file mode 100644
index 000000000000..da84d7d1fed2
--- /dev/null
+++ b/acct-group/alertmanager/alertmanager-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=294
diff --git a/acct-group/alertmanager/alertmanager-0.ebuild b/acct-group/alertmanager/alertmanager-0.ebuild
deleted file mode 100644
index 4530d830ec25..000000000000
--- a/acct-group/alertmanager/alertmanager-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=294
diff --git a/acct-group/amanda/amanda-0-r1.ebuild b/acct-group/amanda/amanda-0-r1.ebuild
new file mode 100644
index 000000000000..3eb2c5b3a0da
--- /dev/null
+++ b/acct-group/amanda/amanda-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=362
diff --git a/acct-group/amanda/amanda-0.ebuild b/acct-group/amanda/amanda-0.ebuild
deleted file mode 100644
index d8599a25ff3f..000000000000
--- a/acct-group/amanda/amanda-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=362
diff --git a/acct-group/amavis/amavis-0-r1.ebuild b/acct-group/amavis/amavis-0-r1.ebuild
deleted file mode 100644
index cd30c60aee3e..000000000000
--- a/acct-group/amavis/amavis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=333
-DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amavis/amavis-0-r2.ebuild b/acct-group/amavis/amavis-0-r2.ebuild
new file mode 100644
index 000000000000..f34143344b41
--- /dev/null
+++ b/acct-group/amavis/amavis-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=333
+DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amule/amule-0-r1.ebuild b/acct-group/amule/amule-0-r1.ebuild
deleted file mode 100644
index 354dc87a1194..000000000000
--- a/acct-group/amule/amule-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/amule"
-ACCT_GROUP_ID=468
diff --git a/acct-group/amule/amule-0-r2.ebuild b/acct-group/amule/amule-0-r2.ebuild
new file mode 100644
index 000000000000..dda4974ede76
--- /dev/null
+++ b/acct-group/amule/amule-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/amule"
+ACCT_GROUP_ID=468
diff --git a/acct-group/android/android-0-r1.ebuild b/acct-group/android/android-0-r1.ebuild
new file mode 100644
index 000000000000..5698fc27e4ab
--- /dev/null
+++ b/acct-group/android/android-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
+
+ACCT_GROUP_ID="174"
diff --git a/acct-group/android/android-0.ebuild b/acct-group/android/android-0.ebuild
deleted file mode 100644
index 5730672b8d65..000000000000
--- a/acct-group/android/android-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
-
-ACCT_GROUP_ID="174"
diff --git a/acct-group/anope/anope-0-r1.ebuild b/acct-group/anope/anope-0-r1.ebuild
deleted file mode 100644
index 4249c83403d3..000000000000
--- a/acct-group/anope/anope-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for Anope IRC services"
-ACCT_GROUP_ID=417
diff --git a/acct-group/anope/anope-0-r2.ebuild b/acct-group/anope/anope-0-r2.ebuild
new file mode 100644
index 000000000000..42de5736718e
--- /dev/null
+++ b/acct-group/anope/anope-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Anope IRC services"
+ACCT_GROUP_ID=417
diff --git a/acct-group/apache/apache-0-r2.ebuild b/acct-group/apache/apache-0-r2.ebuild
deleted file mode 100644
index 90328f8c2836..000000000000
--- a/acct-group/apache/apache-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=81
diff --git a/acct-group/apache/apache-0-r3.ebuild b/acct-group/apache/apache-0-r3.ebuild
new file mode 100644
index 000000000000..1f54198838fd
--- /dev/null
+++ b/acct-group/apache/apache-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=81
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
new file mode 100644
index 000000000000..74d54239c6fc
--- /dev/null
+++ b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=319
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
deleted file mode 100644
index ef6e2c653c52..000000000000
--- a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=319
diff --git a/acct-group/argus/argus-0-r1.ebuild b/acct-group/argus/argus-0-r1.ebuild
new file mode 100644
index 000000000000..2a586410a682
--- /dev/null
+++ b/acct-group/argus/argus-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/argus"
+
+ACCT_GROUP_ID=383
diff --git a/acct-group/argus/argus-0.ebuild b/acct-group/argus/argus-0.ebuild
deleted file mode 100644
index 0d846593c0f3..000000000000
--- a/acct-group/argus/argus-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/argus"
-
-ACCT_GROUP_ID=383
diff --git a/acct-group/arpwatch/arpwatch-0-r1.ebuild b/acct-group/arpwatch/arpwatch-0-r1.ebuild
new file mode 100644
index 000000000000..3763a50ff43b
--- /dev/null
+++ b/acct-group/arpwatch/arpwatch-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/arpwatch"
+
+ACCT_GROUP_ID="170"
diff --git a/acct-group/arpwatch/arpwatch-0.ebuild b/acct-group/arpwatch/arpwatch-0.ebuild
deleted file mode 100644
index c232fe3a362c..000000000000
--- a/acct-group/arpwatch/arpwatch-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/arpwatch"
-
-ACCT_GROUP_ID="170"
diff --git a/acct-group/artifactory/artifactory-0-r1.ebuild b/acct-group/artifactory/artifactory-0-r1.ebuild
new file mode 100644
index 000000000000..3441d692774f
--- /dev/null
+++ b/acct-group/artifactory/artifactory-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/artifactory-bin"
+
+ACCT_GROUP_ID="264"
diff --git a/acct-group/artifactory/artifactory-0.ebuild b/acct-group/artifactory/artifactory-0.ebuild
deleted file mode 100644
index 6f1227123b88..000000000000
--- a/acct-group/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/artifactory-bin"
-
-ACCT_GROUP_ID="264"
diff --git a/acct-group/aspnet/aspnet-0-r1.ebuild b/acct-group/aspnet/aspnet-0-r1.ebuild
new file mode 100644
index 000000000000..c879ec8f038b
--- /dev/null
+++ b/acct-group/aspnet/aspnet-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=216
diff --git a/acct-group/aspnet/aspnet-0.ebuild b/acct-group/aspnet/aspnet-0.ebuild
deleted file mode 100644
index 58a850a8bb9c..000000000000
--- a/acct-group/aspnet/aspnet-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=216
diff --git a/acct-group/asterisk/asterisk-0-r1.ebuild b/acct-group/asterisk/asterisk-0-r1.ebuild
deleted file mode 100644
index 62ec5a2f5b02..000000000000
--- a/acct-group/asterisk/asterisk-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for asterisk"
-ACCT_GROUP_ID=242
diff --git a/acct-group/asterisk/asterisk-0-r2.ebuild b/acct-group/asterisk/asterisk-0-r2.ebuild
new file mode 100644
index 000000000000..da68978223d3
--- /dev/null
+++ b/acct-group/asterisk/asterisk-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for asterisk"
+ACCT_GROUP_ID=242
diff --git a/acct-group/at/at-0-r1.ebuild b/acct-group/at/at-0-r1.ebuild
new file mode 100644
index 000000000000..aec9d092feb7
--- /dev/null
+++ b/acct-group/at/at-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=246
diff --git a/acct-group/at/at-0.ebuild b/acct-group/at/at-0.ebuild
deleted file mode 100644
index 1dc36b11c23b..000000000000
--- a/acct-group/at/at-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=246
diff --git a/acct-group/atheme-services/atheme-services-0-r1.ebuild b/acct-group/atheme-services/atheme-services-0-r1.ebuild
deleted file mode 100644
index 75014bfbb485..000000000000
--- a/acct-group/atheme-services/atheme-services-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Atheme IRC services"
-ACCT_GROUP_ID=412
diff --git a/acct-group/atheme-services/atheme-services-0-r2.ebuild b/acct-group/atheme-services/atheme-services-0-r2.ebuild
new file mode 100644
index 000000000000..ff1b39f3444c
--- /dev/null
+++ b/acct-group/atheme-services/atheme-services-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Atheme IRC services"
+ACCT_GROUP_ID=412
diff --git a/acct-group/audio/audio-0-r1.ebuild b/acct-group/audio/audio-0-r1.ebuild
deleted file mode 100644
index ee027720bf31..000000000000
--- a/acct-group/audio/audio-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=18
diff --git a/acct-group/audio/audio-0-r2.ebuild b/acct-group/audio/audio-0-r2.ebuild
new file mode 100644
index 000000000000..112b264b30ad
--- /dev/null
+++ b/acct-group/audio/audio-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=18
diff --git a/acct-group/automatic/automatic-0-r1.ebuild b/acct-group/automatic/automatic-0-r1.ebuild
new file mode 100644
index 000000000000..60432b0cf093
--- /dev/null
+++ b/acct-group/automatic/automatic-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=338
diff --git a/acct-group/automatic/automatic-0.ebuild b/acct-group/automatic/automatic-0.ebuild
deleted file mode 100644
index c8e6c5c405c5..000000000000
--- a/acct-group/automatic/automatic-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=338
diff --git a/acct-group/automx2/automx2-0-r1.ebuild b/acct-group/automx2/automx2-0-r1.ebuild
deleted file mode 100644
index 59c8977b5fe7..000000000000
--- a/acct-group/automx2/automx2-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/automx2"
-ACCT_GROUP_ID=437
diff --git a/acct-group/automx2/automx2-0-r2.ebuild b/acct-group/automx2/automx2-0-r2.ebuild
new file mode 100644
index 000000000000..4a38f233a8b9
--- /dev/null
+++ b/acct-group/automx2/automx2-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/automx2"
+ACCT_GROUP_ID=437
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
deleted file mode 100644
index 6d912cd47ce4..000000000000
--- a/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi-autoipd"
-ACCT_GROUP_ID=62
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
new file mode 100644
index 000000000000..02b2443648a7
--- /dev/null
+++ b/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi-autoipd"
+ACCT_GROUP_ID=62
diff --git a/acct-group/avahi/avahi-0-r1.ebuild b/acct-group/avahi/avahi-0-r1.ebuild
deleted file mode 100644
index 6602136b24a2..000000000000
--- a/acct-group/avahi/avahi-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi"
-ACCT_GROUP_ID=61
diff --git a/acct-group/avahi/avahi-0-r2.ebuild b/acct-group/avahi/avahi-0-r2.ebuild
new file mode 100644
index 000000000000..0b24f601736e
--- /dev/null
+++ b/acct-group/avahi/avahi-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi"
+ACCT_GROUP_ID=61
diff --git a/acct-group/axtls/axtls-0-r1.ebuild b/acct-group/axtls/axtls-0-r1.ebuild
new file mode 100644
index 000000000000..bf1a8f22259f
--- /dev/null
+++ b/acct-group/axtls/axtls-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-libs/axtls"
+
+ACCT_GROUP_ID="147"
diff --git a/acct-group/axtls/axtls-0.ebuild b/acct-group/axtls/axtls-0.ebuild
deleted file mode 100644
index 4534ecf5b634..000000000000
--- a/acct-group/axtls/axtls-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-libs/axtls"
-
-ACCT_GROUP_ID="147"
diff --git a/acct-group/backuppc/backuppc-0-r1.ebuild b/acct-group/backuppc/backuppc-0-r1.ebuild
new file mode 100644
index 000000000000..3297ead3270f
--- /dev/null
+++ b/acct-group/backuppc/backuppc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-backup/backuppc"
+
+ACCT_GROUP_ID="282"
diff --git a/acct-group/backuppc/backuppc-0.ebuild b/acct-group/backuppc/backuppc-0.ebuild
deleted file mode 100644
index 8adafc19f9be..000000000000
--- a/acct-group/backuppc/backuppc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-backup/backuppc"
-
-ACCT_GROUP_ID="282"
diff --git a/acct-group/bacula/bacula-0-r1.ebuild b/acct-group/bacula/bacula-0-r1.ebuild
deleted file mode 100644
index 399d999796de..000000000000
--- a/acct-group/bacula/bacula-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the bacula backup system"
-ACCT_GROUP_ID=273
diff --git a/acct-group/bacula/bacula-0-r2.ebuild b/acct-group/bacula/bacula-0-r2.ebuild
new file mode 100644
index 000000000000..dc252476093c
--- /dev/null
+++ b/acct-group/bacula/bacula-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the bacula backup system"
+ACCT_GROUP_ID=273
diff --git a/acct-group/bareos/bareos-0-r1.ebuild b/acct-group/bareos/bareos-0-r1.ebuild
deleted file mode 100644
index f839b3044908..000000000000
--- a/acct-group/bareos/bareos-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the bareos network backup suite"
-ACCT_GROUP_ID=403
diff --git a/acct-group/bareos/bareos-0-r2.ebuild b/acct-group/bareos/bareos-0-r2.ebuild
new file mode 100644
index 000000000000..82834b64fcac
--- /dev/null
+++ b/acct-group/bareos/bareos-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the bareos network backup suite"
+ACCT_GROUP_ID=403
diff --git a/acct-group/beanstalk/beanstalk-0-r1.ebuild b/acct-group/beanstalk/beanstalk-0-r1.ebuild
new file mode 100644
index 000000000000..8587963e6d4a
--- /dev/null
+++ b/acct-group/beanstalk/beanstalk-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/beanstalkd"
+
+ACCT_GROUP_ID="137"
diff --git a/acct-group/beanstalk/beanstalk-0.ebuild b/acct-group/beanstalk/beanstalk-0.ebuild
deleted file mode 100644
index 2fd201660183..000000000000
--- a/acct-group/beanstalk/beanstalk-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/beanstalkd"
-
-ACCT_GROUP_ID="137"
diff --git a/acct-group/bedrock/bedrock-0-r1.ebuild b/acct-group/bedrock/bedrock-0-r1.ebuild
deleted file mode 100644
index 409365438231..000000000000
--- a/acct-group/bedrock/bedrock-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft Bedrock server"
-
-ACCT_GROUP_ID="485"
diff --git a/acct-group/bedrock/bedrock-0-r2.ebuild b/acct-group/bedrock/bedrock-0-r2.ebuild
new file mode 100644
index 000000000000..65b2c6db2dbb
--- /dev/null
+++ b/acct-group/bedrock/bedrock-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft Bedrock server"
+
+ACCT_GROUP_ID="485"
diff --git a/acct-group/biboumi/biboumi-0-r1.ebuild b/acct-group/biboumi/biboumi-0-r1.ebuild
new file mode 100644
index 000000000000..2696a03b0ceb
--- /dev/null
+++ b/acct-group/biboumi/biboumi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=508
diff --git a/acct-group/biboumi/biboumi-0.ebuild b/acct-group/biboumi/biboumi-0.ebuild
deleted file mode 100644
index 14c409597792..000000000000
--- a/acct-group/biboumi/biboumi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=508
diff --git a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild b/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
deleted file mode 100644
index 94f94a51727a..000000000000
--- a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=276
diff --git a/acct-group/bind_exporter/bind_exporter-0-r2.ebuild b/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..37141abf1c02
--- /dev/null
+++ b/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=276
diff --git a/acct-group/bird/bird-0-r1.ebuild b/acct-group/bird/bird-0-r1.ebuild
new file mode 100644
index 000000000000..d409ead353b0
--- /dev/null
+++ b/acct-group/bird/bird-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+# TCP port 179, but 179 is already used by acct-group/_bgpd
+ACCT_GROUP_ID=180
diff --git a/acct-group/bird/bird-0.ebuild b/acct-group/bird/bird-0.ebuild
deleted file mode 100644
index 174e87b87bf9..000000000000
--- a/acct-group/bird/bird-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# TCP port 179, but 179 is already used by acct-group/_bgpd
-ACCT_GROUP_ID=180
diff --git a/acct-group/bitcoin/bitcoin-0-r1.ebuild b/acct-group/bitcoin/bitcoin-0-r1.ebuild
deleted file mode 100644
index cc0bf22ffe01..000000000000
--- a/acct-group/bitcoin/bitcoin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for users with access to system-wide Bitcoin services"
-ACCT_GROUP_ID=483
diff --git a/acct-group/bitcoin/bitcoin-0-r2.ebuild b/acct-group/bitcoin/bitcoin-0-r2.ebuild
new file mode 100644
index 000000000000..a29293fcef17
--- /dev/null
+++ b/acct-group/bitcoin/bitcoin-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for users with access to system-wide Bitcoin services"
+ACCT_GROUP_ID=483
diff --git a/acct-group/bitflu/bitflu-0-r1.ebuild b/acct-group/bitflu/bitflu-0-r1.ebuild
new file mode 100644
index 000000000000..8009fbfbedcc
--- /dev/null
+++ b/acct-group/bitflu/bitflu-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/bitflu"
+
+ACCT_GROUP_ID="148"
diff --git a/acct-group/bitflu/bitflu-0.ebuild b/acct-group/bitflu/bitflu-0.ebuild
deleted file mode 100644
index b0544d2346e2..000000000000
--- a/acct-group/bitflu/bitflu-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-p2p/bitflu"
-
-ACCT_GROUP_ID="148"
diff --git a/acct-group/bitlbee/bitlbee-0-r1.ebuild b/acct-group/bitlbee/bitlbee-0-r1.ebuild
deleted file mode 100644
index cfecdbf5c9ff..000000000000
--- a/acct-group/bitlbee/bitlbee-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=407
diff --git a/acct-group/bitlbee/bitlbee-0-r2.ebuild b/acct-group/bitlbee/bitlbee-0-r2.ebuild
new file mode 100644
index 000000000000..93485a39696f
--- /dev/null
+++ b/acct-group/bitlbee/bitlbee-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=407
diff --git a/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..8e1e5e73db5f
--- /dev/null
+++ b/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=293
diff --git a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
deleted file mode 100644
index 71d2888a2d22..000000000000
--- a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=293
diff --git a/acct-group/boinc/boinc-0-r1.ebuild b/acct-group/boinc/boinc-0-r1.ebuild
new file mode 100644
index 000000000000..cad1c8d097f6
--- /dev/null
+++ b/acct-group/boinc/boinc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-misc/boinc"
+ACCT_GROUP_ID=352
diff --git a/acct-group/boinc/boinc-0.ebuild b/acct-group/boinc/boinc-0.ebuild
deleted file mode 100644
index dc46c8eba7b2..000000000000
--- a/acct-group/boinc/boinc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-misc/boinc"
-ACCT_GROUP_ID=352
diff --git a/acct-group/brlapi/brlapi-0-r1.ebuild b/acct-group/brlapi/brlapi-0-r1.ebuild
new file mode 100644
index 000000000000..752469ce1198
--- /dev/null
+++ b/acct-group/brlapi/brlapi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=507
diff --git a/acct-group/brlapi/brlapi-0.ebuild b/acct-group/brlapi/brlapi-0.ebuild
deleted file mode 100644
index 07af6c150bd9..000000000000
--- a/acct-group/brlapi/brlapi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=507
diff --git a/acct-group/brltty/brltty-0-r1.ebuild b/acct-group/brltty/brltty-0-r1.ebuild
new file mode 100644
index 000000000000..73c11e0c07cf
--- /dev/null
+++ b/acct-group/brltty/brltty-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=506
diff --git a/acct-group/brltty/brltty-0.ebuild b/acct-group/brltty/brltty-0.ebuild
deleted file mode 100644
index 5cc5694d6f9c..000000000000
--- a/acct-group/brltty/brltty-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=506
diff --git a/acct-group/buildbot/buildbot-0-r1.ebuild b/acct-group/buildbot/buildbot-0-r1.ebuild
deleted file mode 100644
index 850f789f93b5..000000000000
--- a/acct-group/buildbot/buildbot-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Buildbot program group"
-ACCT_GROUP_ID=393
-SLOT="0"
diff --git a/acct-group/buildbot/buildbot-0-r2.ebuild b/acct-group/buildbot/buildbot-0-r2.ebuild
new file mode 100644
index 000000000000..b58d336eef9c
--- /dev/null
+++ b/acct-group/buildbot/buildbot-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Buildbot program group"
+ACCT_GROUP_ID=393
+SLOT="0"
diff --git a/acct-group/bumblebee/bumblebee-0-r1.ebuild b/acct-group/bumblebee/bumblebee-0-r1.ebuild
new file mode 100644
index 000000000000..316fc9ef3427
--- /dev/null
+++ b/acct-group/bumblebee/bumblebee-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=380
diff --git a/acct-group/bumblebee/bumblebee-0.ebuild b/acct-group/bumblebee/bumblebee-0.ebuild
deleted file mode 100644
index 03a72dbe9273..000000000000
--- a/acct-group/bumblebee/bumblebee-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=380
diff --git a/acct-group/burp/burp-0-r1.ebuild b/acct-group/burp/burp-0-r1.ebuild
deleted file mode 100644
index bd9aeb045577..000000000000
--- a/acct-group/burp/burp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the app-backup/burp server"
-ACCT_GROUP_ID=498
diff --git a/acct-group/burp/burp-0-r2.ebuild b/acct-group/burp/burp-0-r2.ebuild
new file mode 100644
index 000000000000..474fe04b5889
--- /dev/null
+++ b/acct-group/burp/burp-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the app-backup/burp server"
+ACCT_GROUP_ID=498
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
deleted file mode 100644
index 07d9e98d095e..000000000000
--- a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/burrow_exporter"
-
-ACCT_GROUP_ID="502"
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..49197343c68a
--- /dev/null
+++ b/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/burrow_exporter"
+
+ACCT_GROUP_ID="502"
diff --git a/acct-group/cadvisor/cadvisor-0-r1.ebuild b/acct-group/cadvisor/cadvisor-0-r1.ebuild
deleted file mode 100644
index c44d82f6164a..000000000000
--- a/acct-group/cadvisor/cadvisor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=427
diff --git a/acct-group/cadvisor/cadvisor-0-r2.ebuild b/acct-group/cadvisor/cadvisor-0-r2.ebuild
new file mode 100644
index 000000000000..12ee15aed64f
--- /dev/null
+++ b/acct-group/cadvisor/cadvisor-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=427
diff --git a/acct-group/cancd/cancd-0-r1.ebuild b/acct-group/cancd/cancd-0-r1.ebuild
new file mode 100644
index 000000000000..46428de1cae0
--- /dev/null
+++ b/acct-group/cancd/cancd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the CA NetConsole Daemon"
+
+ACCT_GROUP_ID="213"
diff --git a/acct-group/cancd/cancd-0.ebuild b/acct-group/cancd/cancd-0.ebuild
deleted file mode 100644
index cb378da029ab..000000000000
--- a/acct-group/cancd/cancd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the CA NetConsole Daemon"
-
-ACCT_GROUP_ID="213"
diff --git a/acct-group/carbon/carbon-0-r1.ebuild b/acct-group/carbon/carbon-0-r1.ebuild
deleted file mode 100644
index 09ccc3c9f002..000000000000
--- a/acct-group/carbon/carbon-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=230
diff --git a/acct-group/carbon/carbon-0-r2.ebuild b/acct-group/carbon/carbon-0-r2.ebuild
new file mode 100644
index 000000000000..e84b103f0d05
--- /dev/null
+++ b/acct-group/carbon/carbon-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=230
diff --git a/acct-group/cdrom/cdrom-0-r1.ebuild b/acct-group/cdrom/cdrom-0-r1.ebuild
deleted file mode 100644
index 8d402a923a38..000000000000
--- a/acct-group/cdrom/cdrom-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=19
diff --git a/acct-group/cdrom/cdrom-0-r2.ebuild b/acct-group/cdrom/cdrom-0-r2.ebuild
new file mode 100644
index 000000000000..74979bf5d8cb
--- /dev/null
+++ b/acct-group/cdrom/cdrom-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=19
diff --git a/acct-group/ceph/ceph-0-r1.ebuild b/acct-group/ceph/ceph-0-r1.ebuild
deleted file mode 100644
index de5898482a6f..000000000000
--- a/acct-group/ceph/ceph-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=267
diff --git a/acct-group/ceph/ceph-0-r2.ebuild b/acct-group/ceph/ceph-0-r2.ebuild
new file mode 100644
index 000000000000..5ad28791f8d9
--- /dev/null
+++ b/acct-group/ceph/ceph-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=267
diff --git a/acct-group/cgit/cgit-0-r1.ebuild b/acct-group/cgit/cgit-0-r1.ebuild
new file mode 100644
index 000000000000..73dd86cc52dc
--- /dev/null
+++ b/acct-group/cgit/cgit-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=197
diff --git a/acct-group/cgit/cgit-0.ebuild b/acct-group/cgit/cgit-0.ebuild
deleted file mode 100644
index 750e7188cdb7..000000000000
--- a/acct-group/cgit/cgit-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=197
diff --git a/acct-group/chronograf/chronograf-0-r1.ebuild b/acct-group/chronograf/chronograf-0-r1.ebuild
deleted file mode 100644
index 38259347814a..000000000000
--- a/acct-group/chronograf/chronograf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=344
diff --git a/acct-group/chronograf/chronograf-0-r2.ebuild b/acct-group/chronograf/chronograf-0-r2.ebuild
new file mode 100644
index 000000000000..b653b69c5f32
--- /dev/null
+++ b/acct-group/chronograf/chronograf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=344
diff --git a/acct-group/cinder/cinder-0-r1.ebuild b/acct-group/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index d57b97378c77..000000000000
--- a/acct-group/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=442
diff --git a/acct-group/cinder/cinder-0-r2.ebuild b/acct-group/cinder/cinder-0-r2.ebuild
new file mode 100644
index 000000000000..a0016660fffe
--- /dev/null
+++ b/acct-group/cinder/cinder-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=442
diff --git a/acct-group/clair/clair-0-r1.ebuild b/acct-group/clair/clair-0-r1.ebuild
deleted file mode 100644
index 8a34e5dbb5d1..000000000000
--- a/acct-group/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=307
diff --git a/acct-group/clair/clair-0-r2.ebuild b/acct-group/clair/clair-0-r2.ebuild
new file mode 100644
index 000000000000..e9ba2bbad69a
--- /dev/null
+++ b/acct-group/clair/clair-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=307
diff --git a/acct-group/clamav/clamav-0-r1.ebuild b/acct-group/clamav/clamav-0-r1.ebuild
deleted file mode 100644
index 30e86e6753f4..000000000000
--- a/acct-group/clamav/clamav-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=435
diff --git a/acct-group/clamav/clamav-0-r2.ebuild b/acct-group/clamav/clamav-0-r2.ebuild
new file mode 100644
index 000000000000..b41166d96ada
--- /dev/null
+++ b/acct-group/clamav/clamav-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=435
diff --git a/acct-group/cntlm/cntlm-0-r1.ebuild b/acct-group/cntlm/cntlm-0-r1.ebuild
new file mode 100644
index 000000000000..745f398c94b5
--- /dev/null
+++ b/acct-group/cntlm/cntlm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/cntlm"
+
+ACCT_GROUP_ID="255"
diff --git a/acct-group/cntlm/cntlm-0.ebuild b/acct-group/cntlm/cntlm-0.ebuild
deleted file mode 100644
index 38671db40f18..000000000000
--- a/acct-group/cntlm/cntlm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/cntlm"
-
-ACCT_GROUP_ID="255"
diff --git a/acct-group/cockroach/cockroach-0-r1.ebuild b/acct-group/cockroach/cockroach-0-r1.ebuild
new file mode 100644
index 000000000000..c0d4c9ca4dbb
--- /dev/null
+++ b/acct-group/cockroach/cockroach-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/cockroach"
+
+ACCT_GROUP_ID="110"
diff --git a/acct-group/cockroach/cockroach-0.ebuild b/acct-group/cockroach/cockroach-0.ebuild
deleted file mode 100644
index 7f9e3bf019d1..000000000000
--- a/acct-group/cockroach/cockroach-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/cockroach"
-
-ACCT_GROUP_ID="110"
diff --git a/acct-group/collectd/collectd-0-r1.ebuild b/acct-group/collectd/collectd-0-r1.ebuild
new file mode 100644
index 000000000000..8ff3458b3df8
--- /dev/null
+++ b/acct-group/collectd/collectd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="collectd program group"
+
+ACCT_GROUP_ID=440
diff --git a/acct-group/collectd/collectd-0.ebuild b/acct-group/collectd/collectd-0.ebuild
deleted file mode 100644
index 273a23b32ea2..000000000000
--- a/acct-group/collectd/collectd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="collectd program group"
-
-ACCT_GROUP_ID=440
diff --git a/acct-group/colord/colord-0-r1.ebuild b/acct-group/colord/colord-0-r1.ebuild
new file mode 100644
index 000000000000..1758aa8ec47b
--- /dev/null
+++ b/acct-group/colord/colord-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=350
diff --git a/acct-group/colord/colord-0.ebuild b/acct-group/colord/colord-0.ebuild
deleted file mode 100644
index da6555c53bfa..000000000000
--- a/acct-group/colord/colord-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=350
diff --git a/acct-group/consul-template/consul-template-0-r1.ebuild b/acct-group/consul-template/consul-template-0-r1.ebuild
deleted file mode 100644
index 45bea6e5f696..000000000000
--- a/acct-group/consul-template/consul-template-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=408
diff --git a/acct-group/consul-template/consul-template-0-r2.ebuild b/acct-group/consul-template/consul-template-0-r2.ebuild
new file mode 100644
index 000000000000..e8c79f811996
--- /dev/null
+++ b/acct-group/consul-template/consul-template-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=408
diff --git a/acct-group/consul/consul-0-r1.ebuild b/acct-group/consul/consul-0-r1.ebuild
deleted file mode 100644
index 615defa305de..000000000000
--- a/acct-group/consul/consul-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=411
diff --git a/acct-group/consul/consul-0-r2.ebuild b/acct-group/consul/consul-0-r2.ebuild
new file mode 100644
index 000000000000..b7dac9bca6c3
--- /dev/null
+++ b/acct-group/consul/consul-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=411
diff --git a/acct-group/consul_exporter/consul_exporter-0-r1.ebuild b/acct-group/consul_exporter/consul_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..c77db8b3a594
--- /dev/null
+++ b/acct-group/consul_exporter/consul_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=278
diff --git a/acct-group/consul_exporter/consul_exporter-0.ebuild b/acct-group/consul_exporter/consul_exporter-0.ebuild
deleted file mode 100644
index b9e245ce5510..000000000000
--- a/acct-group/consul_exporter/consul_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=278
diff --git a/acct-group/coredns/coredns-0-r1.ebuild b/acct-group/coredns/coredns-0-r1.ebuild
new file mode 100644
index 000000000000..a182b8feb18d
--- /dev/null
+++ b/acct-group/coredns/coredns-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/coredns"
+
+ACCT_GROUP_ID="312"
diff --git a/acct-group/coredns/coredns-0.ebuild b/acct-group/coredns/coredns-0.ebuild
deleted file mode 100644
index 9d29330416d4..000000000000
--- a/acct-group/coredns/coredns-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/coredns"
-
-ACCT_GROUP_ID="312"
diff --git a/acct-group/croc/croc-0-r1.ebuild b/acct-group/croc/croc-0-r1.ebuild
new file mode 100644
index 000000000000..79aff7a7f494
--- /dev/null
+++ b/acct-group/croc/croc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/croc"
+ACCT_GROUP_ID=310
diff --git a/acct-group/croc/croc-0.ebuild b/acct-group/croc/croc-0.ebuild
deleted file mode 100644
index 544469aa859c..000000000000
--- a/acct-group/croc/croc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/croc"
-ACCT_GROUP_ID=310
diff --git a/acct-group/cron/cron-0-r1.ebuild b/acct-group/cron/cron-0-r1.ebuild
new file mode 100644
index 000000000000..84142b621a23
--- /dev/null
+++ b/acct-group/cron/cron-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/cronbase"
+
+ACCT_GROUP_ID="16"
diff --git a/acct-group/cron/cron-0.ebuild b/acct-group/cron/cron-0.ebuild
deleted file mode 100644
index 84116177ac0d..000000000000
--- a/acct-group/cron/cron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/cronbase"
-
-ACCT_GROUP_ID="16"
diff --git a/acct-group/crontab/crontab-0-r1.ebuild b/acct-group/crontab/crontab-0-r1.ebuild
new file mode 100644
index 000000000000..d50789d7615d
--- /dev/null
+++ b/acct-group/crontab/crontab-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=460
diff --git a/acct-group/crontab/crontab-0.ebuild b/acct-group/crontab/crontab-0.ebuild
deleted file mode 100644
index d8765962fb79..000000000000
--- a/acct-group/crontab/crontab-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=460
diff --git a/acct-group/cvmfs/cvmfs-0-r1.ebuild b/acct-group/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 1fcae7e51f98..000000000000
--- a/acct-group/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the CernVM-FS network file system"
-ACCT_GROUP_ID=268
diff --git a/acct-group/cvmfs/cvmfs-0-r2.ebuild b/acct-group/cvmfs/cvmfs-0-r2.ebuild
new file mode 100644
index 000000000000..201f3329a7b2
--- /dev/null
+++ b/acct-group/cvmfs/cvmfs-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the CernVM-FS network file system"
+ACCT_GROUP_ID=268
diff --git a/acct-group/davfs2/davfs2-0-r1.ebuild b/acct-group/davfs2/davfs2-0-r1.ebuild
deleted file mode 100644
index c7a375eb1319..000000000000
--- a/acct-group/davfs2/davfs2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=420
diff --git a/acct-group/davfs2/davfs2-0-r2.ebuild b/acct-group/davfs2/davfs2-0-r2.ebuild
new file mode 100644
index 000000000000..8e919d778a20
--- /dev/null
+++ b/acct-group/davfs2/davfs2-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=420
diff --git a/acct-group/dbmail/dbmail-0-r1.ebuild b/acct-group/dbmail/dbmail-0-r1.ebuild
new file mode 100644
index 000000000000..98ef2242b546
--- /dev/null
+++ b/acct-group/dbmail/dbmail-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=365
diff --git a/acct-group/dbmail/dbmail-0.ebuild b/acct-group/dbmail/dbmail-0.ebuild
deleted file mode 100644
index 761317e9bd0e..000000000000
--- a/acct-group/dbmail/dbmail-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=365
diff --git a/acct-group/dbskkd/dbskkd-0-r1.ebuild b/acct-group/dbskkd/dbskkd-0-r1.ebuild
new file mode 100644
index 000000000000..b657171d9527
--- /dev/null
+++ b/acct-group/dbskkd/dbskkd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-i18n/dbskkd-cdb"
+
+ACCT_GROUP_ID="146"
diff --git a/acct-group/dbskkd/dbskkd-0.ebuild b/acct-group/dbskkd/dbskkd-0.ebuild
deleted file mode 100644
index 84040068089f..000000000000
--- a/acct-group/dbskkd/dbskkd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-i18n/dbskkd-cdb"
-
-ACCT_GROUP_ID="146"
diff --git a/acct-group/ddclient/ddclient-0-r1.ebuild b/acct-group/ddclient/ddclient-0-r1.ebuild
deleted file mode 100644
index 778bf4cbe572..000000000000
--- a/acct-group/ddclient/ddclient-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the dynamic DNS client"
-
-ACCT_GROUP_ID="487"
diff --git a/acct-group/ddclient/ddclient-0-r2.ebuild b/acct-group/ddclient/ddclient-0-r2.ebuild
new file mode 100644
index 000000000000..635e8d6f55ff
--- /dev/null
+++ b/acct-group/ddclient/ddclient-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the dynamic DNS client"
+
+ACCT_GROUP_ID="487"
diff --git a/acct-group/defang/defang-0-r1.ebuild b/acct-group/defang/defang-0-r1.ebuild
new file mode 100644
index 000000000000..07fb25a22c25
--- /dev/null
+++ b/acct-group/defang/defang-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/mimedefang"
+
+ACCT_GROUP_ID="181"
diff --git a/acct-group/defang/defang-0.ebuild b/acct-group/defang/defang-0.ebuild
deleted file mode 100644
index aab0765fabfa..000000000000
--- a/acct-group/defang/defang-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for mail-filter/mimedefang"
-
-ACCT_GROUP_ID="181"
diff --git a/acct-group/dehydrated/dehydrated-0-r1.ebuild b/acct-group/dehydrated/dehydrated-0-r1.ebuild
new file mode 100644
index 000000000000..bd6fc5074d0f
--- /dev/null
+++ b/acct-group/dehydrated/dehydrated-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="dehydrated program group"
+
+ACCT_GROUP_ID=361
diff --git a/acct-group/dehydrated/dehydrated-0.ebuild b/acct-group/dehydrated/dehydrated-0.ebuild
deleted file mode 100644
index 4edd9bf28a24..000000000000
--- a/acct-group/dehydrated/dehydrated-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="dehydrated program group"
-
-ACCT_GROUP_ID=361
diff --git a/acct-group/deluge/deluge-0-r1.ebuild b/acct-group/deluge/deluge-0-r1.ebuild
deleted file mode 100644
index 7f9e1bf27888..000000000000
--- a/acct-group/deluge/deluge-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=454
diff --git a/acct-group/deluge/deluge-0-r2.ebuild b/acct-group/deluge/deluge-0-r2.ebuild
new file mode 100644
index 000000000000..b6fabbb0d9ee
--- /dev/null
+++ b/acct-group/deluge/deluge-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=454
diff --git a/acct-group/dhcp/dhcp-0-r1.ebuild b/acct-group/dhcp/dhcp-0-r1.ebuild
deleted file mode 100644
index 5b54d2ecdd85..000000000000
--- a/acct-group/dhcp/dhcp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=300
diff --git a/acct-group/dhcp/dhcp-0-r2.ebuild b/acct-group/dhcp/dhcp-0-r2.ebuild
new file mode 100644
index 000000000000..ae3d106df1b4
--- /dev/null
+++ b/acct-group/dhcp/dhcp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=300
diff --git a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild b/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
deleted file mode 100644
index 47af5f206833..000000000000
--- a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=303
diff --git a/acct-group/dhcpcd/dhcpcd-0-r2.ebuild b/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
new file mode 100644
index 000000000000..358823c53a84
--- /dev/null
+++ b/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=303
diff --git a/acct-group/dialout/dialout-0-r1.ebuild b/acct-group/dialout/dialout-0-r1.ebuild
deleted file mode 100644
index 3c1316aa585a..000000000000
--- a/acct-group/dialout/dialout-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=20
diff --git a/acct-group/dialout/dialout-0-r2.ebuild b/acct-group/dialout/dialout-0-r2.ebuild
new file mode 100644
index 000000000000..b83a88cc096f
--- /dev/null
+++ b/acct-group/dialout/dialout-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=20
diff --git a/acct-group/dictd/dictd-0-r1.ebuild b/acct-group/dictd/dictd-0-r1.ebuild
new file mode 100644
index 000000000000..30250bf20c3c
--- /dev/null
+++ b/acct-group/dictd/dictd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for app-text/dictd"
+
+ACCT_GROUP_ID=381
diff --git a/acct-group/dictd/dictd-0.ebuild b/acct-group/dictd/dictd-0.ebuild
deleted file mode 100644
index e20464ee6fd1..000000000000
--- a/acct-group/dictd/dictd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for app-text/dictd"
-
-ACCT_GROUP_ID=381
diff --git a/acct-group/dirsrv/dirsrv-0-r1.ebuild b/acct-group/dirsrv/dirsrv-0-r1.ebuild
new file mode 100644
index 000000000000..44e24def6561
--- /dev/null
+++ b/acct-group/dirsrv/dirsrv-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nds/389-ds-base"
+ACCT_GROUP_ID=346
diff --git a/acct-group/dirsrv/dirsrv-0.ebuild b/acct-group/dirsrv/dirsrv-0.ebuild
deleted file mode 100644
index 14eb4d7fac5b..000000000000
--- a/acct-group/dirsrv/dirsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nds/389-ds-base"
-ACCT_GROUP_ID=346
diff --git a/acct-group/disk/disk-0-r1.ebuild b/acct-group/disk/disk-0-r1.ebuild
deleted file mode 100644
index a5568d65c049..000000000000
--- a/acct-group/disk/disk-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=6
diff --git a/acct-group/disk/disk-0-r2.ebuild b/acct-group/disk/disk-0-r2.ebuild
new file mode 100644
index 000000000000..1eb22b9bbbb5
--- /dev/null
+++ b/acct-group/disk/disk-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=6
diff --git a/acct-group/distcc/distcc-1-r1.ebuild b/acct-group/distcc/distcc-1-r1.ebuild
new file mode 100644
index 000000000000..7c650651a234
--- /dev/null
+++ b/acct-group/distcc/distcc-1-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=240
diff --git a/acct-group/distcc/distcc-1.ebuild b/acct-group/distcc/distcc-1.ebuild
deleted file mode 100644
index d26894412994..000000000000
--- a/acct-group/distcc/distcc-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=240
diff --git a/acct-group/dnrd/dnrd-0-r1.ebuild b/acct-group/dnrd/dnrd-0-r1.ebuild
new file mode 100644
index 000000000000..235dbfcf78c0
--- /dev/null
+++ b/acct-group/dnrd/dnrd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnrd"
+
+ACCT_GROUP_ID="262"
diff --git a/acct-group/dnrd/dnrd-0.ebuild b/acct-group/dnrd/dnrd-0.ebuild
deleted file mode 100644
index bba06a48da25..000000000000
--- a/acct-group/dnrd/dnrd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnrd"
-
-ACCT_GROUP_ID="262"
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
deleted file mode 100644
index afd6951e3873..000000000000
--- a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnscrypt-proxy"
-ACCT_GROUP_ID=353
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..0d10d9fd64b4
--- /dev/null
+++ b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnscrypt-proxy"
+ACCT_GROUP_ID=353
diff --git a/acct-group/dnsdist/dnsdist-0-r1.ebuild b/acct-group/dnsdist/dnsdist-0-r1.ebuild
deleted file mode 100644
index df9b403bed38..000000000000
--- a/acct-group/dnsdist/dnsdist-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/dnsdist"
-
-ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsdist/dnsdist-0-r2.ebuild b/acct-group/dnsdist/dnsdist-0-r2.ebuild
new file mode 100644
index 000000000000..573f371e6d0c
--- /dev/null
+++ b/acct-group/dnsdist/dnsdist-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/dnsdist"
+
+ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild b/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
deleted file mode 100644
index d765927def05..000000000000
--- a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq/dnsmasq-0-r2.ebuild b/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
new file mode 100644
index 000000000000..e41841312803
--- /dev/null
+++ b/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
deleted file mode 100644
index e075766a9c4e..000000000000
--- a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=274
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2568d8d50be2
--- /dev/null
+++ b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=274
diff --git a/acct-group/docker/docker-0-r1.ebuild b/acct-group/docker/docker-0-r1.ebuild
deleted file mode 100644
index a448b78e40fb..000000000000
--- a/acct-group/docker/docker-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=48
diff --git a/acct-group/docker/docker-0-r2.ebuild b/acct-group/docker/docker-0-r2.ebuild
new file mode 100644
index 000000000000..e59205efc4c2
--- /dev/null
+++ b/acct-group/docker/docker-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=48
diff --git a/acct-group/docker_auth/docker_auth-0-r1.ebuild b/acct-group/docker_auth/docker_auth-0-r1.ebuild
deleted file mode 100644
index 15cb331e003c..000000000000
--- a/acct-group/docker_auth/docker_auth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=345
diff --git a/acct-group/docker_auth/docker_auth-0-r2.ebuild b/acct-group/docker_auth/docker_auth-0-r2.ebuild
new file mode 100644
index 000000000000..d3f082ccbf0d
--- /dev/null
+++ b/acct-group/docker_auth/docker_auth-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=345
diff --git a/acct-group/dovecot/dovecot-0-r1.ebuild b/acct-group/dovecot/dovecot-0-r1.ebuild
deleted file mode 100644
index 3b37f1a2ebd6..000000000000
--- a/acct-group/dovecot/dovecot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=76
diff --git a/acct-group/dovecot/dovecot-0-r2.ebuild b/acct-group/dovecot/dovecot-0-r2.ebuild
new file mode 100644
index 000000000000..b79d8d933cfe
--- /dev/null
+++ b/acct-group/dovecot/dovecot-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=76
diff --git a/acct-group/dovenull/dovenull-0-r1.ebuild b/acct-group/dovenull/dovenull-0-r1.ebuild
deleted file mode 100644
index f6c9f1011d06..000000000000
--- a/acct-group/dovenull/dovenull-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=74
diff --git a/acct-group/dovenull/dovenull-0-r2.ebuild b/acct-group/dovenull/dovenull-0-r2.ebuild
new file mode 100644
index 000000000000..dfd9f8ee494c
--- /dev/null
+++ b/acct-group/dovenull/dovenull-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=74
diff --git a/acct-group/drone/drone-0-r1.ebuild b/acct-group/drone/drone-0-r1.ebuild
new file mode 100644
index 000000000000..c02ad8cb13d8
--- /dev/null
+++ b/acct-group/drone/drone-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/drone"
+
+ACCT_GROUP_ID="112"
diff --git a/acct-group/drone/drone-0.ebuild b/acct-group/drone/drone-0.ebuild
deleted file mode 100644
index 7e4e2c35ad8b..000000000000
--- a/acct-group/drone/drone-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-util/drone"
-
-ACCT_GROUP_ID="112"
diff --git a/acct-group/ejabberd/ejabberd-0-r1.ebuild b/acct-group/ejabberd/ejabberd-0-r1.ebuild
new file mode 100644
index 000000000000..ec6a736d7bb1
--- /dev/null
+++ b/acct-group/ejabberd/ejabberd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/ejabberd"
+
+ACCT_GROUP_ID=114
diff --git a/acct-group/ejabberd/ejabberd-0.ebuild b/acct-group/ejabberd/ejabberd-0.ebuild
deleted file mode 100644
index 7d4a216908f8..000000000000
--- a/acct-group/ejabberd/ejabberd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/ejabberd"
-
-ACCT_GROUP_ID=114
diff --git a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild b/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
deleted file mode 100644
index 7232aa799576..000000000000
--- a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Elasticsearch program group"
-ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch/elasticsearch-0-r2.ebuild b/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
new file mode 100644
index 000000000000..f9c57569df5f
--- /dev/null
+++ b/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Elasticsearch program group"
+ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
deleted file mode 100644
index 65fdefebaf47..000000000000
--- a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
-
-ACCT_GROUP_ID="501"
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..eb80176af463
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
+
+ACCT_GROUP_ID="501"
diff --git a/acct-group/energi3/energi3-0-r1.ebuild b/acct-group/energi3/energi3-0-r1.ebuild
new file mode 100644
index 000000000000..0d5f2564832b
--- /dev/null
+++ b/acct-group/energi3/energi3-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-p2p/energi3"
+ACCT_GROUP_ID=218
diff --git a/acct-group/energi3/energi3-0.ebuild b/acct-group/energi3/energi3-0.ebuild
deleted file mode 100644
index d844c7679002..000000000000
--- a/acct-group/energi3/energi3-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-p2p/energi3"
-ACCT_GROUP_ID=218
diff --git a/acct-group/epam/epam-0-r1.ebuild b/acct-group/epam/epam-0-r1.ebuild
new file mode 100644
index 000000000000..6df502deb6a8
--- /dev/null
+++ b/acct-group/epam/epam-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ejabberd's epam functionality"
+ACCT_GROUP_ID=418
diff --git a/acct-group/epam/epam-0.ebuild b/acct-group/epam/epam-0.ebuild
deleted file mode 100644
index 7909cc2a4393..000000000000
--- a/acct-group/epam/epam-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ejabberd's epam functionality"
-ACCT_GROUP_ID=418
diff --git a/acct-group/epmd/epmd-0-r1.ebuild b/acct-group/epmd/epmd-0-r1.ebuild
deleted file mode 100644
index 69ad9f1cad2b..000000000000
--- a/acct-group/epmd/epmd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Erlang Portmapper Daemon"
-ACCT_GROUP_ID=335
diff --git a/acct-group/epmd/epmd-0-r2.ebuild b/acct-group/epmd/epmd-0-r2.ebuild
new file mode 100644
index 000000000000..f954ffee5a68
--- /dev/null
+++ b/acct-group/epmd/epmd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Erlang Portmapper Daemon"
+ACCT_GROUP_ID=335
diff --git a/acct-group/err/err-0-r1.ebuild b/acct-group/err/err-0-r1.ebuild
new file mode 100644
index 000000000000..961861c84779
--- /dev/null
+++ b/acct-group/err/err-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=325
diff --git a/acct-group/err/err-0.ebuild b/acct-group/err/err-0.ebuild
deleted file mode 100644
index c1dcd9ca10c8..000000000000
--- a/acct-group/err/err-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=325
diff --git a/acct-group/etcd/etcd-0-r1.ebuild b/acct-group/etcd/etcd-0-r1.ebuild
deleted file mode 100644
index 841bf1ab43ea..000000000000
--- a/acct-group/etcd/etcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=426
diff --git a/acct-group/etcd/etcd-0-r2.ebuild b/acct-group/etcd/etcd-0-r2.ebuild
new file mode 100644
index 000000000000..0cfe9ef27461
--- /dev/null
+++ b/acct-group/etcd/etcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=426
diff --git a/acct-group/exabgp/exabgp-0-r1.ebuild b/acct-group/exabgp/exabgp-0-r1.ebuild
deleted file mode 100644
index ef1948f17efa..000000000000
--- a/acct-group/exabgp/exabgp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=316
diff --git a/acct-group/exabgp/exabgp-0-r2.ebuild b/acct-group/exabgp/exabgp-0-r2.ebuild
new file mode 100644
index 000000000000..273ddc242928
--- /dev/null
+++ b/acct-group/exabgp/exabgp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=316
diff --git a/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild b/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild
new file mode 100644
index 000000000000..d23e375c5f63
--- /dev/null
+++ b/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/ez-ipupdate"
+
+ACCT_GROUP_ID="261"
diff --git a/acct-group/ez-ipupd/ez-ipupd-0.ebuild b/acct-group/ez-ipupd/ez-ipupd-0.ebuild
deleted file mode 100644
index d37dce72a2cc..000000000000
--- a/acct-group/ez-ipupd/ez-ipupd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/ez-ipupdate"
-
-ACCT_GROUP_ID="261"
diff --git a/acct-group/fax/fax-0-r1.ebuild b/acct-group/fax/fax-0-r1.ebuild
new file mode 100644
index 000000000000..67affdc2830a
--- /dev/null
+++ b/acct-group/fax/fax-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dialup/mgetty"
+
+ACCT_GROUP_ID="320"
diff --git a/acct-group/fax/fax-0.ebuild b/acct-group/fax/fax-0.ebuild
deleted file mode 100644
index 2e9923179f3e..000000000000
--- a/acct-group/fax/fax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dialup/mgetty"
-
-ACCT_GROUP_ID="320"
diff --git a/acct-group/fcron/fcron-0-r1.ebuild b/acct-group/fcron/fcron-0-r1.ebuild
new file mode 100644
index 000000000000..56134814b301
--- /dev/null
+++ b/acct-group/fcron/fcron-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/fcron"
+
+ACCT_GROUP_ID="120"
diff --git a/acct-group/fcron/fcron-0.ebuild b/acct-group/fcron/fcron-0.ebuild
deleted file mode 100644
index 2eb3684b77bf..000000000000
--- a/acct-group/fcron/fcron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/fcron"
-
-ACCT_GROUP_ID="120"
diff --git a/acct-group/fdm/fdm-0-r1.ebuild b/acct-group/fdm/fdm-0-r1.ebuild
new file mode 100644
index 000000000000..f1e02f57ad2d
--- /dev/null
+++ b/acct-group/fdm/fdm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fdm"
+
+ACCT_GROUP_ID="248"
diff --git a/acct-group/fdm/fdm-0.ebuild b/acct-group/fdm/fdm-0.ebuild
deleted file mode 100644
index 135f04656589..000000000000
--- a/acct-group/fdm/fdm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fdm"
-
-ACCT_GROUP_ID="248"
diff --git a/acct-group/fetchmail/fetchmail-0-r1.ebuild b/acct-group/fetchmail/fetchmail-0-r1.ebuild
deleted file mode 100644
index 03f13d37300d..000000000000
--- a/acct-group/fetchmail/fetchmail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fetchmail"
-ACCT_GROUP_ID=124
diff --git a/acct-group/fetchmail/fetchmail-0-r2.ebuild b/acct-group/fetchmail/fetchmail-0-r2.ebuild
new file mode 100644
index 000000000000..f08ca98e37a3
--- /dev/null
+++ b/acct-group/fetchmail/fetchmail-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fetchmail"
+ACCT_GROUP_ID=124
diff --git a/acct-group/fhem/fhem-0-r1.ebuild b/acct-group/fhem/fhem-0-r1.ebuild
deleted file mode 100644
index 166e07ec2cf1..000000000000
--- a/acct-group/fhem/fhem-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the FHEM perl server for house automation"
-
-ACCT_GROUP_ID="491"
diff --git a/acct-group/fhem/fhem-0-r2.ebuild b/acct-group/fhem/fhem-0-r2.ebuild
new file mode 100644
index 000000000000..7bc0d371f660
--- /dev/null
+++ b/acct-group/fhem/fhem-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the FHEM perl server for house automation"
+
+ACCT_GROUP_ID="491"
diff --git a/acct-group/fingerprint/fingerprint-0-r1.ebuild b/acct-group/fingerprint/fingerprint-0-r1.ebuild
deleted file mode 100644
index 0df6a20dbd2b..000000000000
--- a/acct-group/fingerprint/fingerprint-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=243
diff --git a/acct-group/fingerprint/fingerprint-0-r2.ebuild b/acct-group/fingerprint/fingerprint-0-r2.ebuild
new file mode 100644
index 000000000000..9d6861472560
--- /dev/null
+++ b/acct-group/fingerprint/fingerprint-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=243
diff --git a/acct-group/firebird/firebird-0-r1.ebuild b/acct-group/firebird/firebird-0-r1.ebuild
deleted file mode 100644
index b2d2f28d7ea3..000000000000
--- a/acct-group/firebird/firebird-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/firebird"
-
-ACCT_GROUP_ID="450"
diff --git a/acct-group/firebird/firebird-0-r2.ebuild b/acct-group/firebird/firebird-0-r2.ebuild
new file mode 100644
index 000000000000..e107349d26d0
--- /dev/null
+++ b/acct-group/firebird/firebird-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/firebird"
+
+ACCT_GROUP_ID="450"
diff --git a/acct-group/flatpak/flatpak-0-r1.ebuild b/acct-group/flatpak/flatpak-0-r1.ebuild
new file mode 100644
index 000000000000..e90888ab5ece
--- /dev/null
+++ b/acct-group/flatpak/flatpak-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=313
diff --git a/acct-group/flatpak/flatpak-0.ebuild b/acct-group/flatpak/flatpak-0.ebuild
deleted file mode 100644
index 4b028c888d26..000000000000
--- a/acct-group/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=313
diff --git a/acct-group/floppy/floppy-0.ebuild b/acct-group/floppy/floppy-0-r1.ebuild
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/flows-0-r1.ebuild b/acct-group/flows/flows-0-r1.ebuild
new file mode 100644
index 000000000000..b6a26f2afa24
--- /dev/null
+++ b/acct-group/flows/flows-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/flow-tools"
+
+ACCT_GROUP_ID=384
diff --git a/acct-group/flows/flows-0.ebuild b/acct-group/flows/flows-0.ebuild
deleted file mode 100644
index 50f9c311d004..000000000000
--- a/acct-group/flows/flows-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/flow-tools"
-
-ACCT_GROUP_ID=384
diff --git a/acct-group/fluentd/fluentd-0-r1.ebuild b/acct-group/fluentd/fluentd-0-r1.ebuild
deleted file mode 100644
index 0f86473d11b6..000000000000
--- a/acct-group/fluentd/fluentd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/fluentd"
-
-ACCT_GROUP_ID="504"
diff --git a/acct-group/fluentd/fluentd-0-r2.ebuild b/acct-group/fluentd/fluentd-0-r2.ebuild
new file mode 100644
index 000000000000..bad64bdcd72a
--- /dev/null
+++ b/acct-group/fluentd/fluentd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/fluentd"
+
+ACCT_GROUP_ID="504"
diff --git a/acct-group/foldingathome/foldingathome-0-r1.ebuild b/acct-group/foldingathome/foldingathome-0-r1.ebuild
new file mode 100644
index 000000000000..d2ce82965e69
--- /dev/null
+++ b/acct-group/foldingathome/foldingathome-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sci-biology/foldingathome"
+
+ACCT_GROUP_ID="128"
diff --git a/acct-group/foldingathome/foldingathome-0.ebuild b/acct-group/foldingathome/foldingathome-0.ebuild
deleted file mode 100644
index 216461c86938..000000000000
--- a/acct-group/foldingathome/foldingathome-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sci-biology/foldingathome"
-
-ACCT_GROUP_ID="128"
diff --git a/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild b/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild
new file mode 100644
index 000000000000..6379f4551c43
--- /dev/null
+++ b/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/fp-multiuser"
+
+ACCT_GROUP_ID="318"
diff --git a/acct-group/fp-multiuser/fp-multiuser-0.ebuild b/acct-group/fp-multiuser/fp-multiuser-0.ebuild
deleted file mode 100644
index a7bd7bb71f26..000000000000
--- a/acct-group/fp-multiuser/fp-multiuser-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/fp-multiuser"
-
-ACCT_GROUP_ID="318"
diff --git a/acct-group/freenet/freenet-0-r1.ebuild b/acct-group/freenet/freenet-0-r1.ebuild
new file mode 100644
index 000000000000..8fb8e574f0d2
--- /dev/null
+++ b/acct-group/freenet/freenet-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/freenet"
+ACCT_GROUP_ID=105
diff --git a/acct-group/freenet/freenet-0.ebuild b/acct-group/freenet/freenet-0.ebuild
deleted file mode 100644
index c09fe1ee67e3..000000000000
--- a/acct-group/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/freenet"
-ACCT_GROUP_ID=105
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..17fa5738728a
--- /dev/null
+++ b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=228
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
deleted file mode 100644
index 1ecaeb6a6b08..000000000000
--- a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=228
diff --git a/acct-group/frr/frr-0-r1.ebuild b/acct-group/frr/frr-0-r1.ebuild
new file mode 100644
index 000000000000..ca45782773ab
--- /dev/null
+++ b/acct-group/frr/frr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=371
diff --git a/acct-group/frr/frr-0.ebuild b/acct-group/frr/frr-0.ebuild
deleted file mode 100644
index 42177f13c3a9..000000000000
--- a/acct-group/frr/frr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=371
diff --git a/acct-group/ftp/ftp-0-r1.ebuild b/acct-group/ftp/ftp-0-r1.ebuild
deleted file mode 100644
index 9c11d486fc4a..000000000000
--- a/acct-group/ftp/ftp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="File Transfer Protocol server user"
-ACCT_GROUP_ID=21
diff --git a/acct-group/ftp/ftp-0-r2.ebuild b/acct-group/ftp/ftp-0-r2.ebuild
new file mode 100644
index 000000000000..cba479f59ede
--- /dev/null
+++ b/acct-group/ftp/ftp-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="File Transfer Protocol server user"
+ACCT_GROUP_ID=21
diff --git a/acct-group/ftpproxy/ftpproxy-0-r1.ebuild b/acct-group/ftpproxy/ftpproxy-0-r1.ebuild
new file mode 100644
index 000000000000..b0c7b700f6d3
--- /dev/null
+++ b/acct-group/ftpproxy/ftpproxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-ftp/frox"
+
+ACCT_GROUP_ID="182"
diff --git a/acct-group/ftpproxy/ftpproxy-0.ebuild b/acct-group/ftpproxy/ftpproxy-0.ebuild
deleted file mode 100644
index 66b993575afe..000000000000
--- a/acct-group/ftpproxy/ftpproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-ftp/frox"
-
-ACCT_GROUP_ID="182"
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
deleted file mode 100644
index d6fc81af1798..000000000000
--- a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=232
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
new file mode 100644
index 000000000000..1061d5c2843d
--- /dev/null
+++ b/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=232
diff --git a/acct-group/gamemode/gamemode-0-r1.ebuild b/acct-group/gamemode/gamemode-0-r1.ebuild
new file mode 100644
index 000000000000..6de84c33acde
--- /dev/null
+++ b/acct-group/gamemode/gamemode-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
+ACCT_GROUP_ID=385
diff --git a/acct-group/gamemode/gamemode-0.ebuild b/acct-group/gamemode/gamemode-0.ebuild
deleted file mode 100644
index addb5e4d722e..000000000000
--- a/acct-group/gamemode/gamemode-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
-ACCT_GROUP_ID=385
diff --git a/acct-group/gamestat/gamestat-0-r1.ebuild b/acct-group/gamestat/gamestat-0-r1.ebuild
deleted file mode 100644
index 8b641548584a..000000000000
--- a/acct-group/gamestat/gamestat-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for shared high-score and game state files"
-ACCT_GROUP_ID=36
diff --git a/acct-group/gamestat/gamestat-0-r2.ebuild b/acct-group/gamestat/gamestat-0-r2.ebuild
new file mode 100644
index 000000000000..bd9da8d91185
--- /dev/null
+++ b/acct-group/gamestat/gamestat-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for shared high-score and game state files"
+ACCT_GROUP_ID=36
diff --git a/acct-group/gatling/gatling-0-r1.ebuild b/acct-group/gatling/gatling-0-r1.ebuild
deleted file mode 100644
index 54710451d35d..000000000000
--- a/acct-group/gatling/gatling-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=364 # matches acct-user/gatling
diff --git a/acct-group/gatling/gatling-0-r2.ebuild b/acct-group/gatling/gatling-0-r2.ebuild
new file mode 100644
index 000000000000..d7970f0e4edd
--- /dev/null
+++ b/acct-group/gatling/gatling-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=364 # matches acct-user/gatling
diff --git a/acct-group/gauth/gauth-0-r1.ebuild b/acct-group/gauth/gauth-0-r1.ebuild
new file mode 100644
index 000000000000..7ffd2ea24153
--- /dev/null
+++ b/acct-group/gauth/gauth-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
+
+ACCT_GROUP_ID="138"
diff --git a/acct-group/gauth/gauth-0.ebuild b/acct-group/gauth/gauth-0.ebuild
deleted file mode 100644
index 31dc4549fa33..000000000000
--- a/acct-group/gauth/gauth-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
-
-ACCT_GROUP_ID="138"
diff --git a/acct-group/gdm/gdm-0-r1.ebuild b/acct-group/gdm/gdm-0-r1.ebuild
new file mode 100644
index 000000000000..5a31412ae683
--- /dev/null
+++ b/acct-group/gdm/gdm-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=32
diff --git a/acct-group/gdm/gdm-0.ebuild b/acct-group/gdm/gdm-0.ebuild
deleted file mode 100644
index 2d82aac6f39d..000000000000
--- a/acct-group/gdm/gdm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=32
diff --git a/acct-group/geneweb/geneweb-0-r1.ebuild b/acct-group/geneweb/geneweb-0-r1.ebuild
deleted file mode 100644
index e68d95f8c291..000000000000
--- a/acct-group/geneweb/geneweb-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for geneweb daemon"
-
-ACCT_GROUP_ID=467
diff --git a/acct-group/geneweb/geneweb-0-r2.ebuild b/acct-group/geneweb/geneweb-0-r2.ebuild
new file mode 100644
index 000000000000..fc4063c85e29
--- /dev/null
+++ b/acct-group/geneweb/geneweb-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for geneweb daemon"
+
+ACCT_GROUP_ID=467
diff --git a/acct-group/geoclue/geoclue-0-r1.ebuild b/acct-group/geoclue/geoclue-0-r1.ebuild
new file mode 100644
index 000000000000..a1d04d1f7011
--- /dev/null
+++ b/acct-group/geoclue/geoclue-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=351
diff --git a/acct-group/geoclue/geoclue-0.ebuild b/acct-group/geoclue/geoclue-0.ebuild
deleted file mode 100644
index 7f96f9de46d6..000000000000
--- a/acct-group/geoclue/geoclue-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=351
diff --git a/acct-group/gerbera/gerbera-0-r1.ebuild b/acct-group/gerbera/gerbera-0-r1.ebuild
deleted file mode 100644
index f23b0d544613..000000000000
--- a/acct-group/gerbera/gerbera-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Gerbera UPnP Media Server group"
-ACCT_GROUP_ID=429
diff --git a/acct-group/gerbera/gerbera-0-r2.ebuild b/acct-group/gerbera/gerbera-0-r2.ebuild
new file mode 100644
index 000000000000..f275c9a42550
--- /dev/null
+++ b/acct-group/gerbera/gerbera-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Gerbera UPnP Media Server group"
+ACCT_GROUP_ID=429
diff --git a/acct-group/git/git-0-r1.ebuild b/acct-group/git/git-0-r1.ebuild
deleted file mode 100644
index 21737c5dcdfe..000000000000
--- a/acct-group/git/git-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=196
diff --git a/acct-group/git/git-0-r2.ebuild b/acct-group/git/git-0-r2.ebuild
new file mode 100644
index 000000000000..6e7351ce4f3c
--- /dev/null
+++ b/acct-group/git/git-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=196
diff --git a/acct-group/github-exporter/github-exporter-0-r1.ebuild b/acct-group/github-exporter/github-exporter-0-r1.ebuild
new file mode 100644
index 000000000000..96f651982fa4
--- /dev/null
+++ b/acct-group/github-exporter/github-exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=238
diff --git a/acct-group/github-exporter/github-exporter-0.ebuild b/acct-group/github-exporter/github-exporter-0.ebuild
deleted file mode 100644
index e8bc30acd2f7..000000000000
--- a/acct-group/github-exporter/github-exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=238
diff --git a/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild b/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild
new file mode 100644
index 000000000000..9d26a29b7c61
--- /dev/null
+++ b/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=510
diff --git a/acct-group/gitlab-runner/gitlab-runner-1.ebuild b/acct-group/gitlab-runner/gitlab-runner-1.ebuild
deleted file mode 100644
index 7a63620aefd8..000000000000
--- a/acct-group/gitlab-runner/gitlab-runner-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=510
diff --git a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild b/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
deleted file mode 100644
index b906a9c72ece..000000000000
--- a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=221
diff --git a/acct-group/gkrellmd/gkrellmd-0-r2.ebuild b/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
new file mode 100644
index 000000000000..41c6b529035b
--- /dev/null
+++ b/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=221
diff --git a/acct-group/glance/glance-0-r1.ebuild b/acct-group/glance/glance-0-r1.ebuild
deleted file mode 100644
index 88a844125280..000000000000
--- a/acct-group/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=443
diff --git a/acct-group/glance/glance-0-r2.ebuild b/acct-group/glance/glance-0-r2.ebuild
new file mode 100644
index 000000000000..cac90772ccf0
--- /dev/null
+++ b/acct-group/glance/glance-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=443
diff --git a/acct-group/gluster/gluster-0-r1.ebuild b/acct-group/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index d79d97827530..000000000000
--- a/acct-group/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=416
diff --git a/acct-group/gluster/gluster-0-r2.ebuild b/acct-group/gluster/gluster-0-r2.ebuild
new file mode 100644
index 000000000000..d385d3e780c2
--- /dev/null
+++ b/acct-group/gluster/gluster-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=416
diff --git a/acct-group/gns3/gns3-0-r1.ebuild b/acct-group/gns3/gns3-0-r1.ebuild
new file mode 100644
index 000000000000..f3d20c0d3135
--- /dev/null
+++ b/acct-group/gns3/gns3-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=522
diff --git a/acct-group/gns3/gns3-0.ebuild b/acct-group/gns3/gns3-0.ebuild
deleted file mode 100644
index e4605b5610ef..000000000000
--- a/acct-group/gns3/gns3-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=522
diff --git a/acct-group/gnump3d/gnump3d-0-r1.ebuild b/acct-group/gnump3d/gnump3d-0-r1.ebuild
new file mode 100644
index 000000000000..c8f2f001be9d
--- /dev/null
+++ b/acct-group/gnump3d/gnump3d-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/gnump3d"
+
+ACCT_GROUP_ID="160"
diff --git a/acct-group/gnump3d/gnump3d-0.ebuild b/acct-group/gnump3d/gnump3d-0.ebuild
deleted file mode 100644
index 3c4504e2ac75..000000000000
--- a/acct-group/gnump3d/gnump3d-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/gnump3d"
-
-ACCT_GROUP_ID="160"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
new file mode 100644
index 000000000000..a1b538246fef
--- /dev/null
+++ b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
deleted file mode 100644
index e70168f79161..000000000000
--- a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild
new file mode 100644
index 000000000000..11ab8a2ea439
--- /dev/null
+++ b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="373"
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
deleted file mode 100644
index bc56160394b8..000000000000
--- a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="373"
diff --git a/acct-group/goaccess/goaccess-0-r1.ebuild b/acct-group/goaccess/goaccess-0-r1.ebuild
new file mode 100644
index 000000000000..5b8bc4733418
--- /dev/null
+++ b/acct-group/goaccess/goaccess-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=523
diff --git a/acct-group/goaccess/goaccess-0.ebuild b/acct-group/goaccess/goaccess-0.ebuild
deleted file mode 100644
index e8027df04f52..000000000000
--- a/acct-group/goaccess/goaccess-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=523
diff --git a/acct-group/gopher/gopher-0-r1.ebuild b/acct-group/gopher/gopher-0-r1.ebuild
new file mode 100644
index 000000000000..7e9fe881ffdf
--- /dev/null
+++ b/acct-group/gopher/gopher-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=287
diff --git a/acct-group/gopher/gopher-0.ebuild b/acct-group/gopher/gopher-0.ebuild
deleted file mode 100644
index ea85d8185e0c..000000000000
--- a/acct-group/gopher/gopher-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=287
diff --git a/acct-group/gopherd/gopherd-0-r1.ebuild b/acct-group/gopherd/gopherd-0-r1.ebuild
new file mode 100644
index 000000000000..6f3afeff7650
--- /dev/null
+++ b/acct-group/gopherd/gopherd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/geomyidae"
+
+ACCT_GROUP_ID="132"
diff --git a/acct-group/gopherd/gopherd-0.ebuild b/acct-group/gopherd/gopherd-0.ebuild
deleted file mode 100644
index 7c433e9e43e0..000000000000
--- a/acct-group/gopherd/gopherd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/geomyidae"
-
-ACCT_GROUP_ID="132"
diff --git a/acct-group/gpib/gpib-0-r1.ebuild b/acct-group/gpib/gpib-0-r1.ebuild
deleted file mode 100644
index 88caead90e5e..000000000000
--- a/acct-group/gpib/gpib-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=409
diff --git a/acct-group/gpib/gpib-0-r2.ebuild b/acct-group/gpib/gpib-0-r2.ebuild
new file mode 100644
index 000000000000..e278818e44db
--- /dev/null
+++ b/acct-group/gpib/gpib-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=409
diff --git a/acct-group/gpio/gpio-0-r1.ebuild b/acct-group/gpio/gpio-0-r1.ebuild
new file mode 100644
index 000000000000..1a45b51a4b61
--- /dev/null
+++ b/acct-group/gpio/gpio-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="225"
diff --git a/acct-group/gpio/gpio-0.ebuild b/acct-group/gpio/gpio-0.ebuild
deleted file mode 100644
index 9f8e9a3621d1..000000000000
--- a/acct-group/gpio/gpio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="225"
diff --git a/acct-group/grafana/grafana-0-r1.ebuild b/acct-group/grafana/grafana-0-r1.ebuild
deleted file mode 100644
index ab11061926b1..000000000000
--- a/acct-group/grafana/grafana-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="grafana program group"
-
-ACCT_GROUP_ID=389
diff --git a/acct-group/grafana/grafana-0-r2.ebuild b/acct-group/grafana/grafana-0-r2.ebuild
new file mode 100644
index 000000000000..e217b4d7a405
--- /dev/null
+++ b/acct-group/grafana/grafana-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="grafana program group"
+
+ACCT_GROUP_ID=389
diff --git a/acct-group/graylog/graylog-0-r1.ebuild b/acct-group/graylog/graylog-0-r1.ebuild
deleted file mode 100644
index 23ff1b46e12a..000000000000
--- a/acct-group/graylog/graylog-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Graylog program group"
-ACCT_GROUP_ID=478
diff --git a/acct-group/graylog/graylog-0-r2.ebuild b/acct-group/graylog/graylog-0-r2.ebuild
new file mode 100644
index 000000000000..b59addc0d545
--- /dev/null
+++ b/acct-group/graylog/graylog-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Graylog program group"
+ACCT_GROUP_ID=478
diff --git a/acct-group/greetd/greetd-0-r1.ebuild b/acct-group/greetd/greetd-0-r1.ebuild
deleted file mode 100644
index defd4a7f1809..000000000000
--- a/acct-group/greetd/greetd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=396
-DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/greetd/greetd-0-r2.ebuild b/acct-group/greetd/greetd-0-r2.ebuild
new file mode 100644
index 000000000000..ae697d32110a
--- /dev/null
+++ b/acct-group/greetd/greetd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=396
+DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/grok_exporter/grok_exporter-0-r1.ebuild b/acct-group/grok_exporter/grok_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..7667a6a11b48
--- /dev/null
+++ b/acct-group/grok_exporter/grok_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/grok_exporter"
+
+ACCT_GROUP_ID="104"
diff --git a/acct-group/grok_exporter/grok_exporter-0.ebuild b/acct-group/grok_exporter/grok_exporter-0.ebuild
deleted file mode 100644
index ff2c696b3fb0..000000000000
--- a/acct-group/grok_exporter/grok_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/grok_exporter"
-
-ACCT_GROUP_ID="104"
diff --git a/acct-group/groonga/groonga-0-r1.ebuild b/acct-group/groonga/groonga-0-r1.ebuild
new file mode 100644
index 000000000000..f99308dcac3b
--- /dev/null
+++ b/acct-group/groonga/groonga-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-text/groonga"
+
+ACCT_GROUP_ID="266"
diff --git a/acct-group/groonga/groonga-0.ebuild b/acct-group/groonga/groonga-0.ebuild
deleted file mode 100644
index 347d9c9825d7..000000000000
--- a/acct-group/groonga/groonga-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-text/groonga"
-
-ACCT_GROUP_ID="266"
diff --git a/acct-group/gvm/gvm-0-r1.ebuild b/acct-group/gvm/gvm-0-r1.ebuild
deleted file mode 100644
index 1416f062f155..000000000000
--- a/acct-group/gvm/gvm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Greenbone vulnerability management program group"
-ACCT_GROUP_ID=495
diff --git a/acct-group/gvm/gvm-0-r2.ebuild b/acct-group/gvm/gvm-0-r2.ebuild
new file mode 100644
index 000000000000..281c7f93aae0
--- /dev/null
+++ b/acct-group/gvm/gvm-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Greenbone vulnerability management program group"
+ACCT_GROUP_ID=495
diff --git a/acct-group/h2o/h2o-0-r1.ebuild b/acct-group/h2o/h2o-0-r1.ebuild
new file mode 100644
index 000000000000..49b355695982
--- /dev/null
+++ b/acct-group/h2o/h2o-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/h2o"
+
+ACCT_GROUP_ID="141"
diff --git a/acct-group/h2o/h2o-0.ebuild b/acct-group/h2o/h2o-0.ebuild
deleted file mode 100644
index 210bbacb211f..000000000000
--- a/acct-group/h2o/h2o-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/h2o"
-
-ACCT_GROUP_ID="141"
diff --git a/acct-group/haclient/haclient-0-r1.ebuild b/acct-group/haclient/haclient-0-r1.ebuild
new file mode 100644
index 000000000000..b9d4dd667d26
--- /dev/null
+++ b/acct-group/haclient/haclient-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/cluster-glue"
+
+ACCT_GROUP_ID="204"
diff --git a/acct-group/haclient/haclient-0.ebuild b/acct-group/haclient/haclient-0.ebuild
deleted file mode 100644
index 26dcd63c48e7..000000000000
--- a/acct-group/haclient/haclient-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-cluster/cluster-glue"
-
-ACCT_GROUP_ID="204"
diff --git a/acct-group/haproxy/haproxy-0-r1.ebuild b/acct-group/haproxy/haproxy-0-r1.ebuild
deleted file mode 100644
index 230356aa82f1..000000000000
--- a/acct-group/haproxy/haproxy-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=188
diff --git a/acct-group/haproxy/haproxy-0-r2.ebuild b/acct-group/haproxy/haproxy-0-r2.ebuild
new file mode 100644
index 000000000000..857a2e2f134f
--- /dev/null
+++ b/acct-group/haproxy/haproxy-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=188
diff --git a/acct-group/havp/havp-0-r1.ebuild b/acct-group/havp/havp-0-r2.ebuild
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/headscale-0-r1.ebuild b/acct-group/headscale/headscale-0-r1.ebuild
new file mode 100644
index 000000000000..a1ad07a64135
--- /dev/null
+++ b/acct-group/headscale/headscale-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=514
diff --git a/acct-group/headscale/headscale-0.ebuild b/acct-group/headscale/headscale-0.ebuild
deleted file mode 100644
index 73623757f6d6..000000000000
--- a/acct-group/headscale/headscale-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=514
diff --git a/acct-group/heat/heat-0-r1.ebuild b/acct-group/heat/heat-0-r1.ebuild
deleted file mode 100644
index d3e6b1b93a80..000000000000
--- a/acct-group/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=444
diff --git a/acct-group/heat/heat-0-r2.ebuild b/acct-group/heat/heat-0-r2.ebuild
new file mode 100644
index 000000000000..44b33bd9def9
--- /dev/null
+++ b/acct-group/heat/heat-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=444
diff --git a/acct-group/hsqldb/hsqldb-0-r1.ebuild b/acct-group/hsqldb/hsqldb-0-r1.ebuild
new file mode 100644
index 000000000000..4fd2909bb0a0
--- /dev/null
+++ b/acct-group/hsqldb/hsqldb-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for hsqldb"
+ACCT_GROUP_ID=217
diff --git a/acct-group/hsqldb/hsqldb-0.ebuild b/acct-group/hsqldb/hsqldb-0.ebuild
deleted file mode 100644
index 041bb24be52a..000000000000
--- a/acct-group/hsqldb/hsqldb-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for hsqldb"
-ACCT_GROUP_ID=217
diff --git a/acct-group/http/http-0-r1.ebuild b/acct-group/http/http-0-r1.ebuild
new file mode 100644
index 000000000000..a91ed39f6dc9
--- /dev/null
+++ b/acct-group/http/http-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=297
diff --git a/acct-group/http/http-0.ebuild b/acct-group/http/http-0.ebuild
deleted file mode 100644
index 6e855875b1d8..000000000000
--- a/acct-group/http/http-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=297
diff --git a/acct-group/i2c/i2c-0-r1.ebuild b/acct-group/i2c/i2c-0-r1.ebuild
new file mode 100644
index 000000000000..2ada0a64d487
--- /dev/null
+++ b/acct-group/i2c/i2c-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="226"
diff --git a/acct-group/i2c/i2c-0.ebuild b/acct-group/i2c/i2c-0.ebuild
deleted file mode 100644
index 9318389c592c..000000000000
--- a/acct-group/i2c/i2c-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="226"
diff --git a/acct-group/i2p/i2p-0-r1.ebuild b/acct-group/i2p/i2p-0-r1.ebuild
deleted file mode 100644
index 9fa033395b17..000000000000
--- a/acct-group/i2p/i2p-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-vpn/i2p"
-ACCT_GROUP_ID=471
diff --git a/acct-group/i2p/i2p-0-r2.ebuild b/acct-group/i2p/i2p-0-r2.ebuild
new file mode 100644
index 000000000000..47ed7781c511
--- /dev/null
+++ b/acct-group/i2p/i2p-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-vpn/i2p"
+ACCT_GROUP_ID=471
diff --git a/acct-group/i2pd/i2pd-0-r1.ebuild b/acct-group/i2pd/i2pd-0-r1.ebuild
deleted file mode 100644
index 2258cde77ad8..000000000000
--- a/acct-group/i2pd/i2pd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
-ACCT_GROUP_ID=470
diff --git a/acct-group/i2pd/i2pd-0-r2.ebuild b/acct-group/i2pd/i2pd-0-r2.ebuild
new file mode 100644
index 000000000000..e823550e39c3
--- /dev/null
+++ b/acct-group/i2pd/i2pd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
+ACCT_GROUP_ID=470
diff --git a/acct-group/icecast/icecast-0-r1.ebuild b/acct-group/icecast/icecast-0-r1.ebuild
new file mode 100644
index 000000000000..eb7e463046f7
--- /dev/null
+++ b/acct-group/icecast/icecast-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/icecast"
+
+ACCT_GROUP_ID="131"
diff --git a/acct-group/icecast/icecast-0.ebuild b/acct-group/icecast/icecast-0.ebuild
deleted file mode 100644
index 8e91828cfb66..000000000000
--- a/acct-group/icecast/icecast-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/icecast"
-
-ACCT_GROUP_ID="131"
diff --git a/acct-group/icecream/icecream-0-r1.ebuild b/acct-group/icecream/icecream-0-r1.ebuild
new file mode 100644
index 000000000000..898cf5518a04
--- /dev/null
+++ b/acct-group/icecream/icecream-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-devel/icecream"
+
+ACCT_GROUP_ID="145"
diff --git a/acct-group/icecream/icecream-0.ebuild b/acct-group/icecream/icecream-0.ebuild
deleted file mode 100644
index 08f8a89a7b97..000000000000
--- a/acct-group/icecream/icecream-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-devel/icecream"
-
-ACCT_GROUP_ID="145"
diff --git a/acct-group/ices/ices-0-r1.ebuild b/acct-group/ices/ices-0-r1.ebuild
new file mode 100644
index 000000000000..59690dd46fd6
--- /dev/null
+++ b/acct-group/ices/ices-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ices"
+
+ACCT_GROUP_ID="162"
diff --git a/acct-group/ices/ices-0.ebuild b/acct-group/ices/ices-0.ebuild
deleted file mode 100644
index 0efbe032797f..000000000000
--- a/acct-group/ices/ices-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/ices"
-
-ACCT_GROUP_ID="162"
diff --git a/acct-group/icinga/icinga-0-r1.ebuild b/acct-group/icinga/icinga-0-r1.ebuild
deleted file mode 100644
index f14f8c10b01a..000000000000
--- a/acct-group/icinga/icinga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=457
diff --git a/acct-group/icinga/icinga-0-r2.ebuild b/acct-group/icinga/icinga-0-r2.ebuild
new file mode 100644
index 000000000000..9d84d81f4cc4
--- /dev/null
+++ b/acct-group/icinga/icinga-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=457
diff --git a/acct-group/icingacmd/icingacmd-0-r1.ebuild b/acct-group/icingacmd/icingacmd-0-r1.ebuild
deleted file mode 100644
index 342794ce41e0..000000000000
--- a/acct-group/icingacmd/icingacmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=458
diff --git a/acct-group/icingacmd/icingacmd-0-r2.ebuild b/acct-group/icingacmd/icingacmd-0-r2.ebuild
new file mode 100644
index 000000000000..9ed75a172c3b
--- /dev/null
+++ b/acct-group/icingacmd/icingacmd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=458
diff --git a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild b/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
deleted file mode 100644
index e2660fdb4be5..000000000000
--- a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=241
diff --git a/acct-group/icingaweb2/icingaweb2-0-r2.ebuild b/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
new file mode 100644
index 000000000000..0f7977916325
--- /dev/null
+++ b/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=241
diff --git a/acct-group/inadyn/inadyn-0.ebuild b/acct-group/inadyn/inadyn-0-r1.ebuild
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/influxdb-0-r1.ebuild b/acct-group/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 8b693e17a672..000000000000
--- a/acct-group/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=342
diff --git a/acct-group/influxdb/influxdb-0-r2.ebuild b/acct-group/influxdb/influxdb-0-r2.ebuild
new file mode 100644
index 000000000000..035b6cd5fcc9
--- /dev/null
+++ b/acct-group/influxdb/influxdb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=342
diff --git a/acct-group/input/input-0-r1.ebuild b/acct-group/input/input-0-r1.ebuild
deleted file mode 100644
index 9ef06e8444a4..000000000000
--- a/acct-group/input/input-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=97
diff --git a/acct-group/input/input-0-r2.ebuild b/acct-group/input/input-0-r2.ebuild
new file mode 100644
index 000000000000..966d8ca0658c
--- /dev/null
+++ b/acct-group/input/input-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=97
diff --git a/acct-group/inspircd/inspircd-0-r1.ebuild b/acct-group/inspircd/inspircd-0-r1.ebuild
deleted file mode 100644
index 6d4c94d302ac..000000000000
--- a/acct-group/inspircd/inspircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# Port 6667 % 500
-ACCT_GROUP_ID=167
diff --git a/acct-group/inspircd/inspircd-0-r2.ebuild b/acct-group/inspircd/inspircd-0-r2.ebuild
new file mode 100644
index 000000000000..4c056457ee4e
--- /dev/null
+++ b/acct-group/inspircd/inspircd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+# Port 6667 % 500
+ACCT_GROUP_ID=167
diff --git a/acct-group/ipfs/ipfs-0-r1.ebuild b/acct-group/ipfs/ipfs-0-r1.ebuild
deleted file mode 100644
index 503f9d4c1a2f..000000000000
--- a/acct-group/ipfs/ipfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
-ACCT_GROUP_ID=484
diff --git a/acct-group/ipfs/ipfs-0-r2.ebuild b/acct-group/ipfs/ipfs-0-r2.ebuild
new file mode 100644
index 000000000000..6328588e24e3
--- /dev/null
+++ b/acct-group/ipfs/ipfs-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
+ACCT_GROUP_ID=484
diff --git a/acct-group/ipsec/ipsec-0-r1.ebuild b/acct-group/ipsec/ipsec-0-r1.ebuild
new file mode 100644
index 000000000000..8a31b9f0e9c9
--- /dev/null
+++ b/acct-group/ipsec/ipsec-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="ipsec (strongswan) program group"
+
+ACCT_GROUP_ID=199
diff --git a/acct-group/ipsec/ipsec-0.ebuild b/acct-group/ipsec/ipsec-0.ebuild
deleted file mode 100644
index d0716459d75e..000000000000
--- a/acct-group/ipsec/ipsec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="ipsec (strongswan) program group"
-
-ACCT_GROUP_ID=199
diff --git a/acct-group/ipsentinel/ipsentinel-0-r1.ebuild b/acct-group/ipsentinel/ipsentinel-0-r1.ebuild
new file mode 100644
index 000000000000..eb3389f4a1e8
--- /dev/null
+++ b/acct-group/ipsentinel/ipsentinel-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ip-sentinel"
+
+ACCT_GROUP_ID="163"
diff --git a/acct-group/ipsentinel/ipsentinel-0.ebuild b/acct-group/ipsentinel/ipsentinel-0.ebuild
deleted file mode 100644
index 0ab3a10e014b..000000000000
--- a/acct-group/ipsentinel/ipsentinel-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/ip-sentinel"
-
-ACCT_GROUP_ID="163"
diff --git a/acct-group/iroffer/iroffer-0-r1.ebuild b/acct-group/iroffer/iroffer-0-r1.ebuild
new file mode 100644
index 000000000000..f25bc31a520d
--- /dev/null
+++ b/acct-group/iroffer/iroffer-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=187
diff --git a/acct-group/iroffer/iroffer-0.ebuild b/acct-group/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 2e3c37129e70..000000000000
--- a/acct-group/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=187
diff --git a/acct-group/jellyfin/jellyfin-0-r1.ebuild b/acct-group/jellyfin/jellyfin-0-r1.ebuild
new file mode 100644
index 000000000000..b2f88b650218
--- /dev/null
+++ b/acct-group/jellyfin/jellyfin-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=518
diff --git a/acct-group/jellyfin/jellyfin-0.ebuild b/acct-group/jellyfin/jellyfin-0.ebuild
deleted file mode 100644
index 9d952362cfe2..000000000000
--- a/acct-group/jellyfin/jellyfin-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=518
diff --git a/acct-group/jenkins/jenkins-0-r1.ebuild b/acct-group/jenkins/jenkins-0-r1.ebuild
new file mode 100644
index 000000000000..887aa8613518
--- /dev/null
+++ b/acct-group/jenkins/jenkins-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Jenkins program group"
+
+ACCT_GROUP_ID=473
diff --git a/acct-group/jenkins/jenkins-0.ebuild b/acct-group/jenkins/jenkins-0.ebuild
deleted file mode 100644
index c90523f69b2b..000000000000
--- a/acct-group/jenkins/jenkins-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Jenkins program group"
-
-ACCT_GROUP_ID=473
diff --git a/acct-group/kafka/kafka-0-r1.ebuild b/acct-group/kafka/kafka-0-r1.ebuild
deleted file mode 100644
index 6d08891db8e6..000000000000
--- a/acct-group/kafka/kafka-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=425
diff --git a/acct-group/kafka/kafka-0-r2.ebuild b/acct-group/kafka/kafka-0-r2.ebuild
new file mode 100644
index 000000000000..738fbb5b48da
--- /dev/null
+++ b/acct-group/kafka/kafka-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=425
diff --git a/acct-group/kapacitor/kapacitor-0-r1.ebuild b/acct-group/kapacitor/kapacitor-0-r1.ebuild
deleted file mode 100644
index 3e998f71108a..000000000000
--- a/acct-group/kapacitor/kapacitor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=343
diff --git a/acct-group/kapacitor/kapacitor-0-r2.ebuild b/acct-group/kapacitor/kapacitor-0-r2.ebuild
new file mode 100644
index 000000000000..3a84f7bcd450
--- /dev/null
+++ b/acct-group/kapacitor/kapacitor-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=343
diff --git a/acct-group/karma/karma-0-r1.ebuild b/acct-group/karma/karma-0-r1.ebuild
new file mode 100644
index 000000000000..68555d5c9381
--- /dev/null
+++ b/acct-group/karma/karma-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/karma-bin"
+
+ACCT_GROUP_ID="118"
diff --git a/acct-group/karma/karma-0.ebuild b/acct-group/karma/karma-0.ebuild
deleted file mode 100644
index 1631d655b6bf..000000000000
--- a/acct-group/karma/karma-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/karma-bin"
-
-ACCT_GROUP_ID="118"
diff --git a/acct-group/keystone/keystone-0-r1.ebuild b/acct-group/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 06d95b537d6f..000000000000
--- a/acct-group/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=445
diff --git a/acct-group/keystone/keystone-0-r2.ebuild b/acct-group/keystone/keystone-0-r2.ebuild
new file mode 100644
index 000000000000..d477d0ca866f
--- /dev/null
+++ b/acct-group/keystone/keystone-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=445
diff --git a/acct-group/kibana/kibana-0-r1.ebuild b/acct-group/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index 936486fe4773..000000000000
--- a/acct-group/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Kibana program group"
-ACCT_GROUP_ID=269
diff --git a/acct-group/kibana/kibana-0-r2.ebuild b/acct-group/kibana/kibana-0-r2.ebuild
new file mode 100644
index 000000000000..61a710122e7e
--- /dev/null
+++ b/acct-group/kibana/kibana-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Kibana program group"
+ACCT_GROUP_ID=269
diff --git a/acct-group/kismet/kismet-0-r1.ebuild b/acct-group/kismet/kismet-0-r1.ebuild
deleted file mode 100644
index cd8df0799bdb..000000000000
--- a/acct-group/kismet/kismet-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="net-wireless/kismet"
-ACCT_GROUP_ID="388"
diff --git a/acct-group/kismet/kismet-0-r2.ebuild b/acct-group/kismet/kismet-0-r2.ebuild
new file mode 100644
index 000000000000..f06dfe9ab2bc
--- /dev/null
+++ b/acct-group/kismet/kismet-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_GROUP_ID="388"
diff --git a/acct-group/kmem/kmem-0-r1.ebuild b/acct-group/kmem/kmem-0-r1.ebuild
deleted file mode 100644
index b07239c3b2ab..000000000000
--- a/acct-group/kmem/kmem-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=9
diff --git a/acct-group/kmem/kmem-0-r2.ebuild b/acct-group/kmem/kmem-0-r2.ebuild
new file mode 100644
index 000000000000..68e5fd412c4a
--- /dev/null
+++ b/acct-group/kmem/kmem-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=9
diff --git a/acct-group/knot-resolver/knot-resolver-0-r1.ebuild b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
new file mode 100644
index 000000000000..cd9132400076
--- /dev/null
+++ b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=525
diff --git a/acct-group/knot-resolver/knot-resolver-0.ebuild b/acct-group/knot-resolver/knot-resolver-0.ebuild
deleted file mode 100644
index e786894a7da9..000000000000
--- a/acct-group/knot-resolver/knot-resolver-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=525
diff --git a/acct-group/knot/knot-0-r1.ebuild b/acct-group/knot/knot-0-r1.ebuild
deleted file mode 100644
index f35128d81950..000000000000
--- a/acct-group/knot/knot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=53
diff --git a/acct-group/knot/knot-0-r2.ebuild b/acct-group/knot/knot-0-r2.ebuild
new file mode 100644
index 000000000000..227d7be2e8aa
--- /dev/null
+++ b/acct-group/knot/knot-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=53
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
deleted file mode 100644
index 52abae9b534e..000000000000
--- a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=432
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
new file mode 100644
index 000000000000..e314e709eba1
--- /dev/null
+++ b/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=432
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
deleted file mode 100644
index 7fc976b63174..000000000000
--- a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=433
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild
new file mode 100644
index 000000000000..763c1ac5a255
--- /dev/null
+++ b/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=433
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
deleted file mode 100644
index 1b61e2a92b1f..000000000000
--- a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=434
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
new file mode 100644
index 000000000000..9b3c883ca810
--- /dev/null
+++ b/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=434
diff --git a/acct-group/kvm/kvm-0-r1.ebuild b/acct-group/kvm/kvm-0-r1.ebuild
deleted file mode 100644
index eadc9b037d32..000000000000
--- a/acct-group/kvm/kvm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=78
diff --git a/acct-group/kvm/kvm-0-r2.ebuild b/acct-group/kvm/kvm-0-r2.ebuild
new file mode 100644
index 000000000000..125d57ad0b93
--- /dev/null
+++ b/acct-group/kvm/kvm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=78
diff --git a/acct-group/ldap/ldap-0-r1.ebuild b/acct-group/ldap/ldap-0-r1.ebuild
new file mode 100644
index 000000000000..f90c3a827f8c
--- /dev/null
+++ b/acct-group/ldap/ldap-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=439
diff --git a/acct-group/ldap/ldap-0.ebuild b/acct-group/ldap/ldap-0.ebuild
deleted file mode 100644
index 88f92a325683..000000000000
--- a/acct-group/ldap/ldap-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=439
diff --git a/acct-group/libreoffice/libreoffice-0-r1.ebuild b/acct-group/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..8d9a73b20e9f
--- /dev/null
+++ b/acct-group/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="512"
diff --git a/acct-group/libreoffice/libreoffice-0.ebuild b/acct-group/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index bf052171998d..000000000000
--- a/acct-group/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="512"
diff --git a/acct-group/libvirt/libvirt-0-r1.ebuild b/acct-group/libvirt/libvirt-0-r1.ebuild
deleted file mode 100644
index d9d2709c5851..000000000000
--- a/acct-group/libvirt/libvirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=79
diff --git a/acct-group/libvirt/libvirt-0-r2.ebuild b/acct-group/libvirt/libvirt-0-r2.ebuild
new file mode 100644
index 000000000000..b3143725a005
--- /dev/null
+++ b/acct-group/libvirt/libvirt-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=79
diff --git a/acct-group/lightdm/lightdm-0-r1.ebuild b/acct-group/lightdm/lightdm-0-r1.ebuild
deleted file mode 100644
index e2adc778ff71..000000000000
--- a/acct-group/lightdm/lightdm-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/lightdm"
-
-ACCT_GROUP_ID="134"
diff --git a/acct-group/lightdm/lightdm-0-r2.ebuild b/acct-group/lightdm/lightdm-0-r2.ebuild
new file mode 100644
index 000000000000..45f3a67230aa
--- /dev/null
+++ b/acct-group/lightdm/lightdm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/lightdm"
+
+ACCT_GROUP_ID="134"
diff --git a/acct-group/lighttpd/lighttpd-0-r1.ebuild b/acct-group/lighttpd/lighttpd-0-r1.ebuild
deleted file mode 100644
index 16dac2e24281..000000000000
--- a/acct-group/lighttpd/lighttpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=302
diff --git a/acct-group/lighttpd/lighttpd-0-r2.ebuild b/acct-group/lighttpd/lighttpd-0-r2.ebuild
new file mode 100644
index 000000000000..044328ed7179
--- /dev/null
+++ b/acct-group/lighttpd/lighttpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=302
diff --git a/acct-group/litecoin/litecoin-0-r1.ebuild b/acct-group/litecoin/litecoin-0-r1.ebuild
new file mode 100644
index 000000000000..f04bbe6599ef
--- /dev/null
+++ b/acct-group/litecoin/litecoin-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/litecoind"
+
+ACCT_GROUP_ID="256"
diff --git a/acct-group/litecoin/litecoin-0.ebuild b/acct-group/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 05549b4b53e9..000000000000
--- a/acct-group/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/litecoind"
-
-ACCT_GROUP_ID="256"
diff --git a/acct-group/lldpd/lldpd-0-r1.ebuild b/acct-group/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 7482f9b79142..000000000000
--- a/acct-group/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=315
diff --git a/acct-group/lldpd/lldpd-0-r2.ebuild b/acct-group/lldpd/lldpd-0-r2.ebuild
new file mode 100644
index 000000000000..de42bfe44bdf
--- /dev/null
+++ b/acct-group/lldpd/lldpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=315
diff --git a/acct-group/locate/locate-0-r1.ebuild b/acct-group/locate/locate-0-r1.ebuild
deleted file mode 100644
index 59071dc6b158..000000000000
--- a/acct-group/locate/locate-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=245
diff --git a/acct-group/locate/locate-0-r2.ebuild b/acct-group/locate/locate-0-r2.ebuild
new file mode 100644
index 000000000000..6cd73ba39ad5
--- /dev/null
+++ b/acct-group/locate/locate-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=245
diff --git a/acct-group/logcheck/logcheck-0-r1.ebuild b/acct-group/logcheck/logcheck-0-r1.ebuild
new file mode 100644
index 000000000000..8bba51bbeaf3
--- /dev/null
+++ b/acct-group/logcheck/logcheck-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logcheck"
+
+ACCT_GROUP_ID="284"
diff --git a/acct-group/logcheck/logcheck-0.ebuild b/acct-group/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 13e5e4692590..000000000000
--- a/acct-group/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logcheck"
-
-ACCT_GROUP_ID="284"
diff --git a/acct-group/logstash/logstash-0-r1.ebuild b/acct-group/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 8253d88b5c0d..000000000000
--- a/acct-group/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Logstash program group"
-ACCT_GROUP_ID=270
diff --git a/acct-group/logstash/logstash-0-r2.ebuild b/acct-group/logstash/logstash-0-r2.ebuild
new file mode 100644
index 000000000000..42641f69f967
--- /dev/null
+++ b/acct-group/logstash/logstash-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Logstash program group"
+ACCT_GROUP_ID=270
diff --git a/acct-group/logsurfer/logsurfer-0-r1.ebuild b/acct-group/logsurfer/logsurfer-0-r1.ebuild
new file mode 100644
index 000000000000..3d292f5966bc
--- /dev/null
+++ b/acct-group/logsurfer/logsurfer-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logsurfer"
+
+ACCT_GROUP_ID="249"
diff --git a/acct-group/logsurfer/logsurfer-0.ebuild b/acct-group/logsurfer/logsurfer-0.ebuild
deleted file mode 100644
index eedfe2f2838e..000000000000
--- a/acct-group/logsurfer/logsurfer-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logsurfer"
-
-ACCT_GROUP_ID="249"
diff --git a/acct-group/lp/lp-0-r1.ebuild b/acct-group/lp/lp-0-r1.ebuild
deleted file mode 100644
index 9af7c058ba87..000000000000
--- a/acct-group/lp/lp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=7
diff --git a/acct-group/lp/lp-0-r2.ebuild b/acct-group/lp/lp-0-r2.ebuild
new file mode 100644
index 000000000000..618f81be25b3
--- /dev/null
+++ b/acct-group/lp/lp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=7
diff --git a/acct-group/lpadmin/lpadmin-0-r1.ebuild b/acct-group/lpadmin/lpadmin-0-r1.ebuild
deleted file mode 100644
index 3eede12f4ab7..000000000000
--- a/acct-group/lpadmin/lpadmin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=106
diff --git a/acct-group/lpadmin/lpadmin-0-r2.ebuild b/acct-group/lpadmin/lpadmin-0-r2.ebuild
new file mode 100644
index 000000000000..4ef70c955560
--- /dev/null
+++ b/acct-group/lpadmin/lpadmin-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=106
diff --git a/acct-group/lxc/lxc-0-r1.ebuild b/acct-group/lxc/lxc-0-r1.ebuild
new file mode 100644
index 000000000000..32280b0d00db
--- /dev/null
+++ b/acct-group/lxc/lxc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=358
+DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxc/lxc-0.ebuild b/acct-group/lxc/lxc-0.ebuild
deleted file mode 100644
index 5a4d8a9ffcdc..000000000000
--- a/acct-group/lxc/lxc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=358
-DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxd/lxd-0-r1.ebuild b/acct-group/lxd/lxd-0-r1.ebuild
deleted file mode 100644
index 4277214c445a..000000000000
--- a/acct-group/lxd/lxd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=402
-DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/lxd/lxd-0-r2.ebuild b/acct-group/lxd/lxd-0-r2.ebuild
new file mode 100644
index 000000000000..3d00c2969023
--- /dev/null
+++ b/acct-group/lxd/lxd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=402
+DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/mail/mail-0-r1.ebuild b/acct-group/mail/mail-0-r1.ebuild
deleted file mode 100644
index 009cc32b854b..000000000000
--- a/acct-group/mail/mail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mail program group"
-ACCT_GROUP_ID=12
diff --git a/acct-group/mail/mail-0-r2.ebuild b/acct-group/mail/mail-0-r2.ebuild
new file mode 100644
index 000000000000..4d07cc2e2645
--- /dev/null
+++ b/acct-group/mail/mail-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Mail program group"
+ACCT_GROUP_ID=12
diff --git a/acct-group/man/man-0-r1.ebuild b/acct-group/man/man-0-r1.ebuild
deleted file mode 100644
index 77c58e22ae04..000000000000
--- a/acct-group/man/man-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=15
diff --git a/acct-group/man/man-0-r2.ebuild b/acct-group/man/man-0-r2.ebuild
new file mode 100644
index 000000000000..c14861bca27c
--- /dev/null
+++ b/acct-group/man/man-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=15
diff --git a/acct-group/maradns/maradns-0-r1.ebuild b/acct-group/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index 95932e13cd11..000000000000
--- a/acct-group/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=99
diff --git a/acct-group/maradns/maradns-0-r2.ebuild b/acct-group/maradns/maradns-0-r2.ebuild
new file mode 100644
index 000000000000..9886574c2705
--- /dev/null
+++ b/acct-group/maradns/maradns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=99
diff --git a/acct-group/memcached/memcached-0-r1.ebuild b/acct-group/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 02291b5e7a48..000000000000
--- a/acct-group/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=441
diff --git a/acct-group/memcached/memcached-0-r2.ebuild b/acct-group/memcached/memcached-0-r2.ebuild
new file mode 100644
index 000000000000..efcdd1096125
--- /dev/null
+++ b/acct-group/memcached/memcached-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=441
diff --git a/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild b/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..5e8edc6f6f93
--- /dev/null
+++ b/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=234
diff --git a/acct-group/memcached_exporter/memcached_exporter-0.ebuild b/acct-group/memcached_exporter/memcached_exporter-0.ebuild
deleted file mode 100644
index 294122b7d637..000000000000
--- a/acct-group/memcached_exporter/memcached_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=234
diff --git a/acct-group/messagebus/messagebus-0-r1.ebuild b/acct-group/messagebus/messagebus-0-r1.ebuild
deleted file mode 100644
index 3e335b806835..000000000000
--- a/acct-group/messagebus/messagebus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=101
diff --git a/acct-group/messagebus/messagebus-0-r2.ebuild b/acct-group/messagebus/messagebus-0-r2.ebuild
new file mode 100644
index 000000000000..c4ee2ee50216
--- /dev/null
+++ b/acct-group/messagebus/messagebus-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=101
diff --git a/acct-group/mgraph/mgraph-0-r1.ebuild b/acct-group/mgraph/mgraph-0-r1.ebuild
new file mode 100644
index 000000000000..77e91ef55a0e
--- /dev/null
+++ b/acct-group/mgraph/mgraph-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/mailgraph"
+ACCT_GROUP_ID=376
diff --git a/acct-group/mgraph/mgraph-0.ebuild b/acct-group/mgraph/mgraph-0.ebuild
deleted file mode 100644
index 04e2463215b2..000000000000
--- a/acct-group/mgraph/mgraph-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/mailgraph"
-ACCT_GROUP_ID=376
diff --git a/acct-group/milter-regex/milter-regex-0-r1.ebuild b/acct-group/milter-regex/milter-regex-0-r1.ebuild
deleted file mode 100644
index 0cf264ba6eb6..000000000000
--- a/acct-group/milter-regex/milter-regex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/milter-regex"
-ACCT_GROUP_ID=438
diff --git a/acct-group/milter-regex/milter-regex-0-r2.ebuild b/acct-group/milter-regex/milter-regex-0-r2.ebuild
new file mode 100644
index 000000000000..5a6247c9190c
--- /dev/null
+++ b/acct-group/milter-regex/milter-regex-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/milter-regex"
+ACCT_GROUP_ID=438
diff --git a/acct-group/minbif/minbif-0-r1.ebuild b/acct-group/minbif/minbif-0-r1.ebuild
new file mode 100644
index 000000000000..364bc0f1d192
--- /dev/null
+++ b/acct-group/minbif/minbif-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/minbif"
+
+ACCT_GROUP_ID="260"
diff --git a/acct-group/minbif/minbif-0.ebuild b/acct-group/minbif/minbif-0.ebuild
deleted file mode 100644
index f5157fcd399b..000000000000
--- a/acct-group/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/minbif"
-
-ACCT_GROUP_ID="260"
diff --git a/acct-group/minecraft/minecraft-0-r1.ebuild b/acct-group/minecraft/minecraft-0-r1.ebuild
deleted file mode 100644
index c09dd13e6cbc..000000000000
--- a/acct-group/minecraft/minecraft-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft server"
-
-ACCT_GROUP_ID="490"
diff --git a/acct-group/minecraft/minecraft-0-r2.ebuild b/acct-group/minecraft/minecraft-0-r2.ebuild
new file mode 100644
index 000000000000..2d3d01a8778e
--- /dev/null
+++ b/acct-group/minecraft/minecraft-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft server"
+
+ACCT_GROUP_ID="490"
diff --git a/acct-group/minetest/minetest-0-r1.ebuild b/acct-group/minetest/minetest-0-r1.ebuild
deleted file mode 100644
index 7a81fdf38907..000000000000
--- a/acct-group/minetest/minetest-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minetest server"
-
-ACCT_GROUP_ID="480"
diff --git a/acct-group/minetest/minetest-0-r2.ebuild b/acct-group/minetest/minetest-0-r2.ebuild
new file mode 100644
index 000000000000..0ab3add9768c
--- /dev/null
+++ b/acct-group/minetest/minetest-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minetest server"
+
+ACCT_GROUP_ID="480"
diff --git a/acct-group/minidlna/minidlna-0-r1.ebuild b/acct-group/minidlna/minidlna-0-r1.ebuild
new file mode 100644
index 000000000000..0bd234023279
--- /dev/null
+++ b/acct-group/minidlna/minidlna-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=339
diff --git a/acct-group/minidlna/minidlna-0.ebuild b/acct-group/minidlna/minidlna-0.ebuild
deleted file mode 100644
index b6f116a6d174..000000000000
--- a/acct-group/minidlna/minidlna-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=339
diff --git a/acct-group/minio/minio-0-r1.ebuild b/acct-group/minio/minio-0-r1.ebuild
new file mode 100644
index 000000000000..803a65bb10f2
--- /dev/null
+++ b/acct-group/minio/minio-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=309
diff --git a/acct-group/minio/minio-0.ebuild b/acct-group/minio/minio-0.ebuild
deleted file mode 100644
index 692376c4968f..000000000000
--- a/acct-group/minio/minio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=309
diff --git a/acct-group/mogile/mogile-0-r1.ebuild b/acct-group/mogile/mogile-0-r1.ebuild
new file mode 100644
index 000000000000..fae6fd78811d
--- /dev/null
+++ b/acct-group/mogile/mogile-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MogileFS group"
+ACCT_GROUP_ID=231
diff --git a/acct-group/mogile/mogile-0.ebuild b/acct-group/mogile/mogile-0.ebuild
deleted file mode 100644
index 7774948b6b0c..000000000000
--- a/acct-group/mogile/mogile-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MogileFS group"
-ACCT_GROUP_ID=231
diff --git a/acct-group/mongodb/mongodb-0-r1.ebuild b/acct-group/mongodb/mongodb-0-r1.ebuild
deleted file mode 100644
index 72c2f3ebbfbd..000000000000
--- a/acct-group/mongodb/mongodb-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MongoDB program group"
-ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb/mongodb-0-r2.ebuild b/acct-group/mongodb/mongodb-0-r2.ebuild
new file mode 100644
index 000000000000..edfa300f4fe1
--- /dev/null
+++ b/acct-group/mongodb/mongodb-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MongoDB program group"
+ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..be67ddc21397
--- /dev/null
+++ b/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=277
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
deleted file mode 100644
index 946813661ba4..000000000000
--- a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=277
diff --git a/acct-group/monitorix/monitorix-0-r1.ebuild b/acct-group/monitorix/monitorix-0-r1.ebuild
deleted file mode 100644
index f3a179de66cd..000000000000
--- a/acct-group/monitorix/monitorix-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Monitorix system tool group"
-ACCT_GROUP_ID=401
diff --git a/acct-group/monitorix/monitorix-0-r2.ebuild b/acct-group/monitorix/monitorix-0-r2.ebuild
new file mode 100644
index 000000000000..54384a731a69
--- /dev/null
+++ b/acct-group/monitorix/monitorix-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Monitorix system tool group"
+ACCT_GROUP_ID=401
diff --git a/acct-group/monkeyd/monkeyd-0-r1.ebuild b/acct-group/monkeyd/monkeyd-0-r1.ebuild
new file mode 100644
index 000000000000..e27300e4a43b
--- /dev/null
+++ b/acct-group/monkeyd/monkeyd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/monkeyd"
+
+ACCT_GROUP_ID="149"
diff --git a/acct-group/monkeyd/monkeyd-0.ebuild b/acct-group/monkeyd/monkeyd-0.ebuild
deleted file mode 100644
index 6869bd2a7451..000000000000
--- a/acct-group/monkeyd/monkeyd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/monkeyd"
-
-ACCT_GROUP_ID="149"
diff --git a/acct-group/monkeysphere/monkeysphere-0-r1.ebuild b/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
deleted file mode 100644
index dbbab8a361de..000000000000
--- a/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="monkeysphere program group"
-
-ACCT_GROUP_ID=390
diff --git a/acct-group/monkeysphere/monkeysphere-0-r2.ebuild b/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
new file mode 100644
index 000000000000..a0ff0762a9af
--- /dev/null
+++ b/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="monkeysphere program group"
+
+ACCT_GROUP_ID=390
diff --git a/acct-group/mosquitto/mosquitto-0-r1.ebuild b/acct-group/mosquitto/mosquitto-0-r1.ebuild
deleted file mode 100644
index 7c23d70d81c7..000000000000
--- a/acct-group/mosquitto/mosquitto-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the mosquitto MQTT broker"
-ACCT_GROUP_ID=482
diff --git a/acct-group/mosquitto/mosquitto-0-r2.ebuild b/acct-group/mosquitto/mosquitto-0-r2.ebuild
new file mode 100644
index 000000000000..791a2328f351
--- /dev/null
+++ b/acct-group/mosquitto/mosquitto-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the mosquitto MQTT broker"
+ACCT_GROUP_ID=482
diff --git a/acct-group/motion/motion-0-r1.ebuild b/acct-group/motion/motion-0-r1.ebuild
deleted file mode 100644
index 596311157273..000000000000
--- a/acct-group/motion/motion-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=395
diff --git a/acct-group/motion/motion-0-r2.ebuild b/acct-group/motion/motion-0-r2.ebuild
new file mode 100644
index 000000000000..e62c9b8e5c62
--- /dev/null
+++ b/acct-group/motion/motion-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=395
diff --git a/acct-group/msmtpd/msmtpd-0-r1.ebuild b/acct-group/msmtpd/msmtpd-0-r1.ebuild
deleted file mode 100644
index 42d6078fc96f..000000000000
--- a/acct-group/msmtpd/msmtpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=222
diff --git a/acct-group/msmtpd/msmtpd-0-r2.ebuild b/acct-group/msmtpd/msmtpd-0-r2.ebuild
new file mode 100644
index 000000000000..de4f2dbcb1d5
--- /dev/null
+++ b/acct-group/msmtpd/msmtpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=222
diff --git a/acct-group/munge/munge-0-r1.ebuild b/acct-group/munge/munge-0-r1.ebuild
new file mode 100644
index 000000000000..fbd452f5355a
--- /dev/null
+++ b/acct-group/munge/munge-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/munge"
+
+ACCT_GROUP_ID="144"
diff --git a/acct-group/munge/munge-0.ebuild b/acct-group/munge/munge-0.ebuild
deleted file mode 100644
index d51744087c22..000000000000
--- a/acct-group/munge/munge-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-auth/munge"
-
-ACCT_GROUP_ID="144"
diff --git a/acct-group/munin/munin-0-r1.ebuild b/acct-group/munin/munin-0-r1.ebuild
deleted file mode 100644
index 0a7dafb4a9d9..000000000000
--- a/acct-group/munin/munin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=177
diff --git a/acct-group/munin/munin-0-r2.ebuild b/acct-group/munin/munin-0-r2.ebuild
new file mode 100644
index 000000000000..dd3de035605f
--- /dev/null
+++ b/acct-group/munin/munin-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=177
diff --git a/acct-group/murmur/murmur-0-r1.ebuild b/acct-group/murmur/murmur-0-r1.ebuild
deleted file mode 100644
index 301727364fea..000000000000
--- a/acct-group/murmur/murmur-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=122
diff --git a/acct-group/murmur/murmur-0-r2.ebuild b/acct-group/murmur/murmur-0-r2.ebuild
new file mode 100644
index 000000000000..a7bf8b136eeb
--- /dev/null
+++ b/acct-group/murmur/murmur-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=122
diff --git a/acct-group/mysql/mysql-0-r1.ebuild b/acct-group/mysql/mysql-0-r1.ebuild
deleted file mode 100644
index 872b4a6bb7d8..000000000000
--- a/acct-group/mysql/mysql-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MySQL program group"
-ACCT_GROUP_ID=60
-SLOT="0"
diff --git a/acct-group/mysql/mysql-0-r2.ebuild b/acct-group/mysql/mysql-0-r2.ebuild
new file mode 100644
index 000000000000..c3f6923ca9ce
--- /dev/null
+++ b/acct-group/mysql/mysql-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MySQL program group"
+ACCT_GROUP_ID=60
+SLOT="0"
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
deleted file mode 100644
index 4b0688ae2798..000000000000
--- a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=308
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..6abb65361f3a
--- /dev/null
+++ b/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=308
diff --git a/acct-group/mythtv/mythtv-0-r1.ebuild b/acct-group/mythtv/mythtv-0-r1.ebuild
deleted file mode 100644
index ef82259b7b02..000000000000
--- a/acct-group/mythtv/mythtv-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mythtv mythbackend server/deamon group"
-
-ACCT_GROUP_ID=117
diff --git a/acct-group/mythtv/mythtv-0-r2.ebuild b/acct-group/mythtv/mythtv-0-r2.ebuild
new file mode 100644
index 000000000000..1bae0b27c841
--- /dev/null
+++ b/acct-group/mythtv/mythtv-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Mythtv mythbackend server/deamon group"
+
+ACCT_GROUP_ID=117
diff --git a/acct-group/nagios/nagios-0-r1.ebuild b/acct-group/nagios/nagios-0-r1.ebuild
deleted file mode 100644
index 4d2ee9d295ea..000000000000
--- a/acct-group/nagios/nagios-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=436
diff --git a/acct-group/nagios/nagios-0-r2.ebuild b/acct-group/nagios/nagios-0-r2.ebuild
new file mode 100644
index 000000000000..57bd2f5d883b
--- /dev/null
+++ b/acct-group/nagios/nagios-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=436
diff --git a/acct-group/named/named-0-r1.ebuild b/acct-group/named/named-0-r1.ebuild
deleted file mode 100644
index fb6bcdd96000..000000000000
--- a/acct-group/named/named-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=40
diff --git a/acct-group/named/named-0-r2.ebuild b/acct-group/named/named-0-r2.ebuild
new file mode 100644
index 000000000000..ddeeb7029d58
--- /dev/null
+++ b/acct-group/named/named-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=40
diff --git a/acct-group/netbox/netbox-0-r1.ebuild b/acct-group/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 84d5f36743b9..000000000000
--- a/acct-group/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=431
diff --git a/acct-group/netbox/netbox-0-r2.ebuild b/acct-group/netbox/netbox-0-r2.ebuild
new file mode 100644
index 000000000000..4043cbd07462
--- /dev/null
+++ b/acct-group/netbox/netbox-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=431
diff --git a/acct-group/netdata/netdata-0-r1.ebuild b/acct-group/netdata/netdata-0-r1.ebuild
deleted file mode 100644
index 7cb3b1013662..000000000000
--- a/acct-group/netdata/netdata-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=290
diff --git a/acct-group/netdata/netdata-0-r2.ebuild b/acct-group/netdata/netdata-0-r2.ebuild
new file mode 100644
index 000000000000..38db03ef5a1b
--- /dev/null
+++ b/acct-group/netdata/netdata-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=290
diff --git a/acct-group/netdev/netdev-0-r1.ebuild b/acct-group/netdev/netdev-0-r1.ebuild
deleted file mode 100644
index 9dbe3bcb29fb..000000000000
--- a/acct-group/netdev/netdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for netdev (avahi)"
-ACCT_GROUP_ID=64
diff --git a/acct-group/netdev/netdev-0-r2.ebuild b/acct-group/netdev/netdev-0-r2.ebuild
new file mode 100644
index 000000000000..8841c2494070
--- /dev/null
+++ b/acct-group/netdev/netdev-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for netdev (avahi)"
+ACCT_GROUP_ID=64
diff --git a/acct-group/netperf/netperf-0-r1.ebuild b/acct-group/netperf/netperf-0-r1.ebuild
new file mode 100644
index 000000000000..eed641e94964
--- /dev/null
+++ b/acct-group/netperf/netperf-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/netperf"
+
+ACCT_GROUP_ID="168"
diff --git a/acct-group/netperf/netperf-0.ebuild b/acct-group/netperf/netperf-0.ebuild
deleted file mode 100644
index f4a3499b161f..000000000000
--- a/acct-group/netperf/netperf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/netperf"
-
-ACCT_GROUP_ID="168"
diff --git a/acct-group/neutron/neutron-0-r1.ebuild b/acct-group/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 90ea9e731a2d..000000000000
--- a/acct-group/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=446
diff --git a/acct-group/neutron/neutron-0-r2.ebuild b/acct-group/neutron/neutron-0-r2.ebuild
new file mode 100644
index 000000000000..d8a95c80e8a1
--- /dev/null
+++ b/acct-group/neutron/neutron-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=446
diff --git a/acct-group/nginx-unit/nginx-unit-0.ebuild b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
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/nginx-vts-exporter-0-r1.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
deleted file mode 100644
index 07125df90248..000000000000
--- a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=354
diff --git a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..392a6c4025f1
--- /dev/null
+++ b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=354
diff --git a/acct-group/nginx/nginx-0-r1.ebuild b/acct-group/nginx/nginx-0-r1.ebuild
deleted file mode 100644
index b326e769a163..000000000000
--- a/acct-group/nginx/nginx-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/nginx"
-
-ACCT_GROUP_ID="82"
diff --git a/acct-group/nginx/nginx-0-r2.ebuild b/acct-group/nginx/nginx-0-r2.ebuild
new file mode 100644
index 000000000000..bca1e3ecda27
--- /dev/null
+++ b/acct-group/nginx/nginx-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx"
+
+ACCT_GROUP_ID="82"
diff --git a/acct-group/ngircd/ngircd-0-r1.ebuild b/acct-group/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 54e757d68d33..000000000000
--- a/acct-group/ngircd/ngircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for ngircd (IRC daemon)"
-ACCT_GROUP_ID=413
diff --git a/acct-group/ngircd/ngircd-0-r2.ebuild b/acct-group/ngircd/ngircd-0-r2.ebuild
new file mode 100644
index 000000000000..ea2849f0ea6d
--- /dev/null
+++ b/acct-group/ngircd/ngircd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for ngircd (IRC daemon)"
+ACCT_GROUP_ID=413
diff --git a/acct-group/ngrep/ngrep-0-r1.ebuild b/acct-group/ngrep/ngrep-0-r1.ebuild
deleted file mode 100644
index c01e5f34d05e..000000000000
--- a/acct-group/ngrep/ngrep-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/ngrep"
-
-ACCT_GROUP_ID="185"
diff --git a/acct-group/ngrep/ngrep-0-r2.ebuild b/acct-group/ngrep/ngrep-0-r2.ebuild
new file mode 100644
index 000000000000..4953ba08691d
--- /dev/null
+++ b/acct-group/ngrep/ngrep-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/ngrep"
+
+ACCT_GROUP_ID="185"
diff --git a/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild b/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild
new file mode 100644
index 000000000000..90d1a5c1369f
--- /dev/null
+++ b/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
+
+ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openconnect/nm-openconnect-0.ebuild b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
deleted file mode 100644
index cf11b4322042..000000000000
--- a/acct-group/nm-openconnect/nm-openconnect-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
-
-ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild b/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild
new file mode 100644
index 000000000000..c97d1aab90ef
--- /dev/null
+++ b/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
+
+ACCT_GROUP_ID="143"
diff --git a/acct-group/nm-openvpn/nm-openvpn-0.ebuild b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
deleted file mode 100644
index 2c34fcd00534..000000000000
--- a/acct-group/nm-openvpn/nm-openvpn-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
-
-ACCT_GROUP_ID="143"
diff --git a/acct-group/nobody/nobody-0-r1.ebuild b/acct-group/nobody/nobody-0-r1.ebuild
new file mode 100644
index 000000000000..4f32dd5f538e
--- /dev/null
+++ b/acct-group/nobody/nobody-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=65534
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/nobody/nobody-0.ebuild b/acct-group/nobody/nobody-0.ebuild
deleted file mode 100644
index 29b11e8db9d2..000000000000
--- a/acct-group/nobody/nobody-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=65534
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/node_exporter/node_exporter-0-r1.ebuild b/acct-group/node_exporter/node_exporter-0-r1.ebuild
deleted file mode 100644
index 7faae92e4669..000000000000
--- a/acct-group/node_exporter/node_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=459
diff --git a/acct-group/node_exporter/node_exporter-0-r2.ebuild b/acct-group/node_exporter/node_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7c28a071b53d
--- /dev/null
+++ b/acct-group/node_exporter/node_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=459
diff --git a/acct-group/nofiles/nofiles-0-r1.ebuild b/acct-group/nofiles/nofiles-0-r1.ebuild
deleted file mode 100644
index 7f42c5050e80..000000000000
--- a/acct-group/nofiles/nofiles-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=200
diff --git a/acct-group/nofiles/nofiles-0-r2.ebuild b/acct-group/nofiles/nofiles-0-r2.ebuild
new file mode 100644
index 000000000000..1da9c58aaf7d
--- /dev/null
+++ b/acct-group/nofiles/nofiles-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=200
diff --git a/acct-group/notary/notary-0-r1.ebuild b/acct-group/notary/notary-0-r1.ebuild
new file mode 100644
index 000000000000..c40e97bec775
--- /dev/null
+++ b/acct-group/notary/notary-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-misc/notary"
+
+ACCT_GROUP_ID="280"
diff --git a/acct-group/notary/notary-0.ebuild b/acct-group/notary/notary-0.ebuild
deleted file mode 100644
index fb865b1555cc..000000000000
--- a/acct-group/notary/notary-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-misc/notary"
-
-ACCT_GROUP_ID="280"
diff --git a/acct-group/nova/nova-0-r1.ebuild b/acct-group/nova/nova-0-r1.ebuild
deleted file mode 100644
index 076e02d12e40..000000000000
--- a/acct-group/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=447
diff --git a/acct-group/nova/nova-0-r2.ebuild b/acct-group/nova/nova-0-r2.ebuild
new file mode 100644
index 000000000000..806349afc01d
--- /dev/null
+++ b/acct-group/nova/nova-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=447
diff --git a/acct-group/nsd/nsd-0-r1.ebuild b/acct-group/nsd/nsd-0-r1.ebuild
deleted file mode 100644
index 3fd399f2dcf7..000000000000
--- a/acct-group/nsd/nsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=223
diff --git a/acct-group/nsd/nsd-0-r2.ebuild b/acct-group/nsd/nsd-0-r2.ebuild
new file mode 100644
index 000000000000..456480d76323
--- /dev/null
+++ b/acct-group/nsd/nsd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=223
diff --git a/acct-group/nslcd/nslcd-0-r1.ebuild b/acct-group/nslcd/nslcd-0-r1.ebuild
deleted file mode 100644
index 6e4738a45005..000000000000
--- a/acct-group/nslcd/nslcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=357
diff --git a/acct-group/nslcd/nslcd-0-r2.ebuild b/acct-group/nslcd/nslcd-0-r2.ebuild
new file mode 100644
index 000000000000..138e0d6b99e8
--- /dev/null
+++ b/acct-group/nslcd/nslcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=357
diff --git a/acct-group/ntopng/ntopng-0-r1.ebuild b/acct-group/ntopng/ntopng-0-r1.ebuild
new file mode 100644
index 000000000000..5f19248d57aa
--- /dev/null
+++ b/acct-group/ntopng/ntopng-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=296
diff --git a/acct-group/ntopng/ntopng-0.ebuild b/acct-group/ntopng/ntopng-0.ebuild
deleted file mode 100644
index e64f641de3d7..000000000000
--- a/acct-group/ntopng/ntopng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=296
diff --git a/acct-group/ntp/ntp-0-r1.ebuild b/acct-group/ntp/ntp-0-r1.ebuild
deleted file mode 100644
index d8f17217cd8d..000000000000
--- a/acct-group/ntp/ntp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=123
diff --git a/acct-group/ntp/ntp-0-r2.ebuild b/acct-group/ntp/ntp-0-r2.ebuild
new file mode 100644
index 000000000000..45fffae0e48e
--- /dev/null
+++ b/acct-group/ntp/ntp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=123
diff --git a/acct-group/nullmail/nullmail-0-r1.ebuild b/acct-group/nullmail/nullmail-0-r1.ebuild
new file mode 100644
index 000000000000..c85a088847ba
--- /dev/null
+++ b/acct-group/nullmail/nullmail-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the nullmailer"
+
+ACCT_GROUP_ID="88"
diff --git a/acct-group/nullmail/nullmail-0.ebuild b/acct-group/nullmail/nullmail-0.ebuild
deleted file mode 100644
index 24f773d248c5..000000000000
--- a/acct-group/nullmail/nullmail-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the nullmailer"
-
-ACCT_GROUP_ID="88"
diff --git a/acct-group/nut/nut-0-r1.ebuild b/acct-group/nut/nut-0-r1.ebuild
new file mode 100644
index 000000000000..f85662f46ff0
--- /dev/null
+++ b/acct-group/nut/nut-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Network-UPS Tools"
+
+ACCT_GROUP_ID="84"
diff --git a/acct-group/nut/nut-0.ebuild b/acct-group/nut/nut-0.ebuild
deleted file mode 100644
index e54ff2647200..000000000000
--- a/acct-group/nut/nut-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Network-UPS Tools"
-
-ACCT_GROUP_ID="84"
diff --git a/acct-group/nzbget/nzbget-0-r1.ebuild b/acct-group/nzbget/nzbget-0-r1.ebuild
new file mode 100644
index 000000000000..63dbcc4c6cdb
--- /dev/null
+++ b/acct-group/nzbget/nzbget-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nntp/nzbget"
+ACCT_GROUP_ID=398
diff --git a/acct-group/nzbget/nzbget-0.ebuild b/acct-group/nzbget/nzbget-0.ebuild
deleted file mode 100644
index c0dae092d2b2..000000000000
--- a/acct-group/nzbget/nzbget-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nntp/nzbget"
-ACCT_GROUP_ID=398
diff --git a/acct-group/oidentd/oidentd-0-r1.ebuild b/acct-group/oidentd/oidentd-0-r1.ebuild
deleted file mode 100644
index dadd950f9544..000000000000
--- a/acct-group/oidentd/oidentd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=493
diff --git a/acct-group/oidentd/oidentd-0-r2.ebuild b/acct-group/oidentd/oidentd-0-r2.ebuild
new file mode 100644
index 000000000000..703dc5367d39
--- /dev/null
+++ b/acct-group/oidentd/oidentd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=493
diff --git a/acct-group/openct/openct-0-r1.ebuild b/acct-group/openct/openct-0-r1.ebuild
deleted file mode 100644
index 256a6212aaef..000000000000
--- a/acct-group/openct/openct-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=46
diff --git a/acct-group/openct/openct-0-r2.ebuild b/acct-group/openct/openct-0-r2.ebuild
new file mode 100644
index 000000000000..e373f6d15260
--- /dev/null
+++ b/acct-group/openct/openct-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=46
diff --git a/acct-group/opendkim/opendkim-0-r1.ebuild b/acct-group/opendkim/opendkim-0-r1.ebuild
deleted file mode 100644
index 984414e1f114..000000000000
--- a/acct-group/opendkim/opendkim-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for OpenDKIM"
-ACCT_GROUP_ID=334
diff --git a/acct-group/opendkim/opendkim-0-r2.ebuild b/acct-group/opendkim/opendkim-0-r2.ebuild
new file mode 100644
index 000000000000..daae0306083c
--- /dev/null
+++ b/acct-group/opendkim/opendkim-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for OpenDKIM"
+ACCT_GROUP_ID=334
diff --git a/acct-group/opendmarc/opendmarc-1-r1.ebuild b/acct-group/opendmarc/opendmarc-1-r1.ebuild
new file mode 100644
index 000000000000..fd6d9faa1c13
--- /dev/null
+++ b/acct-group/opendmarc/opendmarc-1-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/opendmarc"
+ACCT_GROUP_ID=244
diff --git a/acct-group/opendmarc/opendmarc-1.ebuild b/acct-group/opendmarc/opendmarc-1.ebuild
deleted file mode 100644
index 87306502f6d3..000000000000
--- a/acct-group/opendmarc/opendmarc-1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/opendmarc"
-ACCT_GROUP_ID=244
diff --git a/acct-group/opendnssec/opendnssec-0-r1.ebuild b/acct-group/opendnssec/opendnssec-0-r1.ebuild
new file mode 100644
index 000000000000..291c3d63eba3
--- /dev/null
+++ b/acct-group/opendnssec/opendnssec-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/opendnssec"
+
+ACCT_GROUP_ID="151"
diff --git a/acct-group/opendnssec/opendnssec-0.ebuild b/acct-group/opendnssec/opendnssec-0.ebuild
deleted file mode 100644
index b1ab40784094..000000000000
--- a/acct-group/opendnssec/opendnssec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/opendnssec"
-
-ACCT_GROUP_ID="151"
diff --git a/acct-group/openntpd/openntpd-0-r1.ebuild b/acct-group/openntpd/openntpd-0-r1.ebuild
deleted file mode 100644
index 26450b27e0f8..000000000000
--- a/acct-group/openntpd/openntpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=321
diff --git a/acct-group/openntpd/openntpd-0-r2.ebuild b/acct-group/openntpd/openntpd-0-r2.ebuild
new file mode 100644
index 000000000000..3ee1906bc806
--- /dev/null
+++ b/acct-group/openntpd/openntpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=321
diff --git a/acct-group/openrct2/openrct2-0-r1.ebuild b/acct-group/openrct2/openrct2-0-r1.ebuild
deleted file mode 100644
index 234d39ba1ebd..000000000000
--- a/acct-group/openrct2/openrct2-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the OpenRCT2 dedicated server"
-
-ACCT_GROUP_ID="479"
diff --git a/acct-group/openrct2/openrct2-0-r2.ebuild b/acct-group/openrct2/openrct2-0-r2.ebuild
new file mode 100644
index 000000000000..73667b9af642
--- /dev/null
+++ b/acct-group/openrct2/openrct2-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the OpenRCT2 dedicated server"
+
+ACCT_GROUP_ID="479"
diff --git a/acct-group/openttd/openttd-0-r1.ebuild b/acct-group/openttd/openttd-0-r1.ebuild
new file mode 100644
index 000000000000..0bcd30d046a1
--- /dev/null
+++ b/acct-group/openttd/openttd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for games-simulation/openttd"
+
+ACCT_GROUP_ID="513"
diff --git a/acct-group/openttd/openttd-0.ebuild b/acct-group/openttd/openttd-0.ebuild
deleted file mode 100644
index 1d9a13b5160b..000000000000
--- a/acct-group/openttd/openttd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for games-simulation/openttd"
-
-ACCT_GROUP_ID="513"
diff --git a/acct-group/openvpn/openvpn-0-r1.ebuild b/acct-group/openvpn/openvpn-0-r1.ebuild
deleted file mode 100644
index 0abedcd63903..000000000000
--- a/acct-group/openvpn/openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn/openvpn-0-r2.ebuild b/acct-group/openvpn/openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..8ab888445c6b
--- /dev/null
+++ b/acct-group/openvpn/openvpn-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
deleted file mode 100644
index f950a40c2758..000000000000
--- a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=355
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..99350ce10aec
--- /dev/null
+++ b/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=355
diff --git a/acct-group/opm/opm-0-r1.ebuild b/acct-group/opm/opm-0-r1.ebuild
new file mode 100644
index 000000000000..ef89d5cd2cc5
--- /dev/null
+++ b/acct-group/opm/opm-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for an open proxy monitor"
+ACCT_GROUP_ID=127
diff --git a/acct-group/opm/opm-0.ebuild b/acct-group/opm/opm-0.ebuild
deleted file mode 100644
index 155f6374c269..000000000000
--- a/acct-group/opm/opm-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for an open proxy monitor"
-ACCT_GROUP_ID=127
diff --git a/acct-group/oprofile/oprofile-0-r1.ebuild b/acct-group/oprofile/oprofile-0-r1.ebuild
deleted file mode 100644
index 2b203421271c..000000000000
--- a/acct-group/oprofile/oprofile-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-util/oprofile JIT code processing"
-ACCT_GROUP_ID=492
diff --git a/acct-group/oprofile/oprofile-0-r2.ebuild b/acct-group/oprofile/oprofile-0-r2.ebuild
new file mode 100644
index 000000000000..05251855d7c8
--- /dev/null
+++ b/acct-group/oprofile/oprofile-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/oprofile JIT code processing"
+ACCT_GROUP_ID=492
diff --git a/acct-group/oragono/oragono-0-r1.ebuild b/acct-group/oragono/oragono-0-r1.ebuild
new file mode 100644
index 000000000000..9595ed9beec8
--- /dev/null
+++ b/acct-group/oragono/oragono-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the Oragono IRC server"
+ACCT_GROUP_ID=324
diff --git a/acct-group/oragono/oragono-0.ebuild b/acct-group/oragono/oragono-0.ebuild
deleted file mode 100644
index 2566e7772276..000000000000
--- a/acct-group/oragono/oragono-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the Oragono IRC server"
-ACCT_GROUP_ID=324
diff --git a/acct-group/ossec/ossec-0-r1.ebuild b/acct-group/ossec/ossec-0-r1.ebuild
deleted file mode 100644
index 591266c60294..000000000000
--- a/acct-group/ossec/ossec-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=330
-DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/ossec/ossec-0-r2.ebuild b/acct-group/ossec/ossec-0-r2.ebuild
new file mode 100644
index 000000000000..966abb634df9
--- /dev/null
+++ b/acct-group/ossec/ossec-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=330
+DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/owntracks/owntracks-0-r1.ebuild b/acct-group/owntracks/owntracks-0-r1.ebuild
new file mode 100644
index 000000000000..fe5d67599e48
--- /dev/null
+++ b/acct-group/owntracks/owntracks-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
+ACCT_GROUP_ID=524
diff --git a/acct-group/owntracks/owntracks-0.ebuild b/acct-group/owntracks/owntracks-0.ebuild
deleted file mode 100644
index 10c2ac74184e..000000000000
--- a/acct-group/owntracks/owntracks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
-ACCT_GROUP_ID=524
diff --git a/acct-group/p2p/p2p-0-r1.ebuild b/acct-group/p2p/p2p-0-r1.ebuild
new file mode 100644
index 000000000000..52040d2ff7be
--- /dev/null
+++ b/acct-group/p2p/p2p-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mldonkey"
+ACCT_GROUP_ID=378
diff --git a/acct-group/p2p/p2p-0.ebuild b/acct-group/p2p/p2p-0.ebuild
deleted file mode 100644
index 682fd4cc07bc..000000000000
--- a/acct-group/p2p/p2p-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mldonkey"
-ACCT_GROUP_ID=378
diff --git a/acct-group/partimag/partimag-0-r1.ebuild b/acct-group/partimag/partimag-0-r1.ebuild
deleted file mode 100644
index d1c1482d6ab5..000000000000
--- a/acct-group/partimag/partimag-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-block/partimage"
-
-ACCT_GROUP_ID="91"
diff --git a/acct-group/partimag/partimag-0-r2.ebuild b/acct-group/partimag/partimag-0-r2.ebuild
new file mode 100644
index 000000000000..1b3b59f53e25
--- /dev/null
+++ b/acct-group/partimag/partimag-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-block/partimage"
+
+ACCT_GROUP_ID="91"
diff --git a/acct-group/pcap/pcap-0-r1.ebuild b/acct-group/pcap/pcap-0-r1.ebuild
new file mode 100644
index 000000000000..7bb74847aafc
--- /dev/null
+++ b/acct-group/pcap/pcap-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for capturing network traffic"
+ACCT_GROUP_ID=377
diff --git a/acct-group/pcap/pcap-0.ebuild b/acct-group/pcap/pcap-0.ebuild
deleted file mode 100644
index 7c6ece39614e..000000000000
--- a/acct-group/pcap/pcap-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for capturing network traffic"
-ACCT_GROUP_ID=377
diff --git a/acct-group/pcscd/pcscd-0-r1.ebuild b/acct-group/pcscd/pcscd-0-r1.ebuild
deleted file mode 100644
index b2d98afd01e9..000000000000
--- a/acct-group/pcscd/pcscd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=47
diff --git a/acct-group/pcscd/pcscd-0-r2.ebuild b/acct-group/pcscd/pcscd-0-r2.ebuild
new file mode 100644
index 000000000000..29a733881a71
--- /dev/null
+++ b/acct-group/pcscd/pcscd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=47
diff --git a/acct-group/pdns/pdns-0-r1.ebuild b/acct-group/pdns/pdns-0-r1.ebuild
deleted file mode 100644
index 4f9392b371a0..000000000000
--- a/acct-group/pdns/pdns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=423
diff --git a/acct-group/pdns/pdns-0-r2.ebuild b/acct-group/pdns/pdns-0-r2.ebuild
new file mode 100644
index 000000000000..660d64dd4e1f
--- /dev/null
+++ b/acct-group/pdns/pdns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=423
diff --git a/acct-group/pdnsd/pdnsd-0-r1.ebuild b/acct-group/pdnsd/pdnsd-0-r1.ebuild
deleted file mode 100644
index 6c6a29d76f0d..000000000000
--- a/acct-group/pdnsd/pdnsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=184
diff --git a/acct-group/pdnsd/pdnsd-0-r2.ebuild b/acct-group/pdnsd/pdnsd-0-r2.ebuild
new file mode 100644
index 000000000000..9a4d6fcc6db2
--- /dev/null
+++ b/acct-group/pdnsd/pdnsd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=184
diff --git a/acct-group/pgagent/pgagent-0-r1.ebuild b/acct-group/pgagent/pgagent-0-r1.ebuild
new file mode 100644
index 000000000000..5c1514304544
--- /dev/null
+++ b/acct-group/pgagent/pgagent-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/pgagent"
+
+ACCT_GROUP_ID="135"
diff --git a/acct-group/pgagent/pgagent-0.ebuild b/acct-group/pgagent/pgagent-0.ebuild
deleted file mode 100644
index a5716bd1cb4d..000000000000
--- a/acct-group/pgagent/pgagent-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/pgagent"
-
-ACCT_GROUP_ID="135"
diff --git a/acct-group/pipewire/pipewire-0-r1.ebuild b/acct-group/pipewire/pipewire-0-r1.ebuild
new file mode 100644
index 000000000000..5e1d25235785
--- /dev/null
+++ b/acct-group/pipewire/pipewire-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=509
diff --git a/acct-group/pipewire/pipewire-0.ebuild b/acct-group/pipewire/pipewire-0.ebuild
deleted file mode 100644
index c21081d66ed0..000000000000
--- a/acct-group/pipewire/pipewire-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=509
diff --git a/acct-group/pkcs11/pkcs11-0-r1.ebuild b/acct-group/pkcs11/pkcs11-0-r1.ebuild
new file mode 100644
index 000000000000..2c25489a23a4
--- /dev/null
+++ b/acct-group/pkcs11/pkcs11-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-libs/opencryptoki"
+
+ACCT_GROUP_ID="331"
diff --git a/acct-group/pkcs11/pkcs11-0.ebuild b/acct-group/pkcs11/pkcs11-0.ebuild
deleted file mode 100644
index bd2c78e56eca..000000000000
--- a/acct-group/pkcs11/pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-libs/opencryptoki"
-
-ACCT_GROUP_ID="331"
diff --git a/acct-group/placement/placement-0-r1.ebuild b/acct-group/placement/placement-0-r1.ebuild
deleted file mode 100644
index 4fb6ed986132..000000000000
--- a/acct-group/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=448
diff --git a/acct-group/placement/placement-0-r2.ebuild b/acct-group/placement/placement-0-r2.ebuild
new file mode 100644
index 000000000000..2d561e1d290a
--- /dev/null
+++ b/acct-group/placement/placement-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=448
diff --git a/acct-group/plex/plex-0-r1.ebuild b/acct-group/plex/plex-0-r1.ebuild
deleted file mode 100644
index ec85c721a861..000000000000
--- a/acct-group/plex/plex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Plex Media Server group"
-ACCT_GROUP_ID=103
diff --git a/acct-group/plex/plex-0-r2.ebuild b/acct-group/plex/plex-0-r2.ebuild
new file mode 100644
index 000000000000..9239d7ea7f62
--- /dev/null
+++ b/acct-group/plex/plex-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Plex Media Server group"
+ACCT_GROUP_ID=103
diff --git a/acct-group/plugdev/plugdev-0-r1.ebuild b/acct-group/plugdev/plugdev-0-r1.ebuild
deleted file mode 100644
index 66735a7fc0ff..000000000000
--- a/acct-group/plugdev/plugdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group controlling access to removable media"
-ACCT_GROUP_ID=272
diff --git a/acct-group/plugdev/plugdev-0-r2.ebuild b/acct-group/plugdev/plugdev-0-r2.ebuild
new file mode 100644
index 000000000000..e37da5772628
--- /dev/null
+++ b/acct-group/plugdev/plugdev-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group controlling access to removable media"
+ACCT_GROUP_ID=272
diff --git a/acct-group/polkitd/polkitd-0-r1.ebuild b/acct-group/polkitd/polkitd-0-r1.ebuild
deleted file mode 100644
index 7e7baeaeb481..000000000000
--- a/acct-group/polkitd/polkitd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=102
diff --git a/acct-group/polkitd/polkitd-0-r2.ebuild b/acct-group/polkitd/polkitd-0-r2.ebuild
new file mode 100644
index 000000000000..9398dcab7cc3
--- /dev/null
+++ b/acct-group/polkitd/polkitd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=102
diff --git a/acct-group/polw/polw-0-r1.ebuild b/acct-group/polw/polw-0-r1.ebuild
new file mode 100644
index 000000000000..24831f7820a0
--- /dev/null
+++ b/acct-group/polw/polw-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/policyd-weight"
+
+ACCT_GROUP_ID="263"
diff --git a/acct-group/polw/polw-0.ebuild b/acct-group/polw/polw-0.ebuild
deleted file mode 100644
index 66480cce7428..000000000000
--- a/acct-group/polw/polw-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/policyd-weight"
-
-ACCT_GROUP_ID="263"
diff --git a/acct-group/popa3d/popa3d-0-r1.ebuild b/acct-group/popa3d/popa3d-0-r1.ebuild
new file mode 100644
index 000000000000..7857b0f08331
--- /dev/null
+++ b/acct-group/popa3d/popa3d-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/popa3d"
+ACCT_GROUP_ID=375
diff --git a/acct-group/popa3d/popa3d-0.ebuild b/acct-group/popa3d/popa3d-0.ebuild
deleted file mode 100644
index d3620c927b38..000000000000
--- a/acct-group/popa3d/popa3d-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/popa3d"
-ACCT_GROUP_ID=375
diff --git a/acct-group/portage/portage-0-r1.ebuild b/acct-group/portage/portage-0-r1.ebuild
new file mode 100644
index 000000000000..84de44bd01ab
--- /dev/null
+++ b/acct-group/portage/portage-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=250
diff --git a/acct-group/portage/portage-0.ebuild b/acct-group/portage/portage-0.ebuild
deleted file mode 100644
index 802a74d18716..000000000000
--- a/acct-group/portage/portage-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=250
diff --git a/acct-group/postdrop/postdrop-0-r1.ebuild b/acct-group/postdrop/postdrop-0-r1.ebuild
deleted file mode 100644
index 2898ed6fb8ec..000000000000
--- a/acct-group/postdrop/postdrop-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=208
diff --git a/acct-group/postdrop/postdrop-0-r2.ebuild b/acct-group/postdrop/postdrop-0-r2.ebuild
new file mode 100644
index 000000000000..9931f3853516
--- /dev/null
+++ b/acct-group/postdrop/postdrop-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=208
diff --git a/acct-group/postfix/postfix-0-r1.ebuild b/acct-group/postfix/postfix-0-r1.ebuild
deleted file mode 100644
index 3ee20e0cc981..000000000000
--- a/acct-group/postfix/postfix-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=207
diff --git a/acct-group/postfix/postfix-0-r2.ebuild b/acct-group/postfix/postfix-0-r2.ebuild
new file mode 100644
index 000000000000..0df662082122
--- /dev/null
+++ b/acct-group/postfix/postfix-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=207
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
deleted file mode 100644
index 4b924be02018..000000000000
--- a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=356
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..727bbf6ae770
--- /dev/null
+++ b/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=356
diff --git a/acct-group/postfwd/postfwd-0-r1.ebuild b/acct-group/postfwd/postfwd-0-r1.ebuild
new file mode 100644
index 000000000000..cafa87134d52
--- /dev/null
+++ b/acct-group/postfwd/postfwd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/postfwd"
+
+ACCT_GROUP_ID="189"
diff --git a/acct-group/postfwd/postfwd-0.ebuild b/acct-group/postfwd/postfwd-0.ebuild
deleted file mode 100644
index a912e8aeb7fb..000000000000
--- a/acct-group/postfwd/postfwd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for mail-filter/postfwd"
-
-ACCT_GROUP_ID="189"
diff --git a/acct-group/postgres/postgres-0-r1.ebuild b/acct-group/postgres/postgres-0-r1.ebuild
deleted file mode 100644
index 979541863f53..000000000000
--- a/acct-group/postgres/postgres-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="PostgreSQL program group"
-ACCT_GROUP_ID=70
-SLOT="0"
diff --git a/acct-group/postgres/postgres-0-r2.ebuild b/acct-group/postgres/postgres-0-r2.ebuild
new file mode 100644
index 000000000000..1331ea3b1e55
--- /dev/null
+++ b/acct-group/postgres/postgres-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="PostgreSQL program group"
+ACCT_GROUP_ID=70
+SLOT="0"
diff --git a/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild b/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..977c3853bcc1
--- /dev/null
+++ b/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=233
diff --git a/acct-group/postgres_exporter/postgres_exporter-0.ebuild b/acct-group/postgres_exporter/postgres_exporter-0.ebuild
deleted file mode 100644
index 06302af88d1e..000000000000
--- a/acct-group/postgres_exporter/postgres_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=233
diff --git a/acct-group/postgrey/postgrey-0-r1.ebuild b/acct-group/postgrey/postgrey-0-r1.ebuild
new file mode 100644
index 000000000000..9aace7c3955d
--- /dev/null
+++ b/acct-group/postgrey/postgrey-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the postgrey mail daemon"
+ACCT_GROUP_ID=360
diff --git a/acct-group/postgrey/postgrey-0.ebuild b/acct-group/postgrey/postgrey-0.ebuild
deleted file mode 100644
index ff132477a3d6..000000000000
--- a/acct-group/postgrey/postgrey-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the postgrey mail daemon"
-ACCT_GROUP_ID=360
diff --git a/acct-group/privoxy/privoxy-0-r1.ebuild b/acct-group/privoxy/privoxy-0-r1.ebuild
deleted file mode 100644
index c45bf8db39b2..000000000000
--- a/acct-group/privoxy/privoxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A privoxy: privacy oriented web proxy group"
-ACCT_GROUP_ID=392
diff --git a/acct-group/privoxy/privoxy-0-r2.ebuild b/acct-group/privoxy/privoxy-0-r2.ebuild
new file mode 100644
index 000000000000..152a13fb5e9e
--- /dev/null
+++ b/acct-group/privoxy/privoxy-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A privoxy: privacy oriented web proxy group"
+ACCT_GROUP_ID=392
diff --git a/acct-group/prometheus/prometheus-0-r1.ebuild b/acct-group/prometheus/prometheus-0-r1.ebuild
deleted file mode 100644
index 9a19925826cc..000000000000
--- a/acct-group/prometheus/prometheus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=430
diff --git a/acct-group/prometheus/prometheus-0-r2.ebuild b/acct-group/prometheus/prometheus-0-r2.ebuild
new file mode 100644
index 000000000000..7b2cae83ab40
--- /dev/null
+++ b/acct-group/prometheus/prometheus-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=430
diff --git a/acct-group/prosody/prosody-0-r1.ebuild b/acct-group/prosody/prosody-0-r1.ebuild
new file mode 100644
index 000000000000..f90772575391
--- /dev/null
+++ b/acct-group/prosody/prosody-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/prosody"
+
+ACCT_GROUP_ID="115"
diff --git a/acct-group/prosody/prosody-0.ebuild b/acct-group/prosody/prosody-0.ebuild
deleted file mode 100644
index 9baa70ab7f70..000000000000
--- a/acct-group/prosody/prosody-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/prosody"
-
-ACCT_GROUP_ID="115"
diff --git a/acct-group/prowlarr/prowlarr-0-r1.ebuild b/acct-group/prowlarr/prowlarr-0-r1.ebuild
new file mode 100644
index 000000000000..fe67ad261fe3
--- /dev/null
+++ b/acct-group/prowlarr/prowlarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=517
diff --git a/acct-group/prowlarr/prowlarr-0.ebuild b/acct-group/prowlarr/prowlarr-0.ebuild
deleted file mode 100644
index 5ea7e36d2c6b..000000000000
--- a/acct-group/prowlarr/prowlarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=517
diff --git a/acct-group/psybnc/psybnc-0-r1.ebuild b/acct-group/psybnc/psybnc-0-r1.ebuild
new file mode 100644
index 000000000000..4df3a6c278ec
--- /dev/null
+++ b/acct-group/psybnc/psybnc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/psybnc"
+
+ACCT_GROUP_ID="259"
diff --git a/acct-group/psybnc/psybnc-0.ebuild b/acct-group/psybnc/psybnc-0.ebuild
deleted file mode 100644
index bde356121739..000000000000
--- a/acct-group/psybnc/psybnc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/psybnc"
-
-ACCT_GROUP_ID="259"
diff --git a/acct-group/pulse-access/pulse-access-0-r1.ebuild b/acct-group/pulse-access/pulse-access-0-r1.ebuild
new file mode 100644
index 000000000000..763cd4096edc
--- /dev/null
+++ b/acct-group/pulse-access/pulse-access-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=172
diff --git a/acct-group/pulse-access/pulse-access-0.ebuild b/acct-group/pulse-access/pulse-access-0.ebuild
deleted file mode 100644
index 700feb5f191b..000000000000
--- a/acct-group/pulse-access/pulse-access-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=172
diff --git a/acct-group/pulse/pulse-0-r1.ebuild b/acct-group/pulse/pulse-0-r1.ebuild
new file mode 100644
index 000000000000..dcbe29e5d3c1
--- /dev/null
+++ b/acct-group/pulse/pulse-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=171
diff --git a/acct-group/pulse/pulse-0.ebuild b/acct-group/pulse/pulse-0.ebuild
deleted file mode 100644
index 5b0084f6f4f1..000000000000
--- a/acct-group/pulse/pulse-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=171
diff --git a/acct-group/puppet/puppet-0-r1.ebuild b/acct-group/puppet/puppet-0-r1.ebuild
deleted file mode 100644
index cf9422869bf9..000000000000
--- a/acct-group/puppet/puppet-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=455
diff --git a/acct-group/puppet/puppet-0-r2.ebuild b/acct-group/puppet/puppet-0-r2.ebuild
new file mode 100644
index 000000000000..aaadca579eb4
--- /dev/null
+++ b/acct-group/puppet/puppet-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=455
diff --git a/acct-group/puppetdb/puppetdb-0-r1.ebuild b/acct-group/puppetdb/puppetdb-0-r1.ebuild
deleted file mode 100644
index 55e4b42af293..000000000000
--- a/acct-group/puppetdb/puppetdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=456
diff --git a/acct-group/puppetdb/puppetdb-0-r2.ebuild b/acct-group/puppetdb/puppetdb-0-r2.ebuild
new file mode 100644
index 000000000000..623782c5052f
--- /dev/null
+++ b/acct-group/puppetdb/puppetdb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=456
diff --git a/acct-group/pushgateway/pushgateway-0-r1.ebuild b/acct-group/pushgateway/pushgateway-0-r1.ebuild
new file mode 100644
index 000000000000..013d7ec8b032
--- /dev/null
+++ b/acct-group/pushgateway/pushgateway-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/pushgateway"
+
+ACCT_GROUP_ID="288"
diff --git a/acct-group/pushgateway/pushgateway-0.ebuild b/acct-group/pushgateway/pushgateway-0.ebuild
deleted file mode 100644
index c064f6390f10..000000000000
--- a/acct-group/pushgateway/pushgateway-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/pushgateway"
-
-ACCT_GROUP_ID="288"
diff --git a/acct-group/pvpgn/pvpgn-0-r1.ebuild b/acct-group/pvpgn/pvpgn-0-r1.ebuild
new file mode 100644
index 000000000000..3c9571852687
--- /dev/null
+++ b/acct-group/pvpgn/pvpgn-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
+ACCT_GROUP_ID=285
diff --git a/acct-group/pvpgn/pvpgn-0.ebuild b/acct-group/pvpgn/pvpgn-0.ebuild
deleted file mode 100644
index 0a8c0d6e5da8..000000000000
--- a/acct-group/pvpgn/pvpgn-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
-ACCT_GROUP_ID=285
diff --git a/acct-group/qemu/qemu-0-r1.ebuild b/acct-group/qemu/qemu-0-r1.ebuild
deleted file mode 100644
index bfa7c828015d..000000000000
--- a/acct-group/qemu/qemu-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=77
diff --git a/acct-group/qemu/qemu-0-r2.ebuild b/acct-group/qemu/qemu-0-r2.ebuild
new file mode 100644
index 000000000000..207fc98e46dc
--- /dev/null
+++ b/acct-group/qemu/qemu-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=77
diff --git a/acct-group/qmail/qmail-0-r1.ebuild b/acct-group/qmail/qmail-0-r1.ebuild
deleted file mode 100644
index 86f1ae5e27f3..000000000000
--- a/acct-group/qmail/qmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=201
diff --git a/acct-group/qmail/qmail-0-r2.ebuild b/acct-group/qmail/qmail-0-r2.ebuild
new file mode 100644
index 000000000000..8dd6a346f564
--- /dev/null
+++ b/acct-group/qmail/qmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=201
diff --git a/acct-group/quagga/quagga-0-r1.ebuild b/acct-group/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index 104f8007e235..000000000000
--- a/acct-group/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=424
diff --git a/acct-group/quagga/quagga-0-r2.ebuild b/acct-group/quagga/quagga-0-r2.ebuild
new file mode 100644
index 000000000000..cf8345de1bb1
--- /dev/null
+++ b/acct-group/quagga/quagga-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=424
diff --git a/acct-group/quassel/quassel-0-r1.ebuild b/acct-group/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index e700412c050b..000000000000
--- a/acct-group/quassel/quassel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=472
diff --git a/acct-group/quassel/quassel-0-r2.ebuild b/acct-group/quassel/quassel-0-r2.ebuild
new file mode 100644
index 000000000000..ed73341e1622
--- /dev/null
+++ b/acct-group/quassel/quassel-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=472
diff --git a/acct-group/rabbitmq/rabbitmq-0-r1.ebuild b/acct-group/rabbitmq/rabbitmq-0-r1.ebuild
new file mode 100644
index 000000000000..68e9ffcebc90
--- /dev/null
+++ b/acct-group/rabbitmq/rabbitmq-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/rabbitmq-server"
+
+ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq/rabbitmq-0.ebuild b/acct-group/rabbitmq/rabbitmq-0.ebuild
deleted file mode 100644
index 58c6c1ee1b21..000000000000
--- a/acct-group/rabbitmq/rabbitmq-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/rabbitmq-server"
-
-ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..6ebea851e441
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
+
+ACCT_GROUP_ID="107"
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
deleted file mode 100644
index bd882d0b8866..000000000000
--- a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
-
-ACCT_GROUP_ID="107"
diff --git a/acct-group/radarr/radarr-0-r1.ebuild b/acct-group/radarr/radarr-0-r1.ebuild
new file mode 100644
index 000000000000..521778e8e827
--- /dev/null
+++ b/acct-group/radarr/radarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=516
diff --git a/acct-group/radarr/radarr-0.ebuild b/acct-group/radarr/radarr-0.ebuild
deleted file mode 100644
index 1437f0ef9d20..000000000000
--- a/acct-group/radarr/radarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=516
diff --git a/acct-group/radicale/radicale-0-r1.ebuild b/acct-group/radicale/radicale-0-r1.ebuild
deleted file mode 100644
index a2150f5982d2..000000000000
--- a/acct-group/radicale/radicale-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the www-apps/radicale"
-ACCT_GROUP_ID=327
diff --git a/acct-group/radicale/radicale-0-r2.ebuild b/acct-group/radicale/radicale-0-r2.ebuild
new file mode 100644
index 000000000000..3a15e9f97970
--- /dev/null
+++ b/acct-group/radicale/radicale-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the www-apps/radicale"
+ACCT_GROUP_ID=327
diff --git a/acct-group/radius/radius-0-r1.ebuild b/acct-group/radius/radius-0-r1.ebuild
deleted file mode 100644
index 78aaa17a382f..000000000000
--- a/acct-group/radius/radius-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="FreeRadius program group"
-ACCT_GROUP_ID=95
diff --git a/acct-group/radius/radius-0-r2.ebuild b/acct-group/radius/radius-0-r2.ebuild
new file mode 100644
index 000000000000..70012871610e
--- /dev/null
+++ b/acct-group/radius/radius-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="FreeRadius program group"
+ACCT_GROUP_ID=95
diff --git a/acct-group/radvd/radvd-0-r1.ebuild b/acct-group/radvd/radvd-0-r1.ebuild
new file mode 100644
index 000000000000..576d1cfd0166
--- /dev/null
+++ b/acct-group/radvd/radvd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Router Advertisement Daemon"
+
+ACCT_GROUP_ID="215"
diff --git a/acct-group/radvd/radvd-0.ebuild b/acct-group/radvd/radvd-0.ebuild
deleted file mode 100644
index 36fff292c554..000000000000
--- a/acct-group/radvd/radvd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Router Advertisement Daemon"
-
-ACCT_GROUP_ID="215"
diff --git a/acct-group/rbldns/rbldns-0-r1.ebuild b/acct-group/rbldns/rbldns-0-r1.ebuild
deleted file mode 100644
index 6a70e0c3be3d..000000000000
--- a/acct-group/rbldns/rbldns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=153
diff --git a/acct-group/rbldns/rbldns-0-r2.ebuild b/acct-group/rbldns/rbldns-0-r2.ebuild
new file mode 100644
index 000000000000..1034e41ae529
--- /dev/null
+++ b/acct-group/rbldns/rbldns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=153
diff --git a/acct-group/rbot/rbot-0-r1.ebuild b/acct-group/rbot/rbot-0-r1.ebuild
new file mode 100644
index 000000000000..aa03c16b5c3e
--- /dev/null
+++ b/acct-group/rbot/rbot-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-irc/rbot"
+
+ACCT_GROUP_ID="129"
diff --git a/acct-group/rbot/rbot-0.ebuild b/acct-group/rbot/rbot-0.ebuild
deleted file mode 100644
index 2e26e14ae37f..000000000000
--- a/acct-group/rbot/rbot-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-irc/rbot"
-
-ACCT_GROUP_ID="129"
diff --git a/acct-group/readarr/readarr-0-r1.ebuild b/acct-group/readarr/readarr-0-r1.ebuild
new file mode 100644
index 000000000000..7035a70d4581
--- /dev/null
+++ b/acct-group/readarr/readarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=521
diff --git a/acct-group/readarr/readarr-0.ebuild b/acct-group/readarr/readarr-0.ebuild
deleted file mode 100644
index 24ba49a36df4..000000000000
--- a/acct-group/readarr/readarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=521
diff --git a/acct-group/realtime/realtime-0-r1.ebuild b/acct-group/realtime/realtime-0-r1.ebuild
new file mode 100644
index 000000000000..a4734a21bd4f
--- /dev/null
+++ b/acct-group/realtime/realtime-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="realtime privileges group"
+
+ACCT_GROUP_ID=206
diff --git a/acct-group/realtime/realtime-0.ebuild b/acct-group/realtime/realtime-0.ebuild
deleted file mode 100644
index eb80c1e91091..000000000000
--- a/acct-group/realtime/realtime-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="realtime privileges group"
-
-ACCT_GROUP_ID=206
diff --git a/acct-group/redis/redis-0-r1.ebuild b/acct-group/redis/redis-0-r1.ebuild
deleted file mode 100644
index 83f725cd298c..000000000000
--- a/acct-group/redis/redis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Redis program group"
-ACCT_GROUP_ID=75
diff --git a/acct-group/redis/redis-0-r2.ebuild b/acct-group/redis/redis-0-r2.ebuild
new file mode 100644
index 000000000000..0b0048c13fa7
--- /dev/null
+++ b/acct-group/redis/redis-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Redis program group"
+ACCT_GROUP_ID=75
diff --git a/acct-group/redis_exporter/redis_exporter-0-r1.ebuild b/acct-group/redis_exporter/redis_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..29ee8b117172
--- /dev/null
+++ b/acct-group/redis_exporter/redis_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=298
diff --git a/acct-group/redis_exporter/redis_exporter-0.ebuild b/acct-group/redis_exporter/redis_exporter-0.ebuild
deleted file mode 100644
index 89b3cb579f87..000000000000
--- a/acct-group/redis_exporter/redis_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=298
diff --git a/acct-group/redmine/redmine-0-r1.ebuild b/acct-group/redmine/redmine-0-r1.ebuild
deleted file mode 100644
index 73e968b837a7..000000000000
--- a/acct-group/redmine/redmine-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=451
diff --git a/acct-group/redmine/redmine-0-r2.ebuild b/acct-group/redmine/redmine-0-r2.ebuild
new file mode 100644
index 000000000000..f2fa23df394d
--- /dev/null
+++ b/acct-group/redmine/redmine-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=451
diff --git a/acct-group/redsocks/redsocks-0-r1.ebuild b/acct-group/redsocks/redsocks-0-r1.ebuild
deleted file mode 100644
index 376e5708d210..000000000000
--- a/acct-group/redsocks/redsocks-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-proxy/redsocks"
-
-ACCT_GROUP_ID="154"
diff --git a/acct-group/redsocks/redsocks-0-r2.ebuild b/acct-group/redsocks/redsocks-0-r2.ebuild
new file mode 100644
index 000000000000..af112f79b9d8
--- /dev/null
+++ b/acct-group/redsocks/redsocks-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/redsocks"
+
+ACCT_GROUP_ID="154"
diff --git a/acct-group/reg/reg-0-r1.ebuild b/acct-group/reg/reg-0-r1.ebuild
deleted file mode 100644
index 8bc51aa11edc..000000000000
--- a/acct-group/reg/reg-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-containers/reg"
-
-ACCT_GROUP_ID="503"
diff --git a/acct-group/reg/reg-0-r2.ebuild b/acct-group/reg/reg-0-r2.ebuild
new file mode 100644
index 000000000000..ecccab5fa8d8
--- /dev/null
+++ b/acct-group/reg/reg-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/reg"
+
+ACCT_GROUP_ID="503"
diff --git a/acct-group/registry/registry-0-r1.ebuild b/acct-group/registry/registry-0-r1.ebuild
new file mode 100644
index 000000000000..2d3b7c31cc34
--- /dev/null
+++ b/acct-group/registry/registry-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/docker-registry"
+
+ACCT_GROUP_ID="295"
diff --git a/acct-group/registry/registry-0.ebuild b/acct-group/registry/registry-0.ebuild
deleted file mode 100644
index 6da5197ae7ec..000000000000
--- a/acct-group/registry/registry-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-containers/docker-registry"
-
-ACCT_GROUP_ID="295"
diff --git a/acct-group/render/render-0-r1.ebuild b/acct-group/render/render-0-r1.ebuild
deleted file mode 100644
index 6e31b1326308..000000000000
--- a/acct-group/render/render-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=28
diff --git a/acct-group/render/render-0-r2.ebuild b/acct-group/render/render-0-r2.ebuild
new file mode 100644
index 000000000000..0a6ab8cd9485
--- /dev/null
+++ b/acct-group/render/render-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=28
diff --git a/acct-group/roccat/roccat-0-r1.ebuild b/acct-group/roccat/roccat-0-r1.ebuild
new file mode 100644
index 000000000000..34761f2dc218
--- /dev/null
+++ b/acct-group/roccat/roccat-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-apps/roccat-tools"
+
+ACCT_GROUP_ID="203"
diff --git a/acct-group/roccat/roccat-0.ebuild b/acct-group/roccat/roccat-0.ebuild
deleted file mode 100644
index 8c8638f0a4e2..000000000000
--- a/acct-group/roccat/roccat-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-apps/roccat-tools"
-
-ACCT_GROUP_ID="203"
diff --git a/acct-group/root/root-0-r1.ebuild b/acct-group/root/root-0-r1.ebuild
new file mode 100644
index 000000000000..731c421a20f9
--- /dev/null
+++ b/acct-group/root/root-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=0
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/root/root-0.ebuild b/acct-group/root/root-0.ebuild
deleted file mode 100644
index 4c5ed4b34698..000000000000
--- a/acct-group/root/root-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=0
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/rplayd/rplayd-0-r1.ebuild b/acct-group/rplayd/rplayd-0-r1.ebuild
new file mode 100644
index 000000000000..39db60adba80
--- /dev/null
+++ b/acct-group/rplayd/rplayd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/rplay"
+
+ACCT_GROUP_ID="161"
diff --git a/acct-group/rplayd/rplayd-0.ebuild b/acct-group/rplayd/rplayd-0.ebuild
deleted file mode 100644
index 744523e8b26c..000000000000
--- a/acct-group/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/rplay"
-
-ACCT_GROUP_ID="161"
diff --git a/acct-group/rrdcached/rrdcached-0-r1.ebuild b/acct-group/rrdcached/rrdcached-0-r1.ebuild
new file mode 100644
index 000000000000..bc2e20332168
--- /dev/null
+++ b/acct-group/rrdcached/rrdcached-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="511"
diff --git a/acct-group/rrdcached/rrdcached-0.ebuild b/acct-group/rrdcached/rrdcached-0.ebuild
deleted file mode 100644
index 1f28f6225226..000000000000
--- a/acct-group/rrdcached/rrdcached-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="511"
diff --git a/acct-group/rslsync/rslsync-0-r1.ebuild b/acct-group/rslsync/rslsync-0-r1.ebuild
new file mode 100644
index 000000000000..11fec48d0d8f
--- /dev/null
+++ b/acct-group/rslsync/rslsync-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/resilio-sync"
+
+ACCT_GROUP_ID="175"
diff --git a/acct-group/rslsync/rslsync-0.ebuild b/acct-group/rslsync/rslsync-0.ebuild
deleted file mode 100644
index c4e17e79078d..000000000000
--- a/acct-group/rslsync/rslsync-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-p2p/resilio-sync"
-
-ACCT_GROUP_ID="175"
diff --git a/acct-group/rspamd/rspamd-0-r1.ebuild b/acct-group/rspamd/rspamd-0-r1.ebuild
deleted file mode 100644
index 338cfd3414a7..000000000000
--- a/acct-group/rspamd/rspamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for rspamd - Rapid spam filtering system"
-ACCT_GROUP_ID=237
diff --git a/acct-group/rspamd/rspamd-0-r2.ebuild b/acct-group/rspamd/rspamd-0-r2.ebuild
new file mode 100644
index 000000000000..2099e0d20e6a
--- /dev/null
+++ b/acct-group/rspamd/rspamd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for rspamd - Rapid spam filtering system"
+ACCT_GROUP_ID=237
diff --git a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild b/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index 1d702c365cb5..000000000000
--- a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for sci-mathematics/rstudio"
-ACCT_GROUP_ID=466
diff --git a/acct-group/rstudio-server/rstudio-server-0-r2.ebuild b/acct-group/rstudio-server/rstudio-server-0-r2.ebuild
new file mode 100644
index 000000000000..0fd60901e700
--- /dev/null
+++ b/acct-group/rstudio-server/rstudio-server-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for sci-mathematics/rstudio"
+ACCT_GROUP_ID=466
diff --git a/acct-group/rt/rt-0-r1.ebuild b/acct-group/rt/rt-0-r1.ebuild
deleted file mode 100644
index 5f188764ed44..000000000000
--- a/acct-group/rt/rt-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/rt"
-
-ACCT_GROUP_ID="126"
diff --git a/acct-group/rt/rt-0-r2.ebuild b/acct-group/rt/rt-0-r2.ebuild
new file mode 100644
index 000000000000..88c03248cb24
--- /dev/null
+++ b/acct-group/rt/rt-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/rt"
+
+ACCT_GROUP_ID="126"
diff --git a/acct-group/rtkit/rtkit-0-r1.ebuild b/acct-group/rtkit/rtkit-0-r1.ebuild
deleted file mode 100644
index 5f92c0a646b5..000000000000
--- a/acct-group/rtkit/rtkit-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
-ACCT_GROUP_ID=133
diff --git a/acct-group/rtkit/rtkit-0-r2.ebuild b/acct-group/rtkit/rtkit-0-r2.ebuild
new file mode 100644
index 000000000000..df01f1e86d78
--- /dev/null
+++ b/acct-group/rtkit/rtkit-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
+ACCT_GROUP_ID=133
diff --git a/acct-group/rundeck/rundeck-0-r1.ebuild b/acct-group/rundeck/rundeck-0-r1.ebuild
new file mode 100644
index 000000000000..1ac045423f1a
--- /dev/null
+++ b/acct-group/rundeck/rundeck-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/rundeck-bin"
+
+ACCT_GROUP_ID="109"
diff --git a/acct-group/rundeck/rundeck-0.ebuild b/acct-group/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9a51c176b28f..000000000000
--- a/acct-group/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/rundeck-bin"
-
-ACCT_GROUP_ID="109"
diff --git a/acct-group/rwhoisd/rwhoisd-0-r1.ebuild b/acct-group/rwhoisd/rwhoisd-0-r1.ebuild
new file mode 100644
index 000000000000..90a1f5f83e76
--- /dev/null
+++ b/acct-group/rwhoisd/rwhoisd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/rwhoisd"
+
+ACCT_GROUP_ID="258"
diff --git a/acct-group/rwhoisd/rwhoisd-0.ebuild b/acct-group/rwhoisd/rwhoisd-0.ebuild
deleted file mode 100644
index efc2c2e69a79..000000000000
--- a/acct-group/rwhoisd/rwhoisd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/rwhoisd"
-
-ACCT_GROUP_ID="258"
diff --git a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild b/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
deleted file mode 100644
index 4f1a3726241b..000000000000
--- a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="SABnzbd program group"
-
-ACCT_GROUP_ID=397
diff --git a/acct-group/sabnzbd/sabnzbd-0-r2.ebuild b/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
new file mode 100644
index 000000000000..a86819cbc639
--- /dev/null
+++ b/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="SABnzbd program group"
+
+ACCT_GROUP_ID=397
diff --git a/acct-group/sagan/sagan-0-r1.ebuild b/acct-group/sagan/sagan-0-r1.ebuild
new file mode 100644
index 000000000000..01d058152a84
--- /dev/null
+++ b/acct-group/sagan/sagan-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the Sagan log monitoring system"
+ACCT_GROUP_ID=317
diff --git a/acct-group/sagan/sagan-0.ebuild b/acct-group/sagan/sagan-0.ebuild
deleted file mode 100644
index 18b52fedf006..000000000000
--- a/acct-group/sagan/sagan-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Sagan log monitoring system"
-ACCT_GROUP_ID=317
diff --git a/acct-group/samplicator/samplicator-0-r1.ebuild b/acct-group/samplicator/samplicator-0-r1.ebuild
new file mode 100644
index 000000000000..46a667f51ce1
--- /dev/null
+++ b/acct-group/samplicator/samplicator-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/samplicator"
+
+ACCT_GROUP_ID="179"
diff --git a/acct-group/samplicator/samplicator-0.ebuild b/acct-group/samplicator/samplicator-0.ebuild
deleted file mode 100644
index 7e5219d58e15..000000000000
--- a/acct-group/samplicator/samplicator-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/samplicator"
-
-ACCT_GROUP_ID="179"
diff --git a/acct-group/sancp/sancp-0-r1.ebuild b/acct-group/sancp/sancp-0-r1.ebuild
new file mode 100644
index 000000000000..4f74e4e83817
--- /dev/null
+++ b/acct-group/sancp/sancp-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/sancp"
+
+ACCT_GROUP_ID=382
diff --git a/acct-group/sancp/sancp-0.ebuild b/acct-group/sancp/sancp-0.ebuild
deleted file mode 100644
index b273bc3c0ea2..000000000000
--- a/acct-group/sancp/sancp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/sancp"
-
-ACCT_GROUP_ID=382
diff --git a/acct-group/sanlock/sanlock-0-r1.ebuild b/acct-group/sanlock/sanlock-0-r1.ebuild
deleted file mode 100644
index c0d196eb8395..000000000000
--- a/acct-group/sanlock/sanlock-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="shared storage lock manager"
-ACCT_GROUP_ID=340
diff --git a/acct-group/sanlock/sanlock-0-r2.ebuild b/acct-group/sanlock/sanlock-0-r2.ebuild
new file mode 100644
index 000000000000..71ceac8ce503
--- /dev/null
+++ b/acct-group/sanlock/sanlock-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="shared storage lock manager"
+ACCT_GROUP_ID=340
diff --git a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild b/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
deleted file mode 100644
index 2312bc0e37e2..000000000000
--- a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
-ACCT_GROUP_ID=286
diff --git a/acct-group/sauerbraten/sauerbraten-0-r2.ebuild b/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
new file mode 100644
index 000000000000..4eb54a421250
--- /dev/null
+++ b/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
+ACCT_GROUP_ID=286
diff --git a/acct-group/scanlogd/scanlogd-0-r1.ebuild b/acct-group/scanlogd/scanlogd-0-r1.ebuild
new file mode 100644
index 000000000000..2b6b4a16515c
--- /dev/null
+++ b/acct-group/scanlogd/scanlogd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/scanlogd"
+
+ACCT_GROUP_ID="166"
diff --git a/acct-group/scanlogd/scanlogd-0.ebuild b/acct-group/scanlogd/scanlogd-0.ebuild
deleted file mode 100644
index ba71638b34cd..000000000000
--- a/acct-group/scanlogd/scanlogd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/scanlogd"
-
-ACCT_GROUP_ID="166"
diff --git a/acct-group/scanner/scanner-0-r1.ebuild b/acct-group/scanner/scanner-0-r1.ebuild
new file mode 100644
index 000000000000..7a2254915859
--- /dev/null
+++ b/acct-group/scanner/scanner-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for media-gfx/sane-backends"
+
+ACCT_GROUP_ID="332"
diff --git a/acct-group/scanner/scanner-0.ebuild b/acct-group/scanner/scanner-0.ebuild
deleted file mode 100644
index 41c58ed07571..000000000000
--- a/acct-group/scanner/scanner-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for media-gfx/sane-backends"
-
-ACCT_GROUP_ID="332"
diff --git a/acct-group/scponly/scponly-0-r1.ebuild b/acct-group/scponly/scponly-0-r1.ebuild
deleted file mode 100644
index c0418d2599cc..000000000000
--- a/acct-group/scponly/scponly-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for scponly"
-ACCT_GROUP_ID=239
diff --git a/acct-group/scponly/scponly-0-r2.ebuild b/acct-group/scponly/scponly-0-r2.ebuild
new file mode 100644
index 000000000000..d5a704be9aec
--- /dev/null
+++ b/acct-group/scponly/scponly-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for scponly"
+ACCT_GROUP_ID=239
diff --git a/acct-group/scsi/scsi-0-r1.ebuild b/acct-group/scsi/scsi-0-r1.ebuild
new file mode 100644
index 000000000000..f3ee233c3cdf
--- /dev/null
+++ b/acct-group/scsi/scsi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=415
diff --git a/acct-group/scsi/scsi-0.ebuild b/acct-group/scsi/scsi-0.ebuild
deleted file mode 100644
index e87f4b7b1c8d..000000000000
--- a/acct-group/scsi/scsi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=415
diff --git a/acct-group/sddm/sddm-0-r1.ebuild b/acct-group/sddm/sddm-0-r1.ebuild
new file mode 100644
index 000000000000..44ec1b3df484
--- /dev/null
+++ b/acct-group/sddm/sddm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/sddm"
+
+ACCT_GROUP_ID="219"
diff --git a/acct-group/sddm/sddm-0.ebuild b/acct-group/sddm/sddm-0.ebuild
deleted file mode 100644
index 26a7d184213b..000000000000
--- a/acct-group/sddm/sddm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/sddm"
-
-ACCT_GROUP_ID="219"
diff --git a/acct-group/seat/seat-0-r1.ebuild b/acct-group/seat/seat-0-r1.ebuild
new file mode 100644
index 000000000000..5feb719c5fdb
--- /dev/null
+++ b/acct-group/seat/seat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-auth/seatd"
+ACCT_GROUP_ID=202
diff --git a/acct-group/seat/seat-0.ebuild b/acct-group/seat/seat-0.ebuild
deleted file mode 100644
index b5c12d09822b..000000000000
--- a/acct-group/seat/seat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-auth/seatd"
-ACCT_GROUP_ID=202
diff --git a/acct-group/serf/serf-0-r1.ebuild b/acct-group/serf/serf-0-r1.ebuild
new file mode 100644
index 000000000000..6b8c298f2eeb
--- /dev/null
+++ b/acct-group/serf/serf-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/serf"
+
+ACCT_GROUP_ID="314"
diff --git a/acct-group/serf/serf-0.ebuild b/acct-group/serf/serf-0.ebuild
deleted file mode 100644
index 00c3f9c40c85..000000000000
--- a/acct-group/serf/serf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/serf"
-
-ACCT_GROUP_ID="314"
diff --git a/acct-group/sguil/sguil-0-r1.ebuild b/acct-group/sguil/sguil-0-r1.ebuild
new file mode 100644
index 000000000000..b1085c8168b7
--- /dev/null
+++ b/acct-group/sguil/sguil-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/sguil-sensor"
+
+ACCT_GROUP_ID="165"
diff --git a/acct-group/sguil/sguil-0.ebuild b/acct-group/sguil/sguil-0.ebuild
deleted file mode 100644
index 15fbe00afd0d..000000000000
--- a/acct-group/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/sguil-sensor"
-
-ACCT_GROUP_ID="165"
diff --git a/acct-group/sgx/sgx-0-r1.ebuild b/acct-group/sgx/sgx-0-r1.ebuild
new file mode 100644
index 000000000000..dc4b0f1de0ba
--- /dev/null
+++ b/acct-group/sgx/sgx-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="System group: used for SGX enclaves"
+
+ACCT_GROUP_ID=405
diff --git a/acct-group/sgx/sgx-0.ebuild b/acct-group/sgx/sgx-0.ebuild
deleted file mode 100644
index 6a9d9ac0c9d8..000000000000
--- a/acct-group/sgx/sgx-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="System group: used for SGX enclaves"
-
-ACCT_GROUP_ID=405
diff --git a/acct-group/sigh/sigh-0-r1.ebuild b/acct-group/sigh/sigh-0-r1.ebuild
new file mode 100644
index 000000000000..e05e868d4d71
--- /dev/null
+++ b/acct-group/sigh/sigh-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=363
diff --git a/acct-group/sigh/sigh-0.ebuild b/acct-group/sigh/sigh-0.ebuild
deleted file mode 100644
index 82133b99b3ca..000000000000
--- a/acct-group/sigh/sigh-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=363
diff --git a/acct-group/simplevirt/simplevirt-0-r1.ebuild b/acct-group/simplevirt/simplevirt-0-r1.ebuild
deleted file mode 100644
index 6d4d4ffbc136..000000000000
--- a/acct-group/simplevirt/simplevirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=404
diff --git a/acct-group/simplevirt/simplevirt-0-r2.ebuild b/acct-group/simplevirt/simplevirt-0-r2.ebuild
new file mode 100644
index 000000000000..ea9e10ee72d3
--- /dev/null
+++ b/acct-group/simplevirt/simplevirt-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=404
diff --git a/acct-group/sispmctl/sispmctl-0-r1.ebuild b/acct-group/sispmctl/sispmctl-0-r1.ebuild
new file mode 100644
index 000000000000..7b4269a47c0c
--- /dev/null
+++ b/acct-group/sispmctl/sispmctl-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-power/sispmctl"
+
+ACCT_GROUP_ID="173"
diff --git a/acct-group/sispmctl/sispmctl-0.ebuild b/acct-group/sispmctl/sispmctl-0.ebuild
deleted file mode 100644
index 1dcdaedb2271..000000000000
--- a/acct-group/sispmctl/sispmctl-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-power/sispmctl"
-
-ACCT_GROUP_ID="173"
diff --git a/acct-group/sks/sks-0-r1.ebuild b/acct-group/sks/sks-0-r1.ebuild
new file mode 100644
index 000000000000..27cc84dd7259
--- /dev/null
+++ b/acct-group/sks/sks-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for SKS OpenPGP keyserver"
+ACCT_GROUP_ID=370
diff --git a/acct-group/sks/sks-0.ebuild b/acct-group/sks/sks-0.ebuild
deleted file mode 100644
index 0304197a7063..000000000000
--- a/acct-group/sks/sks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SKS OpenPGP keyserver"
-ACCT_GROUP_ID=370
diff --git a/acct-group/slurm/slurm-0-r1.ebuild b/acct-group/slurm/slurm-0-r1.ebuild
deleted file mode 100644
index a77214a6d765..000000000000
--- a/acct-group/slurm/slurm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
-ACCT_GROUP_ID=400
diff --git a/acct-group/slurm/slurm-0-r2.ebuild b/acct-group/slurm/slurm-0-r2.ebuild
new file mode 100644
index 000000000000..4d77700fd816
--- /dev/null
+++ b/acct-group/slurm/slurm-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
+ACCT_GROUP_ID=400
diff --git a/acct-group/smmsp/smmsp-0-r1.ebuild b/acct-group/smmsp/smmsp-0-r1.ebuild
deleted file mode 100644
index 8e0821713295..000000000000
--- a/acct-group/smmsp/smmsp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=209
diff --git a/acct-group/smmsp/smmsp-0-r2.ebuild b/acct-group/smmsp/smmsp-0-r2.ebuild
new file mode 100644
index 000000000000..1b08887f6648
--- /dev/null
+++ b/acct-group/smmsp/smmsp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=209
diff --git a/acct-group/smokeping/smokeping-0-r1.ebuild b/acct-group/smokeping/smokeping-0-r1.ebuild
new file mode 100644
index 000000000000..8a12dbb3875a
--- /dev/null
+++ b/acct-group/smokeping/smokeping-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/smokeping"
+
+ACCT_GROUP_ID="164"
diff --git a/acct-group/smokeping/smokeping-0.ebuild b/acct-group/smokeping/smokeping-0.ebuild
deleted file mode 100644
index 0d00bb46fcb0..000000000000
--- a/acct-group/smokeping/smokeping-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/smokeping"
-
-ACCT_GROUP_ID="164"
diff --git a/acct-group/sms/sms-0-r1.ebuild b/acct-group/sms/sms-0-r1.ebuild
new file mode 100644
index 000000000000..5de57373dacf
--- /dev/null
+++ b/acct-group/sms/sms-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=359
diff --git a/acct-group/sms/sms-0.ebuild b/acct-group/sms/sms-0.ebuild
deleted file mode 100644
index dea788cbae76..000000000000
--- a/acct-group/sms/sms-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=359
diff --git a/acct-group/smtpd/smtpd-0-r1.ebuild b/acct-group/smtpd/smtpd-0-r1.ebuild
deleted file mode 100644
index b09abd76d858..000000000000
--- a/acct-group/smtpd/smtpd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="daemon group for smtpd"
-ACCT_GROUP_ID=25
diff --git a/acct-group/smtpd/smtpd-0-r2.ebuild b/acct-group/smtpd/smtpd-0-r2.ebuild
new file mode 100644
index 000000000000..7c6daeb449a8
--- /dev/null
+++ b/acct-group/smtpd/smtpd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="daemon group for smtpd"
+ACCT_GROUP_ID=25
diff --git a/acct-group/smtpq/smtpq-0-r1.ebuild b/acct-group/smtpq/smtpq-0-r1.ebuild
deleted file mode 100644
index 8797fef847fb..000000000000
--- a/acct-group/smtpq/smtpq-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="queue group for smtpd"
-ACCT_GROUP_ID=252
diff --git a/acct-group/smtpq/smtpq-0-r2.ebuild b/acct-group/smtpq/smtpq-0-r2.ebuild
new file mode 100644
index 000000000000..1bc8ae7786bb
--- /dev/null
+++ b/acct-group/smtpq/smtpq-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="queue group for smtpd"
+ACCT_GROUP_ID=252
diff --git a/acct-group/snapserver/snapserver-0-r1.ebuild b/acct-group/snapserver/snapserver-0-r1.ebuild
new file mode 100644
index 000000000000..4742c6cf0de7
--- /dev/null
+++ b/acct-group/snapserver/snapserver-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Server group for media-sound/snapcast"
+ACCT_GROUP_ID=374
diff --git a/acct-group/snapserver/snapserver-0.ebuild b/acct-group/snapserver/snapserver-0.ebuild
deleted file mode 100644
index 7a224e941124..000000000000
--- a/acct-group/snapserver/snapserver-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Server group for media-sound/snapcast"
-ACCT_GROUP_ID=374
diff --git a/acct-group/sniproxy/sniproxy-0-r1.ebuild b/acct-group/sniproxy/sniproxy-0-r1.ebuild
new file mode 100644
index 000000000000..0858202737dc
--- /dev/null
+++ b/acct-group/sniproxy/sniproxy-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=366
diff --git a/acct-group/sniproxy/sniproxy-0.ebuild b/acct-group/sniproxy/sniproxy-0.ebuild
deleted file mode 100644
index 526eb45957e2..000000000000
--- a/acct-group/sniproxy/sniproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=366
diff --git a/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild b/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..d5970e69065a
--- /dev/null
+++ b/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/snmp_exporter"
+
+ACCT_GROUP_ID="108"
diff --git a/acct-group/snmp_exporter/snmp_exporter-0.ebuild b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
deleted file mode 100644
index 52cf4f2d532e..000000000000
--- a/acct-group/snmp_exporter/snmp_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/snmp_exporter"
-
-ACCT_GROUP_ID="108"
diff --git a/acct-group/snort/snort-0-r1.ebuild b/acct-group/snort/snort-0-r1.ebuild
new file mode 100644
index 000000000000..0ad19e1d8cc9
--- /dev/null
+++ b/acct-group/snort/snort-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=328
diff --git a/acct-group/snort/snort-0.ebuild b/acct-group/snort/snort-0.ebuild
deleted file mode 100644
index 95dcdd566680..000000000000
--- a/acct-group/snort/snort-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=328
diff --git a/acct-group/sobby/sobby-0-r1.ebuild b/acct-group/sobby/sobby-0-r1.ebuild
new file mode 100644
index 000000000000..021a16065541
--- /dev/null
+++ b/acct-group/sobby/sobby-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=322
diff --git a/acct-group/sobby/sobby-0.ebuild b/acct-group/sobby/sobby-0.ebuild
deleted file mode 100644
index 0f95a3ce6461..000000000000
--- a/acct-group/sobby/sobby-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=322
diff --git a/acct-group/sobexsrv/sobexsrv-0-r1.ebuild b/acct-group/sobexsrv/sobexsrv-0-r1.ebuild
new file mode 100644
index 000000000000..7f01a21751cc
--- /dev/null
+++ b/acct-group/sobexsrv/sobexsrv-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sobexsrv: a secure OBEX server"
+ACCT_GROUP_ID=387
diff --git a/acct-group/sobexsrv/sobexsrv-0.ebuild b/acct-group/sobexsrv/sobexsrv-0.ebuild
deleted file mode 100644
index a91907f84e21..000000000000
--- a/acct-group/sobexsrv/sobexsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sobexsrv: a secure OBEX server"
-ACCT_GROUP_ID=387
diff --git a/acct-group/sockd/sockd-0-r1.ebuild b/acct-group/sockd/sockd-0-r1.ebuild
new file mode 100644
index 000000000000..d72ccb7e0e9e
--- /dev/null
+++ b/acct-group/sockd/sockd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/dante"
+
+ACCT_GROUP_ID="214"
diff --git a/acct-group/sockd/sockd-0.ebuild b/acct-group/sockd/sockd-0.ebuild
deleted file mode 100644
index deebd843ff19..000000000000
--- a/acct-group/sockd/sockd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-proxy/dante"
-
-ACCT_GROUP_ID="214"
diff --git a/acct-group/sogo/sogo-0-r1.ebuild b/acct-group/sogo/sogo-0-r1.ebuild
deleted file mode 100644
index d23c3bef7ff9..000000000000
--- a/acct-group/sogo/sogo-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for gnustep-apps/sogo"
-ACCT_GROUP_ID=475
diff --git a/acct-group/sogo/sogo-0-r2.ebuild b/acct-group/sogo/sogo-0-r2.ebuild
new file mode 100644
index 000000000000..46692a2b3bdb
--- /dev/null
+++ b/acct-group/sogo/sogo-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for gnustep-apps/sogo"
+ACCT_GROUP_ID=475
diff --git a/acct-group/soju/soju-0-r1.ebuild b/acct-group/soju/soju-0-r1.ebuild
new file mode 100644
index 000000000000..66cd1ad30d26
--- /dev/null
+++ b/acct-group/soju/soju-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_GROUP_ID=526
diff --git a/acct-group/soju/soju-0.ebuild b/acct-group/soju/soju-0.ebuild
deleted file mode 100644
index e5be123ff93f..000000000000
--- a/acct-group/soju/soju-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="User for the net-irc/soju IRC bouncer"
-ACCT_GROUP_ID=526
diff --git a/acct-group/sonarr/sonarr-0-r1.ebuild b/acct-group/sonarr/sonarr-0-r1.ebuild
new file mode 100644
index 000000000000..bea9a228c69b
--- /dev/null
+++ b/acct-group/sonarr/sonarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=515
diff --git a/acct-group/sonarr/sonarr-0.ebuild b/acct-group/sonarr/sonarr-0.ebuild
deleted file mode 100644
index c40efb6d7a67..000000000000
--- a/acct-group/sonarr/sonarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=515
diff --git a/acct-group/spamd/spamd-0-r1.ebuild b/acct-group/spamd/spamd-0-r1.ebuild
deleted file mode 100644
index d995a905a5ce..000000000000
--- a/acct-group/spamd/spamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the SpamAssassin daemon"
-ACCT_GROUP_ID=337
diff --git a/acct-group/spamd/spamd-0-r2.ebuild b/acct-group/spamd/spamd-0-r2.ebuild
new file mode 100644
index 000000000000..05d1b1f0d616
--- /dev/null
+++ b/acct-group/spamd/spamd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the SpamAssassin daemon"
+ACCT_GROUP_ID=337
diff --git a/acct-group/spectrum/spectrum-0-r1.ebuild b/acct-group/spectrum/spectrum-0-r1.ebuild
deleted file mode 100644
index be11afecfee1..000000000000
--- a/acct-group/spectrum/spectrum-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Spectrum messaging transport"
-
-ACCT_GROUP_ID="486"
diff --git a/acct-group/spectrum/spectrum-0-r2.ebuild b/acct-group/spectrum/spectrum-0-r2.ebuild
new file mode 100644
index 000000000000..ca2ce6dd11b6
--- /dev/null
+++ b/acct-group/spectrum/spectrum-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Spectrum messaging transport"
+
+ACCT_GROUP_ID="486"
diff --git a/acct-group/spi/spi-0-r1.ebuild b/acct-group/spi/spi-0-r1.ebuild
new file mode 100644
index 000000000000..5e2962ae7212
--- /dev/null
+++ b/acct-group/spi/spi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="227"
diff --git a/acct-group/spi/spi-0.ebuild b/acct-group/spi/spi-0.ebuild
deleted file mode 100644
index 88be21fa31f0..000000000000
--- a/acct-group/spi/spi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="227"
diff --git a/acct-group/spire/spire-0-r1.ebuild b/acct-group/spire/spire-0-r1.ebuild
deleted file mode 100644
index 6bb96c368ca5..000000000000
--- a/acct-group/spire/spire-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=271
diff --git a/acct-group/spire/spire-0-r2.ebuild b/acct-group/spire/spire-0-r2.ebuild
new file mode 100644
index 000000000000..493d68009803
--- /dev/null
+++ b/acct-group/spire/spire-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=271
diff --git a/acct-group/spread/spread-0-r1.ebuild b/acct-group/spread/spread-0-r1.ebuild
new file mode 100644
index 000000000000..900b78116d63
--- /dev/null
+++ b/acct-group/spread/spread-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/spread"
+
+ACCT_GROUP_ID="159"
diff --git a/acct-group/spread/spread-0.ebuild b/acct-group/spread/spread-0.ebuild
deleted file mode 100644
index 7bbdd3539cd6..000000000000
--- a/acct-group/spread/spread-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/spread"
-
-ACCT_GROUP_ID="159"
diff --git a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild b/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
deleted file mode 100644
index 895ee6873352..000000000000
--- a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SQLGrey"
-ACCT_GROUP_ID=336
diff --git a/acct-group/sqlgrey/sqlgrey-0-r2.ebuild b/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
new file mode 100644
index 000000000000..fb26a5e012d1
--- /dev/null
+++ b/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for SQLGrey"
+ACCT_GROUP_ID=336
diff --git a/acct-group/squid/squid-0-r1.ebuild b/acct-group/squid/squid-0-r1.ebuild
deleted file mode 100644
index 7295f3099cd9..000000000000
--- a/acct-group/squid/squid-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=301
diff --git a/acct-group/squid/squid-0-r2.ebuild b/acct-group/squid/squid-0-r2.ebuild
new file mode 100644
index 000000000000..4aaa19a79641
--- /dev/null
+++ b/acct-group/squid/squid-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=301
diff --git a/acct-group/sshd/sshd-0-r1.ebuild b/acct-group/sshd/sshd-0-r1.ebuild
deleted file mode 100644
index d54032fc8a6b..000000000000
--- a/acct-group/sshd/sshd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=22
diff --git a/acct-group/sshd/sshd-0-r2.ebuild b/acct-group/sshd/sshd-0-r2.ebuild
new file mode 100644
index 000000000000..fbe8efaf9c1b
--- /dev/null
+++ b/acct-group/sshd/sshd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=22
diff --git a/acct-group/ssmtp/ssmtp-0-r1.ebuild b/acct-group/ssmtp/ssmtp-0-r1.ebuild
new file mode 100644
index 000000000000..dd67498912e9
--- /dev/null
+++ b/acct-group/ssmtp/ssmtp-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-mta/ssmtp"
+
+ACCT_GROUP_ID="299"
diff --git a/acct-group/ssmtp/ssmtp-0.ebuild b/acct-group/ssmtp/ssmtp-0.ebuild
deleted file mode 100644
index 6ad46f6347f0..000000000000
--- a/acct-group/ssmtp/ssmtp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-mta/ssmtp"
-
-ACCT_GROUP_ID="299"
diff --git a/acct-group/sstpc/sstpc-0-r1.ebuild b/acct-group/sstpc/sstpc-0-r1.ebuild
new file mode 100644
index 000000000000..3a0e888cd978
--- /dev/null
+++ b/acct-group/sstpc/sstpc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/sstp-client"
+
+ACCT_GROUP_ID="257"
diff --git a/acct-group/sstpc/sstpc-0.ebuild b/acct-group/sstpc/sstpc-0.ebuild
deleted file mode 100644
index 6d41098780cd..000000000000
--- a/acct-group/sstpc/sstpc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/sstp-client"
-
-ACCT_GROUP_ID="257"
diff --git a/acct-group/stapdev/stapdev-0-r1.ebuild b/acct-group/stapdev/stapdev-0-r1.ebuild
new file mode 100644
index 000000000000..8e55b5a002f7
--- /dev/null
+++ b/acct-group/stapdev/stapdev-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=158
diff --git a/acct-group/stapdev/stapdev-0.ebuild b/acct-group/stapdev/stapdev-0.ebuild
deleted file mode 100644
index b964a19dcabe..000000000000
--- a/acct-group/stapdev/stapdev-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=158
diff --git a/acct-group/stapsys/stapsys-0-r1.ebuild b/acct-group/stapsys/stapsys-0-r1.ebuild
new file mode 100644
index 000000000000..60dd89044f9b
--- /dev/null
+++ b/acct-group/stapsys/stapsys-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=157
diff --git a/acct-group/stapsys/stapsys-0.ebuild b/acct-group/stapsys/stapsys-0.ebuild
deleted file mode 100644
index 82e1d15cc0b8..000000000000
--- a/acct-group/stapsys/stapsys-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=157
diff --git a/acct-group/stapusr/stapusr-0-r1.ebuild b/acct-group/stapusr/stapusr-0-r1.ebuild
new file mode 100644
index 000000000000..5e1a0850f61a
--- /dev/null
+++ b/acct-group/stapusr/stapusr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=156
diff --git a/acct-group/stapusr/stapusr-0.ebuild b/acct-group/stapusr/stapusr-0.ebuild
deleted file mode 100644
index 386b74e9c57b..000000000000
--- a/acct-group/stapusr/stapusr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=156
diff --git a/acct-group/steamcmd/steamcmd-0-r1.ebuild b/acct-group/steamcmd/steamcmd-0-r1.ebuild
deleted file mode 100644
index f2ddf2b44fb6..000000000000
--- a/acct-group/steamcmd/steamcmd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the SteamCMD server"
-
-ACCT_GROUP_ID="489"
diff --git a/acct-group/steamcmd/steamcmd-0-r2.ebuild b/acct-group/steamcmd/steamcmd-0-r2.ebuild
new file mode 100644
index 000000000000..0857f379a59f
--- /dev/null
+++ b/acct-group/steamcmd/steamcmd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the SteamCMD server"
+
+ACCT_GROUP_ID="489"
diff --git a/acct-group/stg/stg-0-r1.ebuild b/acct-group/stg/stg-0-r1.ebuild
new file mode 100644
index 000000000000..5364e086d229
--- /dev/null
+++ b/acct-group/stg/stg-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/stargazer"
+
+ACCT_GROUP_ID="176"
diff --git a/acct-group/stg/stg-0.ebuild b/acct-group/stg/stg-0.ebuild
deleted file mode 100644
index cd405cbaf857..000000000000
--- a/acct-group/stg/stg-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/stargazer"
-
-ACCT_GROUP_ID="176"
diff --git a/acct-group/stubby/stubby-0-r1.ebuild b/acct-group/stubby/stubby-0-r1.ebuild
deleted file mode 100644
index 13e45d99fbec..000000000000
--- a/acct-group/stubby/stubby-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Stubby program group (from net-dns/getdns)"
-ACCT_GROUP_ID=476
diff --git a/acct-group/stubby/stubby-0-r2.ebuild b/acct-group/stubby/stubby-0-r2.ebuild
new file mode 100644
index 000000000000..c87d37f3702a
--- /dev/null
+++ b/acct-group/stubby/stubby-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Stubby program group (from net-dns/getdns)"
+ACCT_GROUP_ID=476
diff --git a/acct-group/stunnel/stunnel-0-r1.ebuild b/acct-group/stunnel/stunnel-0-r1.ebuild
deleted file mode 100644
index 47360c73c9b6..000000000000
--- a/acct-group/stunnel/stunnel-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for stunnel"
-ACCT_GROUP_ID=341
diff --git a/acct-group/stunnel/stunnel-0-r2.ebuild b/acct-group/stunnel/stunnel-0-r2.ebuild
new file mode 100644
index 000000000000..39785b30995e
--- /dev/null
+++ b/acct-group/stunnel/stunnel-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for stunnel"
+ACCT_GROUP_ID=341
diff --git a/acct-group/subsonic/subsonic-0-r1.ebuild b/acct-group/subsonic/subsonic-0-r1.ebuild
new file mode 100644
index 000000000000..d4297cbcd2e8
--- /dev/null
+++ b/acct-group/subsonic/subsonic-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/subsonic-bin"
+
+ACCT_GROUP_ID="136"
diff --git a/acct-group/subsonic/subsonic-0.ebuild b/acct-group/subsonic/subsonic-0.ebuild
deleted file mode 100644
index 95e9e9317296..000000000000
--- a/acct-group/subsonic/subsonic-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/subsonic-bin"
-
-ACCT_GROUP_ID="136"
diff --git a/acct-group/supervisor/supervisor-0-r1.ebuild b/acct-group/supervisor/supervisor-0-r1.ebuild
deleted file mode 100644
index 4890748ecbfe..000000000000
--- a/acct-group/supervisor/supervisor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group to grant access to app-admin/supervisor's management"
-ACCT_GROUP_ID=463
diff --git a/acct-group/supervisor/supervisor-0-r2.ebuild b/acct-group/supervisor/supervisor-0-r2.ebuild
new file mode 100644
index 000000000000..c617112584e2
--- /dev/null
+++ b/acct-group/supervisor/supervisor-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group to grant access to app-admin/supervisor's management"
+ACCT_GROUP_ID=463
diff --git a/acct-group/suricata/suricata-0-r1.ebuild b/acct-group/suricata/suricata-0-r1.ebuild
deleted file mode 100644
index c9ad4e167661..000000000000
--- a/acct-group/suricata/suricata-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Suricata IDS"
-ACCT_GROUP_ID=477
diff --git a/acct-group/suricata/suricata-0-r2.ebuild b/acct-group/suricata/suricata-0-r2.ebuild
new file mode 100644
index 000000000000..93bfdc32e360
--- /dev/null
+++ b/acct-group/suricata/suricata-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Suricata IDS"
+ACCT_GROUP_ID=477
diff --git a/acct-group/svnusers/svnusers-0-r1.ebuild b/acct-group/svnusers/svnusers-0-r1.ebuild
deleted file mode 100644
index 0a1c980c6503..000000000000
--- a/acct-group/svnusers/svnusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=399
diff --git a/acct-group/svnusers/svnusers-0-r2.ebuild b/acct-group/svnusers/svnusers-0-r2.ebuild
new file mode 100644
index 000000000000..5f1ff202b155
--- /dev/null
+++ b/acct-group/svnusers/svnusers-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=399
diff --git a/acct-group/svxlink/svxlink-0-r1.ebuild b/acct-group/svxlink/svxlink-0-r1.ebuild
new file mode 100644
index 000000000000..85c420295f38
--- /dev/null
+++ b/acct-group/svxlink/svxlink-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the svxlink server"
+ACCT_GROUP_ID=247
diff --git a/acct-group/svxlink/svxlink-0.ebuild b/acct-group/svxlink/svxlink-0.ebuild
deleted file mode 100644
index 73dbcd6e5c15..000000000000
--- a/acct-group/svxlink/svxlink-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the svxlink server"
-ACCT_GROUP_ID=247
diff --git a/acct-group/swift/swift-0-r1.ebuild b/acct-group/swift/swift-0-r1.ebuild
deleted file mode 100644
index 02bd773b31ab..000000000000
--- a/acct-group/swift/swift-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=449
diff --git a/acct-group/swift/swift-0-r2.ebuild b/acct-group/swift/swift-0-r2.ebuild
new file mode 100644
index 000000000000..bc62cfafcc2a
--- /dev/null
+++ b/acct-group/swift/swift-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=449
diff --git a/acct-group/synapse/synapse-0-r1.ebuild b/acct-group/synapse/synapse-0-r1.ebuild
new file mode 100644
index 000000000000..ce4c5e9bfbf0
--- /dev/null
+++ b/acct-group/synapse/synapse-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/synapse"
+ACCT_GROUP_ID=519
diff --git a/acct-group/synapse/synapse-0.ebuild b/acct-group/synapse/synapse-0.ebuild
deleted file mode 100644
index 0f7e576bb55a..000000000000
--- a/acct-group/synapse/synapse-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/synapse"
-ACCT_GROUP_ID=519
diff --git a/acct-group/syncthing/syncthing-0-r1.ebuild b/acct-group/syncthing/syncthing-0-r1.ebuild
deleted file mode 100644
index 2c7a7840c246..000000000000
--- a/acct-group/syncthing/syncthing-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
-ACCT_GROUP_ID=499
diff --git a/acct-group/syncthing/syncthing-0-r2.ebuild b/acct-group/syncthing/syncthing-0-r2.ebuild
new file mode 100644
index 000000000000..d97c9cd968c7
--- /dev/null
+++ b/acct-group/syncthing/syncthing-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
+ACCT_GROUP_ID=499
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
deleted file mode 100644
index 118999609538..000000000000
--- a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
new file mode 100644
index 000000000000..1d7bb6544080
--- /dev/null
+++ b/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild b/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
deleted file mode 100644
index 24f44986f516..000000000000
--- a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=505
diff --git a/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild b/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
new file mode 100644
index 000000000000..d6954f22835e
--- /dev/null
+++ b/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=505
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
deleted file mode 100644
index 8ddee6ec320f..000000000000
--- a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
new file mode 100644
index 000000000000..85c381bd53ea
--- /dev/null
+++ b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild b/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
deleted file mode 100644
index c439156e2f63..000000000000
--- a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-journal/systemd-journal-0-r2.ebuild b/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
new file mode 100644
index 000000000000..fa6af68a04c4
--- /dev/null
+++ b/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-network/systemd-network-0-r1.ebuild b/acct-group/systemd-network/systemd-network-0-r1.ebuild
deleted file mode 100644
index 6f88d3ca9895..000000000000
--- a/acct-group/systemd-network/systemd-network-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-network/systemd-network-0-r2.ebuild b/acct-group/systemd-network/systemd-network-0-r2.ebuild
new file mode 100644
index 000000000000..bb6b7af62bb3
--- /dev/null
+++ b/acct-group/systemd-network/systemd-network-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-oom/systemd-oom-0-r1.ebuild b/acct-group/systemd-oom/systemd-oom-0-r1.ebuild
new file mode 100644
index 000000000000..9d1b0e6de967
--- /dev/null
+++ b/acct-group/systemd-oom/systemd-oom-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-oom/systemd-oom-0.ebuild b/acct-group/systemd-oom/systemd-oom-0.ebuild
deleted file mode 100644
index 175d26d66eb5..000000000000
--- a/acct-group/systemd-oom/systemd-oom-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
deleted file mode 100644
index 903603df6230..000000000000
--- a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
new file mode 100644
index 000000000000..d5a49e0df40a
--- /dev/null
+++ b/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
deleted file mode 100644
index 50abd9371502..000000000000
--- a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=195
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
new file mode 100644
index 000000000000..b3acdb6f39cd
--- /dev/null
+++ b/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=195
diff --git a/acct-group/tape/tape-0-r1.ebuild b/acct-group/tape/tape-0-r1.ebuild
deleted file mode 100644
index e7aa561286dd..000000000000
--- a/acct-group/tape/tape-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=26
diff --git a/acct-group/tape/tape-0-r2.ebuild b/acct-group/tape/tape-0-r2.ebuild
new file mode 100644
index 000000000000..87743a734062
--- /dev/null
+++ b/acct-group/tape/tape-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=26
diff --git a/acct-group/taskd/taskd-0-r1.ebuild b/acct-group/taskd/taskd-0-r1.ebuild
new file mode 100644
index 000000000000..65a47cc845e3
--- /dev/null
+++ b/acct-group/taskd/taskd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/taskd"
+
+ACCT_GROUP_ID="152"
diff --git a/acct-group/taskd/taskd-0.ebuild b/acct-group/taskd/taskd-0.ebuild
deleted file mode 100644
index 16ca38a8ade9..000000000000
--- a/acct-group/taskd/taskd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/taskd"
-
-ACCT_GROUP_ID="152"
diff --git a/acct-group/teamspeak/teamspeak-0-r1.ebuild b/acct-group/teamspeak/teamspeak-0-r1.ebuild
deleted file mode 100644
index 05f5b6fd1ea8..000000000000
--- a/acct-group/teamspeak/teamspeak-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the TeamSpeak server"
-
-ACCT_GROUP_ID="488"
diff --git a/acct-group/teamspeak/teamspeak-0-r2.ebuild b/acct-group/teamspeak/teamspeak-0-r2.ebuild
new file mode 100644
index 000000000000..3387dde0dba0
--- /dev/null
+++ b/acct-group/teamspeak/teamspeak-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the TeamSpeak server"
+
+ACCT_GROUP_ID="488"
diff --git a/acct-group/telegraf/telegraf-0-r1.ebuild b/acct-group/telegraf/telegraf-0-r1.ebuild
deleted file mode 100644
index c7a063da8332..000000000000
--- a/acct-group/telegraf/telegraf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=428
diff --git a/acct-group/telegraf/telegraf-0-r2.ebuild b/acct-group/telegraf/telegraf-0-r2.ebuild
new file mode 100644
index 000000000000..593c2d977184
--- /dev/null
+++ b/acct-group/telegraf/telegraf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=428
diff --git a/acct-group/tenshi/tenshi-0-r1.ebuild b/acct-group/tenshi/tenshi-0-r1.ebuild
new file mode 100644
index 000000000000..577b6e34ee6b
--- /dev/null
+++ b/acct-group/tenshi/tenshi-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/tenshi"
+
+ACCT_GROUP_ID="283"
diff --git a/acct-group/tenshi/tenshi-0.ebuild b/acct-group/tenshi/tenshi-0.ebuild
deleted file mode 100644
index 4ca858e2c78d..000000000000
--- a/acct-group/tenshi/tenshi-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/tenshi"
-
-ACCT_GROUP_ID="283"
diff --git a/acct-group/thttpd/thttpd-0-r1.ebuild b/acct-group/thttpd/thttpd-0-r1.ebuild
new file mode 100644
index 000000000000..ecd4915fa384
--- /dev/null
+++ b/acct-group/thttpd/thttpd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/thttpd"
+
+ACCT_GROUP_ID="155"
diff --git a/acct-group/thttpd/thttpd-0.ebuild b/acct-group/thttpd/thttpd-0.ebuild
deleted file mode 100644
index f30403a01946..000000000000
--- a/acct-group/thttpd/thttpd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/thttpd"
-
-ACCT_GROUP_ID="155"
diff --git a/acct-group/tinyproxy/tinyproxy-0-r1.ebuild b/acct-group/tinyproxy/tinyproxy-0-r1.ebuild
new file mode 100644
index 000000000000..6f7689c3c3df
--- /dev/null
+++ b/acct-group/tinyproxy/tinyproxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-proxy/tinyproxy"
+
+ACCT_GROUP_ID=186
diff --git a/acct-group/tinyproxy/tinyproxy-0.ebuild b/acct-group/tinyproxy/tinyproxy-0.ebuild
deleted file mode 100644
index 24a884b47c59..000000000000
--- a/acct-group/tinyproxy/tinyproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-proxy/tinyproxy"
-
-ACCT_GROUP_ID=186
diff --git a/acct-group/tomcat/tomcat-0-r1.ebuild b/acct-group/tomcat/tomcat-0-r1.ebuild
new file mode 100644
index 000000000000..d9b3c7ed3296
--- /dev/null
+++ b/acct-group/tomcat/tomcat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Apache Tomcat"
+ACCT_GROUP_ID=265
diff --git a/acct-group/tomcat/tomcat-0.ebuild b/acct-group/tomcat/tomcat-0.ebuild
deleted file mode 100644
index ddef1fa45694..000000000000
--- a/acct-group/tomcat/tomcat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Apache Tomcat"
-ACCT_GROUP_ID=265
diff --git a/acct-group/tor/tor-0-r1.ebuild b/acct-group/tor/tor-0-r1.ebuild
deleted file mode 100644
index 0fe44e122b31..000000000000
--- a/acct-group/tor/tor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for tor daemon"
-ACCT_GROUP_ID=43
diff --git a/acct-group/tor/tor-0-r2.ebuild b/acct-group/tor/tor-0-r2.ebuild
new file mode 100644
index 000000000000..cb5343bcbdc3
--- /dev/null
+++ b/acct-group/tor/tor-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for tor daemon"
+ACCT_GROUP_ID=43
diff --git a/acct-group/tox/tox-0-r1.ebuild b/acct-group/tox/tox-0-r1.ebuild
deleted file mode 100644
index e50b936945ed..000000000000
--- a/acct-group/tox/tox-0-r1.ebuild
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-group
-DESCRIPTION="Group management for package net-libs/tox"
-ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tox/tox-0-r2.ebuild b/acct-group/tox/tox-0-r2.ebuild
new file mode 100644
index 000000000000..e0df3c1427c9
--- /dev/null
+++ b/acct-group/tox/tox-0-r2.ebuild
@@ -0,0 +1,7 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-group
+DESCRIPTION="Group management for package net-libs/tox"
+ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tpm/tpm-0-r1.ebuild b/acct-group/tpm/tpm-0-r1.ebuild
new file mode 100644
index 000000000000..42ec8b85c14e
--- /dev/null
+++ b/acct-group/tpm/tpm-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=347
diff --git a/acct-group/tpm/tpm-0.ebuild b/acct-group/tpm/tpm-0.ebuild
deleted file mode 100644
index 78bf604298a0..000000000000
--- a/acct-group/tpm/tpm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=347
diff --git a/acct-group/transmission/transmission-0-r1.ebuild b/acct-group/transmission/transmission-0-r1.ebuild
deleted file mode 100644
index 682145cd09be..000000000000
--- a/acct-group/transmission/transmission-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=169
diff --git a/acct-group/transmission/transmission-0-r2.ebuild b/acct-group/transmission/transmission-0-r2.ebuild
new file mode 100644
index 000000000000..ea7be7a6a2bd
--- /dev/null
+++ b/acct-group/transmission/transmission-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=169
diff --git a/acct-group/trickster/trickster-0-r1.ebuild b/acct-group/trickster/trickster-0-r1.ebuild
new file mode 100644
index 000000000000..f52d9309fbfc
--- /dev/null
+++ b/acct-group/trickster/trickster-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/trickster"
+
+ACCT_GROUP_ID="119"
diff --git a/acct-group/trickster/trickster-0.ebuild b/acct-group/trickster/trickster-0.ebuild
deleted file mode 100644
index fa5e88995312..000000000000
--- a/acct-group/trickster/trickster-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/trickster"
-
-ACCT_GROUP_ID="119"
diff --git a/acct-group/trojan/trojan-0-r1.ebuild b/acct-group/trojan/trojan-0-r1.ebuild
new file mode 100644
index 000000000000..8c754f0d94e6
--- /dev/null
+++ b/acct-group/trojan/trojan-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=326
diff --git a/acct-group/trojan/trojan-0.ebuild b/acct-group/trojan/trojan-0.ebuild
deleted file mode 100644
index e3af9f513f48..000000000000
--- a/acct-group/trojan/trojan-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=326
diff --git a/acct-group/tsm/tsm-0-r1.ebuild b/acct-group/tsm/tsm-0-r1.ebuild
deleted file mode 100644
index 117a3a3bde45..000000000000
--- a/acct-group/tsm/tsm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=465
diff --git a/acct-group/tsm/tsm-0-r2.ebuild b/acct-group/tsm/tsm-0-r2.ebuild
new file mode 100644
index 000000000000..e992130a445e
--- /dev/null
+++ b/acct-group/tsm/tsm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=465
diff --git a/acct-group/tss/tss-0-r1.ebuild b/acct-group/tss/tss-0-r1.ebuild
deleted file mode 100644
index 3ecc4e54949c..000000000000
--- a/acct-group/tss/tss-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Trusted Software Stack for TPMs group"
-ACCT_GROUP_ID=59
diff --git a/acct-group/tss/tss-0-r2.ebuild b/acct-group/tss/tss-0-r2.ebuild
new file mode 100644
index 000000000000..24626e201848
--- /dev/null
+++ b/acct-group/tss/tss-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Trusted Software Stack for TPMs group"
+ACCT_GROUP_ID=59
diff --git a/acct-group/ttrssd/ttrssd-0-r1.ebuild b/acct-group/ttrssd/ttrssd-0-r1.ebuild
new file mode 100644
index 000000000000..a42e44e4631c
--- /dev/null
+++ b/acct-group/ttrssd/ttrssd-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-apps/tt-rss"
+ACCT_GROUP_ID=386
diff --git a/acct-group/ttrssd/ttrssd-0.ebuild b/acct-group/ttrssd/ttrssd-0.ebuild
deleted file mode 100644
index 1d5fcc70b9ab..000000000000
--- a/acct-group/ttrssd/ttrssd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-apps/tt-rss"
-ACCT_GROUP_ID=386
diff --git a/acct-group/tty/tty-0-r1.ebuild b/acct-group/tty/tty-0-r1.ebuild
deleted file mode 100644
index 2133d92cfa3b..000000000000
--- a/acct-group/tty/tty-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=5
diff --git a/acct-group/tty/tty-0-r2.ebuild b/acct-group/tty/tty-0-r2.ebuild
new file mode 100644
index 000000000000..b6a00ae485fb
--- /dev/null
+++ b/acct-group/tty/tty-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=5
diff --git a/acct-group/turnserver/turnserver-0-r1.ebuild b/acct-group/turnserver/turnserver-0-r1.ebuild
deleted file mode 100644
index 37a44ee01058..000000000000
--- a/acct-group/turnserver/turnserver-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for a turn server like coturn"
-
-ACCT_GROUP_ID="235"
diff --git a/acct-group/turnserver/turnserver-0-r2.ebuild b/acct-group/turnserver/turnserver-0-r2.ebuild
new file mode 100644
index 000000000000..557eba9e0b1b
--- /dev/null
+++ b/acct-group/turnserver/turnserver-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for a turn server like coturn"
+
+ACCT_GROUP_ID="235"
diff --git a/acct-group/ubridge/ubridge-0-r1.ebuild b/acct-group/ubridge/ubridge-0-r1.ebuild
deleted file mode 100644
index 6d79fba1f383..000000000000
--- a/acct-group/ubridge/ubridge-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/ubridge"
-ACCT_GROUP_ID=461
diff --git a/acct-group/ubridge/ubridge-0-r2.ebuild b/acct-group/ubridge/ubridge-0-r2.ebuild
new file mode 100644
index 000000000000..20ab07a4c9e4
--- /dev/null
+++ b/acct-group/ubridge/ubridge-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/ubridge"
+ACCT_GROUP_ID=461
diff --git a/acct-group/ulogd/ulogd-0-r1.ebuild b/acct-group/ulogd/ulogd-0-r1.ebuild
new file mode 100644
index 000000000000..15b7a3bf99fc
--- /dev/null
+++ b/acct-group/ulogd/ulogd-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ulogd"
+ACCT_GROUP_ID=311
diff --git a/acct-group/ulogd/ulogd-0.ebuild b/acct-group/ulogd/ulogd-0.ebuild
deleted file mode 100644
index d9c49c9aff0e..000000000000
--- a/acct-group/ulogd/ulogd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ulogd"
-ACCT_GROUP_ID=311
diff --git a/acct-group/ultimaker/ultimaker-0-r1.ebuild b/acct-group/ultimaker/ultimaker-0-r1.ebuild
deleted file mode 100644
index af415ea3785f..000000000000
--- a/acct-group/ultimaker/ultimaker-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ultimaker"
-ACCT_GROUP_ID=369
diff --git a/acct-group/ultimaker/ultimaker-0-r2.ebuild b/acct-group/ultimaker/ultimaker-0-r2.ebuild
new file mode 100644
index 000000000000..a69acd173bf8
--- /dev/null
+++ b/acct-group/ultimaker/ultimaker-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ultimaker"
+ACCT_GROUP_ID=369
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild
new file mode 100644
index 000000000000..59e9459f0fdb
--- /dev/null
+++ b/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=279
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
deleted file mode 100644
index 7cf4cee045e4..000000000000
--- a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=279
diff --git a/acct-group/unbound/unbound-0-r1.ebuild b/acct-group/unbound/unbound-0-r1.ebuild
deleted file mode 100644
index 4a2eab027793..000000000000
--- a/acct-group/unbound/unbound-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="unbound program group"
-
-ACCT_GROUP_ID=391
diff --git a/acct-group/unbound/unbound-0-r2.ebuild b/acct-group/unbound/unbound-0-r2.ebuild
new file mode 100644
index 000000000000..a9047bfb0b5f
--- /dev/null
+++ b/acct-group/unbound/unbound-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="unbound program group"
+
+ACCT_GROUP_ID=391
diff --git a/acct-group/unifi-video/unifi-video-0-r1.ebuild b/acct-group/unifi-video/unifi-video-0-r1.ebuild
new file mode 100644
index 000000000000..21165892f5b5
--- /dev/null
+++ b/acct-group/unifi-video/unifi-video-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Unifi Video"
+ACCT_GROUP_ID=348
diff --git a/acct-group/unifi-video/unifi-video-0.ebuild b/acct-group/unifi-video/unifi-video-0.ebuild
deleted file mode 100644
index 39344e103ea3..000000000000
--- a/acct-group/unifi-video/unifi-video-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Unifi Video"
-ACCT_GROUP_ID=348
diff --git a/acct-group/unifi/unifi-0-r1.ebuild b/acct-group/unifi/unifi-0-r1.ebuild
deleted file mode 100644
index f4db39318eb5..000000000000
--- a/acct-group/unifi/unifi-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the UniFi controller"
-
-ACCT_GROUP_ID="113"
diff --git a/acct-group/unifi/unifi-0-r2.ebuild b/acct-group/unifi/unifi-0-r2.ebuild
new file mode 100644
index 000000000000..8cc4b89e2b27
--- /dev/null
+++ b/acct-group/unifi/unifi-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the UniFi controller"
+
+ACCT_GROUP_ID="113"
diff --git a/acct-group/unrealircd/unrealircd-0-r1.ebuild b/acct-group/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index 70f925a3cf58..000000000000
--- a/acct-group/unrealircd/unrealircd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=494
diff --git a/acct-group/unrealircd/unrealircd-0-r2.ebuild b/acct-group/unrealircd/unrealircd-0-r2.ebuild
new file mode 100644
index 000000000000..6e9905dda3ca
--- /dev/null
+++ b/acct-group/unrealircd/unrealircd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=494
diff --git a/acct-group/upmpdcli/upmpdcli-0-r1.ebuild b/acct-group/upmpdcli/upmpdcli-0-r1.ebuild
new file mode 100644
index 000000000000..ad99f3ce7935
--- /dev/null
+++ b/acct-group/upmpdcli/upmpdcli-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for upmpdcli"
+ACCT_GROUP_ID=372
diff --git a/acct-group/upmpdcli/upmpdcli-0.ebuild b/acct-group/upmpdcli/upmpdcli-0.ebuild
deleted file mode 100644
index 1b73dccb8d2f..000000000000
--- a/acct-group/upmpdcli/upmpdcli-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for upmpdcli"
-ACCT_GROUP_ID=372
diff --git a/acct-group/uptimed/uptimed-0-r2.ebuild b/acct-group/uptimed/uptimed-0-r2.ebuild
deleted file mode 100644
index 1934484e34a1..000000000000
--- a/acct-group/uptimed/uptimed-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="220"
diff --git a/acct-group/uptimed/uptimed-0-r3.ebuild b/acct-group/uptimed/uptimed-0-r3.ebuild
new file mode 100644
index 000000000000..9e862e5c5de5
--- /dev/null
+++ b/acct-group/uptimed/uptimed-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="220"
diff --git a/acct-group/usb/usb-0-r1.ebuild b/acct-group/usb/usb-0-r1.ebuild
deleted file mode 100644
index 4655512049db..000000000000
--- a/acct-group/usb/usb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=85
diff --git a/acct-group/usb/usb-0-r2.ebuild b/acct-group/usb/usb-0-r2.ebuild
new file mode 100644
index 000000000000..8f739063b3e6
--- /dev/null
+++ b/acct-group/usb/usb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=85
diff --git a/acct-group/users/users-0-r1.ebuild b/acct-group/users/users-0-r1.ebuild
new file mode 100644
index 000000000000..c0c91d1e11a8
--- /dev/null
+++ b/acct-group/users/users-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=100
diff --git a/acct-group/users/users-0.ebuild b/acct-group/users/users-0.ebuild
deleted file mode 100644
index 50b573c2629d..000000000000
--- a/acct-group/users/users-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=100
diff --git a/acct-group/ushare/ushare-0-r1.ebuild b/acct-group/ushare/ushare-0-r1.ebuild
new file mode 100644
index 000000000000..3cfb444c312f
--- /dev/null
+++ b/acct-group/ushare/ushare-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for uShare"
+ACCT_GROUP_ID=349
diff --git a/acct-group/ushare/ushare-0.ebuild b/acct-group/ushare/ushare-0.ebuild
deleted file mode 100644
index 43678d459806..000000000000
--- a/acct-group/ushare/ushare-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for uShare"
-ACCT_GROUP_ID=349
diff --git a/acct-group/utmp/utmp-0-r1.ebuild b/acct-group/utmp/utmp-0-r1.ebuild
deleted file mode 100644
index 24664616643a..000000000000
--- a/acct-group/utmp/utmp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=406
diff --git a/acct-group/utmp/utmp-0-r2.ebuild b/acct-group/utmp/utmp-0-r2.ebuild
new file mode 100644
index 000000000000..023d71c363c8
--- /dev/null
+++ b/acct-group/utmp/utmp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=406
diff --git a/acct-group/uucp/uucp-0-r1.ebuild b/acct-group/uucp/uucp-0-r1.ebuild
deleted file mode 100644
index e2e32b62e410..000000000000
--- a/acct-group/uucp/uucp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=14
diff --git a/acct-group/uucp/uucp-0-r2.ebuild b/acct-group/uucp/uucp-0-r2.ebuild
new file mode 100644
index 000000000000..4a2dba7d1e89
--- /dev/null
+++ b/acct-group/uucp/uucp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=14
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..2d2d1d5b3ec5
--- /dev/null
+++ b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/uwsgi_exporter"
+
+ACCT_GROUP_ID="289"
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
deleted file mode 100644
index 4c7c20d457ec..000000000000
--- a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/uwsgi_exporter"
-
-ACCT_GROUP_ID="289"
diff --git a/acct-group/vacation/vacation-0-r1.ebuild b/acct-group/vacation/vacation-0-r1.ebuild
new file mode 100644
index 000000000000..6214a9b58c91
--- /dev/null
+++ b/acct-group/vacation/vacation-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/postfixadmin"
+
+ACCT_GROUP_ID="125"
diff --git a/acct-group/vacation/vacation-0.ebuild b/acct-group/vacation/vacation-0.ebuild
deleted file mode 100644
index 94ef2caa53ed..000000000000
--- a/acct-group/vacation/vacation-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/postfixadmin"
-
-ACCT_GROUP_ID="125"
diff --git a/acct-group/varnish/varnish-0-r1.ebuild b/acct-group/varnish/varnish-0-r1.ebuild
deleted file mode 100644
index 9fbcc6472b4e..000000000000
--- a/acct-group/varnish/varnish-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for varnish"
-ACCT_GROUP_ID=474
diff --git a/acct-group/varnish/varnish-0-r2.ebuild b/acct-group/varnish/varnish-0-r2.ebuild
new file mode 100644
index 000000000000..78dafd64efae
--- /dev/null
+++ b/acct-group/varnish/varnish-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for varnish"
+ACCT_GROUP_ID=474
diff --git a/acct-group/vault/vault-0-r1.ebuild b/acct-group/vault/vault-0-r1.ebuild
deleted file mode 100644
index 518aa5cb3111..000000000000
--- a/acct-group/vault/vault-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=410
diff --git a/acct-group/vault/vault-0-r2.ebuild b/acct-group/vault/vault-0-r2.ebuild
new file mode 100644
index 000000000000..bd459568b12e
--- /dev/null
+++ b/acct-group/vault/vault-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=410
diff --git a/acct-group/vault_exporter/vault_exporter-0-r1.ebuild b/acct-group/vault_exporter/vault_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..75c5cf1352b1
--- /dev/null
+++ b/acct-group/vault_exporter/vault_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/vault_exporter"
+
+ACCT_GROUP_ID="323"
diff --git a/acct-group/vault_exporter/vault_exporter-0.ebuild b/acct-group/vault_exporter/vault_exporter-0.ebuild
deleted file mode 100644
index e808ce81aad1..000000000000
--- a/acct-group/vault_exporter/vault_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/vault_exporter"
-
-ACCT_GROUP_ID="323"
diff --git a/acct-group/vboxguest/vboxguest-0-r1.ebuild b/acct-group/vboxguest/vboxguest-0-r1.ebuild
deleted file mode 100644
index 8f7c117f5882..000000000000
--- a/acct-group/vboxguest/vboxguest-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=305
diff --git a/acct-group/vboxguest/vboxguest-0-r2.ebuild b/acct-group/vboxguest/vboxguest-0-r2.ebuild
new file mode 100644
index 000000000000..41282da59a0f
--- /dev/null
+++ b/acct-group/vboxguest/vboxguest-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=305
diff --git a/acct-group/vboxsf/vboxsf-0-r1.ebuild b/acct-group/vboxsf/vboxsf-0-r1.ebuild
deleted file mode 100644
index 6b6336afa19f..000000000000
--- a/acct-group/vboxsf/vboxsf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=306
diff --git a/acct-group/vboxsf/vboxsf-0-r2.ebuild b/acct-group/vboxsf/vboxsf-0-r2.ebuild
new file mode 100644
index 000000000000..2b8cd4dfef06
--- /dev/null
+++ b/acct-group/vboxsf/vboxsf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=306
diff --git a/acct-group/vboxusers/vboxusers-0-r1.ebuild b/acct-group/vboxusers/vboxusers-0-r1.ebuild
deleted file mode 100644
index ce349b0fcdf7..000000000000
--- a/acct-group/vboxusers/vboxusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=304
diff --git a/acct-group/vboxusers/vboxusers-0-r2.ebuild b/acct-group/vboxusers/vboxusers-0-r2.ebuild
new file mode 100644
index 000000000000..81e73edb6bba
--- /dev/null
+++ b/acct-group/vboxusers/vboxusers-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=304
diff --git a/acct-group/vdr/vdr-0-r1.ebuild b/acct-group/vdr/vdr-0-r1.ebuild
deleted file mode 100644
index b150a48a3abe..000000000000
--- a/acct-group/vdr/vdr-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
-
-ACCT_GROUP_ID="452"
diff --git a/acct-group/vdr/vdr-0-r2.ebuild b/acct-group/vdr/vdr-0-r2.ebuild
new file mode 100644
index 000000000000..edc442a09c5e
--- /dev/null
+++ b/acct-group/vdr/vdr-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
+
+ACCT_GROUP_ID="452"
diff --git a/acct-group/vdradmin/vdradmin-0-r1.ebuild b/acct-group/vdradmin/vdradmin-0-r1.ebuild
deleted file mode 100644
index 458e6b888862..000000000000
--- a/acct-group/vdradmin/vdradmin-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-misc/vdradmin-am"
-
-ACCT_GROUP_ID=453
diff --git a/acct-group/vdradmin/vdradmin-0-r2.ebuild b/acct-group/vdradmin/vdradmin-0-r2.ebuild
new file mode 100644
index 000000000000..88460ab332c4
--- /dev/null
+++ b/acct-group/vdradmin/vdradmin-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-misc/vdradmin-am"
+
+ACCT_GROUP_ID=453
diff --git a/acct-group/video/video-0-r1.ebuild b/acct-group/video/video-0-r1.ebuild
deleted file mode 100644
index 3b06b5be9d79..000000000000
--- a/acct-group/video/video-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=27
diff --git a/acct-group/video/video-0-r2.ebuild b/acct-group/video/video-0-r2.ebuild
new file mode 100644
index 000000000000..cbcaf294640b
--- /dev/null
+++ b/acct-group/video/video-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=27
diff --git a/acct-group/vlock/vlock-0-r1.ebuild b/acct-group/vlock/vlock-0-r1.ebuild
new file mode 100644
index 000000000000..086049300d62
--- /dev/null
+++ b/acct-group/vlock/vlock-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/vlock"
+
+ACCT_GROUP_ID="178"
diff --git a/acct-group/vlock/vlock-0.ebuild b/acct-group/vlock/vlock-0.ebuild
deleted file mode 100644
index 5f73550404af..000000000000
--- a/acct-group/vlock/vlock-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/vlock"
-
-ACCT_GROUP_ID="178"
diff --git a/acct-group/vnstat/vnstat-0-r1.ebuild b/acct-group/vnstat/vnstat-0-r1.ebuild
new file mode 100644
index 000000000000..d33a0de72d50
--- /dev/null
+++ b/acct-group/vnstat/vnstat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for vnstat network monitoring"
+ACCT_GROUP_ID=229
diff --git a/acct-group/vnstat/vnstat-0.ebuild b/acct-group/vnstat/vnstat-0.ebuild
deleted file mode 100644
index 9eba86cbc629..000000000000
--- a/acct-group/vnstat/vnstat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for vnstat network monitoring"
-ACCT_GROUP_ID=229
diff --git a/acct-group/vpopmail/vpopmail-0-r1.ebuild b/acct-group/vpopmail/vpopmail-0-r1.ebuild
deleted file mode 100644
index 05fca0f655ee..000000000000
--- a/acct-group/vpopmail/vpopmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=89
diff --git a/acct-group/vpopmail/vpopmail-0-r2.ebuild b/acct-group/vpopmail/vpopmail-0-r2.ebuild
new file mode 100644
index 000000000000..970296853684
--- /dev/null
+++ b/acct-group/vpopmail/vpopmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=89
diff --git a/acct-group/wesnoth/wesnoth-0-r1.ebuild b/acct-group/wesnoth/wesnoth-0-r1.ebuild
deleted file mode 100644
index 434362fd312c..000000000000
--- a/acct-group/wesnoth/wesnoth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=419
diff --git a/acct-group/wesnoth/wesnoth-0-r2.ebuild b/acct-group/wesnoth/wesnoth-0-r2.ebuild
new file mode 100644
index 000000000000..b5b457394987
--- /dev/null
+++ b/acct-group/wesnoth/wesnoth-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=419
diff --git a/acct-group/wheel/wheel-0-r1.ebuild b/acct-group/wheel/wheel-0-r1.ebuild
deleted file mode 100644
index 8f5f3e4f88b7..000000000000
--- a/acct-group/wheel/wheel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=10
diff --git a/acct-group/wheel/wheel-0-r2.ebuild b/acct-group/wheel/wheel-0-r2.ebuild
new file mode 100644
index 000000000000..b1925f5da53b
--- /dev/null
+++ b/acct-group/wheel/wheel-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=10
diff --git a/acct-group/wwwoffle/wwwoffle-0-r1.ebuild b/acct-group/wwwoffle/wwwoffle-0-r1.ebuild
new file mode 100644
index 000000000000..56285ff1380c
--- /dev/null
+++ b/acct-group/wwwoffle/wwwoffle-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/wwwoffle"
+
+ACCT_GROUP_ID="251"
diff --git a/acct-group/wwwoffle/wwwoffle-0.ebuild b/acct-group/wwwoffle/wwwoffle-0.ebuild
deleted file mode 100644
index 05d1c23d5ebb..000000000000
--- a/acct-group/wwwoffle/wwwoffle-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/wwwoffle"
-
-ACCT_GROUP_ID="251"
diff --git a/acct-group/x2goprint/x2goprint-0-r1.ebuild b/acct-group/x2goprint/x2goprint-0-r1.ebuild
deleted file mode 100644
index c81c3e3ac695..000000000000
--- a/acct-group/x2goprint/x2goprint-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=292
diff --git a/acct-group/x2goprint/x2goprint-0-r2.ebuild b/acct-group/x2goprint/x2goprint-0-r2.ebuild
new file mode 100644
index 000000000000..16275e07002d
--- /dev/null
+++ b/acct-group/x2goprint/x2goprint-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=292
diff --git a/acct-group/x2gouser/x2gouser-0-r1.ebuild b/acct-group/x2gouser/x2gouser-0-r1.ebuild
deleted file mode 100644
index 7e838501eee0..000000000000
--- a/acct-group/x2gouser/x2gouser-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=291
diff --git a/acct-group/x2gouser/x2gouser-0-r2.ebuild b/acct-group/x2gouser/x2gouser-0-r2.ebuild
new file mode 100644
index 000000000000..800125020e8b
--- /dev/null
+++ b/acct-group/x2gouser/x2gouser-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=291
diff --git a/acct-group/xpra/xpra-0-r1.ebuild b/acct-group/xpra/xpra-0-r1.ebuild
new file mode 100644
index 000000000000..0f163b260c1f
--- /dev/null
+++ b/acct-group/xpra/xpra-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for x11-wm/xpra"
+ACCT_GROUP_ID=462
diff --git a/acct-group/xpra/xpra-0.ebuild b/acct-group/xpra/xpra-0.ebuild
deleted file mode 100644
index 282cee0f5757..000000000000
--- a/acct-group/xpra/xpra-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for x11-wm/xpra"
-ACCT_GROUP_ID=462
diff --git a/acct-group/xrootd/xrootd-0-r1.ebuild b/acct-group/xrootd/xrootd-0-r1.ebuild
deleted file mode 100644
index 15cdbba956eb..000000000000
--- a/acct-group/xrootd/xrootd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the XRootD server"
-ACCT_GROUP_ID=469
diff --git a/acct-group/xrootd/xrootd-0-r2.ebuild b/acct-group/xrootd/xrootd-0-r2.ebuild
new file mode 100644
index 000000000000..37258ac9342c
--- /dev/null
+++ b/acct-group/xrootd/xrootd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the XRootD server"
+ACCT_GROUP_ID=469
diff --git a/acct-group/xwax/xwax-0-r1.ebuild b/acct-group/xwax/xwax-0-r1.ebuild
new file mode 100644
index 000000000000..9f208e62f068
--- /dev/null
+++ b/acct-group/xwax/xwax-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/xwax"
+
+ACCT_GROUP_ID="205"
diff --git a/acct-group/xwax/xwax-0.ebuild b/acct-group/xwax/xwax-0.ebuild
deleted file mode 100644
index fa5f01bc8577..000000000000
--- a/acct-group/xwax/xwax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/xwax"
-
-ACCT_GROUP_ID="205"
diff --git a/acct-group/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
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/zabbix-0-r1.ebuild b/acct-group/zabbix/zabbix-0-r1.ebuild
new file mode 100644
index 000000000000..0d2ced4b507b
--- /dev/null
+++ b/acct-group/zabbix/zabbix-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Zabbix"
+ACCT_GROUP_ID=329
diff --git a/acct-group/zabbix/zabbix-0.ebuild b/acct-group/zabbix/zabbix-0.ebuild
deleted file mode 100644
index 73561e628222..000000000000
--- a/acct-group/zabbix/zabbix-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Zabbix"
-ACCT_GROUP_ID=329
diff --git a/acct-group/zeppelin/zeppelin-0-r1.ebuild b/acct-group/zeppelin/zeppelin-0-r1.ebuild
deleted file mode 100644
index d65d1aed6485..000000000000
--- a/acct-group/zeppelin/zeppelin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
-ACCT_GROUP_ID=224
diff --git a/acct-group/zeppelin/zeppelin-0-r2.ebuild b/acct-group/zeppelin/zeppelin-0-r2.ebuild
new file mode 100644
index 000000000000..96d38d3b6e2b
--- /dev/null
+++ b/acct-group/zeppelin/zeppelin-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
+ACCT_GROUP_ID=224
diff --git a/acct-group/zetcd/zetcd-0-r1.ebuild b/acct-group/zetcd/zetcd-0-r1.ebuild
new file mode 100644
index 000000000000..7b5d55eac3bd
--- /dev/null
+++ b/acct-group/zetcd/zetcd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-cluster/zetcd"
+
+ACCT_GROUP_ID="253"
diff --git a/acct-group/zetcd/zetcd-0.ebuild b/acct-group/zetcd/zetcd-0.ebuild
deleted file mode 100644
index 1c35fc9add9a..000000000000
--- a/acct-group/zetcd/zetcd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-cluster/zetcd"
-
-ACCT_GROUP_ID="253"
diff --git a/acct-group/ziproxy/ziproxy-0-r1.ebuild b/acct-group/ziproxy/ziproxy-0-r1.ebuild
new file mode 100644
index 000000000000..c9060c781154
--- /dev/null
+++ b/acct-group/ziproxy/ziproxy-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=367
diff --git a/acct-group/ziproxy/ziproxy-0.ebuild b/acct-group/ziproxy/ziproxy-0.ebuild
deleted file mode 100644
index 2a615442577d..000000000000
--- a/acct-group/ziproxy/ziproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=367
diff --git a/acct-group/znc/znc-0-r1.ebuild b/acct-group/znc/znc-0-r1.ebuild
deleted file mode 100644
index 513803e86f5c..000000000000
--- a/acct-group/znc/znc-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/znc"
-ACCT_GROUP_ID=421
diff --git a/acct-group/znc/znc-0-r2.ebuild b/acct-group/znc/znc-0-r2.ebuild
new file mode 100644
index 000000000000..7475710c30af
--- /dev/null
+++ b/acct-group/znc/znc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/znc"
+ACCT_GROUP_ID=421
diff --git a/acct-group/zookeeper/zookeeper-0-r1.ebuild b/acct-group/zookeeper/zookeeper-0-r1.ebuild
new file mode 100644
index 000000000000..23e22ef66749
--- /dev/null
+++ b/acct-group/zookeeper/zookeeper-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/zookeeper-bin"
+
+ACCT_GROUP_ID="211"
diff --git a/acct-group/zookeeper/zookeeper-0.ebuild b/acct-group/zookeeper/zookeeper-0.ebuild
deleted file mode 100644
index c45af2d2d110..000000000000
--- a/acct-group/zookeeper/zookeeper-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-cluster/zookeeper-bin"
-
-ACCT_GROUP_ID="211"
diff --git a/acct-user/_cron-failure/_cron-failure-0-r1.ebuild b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..d521c8d59f17
--- /dev/null
+++ b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/systemd-cron failure emails"
+ACCT_USER_ID="520"
+ACCT_USER_GROUPS=( _cron-failure )
+
+acct-user_add_deps
diff --git a/acct-user/_cron-failure/_cron-failure-0.ebuild b/acct-user/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index bf25d6b1fc4d..000000000000
--- a/acct-user/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/systemd-cron failure emails"
-ACCT_USER_ID="520"
-ACCT_USER_GROUPS=( _cron-failure )
-
-acct-user_add_deps
diff --git a/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild b/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
new file mode 100644
index 000000000000..dd0e1d7b8aa0
--- /dev/null
+++ b/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/aerospike-amc-community"
+
+ACCT_USER_GROUPS=( "aerospike-amc" )
+ACCT_USER_ID="210"
+
+acct-user_add_deps
diff --git a/acct-user/aerospike-amc/aerospike-amc-0.ebuild b/acct-user/aerospike-amc/aerospike-amc-0.ebuild
deleted file mode 100644
index c73b7ab51d09..000000000000
--- a/acct-user/aerospike-amc/aerospike-amc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/aerospike-amc-community"
-
-ACCT_USER_GROUPS=( "aerospike-amc" )
-ACCT_USER_ID="210"
-
-acct-user_add_deps
diff --git a/acct-user/airdcppd/airdcppd-0-r1.ebuild b/acct-user/airdcppd/airdcppd-0-r1.ebuild
deleted file mode 100644
index 75df52a65b7d..000000000000
--- a/acct-user/airdcppd/airdcppd-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/airdcpp-webclient"
-ACCT_USER_ID=464
-ACCT_USER_GROUPS=( ${PN} )
-# Settings are stored in $HOME
-ACCT_USER_HOME=/var/lib/airdcppd
-# Grant write access to group members
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/airdcppd/airdcppd-0-r2.ebuild b/acct-user/airdcppd/airdcppd-0-r2.ebuild
new file mode 100644
index 000000000000..11aec89a5d06
--- /dev/null
+++ b/acct-user/airdcppd/airdcppd-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/airdcpp-webclient"
+ACCT_USER_ID=464
+ACCT_USER_GROUPS=( ${PN} )
+# Settings are stored in $HOME
+ACCT_USER_HOME=/var/lib/airdcppd
+# Grant write access to group members
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/alertmanager/alertmanager-0-r1.ebuild b/acct-user/alertmanager/alertmanager-0-r1.ebuild
new file mode 100644
index 000000000000..867ecaa994db
--- /dev/null
+++ b/acct-user/alertmanager/alertmanager-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for alertmanager"
+ACCT_USER_ID=294
+ACCT_USER_GROUPS=( alertmanager )
+
+acct-user_add_deps
diff --git a/acct-user/alertmanager/alertmanager-0.ebuild b/acct-user/alertmanager/alertmanager-0.ebuild
deleted file mode 100644
index 78028f69692f..000000000000
--- a/acct-user/alertmanager/alertmanager-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for alertmanager"
-ACCT_USER_ID=294
-ACCT_USER_GROUPS=( alertmanager )
-
-acct-user_add_deps
diff --git a/acct-user/alias/alias-0-r1.ebuild b/acct-user/alias/alias-0-r1.ebuild
deleted file mode 100644
index 9910f7b0ae6b..000000000000
--- a/acct-user/alias/alias-0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="alias user for qmail mail delivery"
-ACCT_USER_ID=200
-ACCT_USER_HOME=/var/qmail/alias
-ACCT_USER_HOME_OWNER=alias:qmail
-ACCT_USER_HOME_PERMS=02755
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/qmail "
-RDEPEND+=" acct-group/qmail "
diff --git a/acct-user/alias/alias-0-r2.ebuild b/acct-user/alias/alias-0-r2.ebuild
new file mode 100644
index 000000000000..e02890f71c60
--- /dev/null
+++ b/acct-user/alias/alias-0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="alias user for qmail mail delivery"
+ACCT_USER_ID=200
+ACCT_USER_HOME=/var/qmail/alias
+ACCT_USER_HOME_OWNER=alias:qmail
+ACCT_USER_HOME_PERMS=02755
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/qmail "
+RDEPEND+=" acct-group/qmail "
diff --git a/acct-user/amanda/amanda-0-r1.ebuild b/acct-user/amanda/amanda-0-r1.ebuild
new file mode 100644
index 000000000000..0bfd30545fc1
--- /dev/null
+++ b/acct-user/amanda/amanda-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=362
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/var/spool/amanda
+
+acct-user_add_deps
diff --git a/acct-user/amanda/amanda-0.ebuild b/acct-user/amanda/amanda-0.ebuild
deleted file mode 100644
index 18c4485c8eba..000000000000
--- a/acct-user/amanda/amanda-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=362
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/var/spool/amanda
-
-acct-user_add_deps
diff --git a/acct-user/amavis/amavis-0-r1.ebuild b/acct-user/amavis/amavis-0-r1.ebuild
deleted file mode 100644
index 7fb7c66fadeb..000000000000
--- a/acct-user/amavis/amavis-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=333
-ACCT_USER_GROUPS=( amavis )
-ACCT_USER_HOME=/var/lib/amavishome
-DESCRIPTION="User for mail-filter/amavisd-new"
-
-acct-user_add_deps
diff --git a/acct-user/amavis/amavis-0-r2.ebuild b/acct-user/amavis/amavis-0-r2.ebuild
new file mode 100644
index 000000000000..cea1b1964c03
--- /dev/null
+++ b/acct-user/amavis/amavis-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=333
+ACCT_USER_GROUPS=( amavis )
+ACCT_USER_HOME=/var/lib/amavishome
+DESCRIPTION="User for mail-filter/amavisd-new"
+
+acct-user_add_deps
diff --git a/acct-user/amule/amule-0-r2.ebuild b/acct-user/amule/amule-0-r2.ebuild
deleted file mode 100644
index 545f68eb371a..000000000000
--- a/acct-user/amule/amule-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/amule"
-
-ACCT_USER_GROUPS=( "amule" )
-ACCT_USER_HOME="/var/lib/amule"
-ACCT_USER_ID="468"
-
-acct-user_add_deps
diff --git a/acct-user/amule/amule-0-r3.ebuild b/acct-user/amule/amule-0-r3.ebuild
new file mode 100644
index 000000000000..68f824126c23
--- /dev/null
+++ b/acct-user/amule/amule-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/amule"
+
+ACCT_USER_GROUPS=( "amule" )
+ACCT_USER_HOME="/var/lib/amule"
+ACCT_USER_ID="468"
+
+acct-user_add_deps
diff --git a/acct-user/anope/anope-0-r1.ebuild b/acct-user/anope/anope-0-r1.ebuild
deleted file mode 100644
index e2080507f913..000000000000
--- a/acct-user/anope/anope-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for Anope IRC services"
-ACCT_USER_ID=417
-ACCT_USER_GROUPS=( anope )
-
-acct-user_add_deps
diff --git a/acct-user/anope/anope-0-r2.ebuild b/acct-user/anope/anope-0-r2.ebuild
new file mode 100644
index 000000000000..1af9d55b98f6
--- /dev/null
+++ b/acct-user/anope/anope-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for Anope IRC services"
+ACCT_USER_ID=417
+ACCT_USER_GROUPS=( anope )
+
+acct-user_add_deps
diff --git a/acct-user/apache/apache-0-r2.ebuild b/acct-user/apache/apache-0-r2.ebuild
deleted file mode 100644
index 47626ba98bd7..000000000000
--- a/acct-user/apache/apache-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID="81"
-ACCT_USER_GROUPS=( "apache" )
-ACCT_USER_HOME="/var/www"
-
-acct-user_add_deps
diff --git a/acct-user/apache/apache-0-r3.ebuild b/acct-user/apache/apache-0-r3.ebuild
new file mode 100644
index 000000000000..1d0b8a4e54b9
--- /dev/null
+++ b/acct-user/apache/apache-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="81"
+ACCT_USER_GROUPS=( "apache" )
+ACCT_USER_HOME="/var/www"
+
+acct-user_add_deps
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
new file mode 100644
index 000000000000..5ff5cdddbc60
--- /dev/null
+++ b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for apt-cacher-ng"
+ACCT_USER_ID=319
+ACCT_USER_GROUPS=( apt-cacher-ng )
+
+acct-user_add_deps
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild
deleted file mode 100644
index b51ca6c88ad3..000000000000
--- a/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for apt-cacher-ng"
-ACCT_USER_ID=319
-ACCT_USER_GROUPS=( apt-cacher-ng )
-
-acct-user_add_deps
diff --git a/acct-user/argus/argus-0-r1.ebuild b/acct-user/argus/argus-0-r1.ebuild
new file mode 100644
index 000000000000..52b0c4b0a391
--- /dev/null
+++ b/acct-user/argus/argus-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/argus"
+ACCT_USER_ID=383
+ACCT_USER_HOME=/var/lib/argus
+ACCT_USER_GROUPS=( argus )
+
+acct-user_add_deps
diff --git a/acct-user/argus/argus-0.ebuild b/acct-user/argus/argus-0.ebuild
deleted file mode 100644
index dc0f6e2dffb1..000000000000
--- a/acct-user/argus/argus-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/argus"
-ACCT_USER_ID=383
-ACCT_USER_HOME=/var/lib/argus
-ACCT_USER_GROUPS=( argus )
-
-acct-user_add_deps
diff --git a/acct-user/arpwatch/arpwatch-0-r1.ebuild b/acct-user/arpwatch/arpwatch-0-r1.ebuild
new file mode 100644
index 000000000000..e85389c061ea
--- /dev/null
+++ b/acct-user/arpwatch/arpwatch-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/arpwatch"
+
+ACCT_USER_GROUPS=( "arpwatch" )
+ACCT_USER_ID="170"
+
+acct-user_add_deps
diff --git a/acct-user/arpwatch/arpwatch-0.ebuild b/acct-user/arpwatch/arpwatch-0.ebuild
deleted file mode 100644
index 24f4e8b490e2..000000000000
--- a/acct-user/arpwatch/arpwatch-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/arpwatch"
-
-ACCT_USER_GROUPS=( "arpwatch" )
-ACCT_USER_ID="170"
-
-acct-user_add_deps
diff --git a/acct-user/artifactory/artifactory-0-r1.ebuild b/acct-user/artifactory/artifactory-0-r1.ebuild
new file mode 100644
index 000000000000..22ebc4531a7a
--- /dev/null
+++ b/acct-user/artifactory/artifactory-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for dev-util/artifactory-bin"
+
+ACCT_USER_GROUPS=( "artifactory" )
+ACCT_USER_ID="264"
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
diff --git a/acct-user/artifactory/artifactory-0.ebuild b/acct-user/artifactory/artifactory-0.ebuild
deleted file mode 100644
index f1132d14b63c..000000000000
--- a/acct-user/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-util/artifactory-bin"
-
-ACCT_USER_GROUPS=( "artifactory" )
-ACCT_USER_ID="264"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/aspnet/aspnet-0-r1.ebuild b/acct-user/aspnet/aspnet-0-r1.ebuild
new file mode 100644
index 000000000000..051c267d59f8
--- /dev/null
+++ b/acct-user/aspnet/aspnet-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the www-servers/xsp dotnet server"
+
+ACCT_USER_ID=216
+ACCT_USER_GROUPS=( aspnet )
+
+acct-user_add_deps
diff --git a/acct-user/aspnet/aspnet-0.ebuild b/acct-user/aspnet/aspnet-0.ebuild
deleted file mode 100644
index 8dec86be7001..000000000000
--- a/acct-user/aspnet/aspnet-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the www-servers/xsp dotnet server"
-
-ACCT_USER_ID=216
-ACCT_USER_GROUPS=( aspnet )
-
-acct-user_add_deps
diff --git a/acct-user/asterisk/asterisk-0-r1.ebuild b/acct-user/asterisk/asterisk-0-r1.ebuild
deleted file mode 100644
index 30e23737ef8f..000000000000
--- a/acct-user/asterisk/asterisk-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for asterisk"
-ACCT_USER_ID=242
-ACCT_USER_GROUPS=( asterisk dialout )
-
-acct-user_add_deps
diff --git a/acct-user/asterisk/asterisk-0-r2.ebuild b/acct-user/asterisk/asterisk-0-r2.ebuild
new file mode 100644
index 000000000000..03d2d8b69fe0
--- /dev/null
+++ b/acct-user/asterisk/asterisk-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for asterisk"
+ACCT_USER_ID=242
+ACCT_USER_GROUPS=( asterisk dialout )
+
+acct-user_add_deps
diff --git a/acct-user/at/at-0-r1.ebuild b/acct-user/at/at-0-r1.ebuild
new file mode 100644
index 000000000000..4ab9f746daa6
--- /dev/null
+++ b/acct-user/at/at-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for at daemon"
+ACCT_USER_ID=246
+ACCT_USER_GROUPS=( at )
+
+acct-user_add_deps
diff --git a/acct-user/at/at-0.ebuild b/acct-user/at/at-0.ebuild
deleted file mode 100644
index 74ef92246e38..000000000000
--- a/acct-user/at/at-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for at daemon"
-ACCT_USER_ID=246
-ACCT_USER_GROUPS=( at )
-
-acct-user_add_deps
diff --git a/acct-user/atheme-services/atheme-services-0-r1.ebuild b/acct-user/atheme-services/atheme-services-0-r1.ebuild
deleted file mode 100644
index ada83054fdae..000000000000
--- a/acct-user/atheme-services/atheme-services-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Atheme IRC services"
-ACCT_USER_ID=412
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/atheme-services/atheme-services-0-r2.ebuild b/acct-user/atheme-services/atheme-services-0-r2.ebuild
new file mode 100644
index 000000000000..ced19e695ddd
--- /dev/null
+++ b/acct-user/atheme-services/atheme-services-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Atheme IRC services"
+ACCT_USER_ID=412
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/automatic/automatic-0.ebuild b/acct-user/automatic/automatic-0-r1.ebuild
index 8972c4583c61..8972c4583c61 100644
--- a/acct-user/automatic/automatic-0.ebuild
+++ b/acct-user/automatic/automatic-0-r1.ebuild
diff --git a/acct-user/automx2/automx2-0-r1.ebuild b/acct-user/automx2/automx2-0-r1.ebuild
deleted file mode 100644
index c4effe2e71e2..000000000000
--- a/acct-user/automx2/automx2-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/automx2"
-
-ACCT_USER_ID=437
-ACCT_USER_GROUPS=( automx2 )
-ACCT_USER_HOME="/var/lib/automx2"
-
-acct-user_add_deps
diff --git a/acct-user/automx2/automx2-0-r2.ebuild b/acct-user/automx2/automx2-0-r2.ebuild
new file mode 100644
index 000000000000..c35accc7997d
--- /dev/null
+++ b/acct-user/automx2/automx2-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/automx2"
+
+ACCT_USER_ID=437
+ACCT_USER_GROUPS=( automx2 )
+ACCT_USER_HOME="/var/lib/automx2"
+
+acct-user_add_deps
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild
deleted file mode 100644
index e932d8b44c26..000000000000
--- a/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for avahi-autoipd"
-ACCT_USER_ID=62
-ACCT_USER_GROUPS=( avahi-autoipd )
-
-acct-user_add_deps
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
new file mode 100644
index 000000000000..871a5fe4d3c5
--- /dev/null
+++ b/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi-autoipd"
+ACCT_USER_ID=62
+ACCT_USER_GROUPS=( avahi-autoipd )
+
+acct-user_add_deps
diff --git a/acct-user/avahi/avahi-0-r1.ebuild b/acct-user/avahi/avahi-0-r1.ebuild
deleted file mode 100644
index 60dcf3053d7c..000000000000
--- a/acct-user/avahi/avahi-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for avahi"
-ACCT_USER_ID=61
-ACCT_USER_GROUPS=( avahi )
-
-acct-user_add_deps
diff --git a/acct-user/avahi/avahi-0-r2.ebuild b/acct-user/avahi/avahi-0-r2.ebuild
new file mode 100644
index 000000000000..0db7ea604121
--- /dev/null
+++ b/acct-user/avahi/avahi-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi"
+ACCT_USER_ID=61
+ACCT_USER_GROUPS=( avahi )
+
+acct-user_add_deps
diff --git a/acct-user/axtls/axtls-0-r1.ebuild b/acct-user/axtls/axtls-0-r1.ebuild
new file mode 100644
index 000000000000..9dc12cc02cf7
--- /dev/null
+++ b/acct-user/axtls/axtls-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-libs/axtls"
+
+ACCT_USER_GROUPS=( "axtls" )
+ACCT_USER_ID="147"
+
+acct-user_add_deps
diff --git a/acct-user/axtls/axtls-0.ebuild b/acct-user/axtls/axtls-0.ebuild
deleted file mode 100644
index b85720579f78..000000000000
--- a/acct-user/axtls/axtls-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-libs/axtls"
-
-ACCT_USER_GROUPS=( "axtls" )
-ACCT_USER_ID="147"
-
-acct-user_add_deps
diff --git a/acct-user/backuppc/backuppc-0-r1.ebuild b/acct-user/backuppc/backuppc-0-r1.ebuild
new file mode 100644
index 000000000000..f5b1713025df
--- /dev/null
+++ b/acct-user/backuppc/backuppc-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-backup/backuppc"
+
+ACCT_USER_GROUPS=( "backuppc" )
+ACCT_USER_HOME="/var/lib/backuppc"
+ACCT_USER_ID="282"
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/backuppc/backuppc-0.ebuild b/acct-user/backuppc/backuppc-0.ebuild
deleted file mode 100644
index 3b5a50c9c7a9..000000000000
--- a/acct-user/backuppc/backuppc-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-backup/backuppc"
-
-ACCT_USER_GROUPS=( "backuppc" )
-ACCT_USER_HOME="/var/lib/backuppc"
-ACCT_USER_ID="282"
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/bacula/bacula-0-r1.ebuild b/acct-user/bacula/bacula-0-r1.ebuild
deleted file mode 100644
index 4c2114bfcaf0..000000000000
--- a/acct-user/bacula/bacula-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A group for the bacula backup system"
-ACCT_USER_ID=273
-ACCT_USER_HOME=/var/lib/bacula
-ACCT_USER_GROUPS=( bacula disk tape cdrom )
-
-acct-user_add_deps
diff --git a/acct-user/bacula/bacula-0-r2.ebuild b/acct-user/bacula/bacula-0-r2.ebuild
new file mode 100644
index 000000000000..4158074868d5
--- /dev/null
+++ b/acct-user/bacula/bacula-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A group for the bacula backup system"
+ACCT_USER_ID=273
+ACCT_USER_HOME=/var/lib/bacula
+ACCT_USER_GROUPS=( bacula disk tape cdrom )
+
+acct-user_add_deps
diff --git a/acct-user/bareos/bareos-0-r1.ebuild b/acct-user/bareos/bareos-0-r1.ebuild
deleted file mode 100644
index a382943a3403..000000000000
--- a/acct-user/bareos/bareos-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the bareos network backup suite"
-ACCT_USER_ID=403
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_GROUPS=( ${PN} disk tape cdrom )
-
-acct-user_add_deps
diff --git a/acct-user/bareos/bareos-0-r2.ebuild b/acct-user/bareos/bareos-0-r2.ebuild
new file mode 100644
index 000000000000..d466e8c22273
--- /dev/null
+++ b/acct-user/bareos/bareos-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the bareos network backup suite"
+ACCT_USER_ID=403
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_GROUPS=( ${PN} disk tape cdrom )
+
+acct-user_add_deps
diff --git a/acct-user/beanstalk/beanstalk-0-r1.ebuild b/acct-user/beanstalk/beanstalk-0-r1.ebuild
new file mode 100644
index 000000000000..9aa2f7e50a26
--- /dev/null
+++ b/acct-user/beanstalk/beanstalk-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/beanstalkd"
+
+ACCT_USER_GROUPS=( "beanstalk" )
+ACCT_USER_HOME="/var/lib/beanstalkd"
+ACCT_USER_ID="137"
+
+acct-user_add_deps
diff --git a/acct-user/beanstalk/beanstalk-0.ebuild b/acct-user/beanstalk/beanstalk-0.ebuild
deleted file mode 100644
index a17083ef609d..000000000000
--- a/acct-user/beanstalk/beanstalk-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/beanstalkd"
-
-ACCT_USER_GROUPS=( "beanstalk" )
-ACCT_USER_HOME="/var/lib/beanstalkd"
-ACCT_USER_ID="137"
-
-acct-user_add_deps
diff --git a/acct-user/bedrock/bedrock-0-r1.ebuild b/acct-user/bedrock/bedrock-0-r1.ebuild
deleted file mode 100644
index 454126f27b07..000000000000
--- a/acct-user/bedrock/bedrock-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minecraft Bedrock server"
-
-ACCT_USER_GROUPS=( "bedrock" )
-ACCT_USER_ID="485"
-
-acct-user_add_deps
diff --git a/acct-user/bedrock/bedrock-0-r2.ebuild b/acct-user/bedrock/bedrock-0-r2.ebuild
new file mode 100644
index 000000000000..a96d60d2e1d0
--- /dev/null
+++ b/acct-user/bedrock/bedrock-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft Bedrock server"
+
+ACCT_USER_GROUPS=( "bedrock" )
+ACCT_USER_ID="485"
+
+acct-user_add_deps
diff --git a/acct-user/biboumi/biboumi-0-r1.ebuild b/acct-user/biboumi/biboumi-0-r1.ebuild
new file mode 100644
index 000000000000..3d9df0b62339
--- /dev/null
+++ b/acct-user/biboumi/biboumi-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/biboumi"
+ACCT_USER_ID=508
+ACCT_USER_GROUPS=( biboumi )
+
+acct-user_add_deps
diff --git a/acct-user/biboumi/biboumi-0.ebuild b/acct-user/biboumi/biboumi-0.ebuild
deleted file mode 100644
index 8cd114a9a893..000000000000
--- a/acct-user/biboumi/biboumi-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/biboumi"
-ACCT_USER_ID=508
-ACCT_USER_GROUPS=( biboumi )
-
-acct-user_add_deps
diff --git a/acct-user/bind_exporter/bind_exporter-0-r1.ebuild b/acct-user/bind_exporter/bind_exporter-0-r1.ebuild
deleted file mode 100644
index c1e86aa002ff..000000000000
--- a/acct-user/bind_exporter/bind_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for bind_exporter"
-ACCT_USER_ID=276
-ACCT_USER_GROUPS=( bind_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/bind_exporter/bind_exporter-0-r2.ebuild b/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..bfb761c4b06a
--- /dev/null
+++ b/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for bind_exporter"
+ACCT_USER_ID=276
+ACCT_USER_GROUPS=( bind_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/bird/bird-0-r1.ebuild b/acct-user/bird/bird-0-r1.ebuild
new file mode 100644
index 000000000000..fd0539f6f221
--- /dev/null
+++ b/acct-user/bird/bird-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for BIRD"
+# TCP port 179, but 179 is already used by acct-group/_bgpd
+ACCT_USER_ID=180
+ACCT_USER_GROUPS=( bird )
+
+acct-user_add_deps
diff --git a/acct-user/bird/bird-0.ebuild b/acct-user/bird/bird-0.ebuild
deleted file mode 100644
index 177b8ca80b68..000000000000
--- a/acct-user/bird/bird-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for BIRD"
-# TCP port 179, but 179 is already used by acct-group/_bgpd
-ACCT_USER_ID=180
-ACCT_USER_GROUPS=( bird )
-
-acct-user_add_deps
diff --git a/acct-user/bitcoin/bitcoin-0-r1.ebuild b/acct-user/bitcoin/bitcoin-0-r1.ebuild
deleted file mode 100644
index 1a0d89f8c698..000000000000
--- a/acct-user/bitcoin/bitcoin-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="System-wide Bitcoin services user"
-ACCT_USER_ID=483
-ACCT_USER_GROUPS=( bitcoin )
-
-acct-user_add_deps
diff --git a/acct-user/bitcoin/bitcoin-0-r2.ebuild b/acct-user/bitcoin/bitcoin-0-r2.ebuild
new file mode 100644
index 000000000000..b19975c4a120
--- /dev/null
+++ b/acct-user/bitcoin/bitcoin-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="System-wide Bitcoin services user"
+ACCT_USER_ID=483
+ACCT_USER_GROUPS=( bitcoin )
+
+acct-user_add_deps
diff --git a/acct-user/bitflu/bitflu-0-r1.ebuild b/acct-user/bitflu/bitflu-0-r1.ebuild
new file mode 100644
index 000000000000..239af8cbb540
--- /dev/null
+++ b/acct-user/bitflu/bitflu-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-p2p/bitflu"
+
+ACCT_USER_GROUPS=( "bitflu" )
+ACCT_USER_HOME="/var/lib/bitflu"
+ACCT_USER_ID="148"
+
+acct-user_add_deps
diff --git a/acct-user/bitflu/bitflu-0.ebuild b/acct-user/bitflu/bitflu-0.ebuild
deleted file mode 100644
index 11ea87038ad9..000000000000
--- a/acct-user/bitflu/bitflu-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-p2p/bitflu"
-
-ACCT_USER_GROUPS=( "bitflu" )
-ACCT_USER_HOME="/var/lib/bitflu"
-ACCT_USER_ID="148"
-
-acct-user_add_deps
diff --git a/acct-user/bitlbee/bitlbee-0-r1.ebuild b/acct-user/bitlbee/bitlbee-0-r1.ebuild
deleted file mode 100644
index 31daee37ce52..000000000000
--- a/acct-user/bitlbee/bitlbee-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for biltbee"
-ACCT_USER_ID=407
-ACCT_USER_GROUPS=( bitlbee )
-
-acct-user_add_deps
diff --git a/acct-user/bitlbee/bitlbee-0-r2.ebuild b/acct-user/bitlbee/bitlbee-0-r2.ebuild
new file mode 100644
index 000000000000..7a1497cec9eb
--- /dev/null
+++ b/acct-user/bitlbee/bitlbee-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for biltbee"
+ACCT_USER_ID=407
+ACCT_USER_GROUPS=( bitlbee )
+
+acct-user_add_deps
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..c4ac2c198c67
--- /dev/null
+++ b/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for blackbox_exporter"
+ACCT_USER_ID=293
+ACCT_USER_GROUPS=( blackbox_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild
deleted file mode 100644
index ca262a5dade3..000000000000
--- a/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for blackbox_exporter"
-ACCT_USER_ID=293
-ACCT_USER_GROUPS=( blackbox_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/boinc/boinc-0-r1.ebuild b/acct-user/boinc/boinc-0-r1.ebuild
new file mode 100644
index 000000000000..5ed25f7d5ffd
--- /dev/null
+++ b/acct-user/boinc/boinc-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for sci-misc/boinc"
+ACCT_USER_ID=352
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( boinc video )
+
+acct-user_add_deps
diff --git a/acct-user/boinc/boinc-0.ebuild b/acct-user/boinc/boinc-0.ebuild
deleted file mode 100644
index c96379bc4fbf..000000000000
--- a/acct-user/boinc/boinc-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for sci-misc/boinc"
-ACCT_USER_ID=352
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( boinc video )
-
-acct-user_add_deps
diff --git a/acct-user/brltty/brltty-0-r1.ebuild b/acct-user/brltty/brltty-0-r1.ebuild
new file mode 100644
index 000000000000..5ec59c18540d
--- /dev/null
+++ b/acct-user/brltty/brltty-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for brltty"
+ACCT_USER_ID=506
+ACCT_USER_HOME=/var/lib/brltty
+ACCT_USER_GROUPS=( brltty audio brlapi dialout input pulse-access root tty )
+
+acct-user_add_deps
diff --git a/acct-user/brltty/brltty-0.ebuild b/acct-user/brltty/brltty-0.ebuild
deleted file mode 100644
index 69bff2c3c0ee..000000000000
--- a/acct-user/brltty/brltty-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for brltty"
-ACCT_USER_ID=506
-ACCT_USER_HOME=/var/lib/brltty
-ACCT_USER_GROUPS=( brltty audio brlapi dialout input pulse-access root tty )
-
-acct-user_add_deps
diff --git a/acct-user/buildbot/buildbot-0-r1.ebuild b/acct-user/buildbot/buildbot-0-r1.ebuild
deleted file mode 100644
index f0570fc26f0b..000000000000
--- a/acct-user/buildbot/buildbot-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Buildbot program user"
-ACCT_USER_ID=393
-ACCT_USER_GROUPS=( buildbot )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/buildbot/buildbot-0-r2.ebuild b/acct-user/buildbot/buildbot-0-r2.ebuild
new file mode 100644
index 000000000000..3ecc7b0a3f19
--- /dev/null
+++ b/acct-user/buildbot/buildbot-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Buildbot program user"
+ACCT_USER_ID=393
+ACCT_USER_GROUPS=( buildbot )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/burp/burp-0-r1.ebuild b/acct-user/burp/burp-0-r1.ebuild
deleted file mode 100644
index 646ad79a442c..000000000000
--- a/acct-user/burp/burp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the app-backup/burp server"
-ACCT_USER_ID=498
-ACCT_USER_GROUPS=( burp )
-
-acct-user_add_deps
diff --git a/acct-user/burp/burp-0-r2.ebuild b/acct-user/burp/burp-0-r2.ebuild
new file mode 100644
index 000000000000..e39e2f77d21a
--- /dev/null
+++ b/acct-user/burp/burp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the app-backup/burp server"
+ACCT_USER_ID=498
+ACCT_USER_GROUPS=( burp )
+
+acct-user_add_deps
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
deleted file mode 100644
index 2985c39db4ca..000000000000
--- a/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/burrow_exporter"
-
-ACCT_USER_ID=502
-ACCT_USER_GROUPS=( burrow_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ef0c97a228f5
--- /dev/null
+++ b/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/burrow_exporter"
+
+ACCT_USER_ID=502
+ACCT_USER_GROUPS=( burrow_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/cadvisor/cadvisor-0-r1.ebuild b/acct-user/cadvisor/cadvisor-0-r1.ebuild
deleted file mode 100644
index a464a6029a1c..000000000000
--- a/acct-user/cadvisor/cadvisor-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for cadvisor"
-ACCT_USER_ID=427
-ACCT_USER_GROUPS=( cadvisor )
-
-acct-user_add_deps
diff --git a/acct-user/cadvisor/cadvisor-0-r2.ebuild b/acct-user/cadvisor/cadvisor-0-r2.ebuild
new file mode 100644
index 000000000000..e4fbf56e0e6c
--- /dev/null
+++ b/acct-user/cadvisor/cadvisor-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for cadvisor"
+ACCT_USER_ID=427
+ACCT_USER_GROUPS=( cadvisor )
+
+acct-user_add_deps
diff --git a/acct-user/cancd/cancd-0-r1.ebuild b/acct-user/cancd/cancd-0-r1.ebuild
deleted file mode 100644
index 41284202bbcb..000000000000
--- a/acct-user/cancd/cancd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the CA NetConsole Daemon"
-
-ACCT_USER_GROUPS=( "cancd" )
-ACCT_USER_ID="213"
-
-acct-user_add_deps
diff --git a/acct-user/cancd/cancd-0-r2.ebuild b/acct-user/cancd/cancd-0-r2.ebuild
new file mode 100644
index 000000000000..d5f370bd4a36
--- /dev/null
+++ b/acct-user/cancd/cancd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the CA NetConsole Daemon"
+
+ACCT_USER_GROUPS=( "cancd" )
+ACCT_USER_ID="213"
+
+acct-user_add_deps
diff --git a/acct-user/carbon/carbon-0-r1.ebuild b/acct-user/carbon/carbon-0-r1.ebuild
deleted file mode 100644
index ba8999d6020d..000000000000
--- a/acct-user/carbon/carbon-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for graphite/carbon suite"
-ACCT_USER_ID=230
-ACCT_USER_GROUPS=( carbon )
-
-acct-user_add_deps
diff --git a/acct-user/carbon/carbon-0-r2.ebuild b/acct-user/carbon/carbon-0-r2.ebuild
new file mode 100644
index 000000000000..c7145d21b9ab
--- /dev/null
+++ b/acct-user/carbon/carbon-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for graphite/carbon suite"
+ACCT_USER_ID=230
+ACCT_USER_GROUPS=( carbon )
+
+acct-user_add_deps
diff --git a/acct-user/ceph/ceph-0-r1.ebuild b/acct-user/ceph/ceph-0-r2.ebuild
index 56098366e894..56098366e894 100644
--- a/acct-user/ceph/ceph-0-r1.ebuild
+++ b/acct-user/ceph/ceph-0-r2.ebuild
diff --git a/acct-user/cgit/cgit-0-r1.ebuild b/acct-user/cgit/cgit-0-r1.ebuild
new file mode 100644
index 000000000000..24d621614f49
--- /dev/null
+++ b/acct-user/cgit/cgit-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="a fast web-interface for git repositories"
+
+ACCT_USER_ID=197
+ACCT_USER_GROUPS=( cgit )
+
+acct-user_add_deps
diff --git a/acct-user/cgit/cgit-0.ebuild b/acct-user/cgit/cgit-0.ebuild
deleted file mode 100644
index 5f8c9f85490a..000000000000
--- a/acct-user/cgit/cgit-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="a fast web-interface for git repositories"
-
-ACCT_USER_ID=197
-ACCT_USER_GROUPS=( cgit )
-
-acct-user_add_deps
diff --git a/acct-user/chronograf/chronograf-0-r1.ebuild b/acct-user/chronograf/chronograf-0-r1.ebuild
deleted file mode 100644
index b441506a5d5a..000000000000
--- a/acct-user/chronograf/chronograf-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for chronograf"
-ACCT_USER_ID=344
-ACCT_USER_GROUPS=( chronograf )
-ACCT_USER_HOME=/var/lib/chronograf
-
-acct-user_add_deps
diff --git a/acct-user/chronograf/chronograf-0-r2.ebuild b/acct-user/chronograf/chronograf-0-r2.ebuild
new file mode 100644
index 000000000000..825dece24629
--- /dev/null
+++ b/acct-user/chronograf/chronograf-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for chronograf"
+ACCT_USER_ID=344
+ACCT_USER_GROUPS=( chronograf )
+ACCT_USER_HOME=/var/lib/chronograf
+
+acct-user_add_deps
diff --git a/acct-user/cinder/cinder-0-r1.ebuild b/acct-user/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index 3576a06cec02..000000000000
--- a/acct-user/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack cinder service"
-ACCT_USER_ID=442
-ACCT_USER_HOME=/var/lib/cinder
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( cinder )
-
-acct-user_add_deps
diff --git a/acct-user/cinder/cinder-0-r2.ebuild b/acct-user/cinder/cinder-0-r2.ebuild
new file mode 100644
index 000000000000..ef4ee18dbf85
--- /dev/null
+++ b/acct-user/cinder/cinder-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack cinder service"
+ACCT_USER_ID=442
+ACCT_USER_HOME=/var/lib/cinder
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( cinder )
+
+acct-user_add_deps
diff --git a/acct-user/clair/clair-0-r1.ebuild b/acct-user/clair/clair-0-r1.ebuild
deleted file mode 100644
index c8af2edf912f..000000000000
--- a/acct-user/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for clair"
-ACCT_USER_ID=307
-ACCT_USER_GROUPS=( clair )
-
-acct-user_add_deps
diff --git a/acct-user/clair/clair-0-r2.ebuild b/acct-user/clair/clair-0-r2.ebuild
new file mode 100644
index 000000000000..20127fc6d174
--- /dev/null
+++ b/acct-user/clair/clair-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for clair"
+ACCT_USER_ID=307
+ACCT_USER_GROUPS=( clair )
+
+acct-user_add_deps
diff --git a/acct-user/clamav/clamav-0-r1.ebuild b/acct-user/clamav/clamav-0-r1.ebuild
deleted file mode 100644
index 98649dc699aa..000000000000
--- a/acct-user/clamav/clamav-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=435
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/clamav/clamav-0-r2.ebuild b/acct-user/clamav/clamav-0-r2.ebuild
new file mode 100644
index 000000000000..957eecb6b483
--- /dev/null
+++ b/acct-user/clamav/clamav-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=435
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/cntlm/cntlm-0-r1.ebuild b/acct-user/cntlm/cntlm-0-r1.ebuild
new file mode 100644
index 000000000000..938462f1b567
--- /dev/null
+++ b/acct-user/cntlm/cntlm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/cntlm"
+
+ACCT_USER_GROUPS=( "cntlm" )
+ACCT_USER_ID="255"
+
+acct-user_add_deps
diff --git a/acct-user/cntlm/cntlm-0.ebuild b/acct-user/cntlm/cntlm-0.ebuild
deleted file mode 100644
index 03ab9195b999..000000000000
--- a/acct-user/cntlm/cntlm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/cntlm"
-
-ACCT_USER_GROUPS=( "cntlm" )
-ACCT_USER_ID="255"
-
-acct-user_add_deps
diff --git a/acct-user/cockroach/cockroach-0-r1.ebuild b/acct-user/cockroach/cockroach-0-r1.ebuild
new file mode 100644
index 000000000000..5be8db3263c9
--- /dev/null
+++ b/acct-user/cockroach/cockroach-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/cockroach"
+
+ACCT_USER_ID=110
+ACCT_USER_GROUPS=( cockroach )
+ACCT_USER_HOME=/var/lib/cockroach
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/cockroach/cockroach-0.ebuild b/acct-user/cockroach/cockroach-0.ebuild
deleted file mode 100644
index 404244332221..000000000000
--- a/acct-user/cockroach/cockroach-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/cockroach"
-
-ACCT_USER_ID=110
-ACCT_USER_GROUPS=( cockroach )
-ACCT_USER_HOME=/var/lib/cockroach
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/collectd/collectd-0-r1.ebuild b/acct-user/collectd/collectd-0-r1.ebuild
new file mode 100644
index 000000000000..8ca7b28f5fa9
--- /dev/null
+++ b/acct-user/collectd/collectd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="collectd program user"
+
+ACCT_USER_ID=440
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/collectd/collectd-0.ebuild b/acct-user/collectd/collectd-0.ebuild
deleted file mode 100644
index f1af4a6b69b1..000000000000
--- a/acct-user/collectd/collectd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="collectd program user"
-
-ACCT_USER_ID=440
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/colord/colord-0-r1.ebuild b/acct-user/colord/colord-0-r1.ebuild
new file mode 100644
index 000000000000..7ad884c93ae1
--- /dev/null
+++ b/acct-user/colord/colord-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the colord service"
+ACCT_USER_ID=350
+ACCT_USER_GROUPS=( colord )
+ACCT_USER_HOME=/var/lib/colord
+
+acct-user_add_deps
diff --git a/acct-user/colord/colord-0.ebuild b/acct-user/colord/colord-0.ebuild
deleted file mode 100644
index e5387b5b0f7a..000000000000
--- a/acct-user/colord/colord-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the colord service"
-ACCT_USER_ID=350
-ACCT_USER_GROUPS=( colord )
-ACCT_USER_HOME=/var/lib/colord
-
-acct-user_add_deps
diff --git a/acct-user/consul-template/consul-template-0-r1.ebuild b/acct-user/consul-template/consul-template-0-r1.ebuild
deleted file mode 100644
index 9976bf6fafda..000000000000
--- a/acct-user/consul-template/consul-template-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for consul-template"
-ACCT_USER_ID=408
-ACCT_USER_GROUPS=( consul-template )
-
-acct-user_add_deps
diff --git a/acct-user/consul-template/consul-template-0-r2.ebuild b/acct-user/consul-template/consul-template-0-r2.ebuild
new file mode 100644
index 000000000000..52a1fcfde90a
--- /dev/null
+++ b/acct-user/consul-template/consul-template-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for consul-template"
+ACCT_USER_ID=408
+ACCT_USER_GROUPS=( consul-template )
+
+acct-user_add_deps
diff --git a/acct-user/consul/consul-0-r1.ebuild b/acct-user/consul/consul-0-r1.ebuild
deleted file mode 100644
index 49c0d5a31b06..000000000000
--- a/acct-user/consul/consul-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for consul"
-ACCT_USER_HOME=/var/lib/consul
-ACCT_USER_ID=411
-ACCT_USER_GROUPS=( consul )
-
-acct-user_add_deps
diff --git a/acct-user/consul/consul-0-r2.ebuild b/acct-user/consul/consul-0-r2.ebuild
new file mode 100644
index 000000000000..8cf68af0bd7c
--- /dev/null
+++ b/acct-user/consul/consul-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for consul"
+ACCT_USER_HOME=/var/lib/consul
+ACCT_USER_ID=411
+ACCT_USER_GROUPS=( consul )
+
+acct-user_add_deps
diff --git a/acct-user/consul_exporter/consul_exporter-0-r1.ebuild b/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..90b769bcce2f
--- /dev/null
+++ b/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for consul_exporter"
+ACCT_USER_ID=278
+ACCT_USER_GROUPS=( consul_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/consul_exporter/consul_exporter-0.ebuild b/acct-user/consul_exporter/consul_exporter-0.ebuild
deleted file mode 100644
index 2ea0df3bb057..000000000000
--- a/acct-user/consul_exporter/consul_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for consul_exporter"
-ACCT_USER_ID=278
-ACCT_USER_GROUPS=( consul_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/coredns/coredns-0-r1.ebuild b/acct-user/coredns/coredns-0-r1.ebuild
new file mode 100644
index 000000000000..49377d1566d4
--- /dev/null
+++ b/acct-user/coredns/coredns-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/coredns"
+
+ACCT_USER_HOME=/var/lib/coredns
+ACCT_USER_GROUPS=( "coredns" )
+ACCT_USER_ID="312"
+
+acct-user_add_deps
diff --git a/acct-user/coredns/coredns-0.ebuild b/acct-user/coredns/coredns-0.ebuild
deleted file mode 100644
index 2811839307e2..000000000000
--- a/acct-user/coredns/coredns-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/coredns"
-
-ACCT_USER_HOME=/var/lib/coredns
-ACCT_USER_GROUPS=( "coredns" )
-ACCT_USER_ID="312"
-
-acct-user_add_deps
diff --git a/acct-user/croc/croc-0-r1.ebuild b/acct-user/croc/croc-0-r1.ebuild
new file mode 100644
index 000000000000..ec221b097a29
--- /dev/null
+++ b/acct-user/croc/croc-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/croc"
+ACCT_USER_ID=310
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/croc/croc-0.ebuild b/acct-user/croc/croc-0.ebuild
deleted file mode 100644
index 84f75f78aac4..000000000000
--- a/acct-user/croc/croc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/croc"
-ACCT_USER_ID=310
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/cron/cron-0-r1.ebuild b/acct-user/cron/cron-0-r1.ebuild
new file mode 100644
index 000000000000..cae4953127b9
--- /dev/null
+++ b/acct-user/cron/cron-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/cronbase"
+
+ACCT_USER_GROUPS=( "cron" )
+ACCT_USER_HOME="/var/spool/cron"
+ACCT_USER_ID="16"
+
+acct-user_add_deps
diff --git a/acct-user/cron/cron-0.ebuild b/acct-user/cron/cron-0.ebuild
deleted file mode 100644
index 7ec64484762e..000000000000
--- a/acct-user/cron/cron-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/cronbase"
-
-ACCT_USER_GROUPS=( "cron" )
-ACCT_USER_HOME="/var/spool/cron"
-ACCT_USER_ID="16"
-
-acct-user_add_deps
diff --git a/acct-user/cvmfs/cvmfs-0-r1.ebuild b/acct-user/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 9296d50fb9c1..000000000000
--- a/acct-user/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the CernVM-FS network file system"
-ACCT_USER_ID=268
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/cvmfs/cvmfs-0-r2.ebuild b/acct-user/cvmfs/cvmfs-0-r2.ebuild
new file mode 100644
index 000000000000..aa027b43a791
--- /dev/null
+++ b/acct-user/cvmfs/cvmfs-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the CernVM-FS network file system"
+ACCT_USER_ID=268
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/cyrus/cyrus-0-r2.ebuild b/acct-user/cyrus/cyrus-0-r2.ebuild
deleted file mode 100644
index 7c200b7856e4..000000000000
--- a/acct-user/cyrus/cyrus-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for cyrus-imapd daemon"
-ACCT_USER_ID=415
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/cyrus/cyrus-0-r3.ebuild b/acct-user/cyrus/cyrus-0-r3.ebuild
new file mode 100644
index 000000000000..44c206ccbbc0
--- /dev/null
+++ b/acct-user/cyrus/cyrus-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for cyrus-imapd daemon"
+ACCT_USER_ID=415
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/darkstat/darkstat-0-r1.ebuild b/acct-user/darkstat/darkstat-0-r1.ebuild
new file mode 100644
index 000000000000..27c0e44a253f
--- /dev/null
+++ b/acct-user/darkstat/darkstat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/darkstat"
+ACCT_USER_ID=380
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/darkstat/darkstat-0.ebuild b/acct-user/darkstat/darkstat-0.ebuild
deleted file mode 100644
index f4dfa5bc3f6e..000000000000
--- a/acct-user/darkstat/darkstat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/darkstat"
-ACCT_USER_ID=380
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/davfs2/davfs2-0-r1.ebuild b/acct-user/davfs2/davfs2-0-r1.ebuild
deleted file mode 100644
index fcc2e117501e..000000000000
--- a/acct-user/davfs2/davfs2-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=420
-ACCT_USER_GROUPS=( davfs2 )
-
-acct-user_add_deps
diff --git a/acct-user/davfs2/davfs2-0-r2.ebuild b/acct-user/davfs2/davfs2-0-r2.ebuild
new file mode 100644
index 000000000000..eb92b96293fa
--- /dev/null
+++ b/acct-user/davfs2/davfs2-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=420
+ACCT_USER_GROUPS=( davfs2 )
+
+acct-user_add_deps
diff --git a/acct-user/dbmail/dbmail-0-r1.ebuild b/acct-user/dbmail/dbmail-0-r1.ebuild
new file mode 100644
index 000000000000..ac0c219fdba1
--- /dev/null
+++ b/acct-user/dbmail/dbmail-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=365
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/dbmail/dbmail-0.ebuild b/acct-user/dbmail/dbmail-0.ebuild
deleted file mode 100644
index 273ecbb4ddce..000000000000
--- a/acct-user/dbmail/dbmail-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=365
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/dbskkd/dbskkd-0-r1.ebuild b/acct-user/dbskkd/dbskkd-0-r1.ebuild
new file mode 100644
index 000000000000..fe53f18a5880
--- /dev/null
+++ b/acct-user/dbskkd/dbskkd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-i18n/dbskkd-cdb"
+
+ACCT_USER_GROUPS=( "dbskkd" )
+ACCT_USER_ID="146"
+
+acct-user_add_deps
diff --git a/acct-user/dbskkd/dbskkd-0.ebuild b/acct-user/dbskkd/dbskkd-0.ebuild
deleted file mode 100644
index 07abb14a7d7e..000000000000
--- a/acct-user/dbskkd/dbskkd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-i18n/dbskkd-cdb"
-
-ACCT_USER_GROUPS=( "dbskkd" )
-ACCT_USER_ID="146"
-
-acct-user_add_deps
diff --git a/acct-user/ddclient/ddclient-0-r1.ebuild b/acct-user/ddclient/ddclient-0-r1.ebuild
deleted file mode 100644
index 60bac047e757..000000000000
--- a/acct-user/ddclient/ddclient-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the dynamic DNS client"
-
-ACCT_USER_GROUPS=( "ddclient" )
-ACCT_USER_ID="487"
-
-acct-user_add_deps
diff --git a/acct-user/ddclient/ddclient-0-r2.ebuild b/acct-user/ddclient/ddclient-0-r2.ebuild
new file mode 100644
index 000000000000..0ae2a8ad0574
--- /dev/null
+++ b/acct-user/ddclient/ddclient-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the dynamic DNS client"
+
+ACCT_USER_GROUPS=( "ddclient" )
+ACCT_USER_ID="487"
+
+acct-user_add_deps
diff --git a/acct-user/defang/defang-0-r1.ebuild b/acct-user/defang/defang-0-r1.ebuild
new file mode 100644
index 000000000000..168d014590de
--- /dev/null
+++ b/acct-user/defang/defang-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/mimedefang"
+
+ACCT_USER_GROUPS=( "defang" )
+ACCT_USER_ID="181"
+
+acct-user_add_deps
diff --git a/acct-user/defang/defang-0.ebuild b/acct-user/defang/defang-0.ebuild
deleted file mode 100644
index 295e77995907..000000000000
--- a/acct-user/defang/defang-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for mail-filter/mimedefang"
-
-ACCT_USER_GROUPS=( "defang" )
-ACCT_USER_ID="181"
-
-acct-user_add_deps
diff --git a/acct-user/dehydrated/dehydrated-0-r1.ebuild b/acct-user/dehydrated/dehydrated-0-r1.ebuild
new file mode 100644
index 000000000000..fa49bb0e2d49
--- /dev/null
+++ b/acct-user/dehydrated/dehydrated-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="dehydrated program user"
+
+ACCT_USER_ID=361
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+acct-user_add_deps
diff --git a/acct-user/dehydrated/dehydrated-0.ebuild b/acct-user/dehydrated/dehydrated-0.ebuild
deleted file mode 100644
index a6ec59958704..000000000000
--- a/acct-user/dehydrated/dehydrated-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="dehydrated program user"
-
-ACCT_USER_ID=361
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/lib/${PN}
-
-acct-user_add_deps
diff --git a/acct-user/deluge/deluge-0-r1.ebuild b/acct-user/deluge/deluge-0-r2.ebuild
index 328da7731618..328da7731618 100644
--- a/acct-user/deluge/deluge-0-r1.ebuild
+++ b/acct-user/deluge/deluge-0-r2.ebuild
diff --git a/acct-user/dhcp/dhcp-0-r1.ebuild b/acct-user/dhcp/dhcp-0-r1.ebuild
deleted file mode 100644
index d27eca296a9d..000000000000
--- a/acct-user/dhcp/dhcp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dhcp daemon"
-ACCT_USER_ID=300
-ACCT_USER_GROUPS=( dhcp )
-
-acct-user_add_deps
diff --git a/acct-user/dhcp/dhcp-0-r2.ebuild b/acct-user/dhcp/dhcp-0-r2.ebuild
new file mode 100644
index 000000000000..c526b058b798
--- /dev/null
+++ b/acct-user/dhcp/dhcp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dhcp daemon"
+ACCT_USER_ID=300
+ACCT_USER_GROUPS=( dhcp )
+
+acct-user_add_deps
diff --git a/acct-user/dhcpcd/dhcpcd-0-r1.ebuild b/acct-user/dhcpcd/dhcpcd-0-r1.ebuild
deleted file mode 100644
index 6673dab0fffe..000000000000
--- a/acct-user/dhcpcd/dhcpcd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dhcpcd client"
-ACCT_USER_ID=303
-ACCT_USER_GROUPS=( dhcpcd )
-ACCT_USER_HOME="/var/chroot/dhcpcd"
-
-acct-user_add_deps
diff --git a/acct-user/dhcpcd/dhcpcd-0-r2.ebuild b/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
new file mode 100644
index 000000000000..b9d9b0944546
--- /dev/null
+++ b/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dhcpcd client"
+ACCT_USER_ID=303
+ACCT_USER_GROUPS=( dhcpcd )
+ACCT_USER_HOME="/var/chroot/dhcpcd"
+
+acct-user_add_deps
diff --git a/acct-user/dictd/dictd-0-r1.ebuild b/acct-user/dictd/dictd-0-r1.ebuild
new file mode 100644
index 000000000000..8b54a5ae197f
--- /dev/null
+++ b/acct-user/dictd/dictd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for app-text/dictd"
+ACCT_USER_ID=381
+ACCT_USER_GROUPS=( dictd )
+
+acct-user_add_deps
diff --git a/acct-user/dictd/dictd-0.ebuild b/acct-user/dictd/dictd-0.ebuild
deleted file mode 100644
index 1e32eaaad282..000000000000
--- a/acct-user/dictd/dictd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for app-text/dictd"
-ACCT_USER_ID=381
-ACCT_USER_GROUPS=( dictd )
-
-acct-user_add_deps
diff --git a/acct-user/dirsrv/dirsrv-0-r1.ebuild b/acct-user/dirsrv/dirsrv-0-r1.ebuild
new file mode 100644
index 000000000000..047daaddeedd
--- /dev/null
+++ b/acct-user/dirsrv/dirsrv-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-nds/389-ds-base"
+ACCT_USER_ID=346
+ACCT_USER_GROUPS=( dirsrv )
+
+acct-user_add_deps
diff --git a/acct-user/dirsrv/dirsrv-0.ebuild b/acct-user/dirsrv/dirsrv-0.ebuild
deleted file mode 100644
index 993383e06415..000000000000
--- a/acct-user/dirsrv/dirsrv-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-nds/389-ds-base"
-ACCT_USER_ID=346
-ACCT_USER_GROUPS=( dirsrv )
-
-acct-user_add_deps
diff --git a/acct-user/distcc/distcc-1-r1.ebuild b/acct-user/distcc/distcc-1-r1.ebuild
new file mode 100644
index 000000000000..47daaacfdefa
--- /dev/null
+++ b/acct-user/distcc/distcc-1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User used to run distcc daemon"
+ACCT_USER_ID=240
+ACCT_USER_GROUPS=( distcc )
+
+acct-user_add_deps
diff --git a/acct-user/distcc/distcc-1.ebuild b/acct-user/distcc/distcc-1.ebuild
deleted file mode 100644
index e04e0ea8603b..000000000000
--- a/acct-user/distcc/distcc-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User used to run distcc daemon"
-ACCT_USER_ID=240
-ACCT_USER_GROUPS=( distcc )
-
-acct-user_add_deps
diff --git a/acct-user/dnrd/dnrd-0-r1.ebuild b/acct-user/dnrd/dnrd-0-r1.ebuild
new file mode 100644
index 000000000000..3ec8bafd53e9
--- /dev/null
+++ b/acct-user/dnrd/dnrd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnrd"
+
+ACCT_USER_GROUPS=( "dnrd" )
+ACCT_USER_ID="262"
+
+acct-user_add_deps
diff --git a/acct-user/dnrd/dnrd-0.ebuild b/acct-user/dnrd/dnrd-0.ebuild
deleted file mode 100644
index ef1ebf9041e3..000000000000
--- a/acct-user/dnrd/dnrd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnrd"
-
-ACCT_USER_GROUPS=( "dnrd" )
-ACCT_USER_ID="262"
-
-acct-user_add_deps
diff --git a/acct-user/dnscache/dnscache-0-r1.ebuild b/acct-user/dnscache/dnscache-0-r1.ebuild
new file mode 100644
index 000000000000..c0b54fd7cad7
--- /dev/null
+++ b/acct-user/dnscache/dnscache-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=225
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/dnscache/dnscache-0.ebuild b/acct-user/dnscache/dnscache-0.ebuild
deleted file mode 100644
index e4716c571e77..000000000000
--- a/acct-user/dnscache/dnscache-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=225
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
deleted file mode 100644
index ef741ba82993..000000000000
--- a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnscrypt-proxy"
-ACCT_USER_ID=353
-ACCT_USER_GROUPS=( dnscrypt-proxy )
-
-acct-user_add_deps
diff --git a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..3075854092bd
--- /dev/null
+++ b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnscrypt-proxy"
+ACCT_USER_ID=353
+ACCT_USER_GROUPS=( dnscrypt-proxy )
+
+acct-user_add_deps
diff --git a/acct-user/dnsdist/dnsdist-0-r1.ebuild b/acct-user/dnsdist/dnsdist-0-r1.ebuild
deleted file mode 100644
index 64f3d8922ace..000000000000
--- a/acct-user/dnsdist/dnsdist-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/dnsdist"
-
-ACCT_USER_GROUPS=( "dnsdist" )
-ACCT_USER_ID="414"
-
-acct-user_add_deps
diff --git a/acct-user/dnsdist/dnsdist-0-r2.ebuild b/acct-user/dnsdist/dnsdist-0-r2.ebuild
new file mode 100644
index 000000000000..8b89e209e152
--- /dev/null
+++ b/acct-user/dnsdist/dnsdist-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/dnsdist"
+
+ACCT_USER_GROUPS=( "dnsdist" )
+ACCT_USER_ID="414"
+
+acct-user_add_deps
diff --git a/acct-user/dnslog/dnslog-0-r1.ebuild b/acct-user/dnslog/dnslog-0-r1.ebuild
new file mode 100644
index 000000000000..0c794b383e53
--- /dev/null
+++ b/acct-user/dnslog/dnslog-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=226
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/dnslog/dnslog-0.ebuild b/acct-user/dnslog/dnslog-0.ebuild
deleted file mode 100644
index b961aa923436..000000000000
--- a/acct-user/dnslog/dnslog-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=226
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq/dnsmasq-0-r1.ebuild b/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
deleted file mode 100644
index bf98c0fc929b..000000000000
--- a/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnsmasq"
-
-ACCT_USER_ID=275
-ACCT_USER_GROUPS=( dnsmasq )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq/dnsmasq-0-r2.ebuild b/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
new file mode 100644
index 000000000000..548af2c0d5a4
--- /dev/null
+++ b/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnsmasq"
+
+ACCT_USER_ID=275
+ACCT_USER_GROUPS=( dnsmasq )
+
+acct-user_add_deps
diff --git a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
deleted file mode 100644
index 3bad6b64097a..000000000000
--- a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dnsmasq_exporter"
-ACCT_USER_ID=274
-ACCT_USER_GROUPS=( dnsmasq_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..aafd1d549d4b
--- /dev/null
+++ b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dnsmasq_exporter"
+ACCT_USER_ID=274
+ACCT_USER_GROUPS=( dnsmasq_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/docker_auth/docker_auth-0-r1.ebuild b/acct-user/docker_auth/docker_auth-0-r1.ebuild
deleted file mode 100644
index c6af83062e39..000000000000
--- a/acct-user/docker_auth/docker_auth-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for docker_auth"
-ACCT_USER_ID=345
-ACCT_USER_GROUPS=( docker_auth )
-
-acct-user_add_deps
diff --git a/acct-user/docker_auth/docker_auth-0-r2.ebuild b/acct-user/docker_auth/docker_auth-0-r2.ebuild
new file mode 100644
index 000000000000..4b43ec91c96f
--- /dev/null
+++ b/acct-user/docker_auth/docker_auth-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for docker_auth"
+ACCT_USER_ID=345
+ACCT_USER_GROUPS=( docker_auth )
+
+acct-user_add_deps
diff --git a/acct-user/dovecot/dovecot-0-r1.ebuild b/acct-user/dovecot/dovecot-0-r1.ebuild
deleted file mode 100644
index 661e3706f564..000000000000
--- a/acct-user/dovecot/dovecot-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dovecot daemon"
-ACCT_USER_ID=76
-ACCT_USER_GROUPS=( dovecot )
-
-acct-user_add_deps
diff --git a/acct-user/dovecot/dovecot-0-r2.ebuild b/acct-user/dovecot/dovecot-0-r2.ebuild
new file mode 100644
index 000000000000..107dc2b7bf7d
--- /dev/null
+++ b/acct-user/dovecot/dovecot-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dovecot daemon"
+ACCT_USER_ID=76
+ACCT_USER_GROUPS=( dovecot )
+
+acct-user_add_deps
diff --git a/acct-user/dovenull/dovenull-0-r1.ebuild b/acct-user/dovenull/dovenull-0-r1.ebuild
deleted file mode 100644
index 40d476bdc4eb..000000000000
--- a/acct-user/dovenull/dovenull-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dovecot daemon"
-ACCT_USER_ID=74
-ACCT_USER_GROUPS=( dovenull )
-
-acct-user_add_deps
diff --git a/acct-user/dovenull/dovenull-0-r2.ebuild b/acct-user/dovenull/dovenull-0-r2.ebuild
new file mode 100644
index 000000000000..b1fd15df1755
--- /dev/null
+++ b/acct-user/dovenull/dovenull-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dovecot daemon"
+ACCT_USER_ID=74
+ACCT_USER_GROUPS=( dovenull )
+
+acct-user_add_deps
diff --git a/acct-user/drone/drone-0-r1.ebuild b/acct-user/drone/drone-0-r1.ebuild
new file mode 100644
index 000000000000..9cd5b314e13e
--- /dev/null
+++ b/acct-user/drone/drone-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-util/drone"
+
+ACCT_USER_ID=112
+ACCT_USER_GROUPS=( drone )
+ACCT_USER_HOME=/var/lib/drone
+
+acct-user_add_deps
diff --git a/acct-user/drone/drone-0.ebuild b/acct-user/drone/drone-0.ebuild
deleted file mode 100644
index 3f0bfb9afded..000000000000
--- a/acct-user/drone/drone-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-util/drone"
-
-ACCT_USER_ID=112
-ACCT_USER_GROUPS=( drone )
-ACCT_USER_HOME=/var/lib/drone
-
-acct-user_add_deps
diff --git a/acct-user/duende/duende-0-r1.ebuild b/acct-user/duende/duende-0-r1.ebuild
deleted file mode 100644
index b7ad1e5a6dbf..000000000000
--- a/acct-user/duende/duende-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=66
-ACCT_USER_GROUPS=( "maradns" )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/maradns "
-RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/duende/duende-0-r2.ebuild b/acct-user/duende/duende-0-r2.ebuild
new file mode 100644
index 000000000000..9606fcf3d80c
--- /dev/null
+++ b/acct-user/duende/duende-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=66
+ACCT_USER_GROUPS=( "maradns" )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/maradns "
+RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/ejabberd/ejabberd-2-r1.ebuild b/acct-user/ejabberd/ejabberd-2-r1.ebuild
new file mode 100644
index 000000000000..08408483d2ce
--- /dev/null
+++ b/acct-user/ejabberd/ejabberd-2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/ejabberd"
+
+ACCT_USER_ID=114
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+IUSE="pam"
+
+RDEPEND="pam? ( acct-group/epam )"
+
+acct-user_add_deps
+
+pkg_setup() {
+ use pam && ACCT_USER_GROUPS+=( epam )
+}
diff --git a/acct-user/ejabberd/ejabberd-2.ebuild b/acct-user/ejabberd/ejabberd-2.ebuild
deleted file mode 100644
index 70c1280b36b2..000000000000
--- a/acct-user/ejabberd/ejabberd-2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/ejabberd"
-
-ACCT_USER_ID=114
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/lib/${PN}
-
-IUSE="pam"
-
-RDEPEND="pam? ( acct-group/epam )"
-
-acct-user_add_deps
-
-pkg_setup() {
- use pam && ACCT_USER_GROUPS+=( epam )
-}
diff --git a/acct-user/elasticsearch/elasticsearch-0-r1.ebuild b/acct-user/elasticsearch/elasticsearch-0-r1.ebuild
deleted file mode 100644
index 397e25fe4fde..000000000000
--- a/acct-user/elasticsearch/elasticsearch-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Elasticsearch program user"
-ACCT_USER_ID=183
-ACCT_USER_HOME=/usr/share/elasticsearch
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( elasticsearch )
-acct-user_add_deps
diff --git a/acct-user/elasticsearch/elasticsearch-0-r2.ebuild b/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
new file mode 100644
index 000000000000..e1b91dea15cb
--- /dev/null
+++ b/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Elasticsearch program user"
+ACCT_USER_ID=183
+ACCT_USER_HOME=/usr/share/elasticsearch
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( elasticsearch )
+acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
deleted file mode 100644
index 0641a19753f0..000000000000
--- a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/elasticsearch_exporter"
-
-ACCT_USER_ID=501
-ACCT_USER_GROUPS=( elasticsearch_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4d8aef4a88c1
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/elasticsearch_exporter"
+
+ACCT_USER_ID=501
+ACCT_USER_GROUPS=( elasticsearch_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/energi3/energi3-0-r1.ebuild b/acct-user/energi3/energi3-0-r1.ebuild
new file mode 100644
index 000000000000..c4c06a942c1a
--- /dev/null
+++ b/acct-user/energi3/energi3-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/energi3"
+ACCT_USER_ID=218
+ACCT_USER_GROUPS=( energi3 )
+
+acct-user_add_deps
diff --git a/acct-user/energi3/energi3-0.ebuild b/acct-user/energi3/energi3-0.ebuild
deleted file mode 100644
index 3672377d2cc4..000000000000
--- a/acct-user/energi3/energi3-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/energi3"
-ACCT_USER_ID=218
-ACCT_USER_GROUPS=( energi3 )
-
-acct-user_add_deps
diff --git a/acct-user/epmd/epmd-0-r1.ebuild b/acct-user/epmd/epmd-0-r1.ebuild
deleted file mode 100644
index 5648cf82fb26..000000000000
--- a/acct-user/epmd/epmd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Erlang Portmapper Daemon"
-ACCT_USER_ID=335
-ACCT_USER_GROUPS=( epmd )
-
-acct-user_add_deps
diff --git a/acct-user/epmd/epmd-0-r2.ebuild b/acct-user/epmd/epmd-0-r2.ebuild
new file mode 100644
index 000000000000..093ecbc957b1
--- /dev/null
+++ b/acct-user/epmd/epmd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Erlang Portmapper Daemon"
+ACCT_USER_ID=335
+ACCT_USER_GROUPS=( epmd )
+
+acct-user_add_deps
diff --git a/acct-user/err/err-0-r1.ebuild b/acct-user/err/err-0-r1.ebuild
new file mode 100644
index 000000000000..0def72aa8a34
--- /dev/null
+++ b/acct-user/err/err-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=325
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/err/err-0.ebuild b/acct-user/err/err-0.ebuild
deleted file mode 100644
index 1663b0acc907..000000000000
--- a/acct-user/err/err-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=325
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/etcd/etcd-0-r1.ebuild b/acct-user/etcd/etcd-0-r1.ebuild
deleted file mode 100644
index d682dc9b6422..000000000000
--- a/acct-user/etcd/etcd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for etcd"
-ACCT_USER_HOME=/var/lib/etcd
-ACCT_USER_HOME_PERMS=700
-ACCT_USER_ID=426
-ACCT_USER_GROUPS=( etcd )
-
-acct-user_add_deps
diff --git a/acct-user/etcd/etcd-0-r2.ebuild b/acct-user/etcd/etcd-0-r2.ebuild
new file mode 100644
index 000000000000..0af97deddaa8
--- /dev/null
+++ b/acct-user/etcd/etcd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for etcd"
+ACCT_USER_HOME=/var/lib/etcd
+ACCT_USER_HOME_PERMS=700
+ACCT_USER_ID=426
+ACCT_USER_GROUPS=( etcd )
+
+acct-user_add_deps
diff --git a/acct-user/exabgp/exabgp-0-r1.ebuild b/acct-user/exabgp/exabgp-0-r1.ebuild
deleted file mode 100644
index a78e30a7b12a..000000000000
--- a/acct-user/exabgp/exabgp-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/exabgp"
-
-ACCT_USER_ID=316
-ACCT_USER_GROUPS=( exabgp )
-
-acct-user_add_deps
diff --git a/acct-user/exabgp/exabgp-0-r2.ebuild b/acct-user/exabgp/exabgp-0-r2.ebuild
new file mode 100644
index 000000000000..06853b063cb3
--- /dev/null
+++ b/acct-user/exabgp/exabgp-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/exabgp"
+
+ACCT_USER_ID=316
+ACCT_USER_GROUPS=( exabgp )
+
+acct-user_add_deps
diff --git a/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild b/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
new file mode 100644
index 000000000000..92be78693837
--- /dev/null
+++ b/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/ez-ipupdate"
+
+ACCT_USER_GROUPS=( "ez-ipupd" )
+ACCT_USER_HOME="/var/cache/ez-ipupdate"
+ACCT_USER_ID="261"
+
+acct-user_add_deps
diff --git a/acct-user/ez-ipupd/ez-ipupd-0.ebuild b/acct-user/ez-ipupd/ez-ipupd-0.ebuild
deleted file mode 100644
index 79656896dc6e..000000000000
--- a/acct-user/ez-ipupd/ez-ipupd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/ez-ipupdate"
-
-ACCT_USER_GROUPS=( "ez-ipupd" )
-ACCT_USER_HOME="/var/cache/ez-ipupdate"
-ACCT_USER_ID="261"
-
-acct-user_add_deps
diff --git a/acct-user/fax/fax-0-r1.ebuild b/acct-user/fax/fax-0-r1.ebuild
new file mode 100644
index 000000000000..3ced3405070d
--- /dev/null
+++ b/acct-user/fax/fax-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dialup/mgetty"
+
+ACCT_USER_GROUPS=( "fax" )
+ACCT_USER_ID="320"
+
+acct-user_add_deps
diff --git a/acct-user/fax/fax-0.ebuild b/acct-user/fax/fax-0.ebuild
deleted file mode 100644
index cbc57fbfd4b1..000000000000
--- a/acct-user/fax/fax-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dialup/mgetty"
-
-ACCT_USER_GROUPS=( "fax" )
-ACCT_USER_ID="320"
-
-acct-user_add_deps
diff --git a/acct-user/fcron/fcron-0-r1.ebuild b/acct-user/fcron/fcron-0-r1.ebuild
new file mode 100644
index 000000000000..ca25b3a170af
--- /dev/null
+++ b/acct-user/fcron/fcron-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/fcron"
+
+ACCT_USER_GROUPS=( "fcron" )
+ACCT_USER_ID="120"
+
+acct-user_add_deps
diff --git a/acct-user/fcron/fcron-0.ebuild b/acct-user/fcron/fcron-0.ebuild
deleted file mode 100644
index 2cf35de584c6..000000000000
--- a/acct-user/fcron/fcron-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/fcron"
-
-ACCT_USER_GROUPS=( "fcron" )
-ACCT_USER_ID="120"
-
-acct-user_add_deps
diff --git a/acct-user/fdm/fdm-0-r1.ebuild b/acct-user/fdm/fdm-0-r1.ebuild
new file mode 100644
index 000000000000..646dc4cf50fd
--- /dev/null
+++ b/acct-user/fdm/fdm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/fdm"
+
+ACCT_USER_GROUPS=( "fdm" )
+ACCT_USER_ID="248"
+
+acct-user_add_deps
diff --git a/acct-user/fdm/fdm-0.ebuild b/acct-user/fdm/fdm-0.ebuild
deleted file mode 100644
index 8f0d4e8d7814..000000000000
--- a/acct-user/fdm/fdm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/fdm"
-
-ACCT_USER_GROUPS=( "fdm" )
-ACCT_USER_ID="248"
-
-acct-user_add_deps
diff --git a/acct-user/fetchmail/fetchmail-0-r1.ebuild b/acct-user/fetchmail/fetchmail-0-r1.ebuild
deleted file mode 100644
index 306170f9841a..000000000000
--- a/acct-user/fetchmail/fetchmail-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/fetchmail"
-ACCT_USER_ID=124
-ACCT_USER_GROUPS=( fetchmail )
-ACCT_USER_HOME="/var/lib/fetchmail"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/fetchmail/fetchmail-0-r2.ebuild b/acct-user/fetchmail/fetchmail-0-r2.ebuild
new file mode 100644
index 000000000000..4101dcfa26b4
--- /dev/null
+++ b/acct-user/fetchmail/fetchmail-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/fetchmail"
+ACCT_USER_ID=124
+ACCT_USER_GROUPS=( fetchmail )
+ACCT_USER_HOME="/var/lib/fetchmail"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/fhem/fhem-0-r1.ebuild b/acct-user/fhem/fhem-0-r1.ebuild
deleted file mode 100644
index 00ea760c48fe..000000000000
--- a/acct-user/fhem/fhem-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the FHEM perl server for house automation"
-
-ACCT_USER_GROUPS=( "fhem" )
-ACCT_USER_HOME="/opt/fhem"
-ACCT_USER_ID="491"
-
-acct-user_add_deps
diff --git a/acct-user/fhem/fhem-0-r2.ebuild b/acct-user/fhem/fhem-0-r2.ebuild
new file mode 100644
index 000000000000..51c17069a9a7
--- /dev/null
+++ b/acct-user/fhem/fhem-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the FHEM perl server for house automation"
+
+ACCT_USER_GROUPS=( "fhem" )
+ACCT_USER_HOME="/opt/fhem"
+ACCT_USER_ID="491"
+
+acct-user_add_deps
diff --git a/acct-user/firebird/firebird-0-r2.ebuild b/acct-user/firebird/firebird-0-r2.ebuild
deleted file mode 100644
index e34d2c1a8ac7..000000000000
--- a/acct-user/firebird/firebird-0-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/firebird"
-
-ACCT_USER_GROUPS=( "firebird" )
-ACCT_USER_ID="450"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
-
-pkg_setup() {
- ACCT_USER_HOME="/usr/$(get_libdir)/firebird"
-}
diff --git a/acct-user/firebird/firebird-0-r3.ebuild b/acct-user/firebird/firebird-0-r3.ebuild
new file mode 100644
index 000000000000..9e881781fdf6
--- /dev/null
+++ b/acct-user/firebird/firebird-0-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/firebird"
+
+ACCT_USER_GROUPS=( "firebird" )
+ACCT_USER_ID="450"
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
+
+pkg_setup() {
+ ACCT_USER_HOME="/usr/$(get_libdir)/firebird"
+}
diff --git a/acct-user/flatpak/flatpak-0-r1.ebuild b/acct-user/flatpak/flatpak-0-r1.ebuild
new file mode 100644
index 000000000000..aaead0d36975
--- /dev/null
+++ b/acct-user/flatpak/flatpak-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=313
+ACCT_USER_GROUPS=( flatpak )
+acct-user_add_deps
diff --git a/acct-user/flatpak/flatpak-0.ebuild b/acct-user/flatpak/flatpak-0.ebuild
deleted file mode 100644
index fb1fa5a77512..000000000000
--- a/acct-user/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=313
-ACCT_USER_GROUPS=( flatpak )
-acct-user_add_deps
diff --git a/acct-user/flows/flows-0-r1.ebuild b/acct-user/flows/flows-0-r1.ebuild
new file mode 100644
index 000000000000..2d265636ba43
--- /dev/null
+++ b/acct-user/flows/flows-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/flow-tools"
+ACCT_USER_ID=384
+ACCT_USER_HOME=/var/lib/flows
+ACCT_USER_GROUPS=( flows )
+
+acct-user_add_deps
diff --git a/acct-user/flows/flows-0.ebuild b/acct-user/flows/flows-0.ebuild
deleted file mode 100644
index dbfdd9f98492..000000000000
--- a/acct-user/flows/flows-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/flow-tools"
-ACCT_USER_ID=384
-ACCT_USER_HOME=/var/lib/flows
-ACCT_USER_GROUPS=( flows )
-
-acct-user_add_deps
diff --git a/acct-user/fluentd/fluentd-0-r1.ebuild b/acct-user/fluentd/fluentd-0-r1.ebuild
deleted file mode 100644
index b25d51d0046a..000000000000
--- a/acct-user/fluentd/fluentd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/fluentd"
-
-ACCT_USER_ID=504
-ACCT_USER_GROUPS=( fluentd )
-
-acct-user_add_deps
diff --git a/acct-user/fluentd/fluentd-0-r2.ebuild b/acct-user/fluentd/fluentd-0-r2.ebuild
new file mode 100644
index 000000000000..15b390b4f36b
--- /dev/null
+++ b/acct-user/fluentd/fluentd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/fluentd"
+
+ACCT_USER_ID=504
+ACCT_USER_GROUPS=( fluentd )
+
+acct-user_add_deps
diff --git a/acct-user/fnord/fnord-0-r1.ebuild b/acct-user/fnord/fnord-0-r1.ebuild
new file mode 100644
index 000000000000..2a104f9cbaeb
--- /dev/null
+++ b/acct-user/fnord/fnord-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-servers/fnord"
+
+ACCT_USER_GROUPS=( "nofiles" )
+ACCT_USER_HOME="/etc/fnord"
+ACCT_USER_ID="402"
+
+acct-user_add_deps
diff --git a/acct-user/fnord/fnord-0.ebuild b/acct-user/fnord/fnord-0.ebuild
deleted file mode 100644
index fe97d10637a2..000000000000
--- a/acct-user/fnord/fnord-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-servers/fnord"
-
-ACCT_USER_GROUPS=( "nofiles" )
-ACCT_USER_HOME="/etc/fnord"
-ACCT_USER_ID="402"
-
-acct-user_add_deps
diff --git a/acct-user/fnordlog/fnordlog-0-r1.ebuild b/acct-user/fnordlog/fnordlog-0-r1.ebuild
new file mode 100644
index 000000000000..9fb95c7fbad1
--- /dev/null
+++ b/acct-user/fnordlog/fnordlog-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-servers/fnord"
+
+ACCT_USER_GROUPS=( "nofiles" )
+ACCT_USER_HOME="/etc/fnord"
+ACCT_USER_ID="385"
+
+acct-user_add_deps
diff --git a/acct-user/fnordlog/fnordlog-0.ebuild b/acct-user/fnordlog/fnordlog-0.ebuild
deleted file mode 100644
index 25b7383a8575..000000000000
--- a/acct-user/fnordlog/fnordlog-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-servers/fnord"
-
-ACCT_USER_GROUPS=( "nofiles" )
-ACCT_USER_HOME="/etc/fnord"
-ACCT_USER_ID="385"
-
-acct-user_add_deps
diff --git a/acct-user/foldingathome/foldingathome-0-r1.ebuild b/acct-user/foldingathome/foldingathome-0-r1.ebuild
new file mode 100644
index 000000000000..4f01d42def53
--- /dev/null
+++ b/acct-user/foldingathome/foldingathome-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sci-biology/foldingathome"
+
+ACCT_USER_GROUPS=( "foldingathome" "video" )
+ACCT_USER_HOME="/opt/foldingathome"
+ACCT_USER_ID="128"
+
+acct-user_add_deps
diff --git a/acct-user/foldingathome/foldingathome-0.ebuild b/acct-user/foldingathome/foldingathome-0.ebuild
deleted file mode 100644
index a09b52cd1831..000000000000
--- a/acct-user/foldingathome/foldingathome-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sci-biology/foldingathome"
-
-ACCT_USER_GROUPS=( "foldingathome" "video" )
-ACCT_USER_HOME="/opt/foldingathome"
-ACCT_USER_ID="128"
-
-acct-user_add_deps
diff --git a/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild b/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
new file mode 100644
index 000000000000..0397363b2c62
--- /dev/null
+++ b/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/fp-multiuser"
+
+ACCT_USER_HOME=/var/lib/fp-multiuser
+ACCT_USER_GROUPS=( "fp-multiuser" )
+ACCT_USER_ID="318"
+
+acct-user_add_deps
diff --git a/acct-user/fp-multiuser/fp-multiuser-0.ebuild b/acct-user/fp-multiuser/fp-multiuser-0.ebuild
deleted file mode 100644
index bbaef0f6ce78..000000000000
--- a/acct-user/fp-multiuser/fp-multiuser-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/fp-multiuser"
-
-ACCT_USER_HOME=/var/lib/fp-multiuser
-ACCT_USER_GROUPS=( "fp-multiuser" )
-ACCT_USER_ID="318"
-
-acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0-r1.ebuild b/acct-user/freenet/freenet-0-r1.ebuild
new file mode 100644
index 000000000000..c03cfb616ecc
--- /dev/null
+++ b/acct-user/freenet/freenet-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/freenet"
+ACCT_USER_ID=105
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/freenet
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0.ebuild b/acct-user/freenet/freenet-0.ebuild
deleted file mode 100644
index 3f624fa01977..000000000000
--- a/acct-user/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/freenet"
-ACCT_USER_ID=105
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/freenet
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..8cc42b2fe072
--- /dev/null
+++ b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="FRITZ!Box Smart Home Exporter User"
+
+ACCT_USER_ID=228
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
deleted file mode 100644
index 7b7ec26bde35..000000000000
--- a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="FRITZ!Box Smart Home Exporter User"
-
-ACCT_USER_ID=228
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/frr/frr-0-r1.ebuild b/acct-user/frr/frr-0-r1.ebuild
new file mode 100644
index 000000000000..8a2f7caed68f
--- /dev/null
+++ b/acct-user/frr/frr-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=371
+ACCT_USER_GROUPS=( frr )
+
+acct-user_add_deps
diff --git a/acct-user/frr/frr-0.ebuild b/acct-user/frr/frr-0.ebuild
deleted file mode 100644
index ec7cc1f8d314..000000000000
--- a/acct-user/frr/frr-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=371
-ACCT_USER_GROUPS=( frr )
-
-acct-user_add_deps
diff --git a/acct-user/ftp/ftp-0-r3.ebuild b/acct-user/ftp/ftp-0-r3.ebuild
deleted file mode 100644
index d82683fffe97..000000000000
--- a/acct-user/ftp/ftp-0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="File Transfer Protocol (FTP) server user"
-
-ACCT_USER_GROUPS=( "ftp" )
-ACCT_USER_HOME="/var/lib/ftp"
-ACCT_USER_HOME_OWNER="root:ftp"
-ACCT_USER_ID="21"
-
-acct-user_add_deps
diff --git a/acct-user/ftp/ftp-0-r4.ebuild b/acct-user/ftp/ftp-0-r4.ebuild
new file mode 100644
index 000000000000..9d7d85fa77b3
--- /dev/null
+++ b/acct-user/ftp/ftp-0-r4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="File Transfer Protocol (FTP) server user"
+
+ACCT_USER_GROUPS=( "ftp" )
+ACCT_USER_HOME="/var/lib/ftp"
+ACCT_USER_HOME_OWNER="root:ftp"
+ACCT_USER_ID="21"
+
+acct-user_add_deps
diff --git a/acct-user/ftpproxy/ftpproxy-0-r1.ebuild b/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
new file mode 100644
index 000000000000..4a50399145da
--- /dev/null
+++ b/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-ftp/frox"
+
+ACCT_USER_GROUPS=( "ftpproxy" )
+ACCT_USER_HOME="/var/spool/frox"
+ACCT_USER_HOME_PERMS="700"
+ACCT_USER_ID="182"
+
+acct-user_add_deps
diff --git a/acct-user/ftpproxy/ftpproxy-0.ebuild b/acct-user/ftpproxy/ftpproxy-0.ebuild
deleted file mode 100644
index 0a05768729d5..000000000000
--- a/acct-user/ftpproxy/ftpproxy-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-ftp/frox"
-
-ACCT_USER_GROUPS=( "ftpproxy" )
-ACCT_USER_HOME="/var/spool/frox"
-ACCT_USER_HOME_PERMS="700"
-ACCT_USER_ID="182"
-
-acct-user_add_deps
diff --git a/acct-user/gatling/gatling-0-r1.ebuild b/acct-user/gatling/gatling-0-r1.ebuild
deleted file mode 100644
index ea4d268d2c40..000000000000
--- a/acct-user/gatling/gatling-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_GROUPS=( gatling )
-ACCT_USER_HOME=/var/www/localhost
-ACCT_USER_ID=364 # matches acct-group/gatling
-
-acct-user_add_deps
diff --git a/acct-user/gatling/gatling-0-r2.ebuild b/acct-user/gatling/gatling-0-r2.ebuild
new file mode 100644
index 000000000000..9c2708333635
--- /dev/null
+++ b/acct-user/gatling/gatling-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_GROUPS=( gatling )
+ACCT_USER_HOME=/var/www/localhost
+ACCT_USER_ID=364 # matches acct-group/gatling
+
+acct-user_add_deps
diff --git a/acct-user/gauth/gauth-0-r1.ebuild b/acct-user/gauth/gauth-0-r1.ebuild
new file mode 100644
index 000000000000..4ba3f3f025b3
--- /dev/null
+++ b/acct-user/gauth/gauth-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-auth/google-authenticator-wrappers"
+
+ACCT_USER_GROUPS=( "gauth" )
+ACCT_USER_ID="138"
+
+acct-user_add_deps
diff --git a/acct-user/gauth/gauth-0.ebuild b/acct-user/gauth/gauth-0.ebuild
deleted file mode 100644
index 97ad122a12bb..000000000000
--- a/acct-user/gauth/gauth-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-auth/google-authenticator-wrappers"
-
-ACCT_USER_GROUPS=( "gauth" )
-ACCT_USER_ID="138"
-
-acct-user_add_deps
diff --git a/acct-user/gdm/gdm-0-r1.ebuild b/acct-user/gdm/gdm-0-r1.ebuild
new file mode 100644
index 000000000000..9d57eb6782f5
--- /dev/null
+++ b/acct-user/gdm/gdm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running GDM"
+ACCT_USER_ID=32
+ACCT_USER_GROUPS=( gdm video )
+ACCT_USER_HOME=/var/lib/gdm
+
+acct-user_add_deps
diff --git a/acct-user/gdm/gdm-0.ebuild b/acct-user/gdm/gdm-0.ebuild
deleted file mode 100644
index dcbdc40a98e1..000000000000
--- a/acct-user/gdm/gdm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running GDM"
-ACCT_USER_ID=32
-ACCT_USER_GROUPS=( gdm video )
-ACCT_USER_HOME=/var/lib/gdm
-
-acct-user_add_deps
diff --git a/acct-user/geneweb/geneweb-0-r1.ebuild b/acct-user/geneweb/geneweb-0-r1.ebuild
deleted file mode 100644
index ddb7933984a2..000000000000
--- a/acct-user/geneweb/geneweb-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user id for geneweb daemon"
-
-ACCT_USER_ID=467
-ACCT_USER_HOME=/var/lib/geneweb
-ACCT_USER_GROUPS=( geneweb )
-
-acct-user_add_deps
diff --git a/acct-user/geneweb/geneweb-0-r2.ebuild b/acct-user/geneweb/geneweb-0-r2.ebuild
new file mode 100644
index 000000000000..c63d14d893c0
--- /dev/null
+++ b/acct-user/geneweb/geneweb-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user id for geneweb daemon"
+
+ACCT_USER_ID=467
+ACCT_USER_HOME=/var/lib/geneweb
+ACCT_USER_GROUPS=( geneweb )
+
+acct-user_add_deps
diff --git a/acct-user/geoclue/geoclue-0-r1.ebuild b/acct-user/geoclue/geoclue-0-r1.ebuild
new file mode 100644
index 000000000000..e679be2efdf6
--- /dev/null
+++ b/acct-user/geoclue/geoclue-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the GeoClue D-Bus geolocation service"
+ACCT_USER_ID=351
+ACCT_USER_GROUPS=( geoclue )
+ACCT_USER_HOME=/var/lib/geoclue
+
+acct-user_add_deps
diff --git a/acct-user/geoclue/geoclue-0.ebuild b/acct-user/geoclue/geoclue-0.ebuild
deleted file mode 100644
index 0a6888d43ee4..000000000000
--- a/acct-user/geoclue/geoclue-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the GeoClue D-Bus geolocation service"
-ACCT_USER_ID=351
-ACCT_USER_GROUPS=( geoclue )
-ACCT_USER_HOME=/var/lib/geoclue
-
-acct-user_add_deps
diff --git a/acct-user/gerbera/gerbera-0-r1.ebuild b/acct-user/gerbera/gerbera-0-r1.ebuild
deleted file mode 100644
index ded9049718c7..000000000000
--- a/acct-user/gerbera/gerbera-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Gerbera UPnP Media Server user"
-ACCT_USER_ID=429
-ACCT_USER_HOME=/var/lib/gerbera
-ACCT_USER_GROUPS=( gerbera video )
-
-acct-user_add_deps
diff --git a/acct-user/gerbera/gerbera-0-r2.ebuild b/acct-user/gerbera/gerbera-0-r2.ebuild
new file mode 100644
index 000000000000..6d7dd80afe5c
--- /dev/null
+++ b/acct-user/gerbera/gerbera-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Gerbera UPnP Media Server user"
+ACCT_USER_ID=429
+ACCT_USER_HOME=/var/lib/gerbera
+ACCT_USER_GROUPS=( gerbera video )
+
+acct-user_add_deps
diff --git a/acct-user/git/git-0-r2.ebuild b/acct-user/git/git-0-r3.ebuild
index d6388db32836..d6388db32836 100644
--- a/acct-user/git/git-0-r2.ebuild
+++ b/acct-user/git/git-0-r3.ebuild
diff --git a/acct-user/github-exporter/github-exporter-0-r1.ebuild b/acct-user/github-exporter/github-exporter-0-r1.ebuild
new file mode 100644
index 000000000000..26444dd97aef
--- /dev/null
+++ b/acct-user/github-exporter/github-exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for github-exporter"
+ACCT_USER_ID=238
+ACCT_USER_GROUPS=( github-exporter )
+
+acct-user_add_deps
diff --git a/acct-user/github-exporter/github-exporter-0.ebuild b/acct-user/github-exporter/github-exporter-0.ebuild
deleted file mode 100644
index 5fc6470f9cdc..000000000000
--- a/acct-user/github-exporter/github-exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for github-exporter"
-ACCT_USER_ID=238
-ACCT_USER_GROUPS=( github-exporter )
-
-acct-user_add_deps
diff --git a/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild b/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
new file mode 100644
index 000000000000..0dcd40188c58
--- /dev/null
+++ b/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Dedicated user for gitlab-runner"
+
+ACCT_USER_ID=510
+ACCT_USER_GROUPS=( gitlab-runner )
+
+ACCT_USER_HOME=/var/lib/gitlab-runner
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/gitlab-runner/gitlab-runner-1.ebuild b/acct-user/gitlab-runner/gitlab-runner-1.ebuild
deleted file mode 100644
index 927761e522c4..000000000000
--- a/acct-user/gitlab-runner/gitlab-runner-1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Dedicated user for gitlab-runner"
-
-ACCT_USER_ID=510
-ACCT_USER_GROUPS=( gitlab-runner )
-
-ACCT_USER_HOME=/var/lib/gitlab-runner
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/gkrellmd/gkrellmd-0-r1.ebuild b/acct-user/gkrellmd/gkrellmd-0-r1.ebuild
deleted file mode 100644
index 419393f02f51..000000000000
--- a/acct-user/gkrellmd/gkrellmd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for gkrellm daemon"
-ACCT_USER_ID=221
-ACCT_USER_GROUPS=( gkrellmd )
-
-acct-user_add_deps
diff --git a/acct-user/gkrellmd/gkrellmd-0-r2.ebuild b/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
new file mode 100644
index 000000000000..a174866f976a
--- /dev/null
+++ b/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for gkrellm daemon"
+ACCT_USER_ID=221
+ACCT_USER_GROUPS=( gkrellmd )
+
+acct-user_add_deps
diff --git a/acct-user/glance/glance-0-r1.ebuild b/acct-user/glance/glance-0-r1.ebuild
deleted file mode 100644
index bf1992f35860..000000000000
--- a/acct-user/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the glance openstack service"
-ACCT_USER_ID=443
-ACCT_USER_HOME=/var/lib/glance
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( glance )
-
-acct-user_add_deps
diff --git a/acct-user/glance/glance-0-r2.ebuild b/acct-user/glance/glance-0-r2.ebuild
new file mode 100644
index 000000000000..da592367b662
--- /dev/null
+++ b/acct-user/glance/glance-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the glance openstack service"
+ACCT_USER_ID=443
+ACCT_USER_HOME=/var/lib/glance
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( glance )
+
+acct-user_add_deps
diff --git a/acct-user/gluster/gluster-0-r1.ebuild b/acct-user/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index 7b4597c69810..000000000000
--- a/acct-user/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-# Needed for statedumps
-# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
-
-ACCT_USER_ID=416
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/gluster/gluster-0-r2.ebuild b/acct-user/gluster/gluster-0-r2.ebuild
new file mode 100644
index 000000000000..f76614e4e886
--- /dev/null
+++ b/acct-user/gluster/gluster-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+# Needed for statedumps
+# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+
+ACCT_USER_ID=416
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/gns3/gns3-0-r1.ebuild b/acct-user/gns3/gns3-0-r1.ebuild
new file mode 100644
index 000000000000..3f5fd4abf6f3
--- /dev/null
+++ b/acct-user/gns3/gns3-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=522
+ACCT_USER_HOME=/var/lib/gns3
+ACCT_USER_GROUPS=( gns3 ubridge )
+
+acct-user_add_deps
diff --git a/acct-user/gns3/gns3-0.ebuild b/acct-user/gns3/gns3-0.ebuild
deleted file mode 100644
index c3e289d69213..000000000000
--- a/acct-user/gns3/gns3-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=522
-ACCT_USER_HOME=/var/lib/gns3
-ACCT_USER_GROUPS=( gns3 ubridge )
-
-acct-user_add_deps
diff --git a/acct-user/gnump3d/gnump3d-0-r1.ebuild b/acct-user/gnump3d/gnump3d-0-r1.ebuild
new file mode 100644
index 000000000000..19f4d5e4fb9b
--- /dev/null
+++ b/acct-user/gnump3d/gnump3d-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/gnump3d"
+
+ACCT_USER_GROUPS=( "gnump3d" )
+ACCT_USER_ID="160"
+
+acct-user_add_deps
diff --git a/acct-user/gnump3d/gnump3d-0.ebuild b/acct-user/gnump3d/gnump3d-0.ebuild
deleted file mode 100644
index 131534a55167..000000000000
--- a/acct-user/gnump3d/gnump3d-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/gnump3d"
-
-ACCT_USER_GROUPS=( "gnump3d" )
-ACCT_USER_ID="160"
-
-acct-user_add_deps
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
new file mode 100644
index 000000000000..dfbbe919c7ce
--- /dev/null
+++ b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_USER_GROUPS=( "gnupg-pkcs11-scd-proxy" "gnupg-pkcs11" )
+ACCT_USER_ID="281"
+
+acct-user_add_deps
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
deleted file mode 100644
index a0fafbbe430f..000000000000
--- a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_USER_GROUPS=( "gnupg-pkcs11-scd-proxy" "gnupg-pkcs11" )
-ACCT_USER_ID="281"
-
-acct-user_add_deps
diff --git a/acct-user/goaccess/goaccess-0.ebuild b/acct-user/goaccess/goaccess-0-r1.ebuild
index bc260252062a..bc260252062a 100644
--- a/acct-user/goaccess/goaccess-0.ebuild
+++ b/acct-user/goaccess/goaccess-0-r1.ebuild
diff --git a/acct-user/gopher/gopher-0-r1.ebuild b/acct-user/gopher/gopher-0-r1.ebuild
new file mode 100644
index 000000000000..4edc807d798c
--- /dev/null
+++ b/acct-user/gopher/gopher-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for gofish"
+ACCT_USER_ID=287
+ACCT_USER_GROUPS=( gopher )
+
+acct-user_add_deps
diff --git a/acct-user/gopher/gopher-0.ebuild b/acct-user/gopher/gopher-0.ebuild
deleted file mode 100644
index 6bfe8e00e98f..000000000000
--- a/acct-user/gopher/gopher-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for gofish"
-ACCT_USER_ID=287
-ACCT_USER_GROUPS=( gopher )
-
-acct-user_add_deps
diff --git a/acct-user/gopherd/gopherd-0-r1.ebuild b/acct-user/gopherd/gopherd-0-r1.ebuild
new file mode 100644
index 000000000000..8b8b389b9eef
--- /dev/null
+++ b/acct-user/gopherd/gopherd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/geomyidae"
+
+ACCT_USER_GROUPS=( "gopherd" )
+ACCT_USER_HOME="/var/gopher"
+ACCT_USER_ID="132"
+
+acct-user_add_deps
diff --git a/acct-user/gopherd/gopherd-0.ebuild b/acct-user/gopherd/gopherd-0.ebuild
deleted file mode 100644
index fe62a2eccb04..000000000000
--- a/acct-user/gopherd/gopherd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/geomyidae"
-
-ACCT_USER_GROUPS=( "gopherd" )
-ACCT_USER_HOME="/var/gopher"
-ACCT_USER_ID="132"
-
-acct-user_add_deps
diff --git a/acct-user/gpsd/gpsd-0-r2.ebuild b/acct-user/gpsd/gpsd-0-r2.ebuild
deleted file mode 100644
index 50e1fb06a35d..000000000000
--- a/acct-user/gpsd/gpsd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for gpsd"
-ACCT_USER_ID=299
-# bug #744982
-ACCT_USER_GROUPS=( dialout uucp )
-
-acct-user_add_deps
diff --git a/acct-user/gpsd/gpsd-0-r3.ebuild b/acct-user/gpsd/gpsd-0-r3.ebuild
new file mode 100644
index 000000000000..02e5bd60b85a
--- /dev/null
+++ b/acct-user/gpsd/gpsd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for gpsd"
+ACCT_USER_ID=299
+# bug #744982
+ACCT_USER_GROUPS=( dialout uucp )
+
+acct-user_add_deps
diff --git a/acct-user/grafana/grafana-0-r1.ebuild b/acct-user/grafana/grafana-0-r1.ebuild
deleted file mode 100644
index 3ba21e568192..000000000000
--- a/acct-user/grafana/grafana-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="grafana program user"
-
-ACCT_USER_ID=389
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/grafana/grafana-0-r2.ebuild b/acct-user/grafana/grafana-0-r2.ebuild
new file mode 100644
index 000000000000..b990bfa8bda8
--- /dev/null
+++ b/acct-user/grafana/grafana-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="grafana program user"
+
+ACCT_USER_ID=389
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/graylog/graylog-0-r1.ebuild b/acct-user/graylog/graylog-0-r1.ebuild
deleted file mode 100644
index e9da0964abcc..000000000000
--- a/acct-user/graylog/graylog-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Graylog program user"
-ACCT_USER_ID=478
-ACCT_USER_GROUPS=( graylog )
-acct-user_add_deps
diff --git a/acct-user/graylog/graylog-0-r2.ebuild b/acct-user/graylog/graylog-0-r2.ebuild
new file mode 100644
index 000000000000..eb3ad26ddeb4
--- /dev/null
+++ b/acct-user/graylog/graylog-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Graylog program user"
+ACCT_USER_ID=478
+ACCT_USER_GROUPS=( graylog )
+acct-user_add_deps
diff --git a/acct-user/greetd/greetd-0-r1.ebuild b/acct-user/greetd/greetd-0-r1.ebuild
deleted file mode 100644
index 9578715d3bbe..000000000000
--- a/acct-user/greetd/greetd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=396
-ACCT_USER_GROUPS=( greetd video )
-DESCRIPTION="User for gui-libs/greetd"
-
-acct-user_add_deps
diff --git a/acct-user/greetd/greetd-0-r2.ebuild b/acct-user/greetd/greetd-0-r2.ebuild
new file mode 100644
index 000000000000..48f4b6d94f38
--- /dev/null
+++ b/acct-user/greetd/greetd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=396
+ACCT_USER_GROUPS=( greetd video )
+DESCRIPTION="User for gui-libs/greetd"
+
+acct-user_add_deps
diff --git a/acct-user/grok_exporter/grok_exporter-0-r1.ebuild b/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..87a17187d7ed
--- /dev/null
+++ b/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/grok_exporter"
+
+ACCT_USER_ID=104
+ACCT_USER_GROUPS=( grok_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/grok_exporter/grok_exporter-0.ebuild b/acct-user/grok_exporter/grok_exporter-0.ebuild
deleted file mode 100644
index c58147fb8bc5..000000000000
--- a/acct-user/grok_exporter/grok_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/grok_exporter"
-
-ACCT_USER_ID=104
-ACCT_USER_GROUPS=( grok_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/groonga/groonga-0-r1.ebuild b/acct-user/groonga/groonga-0-r1.ebuild
new file mode 100644
index 000000000000..6647b44bb496
--- /dev/null
+++ b/acct-user/groonga/groonga-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-text/groonga"
+
+ACCT_USER_GROUPS=( "groonga" )
+ACCT_USER_ID="266"
+
+acct-user_add_deps
diff --git a/acct-user/groonga/groonga-0.ebuild b/acct-user/groonga/groonga-0.ebuild
deleted file mode 100644
index 7df7ee2917a9..000000000000
--- a/acct-user/groonga/groonga-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-text/groonga"
-
-ACCT_USER_GROUPS=( "groonga" )
-ACCT_USER_ID="266"
-
-acct-user_add_deps
diff --git a/acct-user/gvm/gvm-0-r1.ebuild b/acct-user/gvm/gvm-0-r1.ebuild
deleted file mode 100644
index a6d2af7e6b4f..000000000000
--- a/acct-user/gvm/gvm-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Greenbone vulnerability management program user"
-ACCT_USER_ID=495
-ACCT_USER_HOME=/var/lib/gvm
-ACCT_USER_GROUPS=( gvm )
-
-acct-user_add_deps
diff --git a/acct-user/gvm/gvm-0-r2.ebuild b/acct-user/gvm/gvm-0-r2.ebuild
new file mode 100644
index 000000000000..bafded17a742
--- /dev/null
+++ b/acct-user/gvm/gvm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Greenbone vulnerability management program user"
+ACCT_USER_ID=495
+ACCT_USER_HOME=/var/lib/gvm
+ACCT_USER_GROUPS=( gvm )
+
+acct-user_add_deps
diff --git a/acct-user/h2o/h2o-0-r1.ebuild b/acct-user/h2o/h2o-0-r1.ebuild
new file mode 100644
index 000000000000..d01ee4c8ca23
--- /dev/null
+++ b/acct-user/h2o/h2o-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/h2o"
+
+ACCT_USER_GROUPS=( "h2o" )
+ACCT_USER_ID="141"
+
+acct-user_add_deps
diff --git a/acct-user/h2o/h2o-0.ebuild b/acct-user/h2o/h2o-0.ebuild
deleted file mode 100644
index 356f1e56ec29..000000000000
--- a/acct-user/h2o/h2o-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/h2o"
-
-ACCT_USER_GROUPS=( "h2o" )
-ACCT_USER_ID="141"
-
-acct-user_add_deps
diff --git a/acct-user/hacluster/hacluster-0-r1.ebuild b/acct-user/hacluster/hacluster-0-r1.ebuild
new file mode 100644
index 000000000000..becc65512d90
--- /dev/null
+++ b/acct-user/hacluster/hacluster-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-cluster/cluster-glue"
+
+ACCT_USER_GROUPS=( "haclient" )
+ACCT_USER_HOME="/var/lib/heartbeat"
+ACCT_USER_ID="304"
+
+acct-user_add_deps
diff --git a/acct-user/hacluster/hacluster-0.ebuild b/acct-user/hacluster/hacluster-0.ebuild
deleted file mode 100644
index 7558b70e8c0d..000000000000
--- a/acct-user/hacluster/hacluster-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-cluster/cluster-glue"
-
-ACCT_USER_GROUPS=( "haclient" )
-ACCT_USER_HOME="/var/lib/heartbeat"
-ACCT_USER_ID="304"
-
-acct-user_add_deps
diff --git a/acct-user/haproxy/haproxy-0-r1.ebuild b/acct-user/haproxy/haproxy-0-r1.ebuild
deleted file mode 100644
index 7306045a6a3e..000000000000
--- a/acct-user/haproxy/haproxy-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=188
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/haproxy/haproxy-0-r2.ebuild b/acct-user/haproxy/haproxy-0-r2.ebuild
new file mode 100644
index 000000000000..03c81ce79b9b
--- /dev/null
+++ b/acct-user/haproxy/haproxy-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=188
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/havp/havp-0-r1.ebuild b/acct-user/havp/havp-0-r2.ebuild
index 9b8f3542221f..9b8f3542221f 100644
--- a/acct-user/havp/havp-0-r1.ebuild
+++ b/acct-user/havp/havp-0-r2.ebuild
diff --git a/acct-user/headscale/headscale-0.ebuild b/acct-user/headscale/headscale-0-r1.ebuild
index 23080db987f7..23080db987f7 100644
--- a/acct-user/headscale/headscale-0.ebuild
+++ b/acct-user/headscale/headscale-0-r1.ebuild
diff --git a/acct-user/heat/heat-0-r1.ebuild b/acct-user/heat/heat-0-r1.ebuild
deleted file mode 100644
index d721c2e9d042..000000000000
--- a/acct-user/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the heat openstack service"
-ACCT_USER_ID=444
-ACCT_USER_HOME=/var/lib/heat
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( heat )
-
-acct-user_add_deps
diff --git a/acct-user/heat/heat-0-r2.ebuild b/acct-user/heat/heat-0-r2.ebuild
new file mode 100644
index 000000000000..eb03e5de5de4
--- /dev/null
+++ b/acct-user/heat/heat-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the heat openstack service"
+ACCT_USER_ID=444
+ACCT_USER_HOME=/var/lib/heat
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( heat )
+
+acct-user_add_deps
diff --git a/acct-user/hsqldb/hsqldb-0-r1.ebuild b/acct-user/hsqldb/hsqldb-0-r1.ebuild
new file mode 100644
index 000000000000..18eddffbea04
--- /dev/null
+++ b/acct-user/hsqldb/hsqldb-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for hsqldb"
+ACCT_USER_ID=217
+ACCT_USER_GROUPS=( hsqldb )
+
+acct-user_add_deps
diff --git a/acct-user/hsqldb/hsqldb-0.ebuild b/acct-user/hsqldb/hsqldb-0.ebuild
deleted file mode 100644
index 887cecb0627e..000000000000
--- a/acct-user/hsqldb/hsqldb-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for hsqldb"
-ACCT_USER_ID=217
-ACCT_USER_GROUPS=( hsqldb )
-
-acct-user_add_deps
diff --git a/acct-user/http/http-0-r1.ebuild b/acct-user/http/http-0-r1.ebuild
new file mode 100644
index 000000000000..01da8bc68a00
--- /dev/null
+++ b/acct-user/http/http-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/caddy"
+
+ACCT_USER_HOME=/var/lib/http
+ACCT_USER_GROUPS=( "http" )
+ACCT_USER_ID="297"
+
+acct-user_add_deps
diff --git a/acct-user/http/http-0.ebuild b/acct-user/http/http-0.ebuild
deleted file mode 100644
index b33130fdf84e..000000000000
--- a/acct-user/http/http-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/caddy"
-
-ACCT_USER_HOME=/var/lib/http
-ACCT_USER_GROUPS=( "http" )
-ACCT_USER_ID="297"
-
-acct-user_add_deps
diff --git a/acct-user/i2p/i2p-0-r1.ebuild b/acct-user/i2p/i2p-0-r1.ebuild
deleted file mode 100644
index 3acdb2cf83f0..000000000000
--- a/acct-user/i2p/i2p-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for system-wide net-vpn/i2p"
-ACCT_USER_ID=471
-ACCT_USER_GROUPS=( i2p )
-ACCT_USER_HOME=/var/lib/i2p
-
-acct-user_add_deps
diff --git a/acct-user/i2p/i2p-0-r2.ebuild b/acct-user/i2p/i2p-0-r2.ebuild
new file mode 100644
index 000000000000..03e1a11909f6
--- /dev/null
+++ b/acct-user/i2p/i2p-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for system-wide net-vpn/i2p"
+ACCT_USER_ID=471
+ACCT_USER_GROUPS=( i2p )
+ACCT_USER_HOME=/var/lib/i2p
+
+acct-user_add_deps
diff --git a/acct-user/i2pd/i2pd-0-r1.ebuild b/acct-user/i2pd/i2pd-0-r1.ebuild
deleted file mode 100644
index b46cb5b6fb3a..000000000000
--- a/acct-user/i2pd/i2pd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-vpn/i2pd server"
-ACCT_USER_ID=470
-ACCT_USER_GROUPS=( i2pd )
-ACCT_USER_HOME=/var/lib/i2pd
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/i2pd/i2pd-0-r2.ebuild b/acct-user/i2pd/i2pd-0-r2.ebuild
new file mode 100644
index 000000000000..5260bcec21a1
--- /dev/null
+++ b/acct-user/i2pd/i2pd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-vpn/i2pd server"
+ACCT_USER_ID=470
+ACCT_USER_GROUPS=( i2pd )
+ACCT_USER_HOME=/var/lib/i2pd
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/icecast/icecast-0-r1.ebuild b/acct-user/icecast/icecast-0-r1.ebuild
new file mode 100644
index 000000000000..b303a86666d0
--- /dev/null
+++ b/acct-user/icecast/icecast-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/icecast"
+
+ACCT_USER_GROUPS=( "icecast" )
+ACCT_USER_ID="131"
+
+acct-user_add_deps
diff --git a/acct-user/icecast/icecast-0.ebuild b/acct-user/icecast/icecast-0.ebuild
deleted file mode 100644
index 50f822213b0b..000000000000
--- a/acct-user/icecast/icecast-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/icecast"
-
-ACCT_USER_GROUPS=( "icecast" )
-ACCT_USER_ID="131"
-
-acct-user_add_deps
diff --git a/acct-user/icecream/icecream-0-r1.ebuild b/acct-user/icecream/icecream-0-r1.ebuild
new file mode 100644
index 000000000000..955f96208772
--- /dev/null
+++ b/acct-user/icecream/icecream-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-devel/icecream"
+
+ACCT_USER_GROUPS=( "icecream" )
+ACCT_USER_HOME="/var/cache/icecream"
+ACCT_USER_ID="145"
+
+acct-user_add_deps
diff --git a/acct-user/icecream/icecream-0.ebuild b/acct-user/icecream/icecream-0.ebuild
deleted file mode 100644
index 267a068e5776..000000000000
--- a/acct-user/icecream/icecream-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-devel/icecream"
-
-ACCT_USER_GROUPS=( "icecream" )
-ACCT_USER_HOME="/var/cache/icecream"
-ACCT_USER_ID="145"
-
-acct-user_add_deps
diff --git a/acct-user/ices/ices-0-r1.ebuild b/acct-user/ices/ices-0-r1.ebuild
new file mode 100644
index 000000000000..0cc042ce665d
--- /dev/null
+++ b/acct-user/ices/ices-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ices"
+
+ACCT_USER_GROUPS=( "ices" )
+ACCT_USER_ID="162"
+
+acct-user_add_deps
diff --git a/acct-user/ices/ices-0.ebuild b/acct-user/ices/ices-0.ebuild
deleted file mode 100644
index f5e3508280b0..000000000000
--- a/acct-user/ices/ices-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/ices"
-
-ACCT_USER_GROUPS=( "ices" )
-ACCT_USER_ID="162"
-
-acct-user_add_deps
diff --git a/acct-user/icinga/icinga-0-r1.ebuild b/acct-user/icinga/icinga-0-r1.ebuild
deleted file mode 100644
index 015dc5c32ff5..000000000000
--- a/acct-user/icinga/icinga-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Icinga User"
-ACCT_USER_ID=457
-ACCT_USER_HOME=/var/lib/icinga2
-ACCT_USER_GROUPS=( icinga icingacmd nagios )
-
-acct-user_add_deps
diff --git a/acct-user/icinga/icinga-0-r2.ebuild b/acct-user/icinga/icinga-0-r2.ebuild
new file mode 100644
index 000000000000..8d2976baab64
--- /dev/null
+++ b/acct-user/icinga/icinga-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Icinga User"
+ACCT_USER_ID=457
+ACCT_USER_HOME=/var/lib/icinga2
+ACCT_USER_GROUPS=( icinga icingacmd nagios )
+
+acct-user_add_deps
diff --git a/acct-user/icingadirector/icingadirector-0-r1.ebuild b/acct-user/icingadirector/icingadirector-0-r1.ebuild
new file mode 100644
index 000000000000..e2684ec08fc9
--- /dev/null
+++ b/acct-user/icingadirector/icingadirector-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Icinga Director User"
+ACCT_USER_ID=231
+ACCT_USER_HOME=/var/lib/icingadirector
+ACCT_USER_GROUPS=( icingaweb2 )
+
+acct-user_add_deps
diff --git a/acct-user/icingadirector/icingadirector-0.ebuild b/acct-user/icingadirector/icingadirector-0.ebuild
deleted file mode 100644
index f82b14af5783..000000000000
--- a/acct-user/icingadirector/icingadirector-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="Icinga Director User"
-ACCT_USER_ID=231
-ACCT_USER_HOME=/var/lib/icingadirector
-ACCT_USER_GROUPS=( icingaweb2 )
-
-acct-user_add_deps
diff --git a/acct-user/inadyn/inadyn-0.ebuild b/acct-user/inadyn/inadyn-0-r1.ebuild
index 62fcbf9f94b0..62fcbf9f94b0 100644
--- a/acct-user/inadyn/inadyn-0.ebuild
+++ b/acct-user/inadyn/inadyn-0-r1.ebuild
diff --git a/acct-user/influxdb/influxdb-0-r1.ebuild b/acct-user/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 9f92875d2fdf..000000000000
--- a/acct-user/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for influxdb"
-ACCT_USER_ID=342
-ACCT_USER_GROUPS=( influxdb )
-ACCT_USER_HOME=/var/lib/influxdb
-
-acct-user_add_deps
diff --git a/acct-user/influxdb/influxdb-0-r2.ebuild b/acct-user/influxdb/influxdb-0-r2.ebuild
new file mode 100644
index 000000000000..21d7eb55e107
--- /dev/null
+++ b/acct-user/influxdb/influxdb-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for influxdb"
+ACCT_USER_ID=342
+ACCT_USER_GROUPS=( influxdb )
+ACCT_USER_HOME=/var/lib/influxdb
+
+acct-user_add_deps
diff --git a/acct-user/inspircd/inspircd-0-r1.ebuild b/acct-user/inspircd/inspircd-0-r1.ebuild
deleted file mode 100644
index 7719ce203cbd..000000000000
--- a/acct-user/inspircd/inspircd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for InspIRCd server daemon"
-ACCT_USER_ID=167
-ACCT_USER_GROUPS=( inspircd )
-
-acct-user_add_deps
diff --git a/acct-user/inspircd/inspircd-0-r2.ebuild b/acct-user/inspircd/inspircd-0-r2.ebuild
new file mode 100644
index 000000000000..387ce15f89bd
--- /dev/null
+++ b/acct-user/inspircd/inspircd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for InspIRCd server daemon"
+ACCT_USER_ID=167
+ACCT_USER_GROUPS=( inspircd )
+
+acct-user_add_deps
diff --git a/acct-user/ipfs/ipfs-0-r1.ebuild b/acct-user/ipfs/ipfs-0-r1.ebuild
deleted file mode 100644
index 54ddc40e854c..000000000000
--- a/acct-user/ipfs/ipfs-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-p2p/go-ipfs-bin server"
-ACCT_USER_ID=484
-ACCT_USER_HOME=/var/lib/ipfs
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( ipfs )
-
-acct-user_add_deps
diff --git a/acct-user/ipfs/ipfs-0-r2.ebuild b/acct-user/ipfs/ipfs-0-r2.ebuild
new file mode 100644
index 000000000000..b9df15adae9e
--- /dev/null
+++ b/acct-user/ipfs/ipfs-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-p2p/go-ipfs-bin server"
+ACCT_USER_ID=484
+ACCT_USER_HOME=/var/lib/ipfs
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( ipfs )
+
+acct-user_add_deps
diff --git a/acct-user/ippl/ippl-0-r1.ebuild b/acct-user/ippl/ippl-0-r1.ebuild
deleted file mode 100644
index 24bf022a7c8c..000000000000
--- a/acct-user/ippl/ippl-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for net-analyzer/ippl"
-ACCT_USER_ID=465
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/ippl/ippl-0-r2.ebuild b/acct-user/ippl/ippl-0-r2.ebuild
new file mode 100644
index 000000000000..151c567ab853
--- /dev/null
+++ b/acct-user/ippl/ippl-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for net-analyzer/ippl"
+ACCT_USER_ID=465
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/ipsec/ipsec-0-r1.ebuild b/acct-user/ipsec/ipsec-0-r1.ebuild
new file mode 100644
index 000000000000..a5697b99a67a
--- /dev/null
+++ b/acct-user/ipsec/ipsec-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="ipsec (strongswan) program user"
+
+ACCT_USER_ID=199
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/ipsec/ipsec-0.ebuild b/acct-user/ipsec/ipsec-0.ebuild
deleted file mode 100644
index 738b68f43199..000000000000
--- a/acct-user/ipsec/ipsec-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="ipsec (strongswan) program user"
-
-ACCT_USER_ID=199
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/ipsentinel/ipsentinel-0-r1.ebuild b/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
new file mode 100644
index 000000000000..8c7be37bbd69
--- /dev/null
+++ b/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ip-sentinel"
+
+ACCT_USER_GROUPS=( "ipsentinel" )
+ACCT_USER_ID="163"
+
+acct-user_add_deps
diff --git a/acct-user/ipsentinel/ipsentinel-0.ebuild b/acct-user/ipsentinel/ipsentinel-0.ebuild
deleted file mode 100644
index 1dceb5b8104a..000000000000
--- a/acct-user/ipsentinel/ipsentinel-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/ip-sentinel"
-
-ACCT_USER_GROUPS=( "ipsentinel" )
-ACCT_USER_ID="163"
-
-acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0-r1.ebuild b/acct-user/iroffer/iroffer-0-r1.ebuild
new file mode 100644
index 000000000000..a44bed6da0d0
--- /dev/null
+++ b/acct-user/iroffer/iroffer-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=187
+ACCT_USER_GROUPS=( iroffer )
+
+acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0.ebuild b/acct-user/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 452a50f2f547..000000000000
--- a/acct-user/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=187
-ACCT_USER_GROUPS=( iroffer )
-
-acct-user_add_deps
diff --git a/acct-user/jellyfin/jellyfin-0-r1.ebuild b/acct-user/jellyfin/jellyfin-0-r1.ebuild
deleted file mode 100644
index 80de5e231296..000000000000
--- a/acct-user/jellyfin/jellyfin-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_HOME=/var/lib/jellyfin
-ACCT_USER_ID=518
-ACCT_USER_GROUPS=( jellyfin render video )
-
-acct-user_add_deps
diff --git a/acct-user/jellyfin/jellyfin-0-r2.ebuild b/acct-user/jellyfin/jellyfin-0-r2.ebuild
new file mode 100644
index 000000000000..c19f4a25d127
--- /dev/null
+++ b/acct-user/jellyfin/jellyfin-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_HOME=/var/lib/jellyfin
+ACCT_USER_ID=518
+ACCT_USER_GROUPS=( jellyfin render video )
+
+acct-user_add_deps
diff --git a/acct-user/jenkins/jenkins-0-r1.ebuild b/acct-user/jenkins/jenkins-0-r1.ebuild
new file mode 100644
index 000000000000..fe4befe0583b
--- /dev/null
+++ b/acct-user/jenkins/jenkins-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Jenkins program user"
+
+ACCT_USER_ID=473
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/jenkins/jenkins-0.ebuild b/acct-user/jenkins/jenkins-0.ebuild
deleted file mode 100644
index e568647b1f02..000000000000
--- a/acct-user/jenkins/jenkins-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Jenkins program user"
-
-ACCT_USER_ID=473
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/kafka/kafka-0-r1.ebuild b/acct-user/kafka/kafka-0-r1.ebuild
deleted file mode 100644
index f69be4e3ece8..000000000000
--- a/acct-user/kafka/kafka-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for kafka"
-
-ACCT_USER_ID=425
-ACCT_USER_HOME=/var/lib/kafka
-ACCT_USER_SHELL=/bin/sh
-ACCT_USER_GROUPS=( kafka )
-
-acct-user_add_deps
diff --git a/acct-user/kafka/kafka-0-r2.ebuild b/acct-user/kafka/kafka-0-r2.ebuild
new file mode 100644
index 000000000000..2b3793a80e93
--- /dev/null
+++ b/acct-user/kafka/kafka-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for kafka"
+
+ACCT_USER_ID=425
+ACCT_USER_HOME=/var/lib/kafka
+ACCT_USER_SHELL=/bin/sh
+ACCT_USER_GROUPS=( kafka )
+
+acct-user_add_deps
diff --git a/acct-user/kapacitor/kapacitor-0-r1.ebuild b/acct-user/kapacitor/kapacitor-0-r1.ebuild
deleted file mode 100644
index abc1cc404a05..000000000000
--- a/acct-user/kapacitor/kapacitor-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for kapacitor"
-ACCT_USER_ID=343
-ACCT_USER_GROUPS=( kapacitor )
-ACCT_USER_HOME=/var/lib/kapacitor
-
-acct-user_add_deps
diff --git a/acct-user/kapacitor/kapacitor-0-r2.ebuild b/acct-user/kapacitor/kapacitor-0-r2.ebuild
new file mode 100644
index 000000000000..b61f9fbd2c9a
--- /dev/null
+++ b/acct-user/kapacitor/kapacitor-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for kapacitor"
+ACCT_USER_ID=343
+ACCT_USER_GROUPS=( kapacitor )
+ACCT_USER_HOME=/var/lib/kapacitor
+
+acct-user_add_deps
diff --git a/acct-user/karma/karma-0-r1.ebuild b/acct-user/karma/karma-0-r1.ebuild
new file mode 100644
index 000000000000..420c7da0121f
--- /dev/null
+++ b/acct-user/karma/karma-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/karma-bin"
+
+ACCT_USER_ID=118
+ACCT_USER_GROUPS=( karma )
+
+acct-user_add_deps
diff --git a/acct-user/karma/karma-0.ebuild b/acct-user/karma/karma-0.ebuild
deleted file mode 100644
index e125361d1e72..000000000000
--- a/acct-user/karma/karma-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/karma-bin"
-
-ACCT_USER_ID=118
-ACCT_USER_GROUPS=( karma )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/keystone-0-r1.ebuild b/acct-user/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 1519aa941e90..000000000000
--- a/acct-user/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the keystone openstack service"
-ACCT_USER_ID=445
-ACCT_USER_HOME=/var/lib/keystone
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( keystone )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/keystone-0-r2.ebuild b/acct-user/keystone/keystone-0-r2.ebuild
new file mode 100644
index 000000000000..873aea351054
--- /dev/null
+++ b/acct-user/keystone/keystone-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the keystone openstack service"
+ACCT_USER_ID=445
+ACCT_USER_HOME=/var/lib/keystone
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( keystone )
+
+acct-user_add_deps
diff --git a/acct-user/kibana/kibana-0-r1.ebuild b/acct-user/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index b04ba4aacc1d..000000000000
--- a/acct-user/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Kibana program user"
-ACCT_USER_ID=269
-ACCT_USER_HOME=/var/lib/kibana
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( kibana )
-acct-user_add_deps
diff --git a/acct-user/kibana/kibana-0-r2.ebuild b/acct-user/kibana/kibana-0-r2.ebuild
new file mode 100644
index 000000000000..4a188fc20953
--- /dev/null
+++ b/acct-user/kibana/kibana-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Kibana program user"
+ACCT_USER_ID=269
+ACCT_USER_HOME=/var/lib/kibana
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( kibana )
+acct-user_add_deps
diff --git a/acct-user/kismet/kismet-0-r1.ebuild b/acct-user/kismet/kismet-0-r1.ebuild
deleted file mode 100644
index 76f56775cac5..000000000000
--- a/acct-user/kismet/kismet-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="net-wireless/kismet"
-ACCT_USER_ID="388"
-ACCT_USER_GROUPS=( kismet )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/kismet "
-RDEPEND+=" acct-group/kismet "
diff --git a/acct-user/kismet/kismet-0-r2.ebuild b/acct-user/kismet/kismet-0-r2.ebuild
new file mode 100644
index 000000000000..7d3a4b49839d
--- /dev/null
+++ b/acct-user/kismet/kismet-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_USER_ID="388"
+ACCT_USER_GROUPS=( kismet )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/kismet "
+RDEPEND+=" acct-group/kismet "
diff --git a/acct-user/knot-resolver/knot-resolver-0-r1.ebuild b/acct-user/knot-resolver/knot-resolver-0-r1.ebuild
new file mode 100644
index 000000000000..726a5d2c673f
--- /dev/null
+++ b/acct-user/knot-resolver/knot-resolver-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=525
+ACCT_USER_HOME=/var/lib/knot-resolver
+ACCT_USER_GROUPS=( knot-resolver )
+
+acct-user_add_deps
diff --git a/acct-user/knot-resolver/knot-resolver-0.ebuild b/acct-user/knot-resolver/knot-resolver-0.ebuild
deleted file mode 100644
index acac705b4619..000000000000
--- a/acct-user/knot-resolver/knot-resolver-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=525
-ACCT_USER_HOME=/var/lib/knot-resolver
-ACCT_USER_GROUPS=( knot-resolver )
-
-acct-user_add_deps
diff --git a/acct-user/knot/knot-0-r1.ebuild b/acct-user/knot/knot-0-r1.ebuild
deleted file mode 100644
index 5be8df72f20f..000000000000
--- a/acct-user/knot/knot-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for knot DNS server"
-ACCT_USER_ID=53
-ACCT_USER_HOME=/var/lib/knot
-ACCT_USER_GROUPS=( knot )
-
-acct-user_add_deps
diff --git a/acct-user/knot/knot-0-r2.ebuild b/acct-user/knot/knot-0-r2.ebuild
new file mode 100644
index 000000000000..e1589d0acc7f
--- /dev/null
+++ b/acct-user/knot/knot-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for knot DNS server"
+ACCT_USER_ID=53
+ACCT_USER_HOME=/var/lib/knot
+ACCT_USER_GROUPS=( knot )
+
+acct-user_add_deps
diff --git a/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild
deleted file mode 100644
index 7ec98102fdae..000000000000
--- a/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-apiserver"
-ACCT_USER_ID=432
-ACCT_USER_GROUPS=( kube-apiserver )
-
-acct-user_add_deps
diff --git a/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
new file mode 100644
index 000000000000..0ca7505f290c
--- /dev/null
+++ b/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-apiserver"
+ACCT_USER_ID=432
+ACCT_USER_GROUPS=( kube-apiserver )
+
+acct-user_add_deps
diff --git a/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild
deleted file mode 100644
index 6ba2b48ee468..000000000000
--- a/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-controller-manager"
-ACCT_USER_ID=433
-ACCT_USER_GROUPS=( kube-controller-manager )
-
-acct-user_add_deps
diff --git a/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild
new file mode 100644
index 000000000000..472ccc1d16f7
--- /dev/null
+++ b/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-controller-manager"
+ACCT_USER_ID=433
+ACCT_USER_GROUPS=( kube-controller-manager )
+
+acct-user_add_deps
diff --git a/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild
deleted file mode 100644
index 913fcb70494d..000000000000
--- a/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-scheduler"
-ACCT_USER_ID=434
-ACCT_USER_GROUPS=( kube-scheduler )
-
-acct-user_add_deps
diff --git a/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
new file mode 100644
index 000000000000..a6fcaaa54979
--- /dev/null
+++ b/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-scheduler"
+ACCT_USER_ID=434
+ACCT_USER_GROUPS=( kube-scheduler )
+
+acct-user_add_deps
diff --git a/acct-user/ldap/ldap-0-r1.ebuild b/acct-user/ldap/ldap-0-r1.ebuild
new file mode 100644
index 000000000000..46d4c83ae93e
--- /dev/null
+++ b/acct-user/ldap/ldap-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for ldap"
+ACCT_USER_ID=439
+ACCT_USER_GROUPS=( ldap )
+
+acct-user_add_deps
+
+pkg_setup() {
+ ACCT_USER_HOME=/usr/$(get_libdir)/openldap
+}
diff --git a/acct-user/ldap/ldap-0.ebuild b/acct-user/ldap/ldap-0.ebuild
deleted file mode 100644
index dbb6a9e79d87..000000000000
--- a/acct-user/ldap/ldap-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for ldap"
-ACCT_USER_ID=439
-ACCT_USER_GROUPS=( ldap )
-
-acct-user_add_deps
-
-pkg_setup() {
- ACCT_USER_HOME=/usr/$(get_libdir)/openldap
-}
diff --git a/acct-user/libreoffice/libreoffice-0-r1.ebuild b/acct-user/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..aa08fcfb70de
--- /dev/null
+++ b/acct-user/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for the headless LibreOffice server"
+
+ACCT_USER_GROUPS=( "libreoffice" )
+ACCT_USER_HOME="/var/lib/libreoffice"
+ACCT_USER_ID="512"
+
+acct-user_add_deps
diff --git a/acct-user/libreoffice/libreoffice-0.ebuild b/acct-user/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index 59f859ea5a19..000000000000
--- a/acct-user/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for the headless LibreOffice server"
-
-ACCT_USER_GROUPS=( "libreoffice" )
-ACCT_USER_HOME="/var/lib/libreoffice"
-ACCT_USER_ID="512"
-
-acct-user_add_deps
diff --git a/acct-user/lightdm/lightdm-0-r1.ebuild b/acct-user/lightdm/lightdm-0-r1.ebuild
new file mode 100644
index 000000000000..25af3b9c7f54
--- /dev/null
+++ b/acct-user/lightdm/lightdm-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/lightdm"
+
+ACCT_USER_GROUPS=( "lightdm" "video" )
+ACCT_USER_HOME="/var/lib/lightdm"
+ACCT_USER_ID="134"
+
+acct-user_add_deps
diff --git a/acct-user/lightdm/lightdm-0.ebuild b/acct-user/lightdm/lightdm-0.ebuild
deleted file mode 100644
index 43ea49e4ee73..000000000000
--- a/acct-user/lightdm/lightdm-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for x11-misc/lightdm"
-
-ACCT_USER_GROUPS=( "lightdm" "video" )
-ACCT_USER_HOME="/var/lib/lightdm"
-ACCT_USER_ID="134"
-
-acct-user_add_deps
diff --git a/acct-user/lighttpd/lighttpd-0-r1.ebuild b/acct-user/lighttpd/lighttpd-0-r1.ebuild
deleted file mode 100644
index 5534663d206b..000000000000
--- a/acct-user/lighttpd/lighttpd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for lighttpd"
-ACCT_USER_ID=302
-ACCT_USER_GROUPS=( lighttpd )
-
-acct-user_add_deps
diff --git a/acct-user/lighttpd/lighttpd-0-r2.ebuild b/acct-user/lighttpd/lighttpd-0-r2.ebuild
new file mode 100644
index 000000000000..155cf8661c81
--- /dev/null
+++ b/acct-user/lighttpd/lighttpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for lighttpd"
+ACCT_USER_ID=302
+ACCT_USER_GROUPS=( lighttpd )
+
+acct-user_add_deps
diff --git a/acct-user/litecoin/litecoin-0-r1.ebuild b/acct-user/litecoin/litecoin-0-r1.ebuild
new file mode 100644
index 000000000000..4f83d6e97e50
--- /dev/null
+++ b/acct-user/litecoin/litecoin-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/litecoind"
+
+ACCT_USER_GROUPS=( "litecoin" )
+ACCT_USER_HOME="/var/lib/litecoin"
+ACCT_USER_ID="256"
+
+acct-user_add_deps
diff --git a/acct-user/litecoin/litecoin-0.ebuild b/acct-user/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 2a9cad12ecb1..000000000000
--- a/acct-user/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/litecoind"
-
-ACCT_USER_GROUPS=( "litecoin" )
-ACCT_USER_HOME="/var/lib/litecoin"
-ACCT_USER_ID="256"
-
-acct-user_add_deps
diff --git a/acct-user/lldpd/lldpd-0-r1.ebuild b/acct-user/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 1b1593fc3a76..000000000000
--- a/acct-user/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/lldpd"
-
-ACCT_USER_ID=315
-ACCT_USER_GROUPS=( lldpd )
-
-acct-user_add_deps
diff --git a/acct-user/lldpd/lldpd-0-r2.ebuild b/acct-user/lldpd/lldpd-0-r2.ebuild
new file mode 100644
index 000000000000..e8ac77195bf3
--- /dev/null
+++ b/acct-user/lldpd/lldpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/lldpd"
+
+ACCT_USER_ID=315
+ACCT_USER_GROUPS=( lldpd )
+
+acct-user_add_deps
diff --git a/acct-user/logcheck/logcheck-0-r1.ebuild b/acct-user/logcheck/logcheck-0-r1.ebuild
new file mode 100644
index 000000000000..f2635a5ebd27
--- /dev/null
+++ b/acct-user/logcheck/logcheck-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logcheck"
+
+ACCT_USER_GROUPS=( "logcheck" )
+ACCT_USER_ID="284"
+
+acct-user_add_deps
diff --git a/acct-user/logcheck/logcheck-0.ebuild b/acct-user/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 4dfb987a1636..000000000000
--- a/acct-user/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logcheck"
-
-ACCT_USER_GROUPS=( "logcheck" )
-ACCT_USER_ID="284"
-
-acct-user_add_deps
diff --git a/acct-user/logstash/logstash-0-r1.ebuild b/acct-user/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 748b9f907d0d..000000000000
--- a/acct-user/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Logstash program user"
-ACCT_USER_ID=270
-ACCT_USER_HOME=/var/lib/logstash
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( logstash )
-acct-user_add_deps
diff --git a/acct-user/logstash/logstash-0-r2.ebuild b/acct-user/logstash/logstash-0-r2.ebuild
new file mode 100644
index 000000000000..44658d2d4261
--- /dev/null
+++ b/acct-user/logstash/logstash-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Logstash program user"
+ACCT_USER_ID=270
+ACCT_USER_HOME=/var/lib/logstash
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( logstash )
+acct-user_add_deps
diff --git a/acct-user/logsurfer/logsurfer-0-r1.ebuild b/acct-user/logsurfer/logsurfer-0-r1.ebuild
new file mode 100644
index 000000000000..f55cf8a7802d
--- /dev/null
+++ b/acct-user/logsurfer/logsurfer-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logsurfer"
+
+ACCT_USER_GROUPS=( "logsurfer" )
+ACCT_USER_ID="249"
+
+acct-user_add_deps
diff --git a/acct-user/logsurfer/logsurfer-0.ebuild b/acct-user/logsurfer/logsurfer-0.ebuild
deleted file mode 100644
index be3a125870b5..000000000000
--- a/acct-user/logsurfer/logsurfer-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logsurfer"
-
-ACCT_USER_GROUPS=( "logsurfer" )
-ACCT_USER_ID="249"
-
-acct-user_add_deps
diff --git a/acct-user/lxc/lxc-0-r1.ebuild b/acct-user/lxc/lxc-0-r1.ebuild
new file mode 100644
index 000000000000..503091786bb5
--- /dev/null
+++ b/acct-user/lxc/lxc-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-containers/lxc"
+ACCT_USER_ID=358
+ACCT_USER_GROUPS=( lxc )
+
+acct-user_add_deps
diff --git a/acct-user/lxc/lxc-0.ebuild b/acct-user/lxc/lxc-0.ebuild
deleted file mode 100644
index 1ea4ec8d2826..000000000000
--- a/acct-user/lxc/lxc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-containers/lxc"
-ACCT_USER_ID=358
-ACCT_USER_GROUPS=( lxc )
-
-acct-user_add_deps
diff --git a/acct-user/mail/mail-0-r1.ebuild b/acct-user/mail/mail-0-r1.ebuild
deleted file mode 100644
index da2aeb27f123..000000000000
--- a/acct-user/mail/mail-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Mail program user"
-ACCT_USER_ID=8
-ACCT_USER_HOME=/var/spool/mail
-ACCT_USER_HOME_OWNER=root:mail
-ACCT_USER_HOME_PERMS=03775
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/mail/mail-0-r2.ebuild b/acct-user/mail/mail-0-r2.ebuild
new file mode 100644
index 000000000000..7e265e0f4c6f
--- /dev/null
+++ b/acct-user/mail/mail-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Mail program user"
+ACCT_USER_ID=8
+ACCT_USER_HOME=/var/spool/mail
+ACCT_USER_HOME_OWNER=root:mail
+ACCT_USER_HOME_PERMS=03775
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/man/man-1-r1.ebuild b/acct-user/man/man-1-r1.ebuild
deleted file mode 100644
index 7fc43e801d0b..000000000000
--- a/acct-user/man/man-1-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=13
-ACCT_USER_GROUPS=( man )
-
-acct-user_add_deps
diff --git a/acct-user/man/man-1-r2.ebuild b/acct-user/man/man-1-r2.ebuild
new file mode 100644
index 000000000000..95551cbfed4e
--- /dev/null
+++ b/acct-user/man/man-1-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=13
+ACCT_USER_GROUPS=( man )
+
+acct-user_add_deps
diff --git a/acct-user/maradns/maradns-0-r1.ebuild b/acct-user/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index c2a756d077b5..000000000000
--- a/acct-user/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=99
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/maradns/maradns-0-r2.ebuild b/acct-user/maradns/maradns-0-r2.ebuild
new file mode 100644
index 000000000000..7448e405ec94
--- /dev/null
+++ b/acct-user/maradns/maradns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=99
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/memcached/memcached-0-r1.ebuild b/acct-user/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 65ff4babf81f..000000000000
--- a/acct-user/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the memcached service"
-ACCT_USER_ID=441
-ACCT_USER_GROUPS=( memcached )
-
-acct-user_add_deps
diff --git a/acct-user/memcached/memcached-0-r2.ebuild b/acct-user/memcached/memcached-0-r2.ebuild
new file mode 100644
index 000000000000..17e00df26495
--- /dev/null
+++ b/acct-user/memcached/memcached-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the memcached service"
+ACCT_USER_ID=441
+ACCT_USER_GROUPS=( memcached )
+
+acct-user_add_deps
diff --git a/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild b/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..78a563f0de1e
--- /dev/null
+++ b/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for memcached_exporter"
+ACCT_USER_ID=234
+ACCT_USER_GROUPS=( memcached_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/memcached_exporter/memcached_exporter-0.ebuild b/acct-user/memcached_exporter/memcached_exporter-0.ebuild
deleted file mode 100644
index 289d72e5eb68..000000000000
--- a/acct-user/memcached_exporter/memcached_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for memcached_exporter"
-ACCT_USER_ID=234
-ACCT_USER_GROUPS=( memcached_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/messagebus/messagebus-0-r1.ebuild b/acct-user/messagebus/messagebus-0-r1.ebuild
deleted file mode 100644
index 4dbd5fc10439..000000000000
--- a/acct-user/messagebus/messagebus-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=101
-ACCT_USER_GROUPS=( messagebus )
-
-acct-user_add_deps
diff --git a/acct-user/messagebus/messagebus-0-r2.ebuild b/acct-user/messagebus/messagebus-0-r2.ebuild
new file mode 100644
index 000000000000..c75cc7874852
--- /dev/null
+++ b/acct-user/messagebus/messagebus-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=101
+ACCT_USER_GROUPS=( messagebus )
+
+acct-user_add_deps
diff --git a/acct-user/mgraph/mgraph-0-r1.ebuild b/acct-user/mgraph/mgraph-0-r1.ebuild
new file mode 100644
index 000000000000..fd1fee37a63d
--- /dev/null
+++ b/acct-user/mgraph/mgraph-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/mailgraph"
+ACCT_USER_ID=376
+ACCT_USER_GROUPS=( mgraph adm )
+ACCT_USER_HOME="/var/lib/mailgraph"
+ACCT_USER_HOME_PERMS=750
+
+acct-user_add_deps
diff --git a/acct-user/mgraph/mgraph-0.ebuild b/acct-user/mgraph/mgraph-0.ebuild
deleted file mode 100644
index 4dc665546fd0..000000000000
--- a/acct-user/mgraph/mgraph-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/mailgraph"
-ACCT_USER_ID=376
-ACCT_USER_GROUPS=( mgraph adm )
-ACCT_USER_HOME="/var/lib/mailgraph"
-ACCT_USER_HOME_PERMS=750
-
-acct-user_add_deps
diff --git a/acct-user/milter-regex/milter-regex-0-r1.ebuild b/acct-user/milter-regex/milter-regex-0-r1.ebuild
deleted file mode 100644
index 973ab9bf9783..000000000000
--- a/acct-user/milter-regex/milter-regex-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/milter-regex"
-
-ACCT_USER_ID=438
-ACCT_USER_GROUPS=( milter-regex )
-
-acct-user_add_deps
diff --git a/acct-user/milter-regex/milter-regex-0-r2.ebuild b/acct-user/milter-regex/milter-regex-0-r2.ebuild
new file mode 100644
index 000000000000..666063185127
--- /dev/null
+++ b/acct-user/milter-regex/milter-regex-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/milter-regex"
+
+ACCT_USER_ID=438
+ACCT_USER_GROUPS=( milter-regex )
+
+acct-user_add_deps
diff --git a/acct-user/minbif/minbif-0-r1.ebuild b/acct-user/minbif/minbif-0-r1.ebuild
new file mode 100644
index 000000000000..8b2a8d2ffe3a
--- /dev/null
+++ b/acct-user/minbif/minbif-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/minbif"
+
+ACCT_USER_GROUPS=( "minbif" )
+ACCT_USER_HOME="/var/lib/minbif"
+ACCT_USER_ID="260"
+
+acct-user_add_deps
diff --git a/acct-user/minbif/minbif-0.ebuild b/acct-user/minbif/minbif-0.ebuild
deleted file mode 100644
index e93ddf7c984a..000000000000
--- a/acct-user/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/minbif"
-
-ACCT_USER_GROUPS=( "minbif" )
-ACCT_USER_HOME="/var/lib/minbif"
-ACCT_USER_ID="260"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/minecraft-0-r1.ebuild b/acct-user/minecraft/minecraft-0-r1.ebuild
deleted file mode 100644
index c4290868b526..000000000000
--- a/acct-user/minecraft/minecraft-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minecraft server"
-
-ACCT_USER_GROUPS=( "minecraft" )
-ACCT_USER_HOME="/var/lib/minecraft-server"
-ACCT_USER_ID="490"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/minecraft-0-r2.ebuild b/acct-user/minecraft/minecraft-0-r2.ebuild
new file mode 100644
index 000000000000..b591f5313e6b
--- /dev/null
+++ b/acct-user/minecraft/minecraft-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft server"
+
+ACCT_USER_GROUPS=( "minecraft" )
+ACCT_USER_HOME="/var/lib/minecraft-server"
+ACCT_USER_ID="490"
+
+acct-user_add_deps
diff --git a/acct-user/minetest/minetest-1-r1.ebuild b/acct-user/minetest/minetest-1-r1.ebuild
deleted file mode 100644
index 728978354ba5..000000000000
--- a/acct-user/minetest/minetest-1-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minetest server"
-
-ACCT_USER_GROUPS=( "minetest" )
-ACCT_USER_ID="480"
-ACCT_USER_HOME="/var/lib/minetest"
-
-acct-user_add_deps
diff --git a/acct-user/minetest/minetest-1-r2.ebuild b/acct-user/minetest/minetest-1-r2.ebuild
new file mode 100644
index 000000000000..4af1d2ed9392
--- /dev/null
+++ b/acct-user/minetest/minetest-1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minetest server"
+
+ACCT_USER_GROUPS=( "minetest" )
+ACCT_USER_ID="480"
+ACCT_USER_HOME="/var/lib/minetest"
+
+acct-user_add_deps
diff --git a/acct-user/minidlna/minidlna-0-r1.ebuild b/acct-user/minidlna/minidlna-0-r1.ebuild
new file mode 100644
index 000000000000..cbf710b89ee5
--- /dev/null
+++ b/acct-user/minidlna/minidlna-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=339
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/minidlna/minidlna-0.ebuild b/acct-user/minidlna/minidlna-0.ebuild
deleted file mode 100644
index df5a7d15b91f..000000000000
--- a/acct-user/minidlna/minidlna-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=339
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/miniflux/miniflux-0-r1.ebuild b/acct-user/miniflux/miniflux-0-r1.ebuild
new file mode 100644
index 000000000000..b2317ab7f2e7
--- /dev/null
+++ b/acct-user/miniflux/miniflux-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/miniflux"
+ACCT_USER_ID=404
+ACCT_USER_GROUPS=( nobody )
+
+acct-user_add_deps
diff --git a/acct-user/miniflux/miniflux-0.ebuild b/acct-user/miniflux/miniflux-0.ebuild
deleted file mode 100644
index 941a566e7309..000000000000
--- a/acct-user/miniflux/miniflux-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/miniflux"
-ACCT_USER_ID=404
-ACCT_USER_GROUPS=( nobody )
-
-acct-user_add_deps
diff --git a/acct-user/minio/minio-0-r1.ebuild b/acct-user/minio/minio-0-r1.ebuild
new file mode 100644
index 000000000000..4efb67950a9c
--- /dev/null
+++ b/acct-user/minio/minio-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for minio"
+ACCT_USER_ID=309
+ACCT_USER_HOME=/var/lib/minio
+ACCT_USER_GROUPS=( minio )
+
+acct-user_add_deps
diff --git a/acct-user/minio/minio-0.ebuild b/acct-user/minio/minio-0.ebuild
deleted file mode 100644
index 1c8765edb840..000000000000
--- a/acct-user/minio/minio-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for minio"
-ACCT_USER_ID=309
-ACCT_USER_HOME=/var/lib/minio
-ACCT_USER_GROUPS=( minio )
-
-acct-user_add_deps
diff --git a/acct-user/mogile/mogile-0-r1.ebuild b/acct-user/mogile/mogile-0-r1.ebuild
new file mode 100644
index 000000000000..407e8ab74359
--- /dev/null
+++ b/acct-user/mogile/mogile-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MogileFS user"
+ACCT_USER_ID=460
+ACCT_USER_ENFORCE_ID=1
+ACCT_USER_GROUPS=( mogile )
+
+acct-user_add_deps
diff --git a/acct-user/mogile/mogile-0.ebuild b/acct-user/mogile/mogile-0.ebuild
deleted file mode 100644
index 2441a86d5f14..000000000000
--- a/acct-user/mogile/mogile-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MogileFS user"
-ACCT_USER_ID=460
-ACCT_USER_ENFORCE_ID=1
-ACCT_USER_GROUPS=( mogile )
-
-acct-user_add_deps
diff --git a/acct-user/mongodb/mongodb-0-r1.ebuild b/acct-user/mongodb/mongodb-0-r1.ebuild
deleted file mode 100644
index b52e1ce055b5..000000000000
--- a/acct-user/mongodb/mongodb-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MongoDB program user"
-ACCT_USER_ID=481
-ACCT_USER_HOME=/var/lib/mongodb
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( mongodb )
-acct-user_add_deps
diff --git a/acct-user/mongodb/mongodb-0-r2.ebuild b/acct-user/mongodb/mongodb-0-r2.ebuild
new file mode 100644
index 000000000000..e1b6eeb17d80
--- /dev/null
+++ b/acct-user/mongodb/mongodb-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MongoDB program user"
+ACCT_USER_ID=481
+ACCT_USER_HOME=/var/lib/mongodb
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( mongodb )
+acct-user_add_deps
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..6b855f4acfef
--- /dev/null
+++ b/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for mongodb_exporter"
+ACCT_USER_ID=277
+ACCT_USER_GROUPS=( mongodb_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
deleted file mode 100644
index aadf83004efd..000000000000
--- a/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for mongodb_exporter"
-ACCT_USER_ID=277
-ACCT_USER_GROUPS=( mongodb_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/monitorix/monitorix-0-r1.ebuild b/acct-user/monitorix/monitorix-0-r1.ebuild
deleted file mode 100644
index 4109068cc47f..000000000000
--- a/acct-user/monitorix/monitorix-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Monitorix system tool user"
-ACCT_USER_ID=401
-ACCT_USER_GROUPS=( monitorix )
-
-acct-user_add_deps
diff --git a/acct-user/monitorix/monitorix-0-r2.ebuild b/acct-user/monitorix/monitorix-0-r2.ebuild
new file mode 100644
index 000000000000..e9c54be3e683
--- /dev/null
+++ b/acct-user/monitorix/monitorix-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Monitorix system tool user"
+ACCT_USER_ID=401
+ACCT_USER_GROUPS=( monitorix )
+
+acct-user_add_deps
diff --git a/acct-user/monkeyd/monkeyd-0-r1.ebuild b/acct-user/monkeyd/monkeyd-0-r1.ebuild
new file mode 100644
index 000000000000..228bd178732e
--- /dev/null
+++ b/acct-user/monkeyd/monkeyd-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/monkeyd"
+
+ACCT_USER_GROUPS=( "monkeyd" )
+ACCT_USER_HOME="/var/tmp/monkeyd"
+ACCT_USER_HOME_PERMS="0770"
+ACCT_USER_ID="149"
+
+acct-user_add_deps
diff --git a/acct-user/monkeyd/monkeyd-0.ebuild b/acct-user/monkeyd/monkeyd-0.ebuild
deleted file mode 100644
index 55cb3b5ff5d2..000000000000
--- a/acct-user/monkeyd/monkeyd-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/monkeyd"
-
-ACCT_USER_GROUPS=( "monkeyd" )
-ACCT_USER_HOME="/var/tmp/monkeyd"
-ACCT_USER_HOME_PERMS="0770"
-ACCT_USER_ID="149"
-
-acct-user_add_deps
diff --git a/acct-user/monkeysphere/monkeysphere-0-r1.ebuild b/acct-user/monkeysphere/monkeysphere-0-r1.ebuild
deleted file mode 100644
index a4288b053b5a..000000000000
--- a/acct-user/monkeysphere/monkeysphere-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="monkeysphere program user"
-
-ACCT_USER_ID=390
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_HOME_OWNER="root:${PN}"
-ACCT_USER_HOME_PERMS=0751
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/monkeysphere/monkeysphere-0-r2.ebuild b/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
new file mode 100644
index 000000000000..5bf080cb25de
--- /dev/null
+++ b/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="monkeysphere program user"
+
+ACCT_USER_ID=390
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_OWNER="root:${PN}"
+ACCT_USER_HOME_PERMS=0751
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/mosquitto/mosquitto-0-r1.ebuild b/acct-user/mosquitto/mosquitto-0-r1.ebuild
deleted file mode 100644
index b894117073bd..000000000000
--- a/acct-user/mosquitto/mosquitto-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the mosquitto MQTT broker"
-ACCT_USER_ID=482
-ACCT_USER_GROUPS=( mosquitto )
-
-acct-user_add_deps
diff --git a/acct-user/mosquitto/mosquitto-0-r2.ebuild b/acct-user/mosquitto/mosquitto-0-r2.ebuild
new file mode 100644
index 000000000000..450a523203e3
--- /dev/null
+++ b/acct-user/mosquitto/mosquitto-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the mosquitto MQTT broker"
+ACCT_USER_ID=482
+ACCT_USER_GROUPS=( mosquitto )
+
+acct-user_add_deps
diff --git a/acct-user/motion/motion-0-r1.ebuild b/acct-user/motion/motion-0-r1.ebuild
deleted file mode 100644
index bb4695efc896..000000000000
--- a/acct-user/motion/motion-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="added by portage for motion, a software motion detector"
-ACCT_USER_ID=395
-ACCT_USER_GROUPS=( motion video )
-
-acct-user_add_deps
diff --git a/acct-user/motion/motion-0-r2.ebuild b/acct-user/motion/motion-0-r2.ebuild
new file mode 100644
index 000000000000..2580f7f8db61
--- /dev/null
+++ b/acct-user/motion/motion-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="added by portage for motion, a software motion detector"
+ACCT_USER_ID=395
+ACCT_USER_GROUPS=( motion video )
+
+acct-user_add_deps
diff --git a/acct-user/mpd/mpd-0-r1.ebuild b/acct-user/mpd/mpd-0-r1.ebuild
deleted file mode 100644
index a941e48d0f2e..000000000000
--- a/acct-user/mpd/mpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for music player daemon (mpd)"
-ACCT_USER_ID=45
-ACCT_USER_HOME=/var/lib/mpd
-ACCT_USER_GROUPS=( audio )
-
-acct-user_add_deps
diff --git a/acct-user/mpd/mpd-0-r2.ebuild b/acct-user/mpd/mpd-0-r2.ebuild
new file mode 100644
index 000000000000..7bf030d369de
--- /dev/null
+++ b/acct-user/mpd/mpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for music player daemon (mpd)"
+ACCT_USER_ID=45
+ACCT_USER_HOME=/var/lib/mpd
+ACCT_USER_GROUPS=( audio )
+
+acct-user_add_deps
diff --git a/acct-user/msmtpd/msmtpd-0-r1.ebuild b/acct-user/msmtpd/msmtpd-0-r1.ebuild
deleted file mode 100644
index 897476f00345..000000000000
--- a/acct-user/msmtpd/msmtpd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for msmtp daemon"
-ACCT_USER_ID=222
-ACCT_USER_GROUPS=( msmtpd )
-
-acct-user_add_deps
diff --git a/acct-user/msmtpd/msmtpd-0-r2.ebuild b/acct-user/msmtpd/msmtpd-0-r2.ebuild
new file mode 100644
index 000000000000..f635313b24c0
--- /dev/null
+++ b/acct-user/msmtpd/msmtpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for msmtp daemon"
+ACCT_USER_ID=222
+ACCT_USER_GROUPS=( msmtpd )
+
+acct-user_add_deps
diff --git a/acct-user/munge/munge-0-r1.ebuild b/acct-user/munge/munge-0-r1.ebuild
new file mode 100644
index 000000000000..51037b9634ff
--- /dev/null
+++ b/acct-user/munge/munge-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-auth/munge"
+
+ACCT_USER_GROUPS=( "munge" )
+ACCT_USER_HOME="/var/lib/munge"
+ACCT_USER_ID="144"
+
+acct-user_add_deps
diff --git a/acct-user/munge/munge-0.ebuild b/acct-user/munge/munge-0.ebuild
deleted file mode 100644
index fa2e7d4fe227..000000000000
--- a/acct-user/munge/munge-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-auth/munge"
-
-ACCT_USER_GROUPS=( "munge" )
-ACCT_USER_HOME="/var/lib/munge"
-ACCT_USER_ID="144"
-
-acct-user_add_deps
diff --git a/acct-user/munin-async/munin-async-0-r1.ebuild b/acct-user/munin-async/munin-async-0-r2.ebuild
index a11cabd62269..a11cabd62269 100644
--- a/acct-user/munin-async/munin-async-0-r1.ebuild
+++ b/acct-user/munin-async/munin-async-0-r2.ebuild
diff --git a/acct-user/munin/munin-0-r1.ebuild b/acct-user/munin/munin-0-r2.ebuild
index 08f9f00552be..08f9f00552be 100644
--- a/acct-user/munin/munin-0-r1.ebuild
+++ b/acct-user/munin/munin-0-r2.ebuild
diff --git a/acct-user/murmur/murmur-0-r1.ebuild b/acct-user/murmur/murmur-0-r1.ebuild
deleted file mode 100644
index 10429cb587b3..000000000000
--- a/acct-user/murmur/murmur-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for murmur daemon"
-ACCT_USER_ID=122
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_OWNER=${PN}:root
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( murmur )
-
-acct-user_add_deps
diff --git a/acct-user/murmur/murmur-0-r2.ebuild b/acct-user/murmur/murmur-0-r2.ebuild
new file mode 100644
index 000000000000..b6d3fcb6fa7c
--- /dev/null
+++ b/acct-user/murmur/murmur-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for murmur daemon"
+ACCT_USER_ID=122
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_OWNER=${PN}:root
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( murmur )
+
+acct-user_add_deps
diff --git a/acct-user/mysql/mysql-0-r1.ebuild b/acct-user/mysql/mysql-0-r1.ebuild
deleted file mode 100644
index 85cead7ce2e0..000000000000
--- a/acct-user/mysql/mysql-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MySQL program user"
-ACCT_USER_ID=60
-ACCT_USER_GROUPS=( mysql )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/mysql/mysql-0-r2.ebuild b/acct-user/mysql/mysql-0-r2.ebuild
new file mode 100644
index 000000000000..e198373af282
--- /dev/null
+++ b/acct-user/mysql/mysql-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MySQL program user"
+ACCT_USER_ID=60
+ACCT_USER_GROUPS=( mysql )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild
deleted file mode 100644
index 2dda2325009a..000000000000
--- a/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="mysqld_exporter User"
-ACCT_USER_ID=308
-ACCT_USER_HOME=/var/lib/mysqld_exporter
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( mysqld_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7e5666e46909
--- /dev/null
+++ b/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="mysqld_exporter User"
+ACCT_USER_ID=308
+ACCT_USER_HOME=/var/lib/mysqld_exporter
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( mysqld_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/mythtv/mythtv-0-r1.ebuild b/acct-user/mythtv/mythtv-0-r1.ebuild
deleted file mode 100644
index 79984187e86a..000000000000
--- a/acct-user/mythtv/mythtv-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Mythtv mythbackend server/daemon user"
-ACCT_USER_ID=117
-ACCT_USER_GROUPS=( mythtv video audio cdrom tty )
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_HOME=/var/lib/mythtv
-
-acct-user_add_deps
diff --git a/acct-user/mythtv/mythtv-0-r2.ebuild b/acct-user/mythtv/mythtv-0-r2.ebuild
new file mode 100644
index 000000000000..43fc7503be63
--- /dev/null
+++ b/acct-user/mythtv/mythtv-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Mythtv mythbackend server/daemon user"
+ACCT_USER_ID=117
+ACCT_USER_GROUPS=( mythtv video audio cdrom tty )
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_HOME=/var/lib/mythtv
+
+acct-user_add_deps
diff --git a/acct-user/nagios/nagios-0-r1.ebuild b/acct-user/nagios/nagios-0-r1.ebuild
deleted file mode 100644
index c092b1d3ae8b..000000000000
--- a/acct-user/nagios/nagios-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=436
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/nagios/nagios-0-r2.ebuild b/acct-user/nagios/nagios-0-r2.ebuild
new file mode 100644
index 000000000000..b20dbf0f431b
--- /dev/null
+++ b/acct-user/nagios/nagios-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=436
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/named/named-0-r1.ebuild b/acct-user/named/named-0-r2.ebuild
index 4ca236119be0..4ca236119be0 100644
--- a/acct-user/named/named-0-r1.ebuild
+++ b/acct-user/named/named-0-r2.ebuild
diff --git a/acct-user/netbox/netbox-0-r1.ebuild b/acct-user/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 1d47bf20c233..000000000000
--- a/acct-user/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netbox"
-ACCT_USER_ID=431
-ACCT_USER_GROUPS=( netbox )
-ACCT_USER_HOME=/var/lib/netbox
-
-acct-user_add_deps
diff --git a/acct-user/netbox/netbox-0-r2.ebuild b/acct-user/netbox/netbox-0-r2.ebuild
new file mode 100644
index 000000000000..ee94820335d9
--- /dev/null
+++ b/acct-user/netbox/netbox-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for netbox"
+ACCT_USER_ID=431
+ACCT_USER_GROUPS=( netbox )
+ACCT_USER_HOME=/var/lib/netbox
+
+acct-user_add_deps
diff --git a/acct-user/netdata/netdata-1-r1.ebuild b/acct-user/netdata/netdata-1-r1.ebuild
new file mode 100644
index 000000000000..6b571b269430
--- /dev/null
+++ b/acct-user/netdata/netdata-1-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for netdata"
+ACCT_USER_ID=290
+ACCT_USER_GROUPS=( netdata )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/netdata/netdata-1.ebuild b/acct-user/netdata/netdata-1.ebuild
deleted file mode 100644
index 0d66b49653cd..000000000000
--- a/acct-user/netdata/netdata-1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netdata"
-ACCT_USER_ID=290
-ACCT_USER_GROUPS=( netdata )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/netperf/netperf-0-r1.ebuild b/acct-user/netperf/netperf-0-r1.ebuild
new file mode 100644
index 000000000000..b255ae4a2f28
--- /dev/null
+++ b/acct-user/netperf/netperf-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/netperf"
+
+ACCT_USER_GROUPS=( "netperf" )
+ACCT_USER_ID="168"
+
+acct-user_add_deps
diff --git a/acct-user/netperf/netperf-0.ebuild b/acct-user/netperf/netperf-0.ebuild
deleted file mode 100644
index 479d3788dbaa..000000000000
--- a/acct-user/netperf/netperf-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/netperf"
-
-ACCT_USER_GROUPS=( "netperf" )
-ACCT_USER_ID="168"
-
-acct-user_add_deps
diff --git a/acct-user/neutron/neutron-0-r1.ebuild b/acct-user/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 8f58ff4800e9..000000000000
--- a/acct-user/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack neutron service"
-ACCT_USER_ID=446
-ACCT_USER_HOME=/var/lib/neutron
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( neutron )
-
-acct-user_add_deps
diff --git a/acct-user/neutron/neutron-0-r2.ebuild b/acct-user/neutron/neutron-0-r2.ebuild
new file mode 100644
index 000000000000..46060ff7e46b
--- /dev/null
+++ b/acct-user/neutron/neutron-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack neutron service"
+ACCT_USER_ID=446
+ACCT_USER_HOME=/var/lib/neutron
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( neutron )
+
+acct-user_add_deps
diff --git a/acct-user/nginx-unit/nginx-unit-0.ebuild b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
index 25bc84af7397..25bc84af7397 100644
--- a/acct-user/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
diff --git a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
deleted file mode 100644
index a066f8e465cf..000000000000
--- a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for nginx-vts-exporter"
-ACCT_USER_ID=354
-ACCT_USER_GROUPS=( nginx-vts-exporter )
-
-acct-user_add_deps
diff --git a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ede97d226773
--- /dev/null
+++ b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for nginx-vts-exporter"
+ACCT_USER_ID=354
+ACCT_USER_GROUPS=( nginx-vts-exporter )
+
+acct-user_add_deps
diff --git a/acct-user/nginx/nginx-0-r1.ebuild b/acct-user/nginx/nginx-0-r1.ebuild
new file mode 100644
index 000000000000..f6b6ea4ea30f
--- /dev/null
+++ b/acct-user/nginx/nginx-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="82"
+ACCT_USER_GROUPS=( "nginx" )
+ACCT_USER_HOME="/var/lib/nginx"
+
+acct-user_add_deps
diff --git a/acct-user/nginx/nginx-0.ebuild b/acct-user/nginx/nginx-0.ebuild
deleted file mode 100644
index 959c00fdf8c4..000000000000
--- a/acct-user/nginx/nginx-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID="82"
-ACCT_USER_GROUPS=( "nginx" )
-ACCT_USER_HOME="/var/lib/nginx"
-
-acct-user_add_deps
diff --git a/acct-user/ngircd/ngircd-0-r1.ebuild b/acct-user/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 19028a9bee20..000000000000
--- a/acct-user/ngircd/ngircd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for ngircd (IRC daemon)"
-ACCT_USER_ID=413
-ACCT_USER_GROUPS=( ngircd )
-
-acct-user_add_deps
diff --git a/acct-user/ngircd/ngircd-0-r2.ebuild b/acct-user/ngircd/ngircd-0-r2.ebuild
new file mode 100644
index 000000000000..79639b6b8e4c
--- /dev/null
+++ b/acct-user/ngircd/ngircd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for ngircd (IRC daemon)"
+ACCT_USER_ID=413
+ACCT_USER_GROUPS=( ngircd )
+
+acct-user_add_deps
diff --git a/acct-user/ngrep/ngrep-0-r1.ebuild b/acct-user/ngrep/ngrep-0-r1.ebuild
deleted file mode 100644
index 4851b7fcb10f..000000000000
--- a/acct-user/ngrep/ngrep-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/ngrep"
-
-ACCT_USER_GROUPS=( "ngrep" )
-ACCT_USER_ID="185"
-
-acct-user_add_deps
diff --git a/acct-user/ngrep/ngrep-0-r2.ebuild b/acct-user/ngrep/ngrep-0-r2.ebuild
new file mode 100644
index 000000000000..810bddcee9f5
--- /dev/null
+++ b/acct-user/ngrep/ngrep-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/ngrep"
+
+ACCT_USER_GROUPS=( "ngrep" )
+ACCT_USER_ID="185"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild b/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
new file mode 100644
index 000000000000..5f0a81f394f3
--- /dev/null
+++ b/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/networkmanager-openconnect"
+
+ACCT_USER_GROUPS=( "nm-openconnect" )
+ACCT_USER_ID="142"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openconnect/nm-openconnect-0.ebuild b/acct-user/nm-openconnect/nm-openconnect-0.ebuild
deleted file mode 100644
index aee4002155c4..000000000000
--- a/acct-user/nm-openconnect/nm-openconnect-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/networkmanager-openconnect"
-
-ACCT_USER_GROUPS=( "nm-openconnect" )
-ACCT_USER_ID="142"
-
-acct-user_add_deps
diff --git a/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild b/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
new file mode 100644
index 000000000000..24e46f7d19a1
--- /dev/null
+++ b/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/networkmanager-openvpn"
+
+ACCT_USER_GROUPS=( "nm-openvpn" )
+ACCT_USER_ID="143"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openvpn/nm-openvpn-0.ebuild b/acct-user/nm-openvpn/nm-openvpn-0.ebuild
deleted file mode 100644
index 6a7cef1e2ce4..000000000000
--- a/acct-user/nm-openvpn/nm-openvpn-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/networkmanager-openvpn"
-
-ACCT_USER_GROUPS=( "nm-openvpn" )
-ACCT_USER_ID="143"
-
-acct-user_add_deps
diff --git a/acct-user/nobody/nobody-0-r1.ebuild b/acct-user/nobody/nobody-0-r1.ebuild
new file mode 100644
index 000000000000..8ee787fc00b2
--- /dev/null
+++ b/acct-user/nobody/nobody-0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=65534
+ACCT_USER_ENFORCE_ID=yes
+ACCT_USER_HOME="/var/empty"
+ACCT_USER_HOME_OWNER="root:root"
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( nobody )
+
+acct-user_add_deps
+
+RDEPEND+=" acct-user/root"
diff --git a/acct-user/nobody/nobody-0.ebuild b/acct-user/nobody/nobody-0.ebuild
deleted file mode 100644
index 444addd883b0..000000000000
--- a/acct-user/nobody/nobody-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=65534
-ACCT_USER_ENFORCE_ID=yes
-ACCT_USER_HOME="/var/empty"
-ACCT_USER_HOME_OWNER="root:root"
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( nobody )
-
-acct-user_add_deps
-
-RDEPEND+=" acct-user/root"
diff --git a/acct-user/node_exporter/node_exporter-0-r1.ebuild b/acct-user/node_exporter/node_exporter-0-r1.ebuild
deleted file mode 100644
index 9bd941f4b72f..000000000000
--- a/acct-user/node_exporter/node_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="node_exporter User"
-ACCT_USER_ID=459
-ACCT_USER_GROUPS=( node_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/node_exporter/node_exporter-0-r2.ebuild b/acct-user/node_exporter/node_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2ca85112dfde
--- /dev/null
+++ b/acct-user/node_exporter/node_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="node_exporter User"
+ACCT_USER_ID=459
+ACCT_USER_GROUPS=( node_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/notary/notary-0-r1.ebuild b/acct-user/notary/notary-0-r1.ebuild
new file mode 100644
index 000000000000..754a4408efe1
--- /dev/null
+++ b/acct-user/notary/notary-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-misc/notary"
+
+ACCT_USER_GROUPS=( "notary" )
+ACCT_USER_ID="280"
+
+acct-user_add_deps
diff --git a/acct-user/notary/notary-0.ebuild b/acct-user/notary/notary-0.ebuild
deleted file mode 100644
index 4b852c14c7f0..000000000000
--- a/acct-user/notary/notary-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-misc/notary"
-
-ACCT_USER_GROUPS=( "notary" )
-ACCT_USER_ID="280"
-
-acct-user_add_deps
diff --git a/acct-user/nova/nova-0-r1.ebuild b/acct-user/nova/nova-0-r1.ebuild
deleted file mode 100644
index 660f668cf623..000000000000
--- a/acct-user/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack nova service"
-ACCT_USER_ID=447
-ACCT_USER_HOME=/var/lib/nova
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( nova )
-
-acct-user_add_deps
diff --git a/acct-user/nova/nova-0-r2.ebuild b/acct-user/nova/nova-0-r2.ebuild
new file mode 100644
index 000000000000..03c2a8b97662
--- /dev/null
+++ b/acct-user/nova/nova-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack nova service"
+ACCT_USER_ID=447
+ACCT_USER_HOME=/var/lib/nova
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( nova )
+
+acct-user_add_deps
diff --git a/acct-user/nsd/nsd-0-r1.ebuild b/acct-user/nsd/nsd-0-r1.ebuild
deleted file mode 100644
index 127c286f9a84..000000000000
--- a/acct-user/nsd/nsd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for nsd daemon"
-ACCT_USER_ID=223
-ACCT_USER_GROUPS=( nsd )
-
-acct-user_add_deps
diff --git a/acct-user/nsd/nsd-0-r2.ebuild b/acct-user/nsd/nsd-0-r2.ebuild
new file mode 100644
index 000000000000..be5ee197a884
--- /dev/null
+++ b/acct-user/nsd/nsd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for nsd daemon"
+ACCT_USER_ID=223
+ACCT_USER_GROUPS=( nsd )
+
+acct-user_add_deps
diff --git a/acct-user/nslcd/nslcd-0-r1.ebuild b/acct-user/nslcd/nslcd-0-r1.ebuild
deleted file mode 100644
index c783848cf4bb..000000000000
--- a/acct-user/nslcd/nslcd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for nss-pam-ldapd"
-
-ACCT_USER_ID=357
-ACCT_USER_GROUPS=( nslcd )
-
-acct-user_add_deps
diff --git a/acct-user/nslcd/nslcd-0-r2.ebuild b/acct-user/nslcd/nslcd-0-r2.ebuild
new file mode 100644
index 000000000000..2b6742845a63
--- /dev/null
+++ b/acct-user/nslcd/nslcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for nss-pam-ldapd"
+
+ACCT_USER_ID=357
+ACCT_USER_GROUPS=( nslcd )
+
+acct-user_add_deps
diff --git a/acct-user/ntopng/ntopng-0-r1.ebuild b/acct-user/ntopng/ntopng-0-r1.ebuild
new file mode 100644
index 000000000000..4697c8d589a8
--- /dev/null
+++ b/acct-user/ntopng/ntopng-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ntopng"
+ACCT_USER_ID=296
+ACCT_USER_GROUPS=( ntopng )
+
+acct-user_add_deps
diff --git a/acct-user/ntopng/ntopng-0.ebuild b/acct-user/ntopng/ntopng-0.ebuild
deleted file mode 100644
index f6a1885ae868..000000000000
--- a/acct-user/ntopng/ntopng-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ntopng"
-ACCT_USER_ID=296
-ACCT_USER_GROUPS=( ntopng )
-
-acct-user_add_deps
diff --git a/acct-user/ntp/ntp-0-r1.ebuild b/acct-user/ntp/ntp-0-r1.ebuild
deleted file mode 100644
index cd5fe5a72db6..000000000000
--- a/acct-user/ntp/ntp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for ntp daemon"
-ACCT_USER_ID=123
-ACCT_USER_GROUPS=( ntp )
-
-acct-user_add_deps
diff --git a/acct-user/ntp/ntp-0-r2.ebuild b/acct-user/ntp/ntp-0-r2.ebuild
new file mode 100644
index 000000000000..0e38e0cb70d3
--- /dev/null
+++ b/acct-user/ntp/ntp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for ntp daemon"
+ACCT_USER_ID=123
+ACCT_USER_GROUPS=( ntp )
+
+acct-user_add_deps
diff --git a/acct-user/nullmail/nullmail-0-r1.ebuild b/acct-user/nullmail/nullmail-0-r1.ebuild
new file mode 100644
index 000000000000..ed75e88c8a6f
--- /dev/null
+++ b/acct-user/nullmail/nullmail-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the nullmailer"
+
+ACCT_USER_GROUPS=( "nullmail" )
+ACCT_USER_HOME="/var/spool/nullmailer"
+ACCT_USER_ID="88"
+
+acct-user_add_deps
diff --git a/acct-user/nullmail/nullmail-0.ebuild b/acct-user/nullmail/nullmail-0.ebuild
deleted file mode 100644
index 01b773208aeb..000000000000
--- a/acct-user/nullmail/nullmail-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the nullmailer"
-
-ACCT_USER_GROUPS=( "nullmail" )
-ACCT_USER_HOME="/var/spool/nullmailer"
-ACCT_USER_ID="88"
-
-acct-user_add_deps
diff --git a/acct-user/nut/nut-0-r1.ebuild b/acct-user/nut/nut-0-r1.ebuild
deleted file mode 100644
index e0c09e02a34b..000000000000
--- a/acct-user/nut/nut-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Network-UPS Tools"
-
-ACCT_USER_GROUPS=( "nut" "uucp" )
-ACCT_USER_HOME="/var/lib/nut"
-ACCT_USER_ID="84"
-
-acct-user_add_deps
diff --git a/acct-user/nut/nut-0-r2.ebuild b/acct-user/nut/nut-0-r2.ebuild
new file mode 100644
index 000000000000..d9c746f626db
--- /dev/null
+++ b/acct-user/nut/nut-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Network-UPS Tools"
+
+ACCT_USER_GROUPS=( "nut" "uucp" )
+ACCT_USER_HOME="/var/lib/nut"
+ACCT_USER_ID="84"
+
+acct-user_add_deps
diff --git a/acct-user/nvpd/nvpd-0-r1.ebuild b/acct-user/nvpd/nvpd-0-r1.ebuild
new file mode 100644
index 000000000000..072adc5d8abc
--- /dev/null
+++ b/acct-user/nvpd/nvpd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for nvidia-persistenced"
+ACCT_USER_ID=458
+ACCT_USER_GROUPS=( video )
+
+acct-user_add_deps
diff --git a/acct-user/nvpd/nvpd-0.ebuild b/acct-user/nvpd/nvpd-0.ebuild
deleted file mode 100644
index fa3633c7862e..000000000000
--- a/acct-user/nvpd/nvpd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for nvidia-persistenced"
-ACCT_USER_ID=458
-ACCT_USER_GROUPS=( video )
-
-acct-user_add_deps
diff --git a/acct-user/nzbget/nzbget-0-r1.ebuild b/acct-user/nzbget/nzbget-0-r1.ebuild
new file mode 100644
index 000000000000..7bf7f87f0097
--- /dev/null
+++ b/acct-user/nzbget/nzbget-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-nntp/nzbget"
+ACCT_USER_ID=398
+ACCT_USER_GROUPS=( ${PN} )
+# Downloads are stored there
+ACCT_USER_HOME=/var/lib/nzbget
+# Grant write access to group members
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/nzbget/nzbget-0.ebuild b/acct-user/nzbget/nzbget-0.ebuild
deleted file mode 100644
index d7b1ff8b1a14..000000000000
--- a/acct-user/nzbget/nzbget-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-nntp/nzbget"
-ACCT_USER_ID=398
-ACCT_USER_GROUPS=( ${PN} )
-# Downloads are stored there
-ACCT_USER_HOME=/var/lib/nzbget
-# Grant write access to group members
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/oidentd/oidentd-0-r1.ebuild b/acct-user/oidentd/oidentd-0-r1.ebuild
deleted file mode 100644
index c4c59907e3bc..000000000000
--- a/acct-user/oidentd/oidentd-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=493
-ACCT_USER_GROUPS=( oidentd )
-
-acct-user_add_deps
diff --git a/acct-user/oidentd/oidentd-0-r2.ebuild b/acct-user/oidentd/oidentd-0-r2.ebuild
new file mode 100644
index 000000000000..e750efb495d8
--- /dev/null
+++ b/acct-user/oidentd/oidentd-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=493
+ACCT_USER_GROUPS=( oidentd )
+
+acct-user_add_deps
diff --git a/acct-user/openctd/openctd-0-r1.ebuild b/acct-user/openctd/openctd-0-r1.ebuild
new file mode 100644
index 000000000000..e5943719af29
--- /dev/null
+++ b/acct-user/openctd/openctd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for dev-libs/openct"
+
+ACCT_USER_GROUPS=( "openct" )
+ACCT_USER_ID="46"
+
+acct-user_add_deps
diff --git a/acct-user/openctd/openctd-0.ebuild b/acct-user/openctd/openctd-0.ebuild
deleted file mode 100644
index 71d19f1fd648..000000000000
--- a/acct-user/openctd/openctd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-libs/openct"
-
-ACCT_USER_GROUPS=( "openct" )
-ACCT_USER_ID="46"
-
-acct-user_add_deps
diff --git a/acct-user/opendkim/opendkim-0-r1.ebuild b/acct-user/opendkim/opendkim-0-r1.ebuild
deleted file mode 100644
index 6e82e3c1bc82..000000000000
--- a/acct-user/opendkim/opendkim-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for OpenDKIM"
-
-ACCT_USER_ID=334
-ACCT_USER_GROUPS=( opendkim )
-
-acct-user_add_deps
diff --git a/acct-user/opendkim/opendkim-0-r2.ebuild b/acct-user/opendkim/opendkim-0-r2.ebuild
new file mode 100644
index 000000000000..45820b9fe19e
--- /dev/null
+++ b/acct-user/opendkim/opendkim-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for OpenDKIM"
+
+ACCT_USER_ID=334
+ACCT_USER_GROUPS=( opendkim )
+
+acct-user_add_deps
diff --git a/acct-user/opendmarc/opendmarc-0-r1.ebuild b/acct-user/opendmarc/opendmarc-0-r1.ebuild
new file mode 100644
index 000000000000..f7defc95688f
--- /dev/null
+++ b/acct-user/opendmarc/opendmarc-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/opendmarc"
+
+ACCT_USER_ID=244
+ACCT_USER_GROUPS=( opendmarc )
+
+ACCT_USER_HOME="/var/lib/opendmarc"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/opendmarc/opendmarc-0.ebuild b/acct-user/opendmarc/opendmarc-0.ebuild
deleted file mode 100644
index bd9a6b89f925..000000000000
--- a/acct-user/opendmarc/opendmarc-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/opendmarc"
-
-ACCT_USER_ID=244
-ACCT_USER_GROUPS=( opendmarc )
-
-ACCT_USER_HOME="/var/lib/opendmarc"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/opendnssec/opendnssec-0-r1.ebuild b/acct-user/opendnssec/opendnssec-0-r1.ebuild
new file mode 100644
index 000000000000..3684c42cbf0e
--- /dev/null
+++ b/acct-user/opendnssec/opendnssec-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/opendnssec"
+
+ACCT_USER_GROUPS=( "opendnssec" )
+ACCT_USER_ID="151"
+
+acct-user_add_deps
diff --git a/acct-user/opendnssec/opendnssec-0.ebuild b/acct-user/opendnssec/opendnssec-0.ebuild
deleted file mode 100644
index 620602fb74b7..000000000000
--- a/acct-user/opendnssec/opendnssec-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/opendnssec"
-
-ACCT_USER_GROUPS=( "opendnssec" )
-ACCT_USER_ID="151"
-
-acct-user_add_deps
diff --git a/acct-user/openntpd/openntpd-0-r1.ebuild b/acct-user/openntpd/openntpd-0-r1.ebuild
deleted file mode 100644
index 9210523ff425..000000000000
--- a/acct-user/openntpd/openntpd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for openntpd daemon"
-ACCT_USER_ID=321
-ACCT_USER_GROUPS=( openntpd )
-ACCT_USER_HOME=/var/lib/openntpd/chroot
-ACCT_USER_HOME_OWNER=root:root
-
-acct-user_add_deps
diff --git a/acct-user/openntpd/openntpd-0-r2.ebuild b/acct-user/openntpd/openntpd-0-r2.ebuild
new file mode 100644
index 000000000000..64e9497fe4be
--- /dev/null
+++ b/acct-user/openntpd/openntpd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for openntpd daemon"
+ACCT_USER_ID=321
+ACCT_USER_GROUPS=( openntpd )
+ACCT_USER_HOME=/var/lib/openntpd/chroot
+ACCT_USER_HOME_OWNER=root:root
+
+acct-user_add_deps
diff --git a/acct-user/openrct2/openrct2-0-r1.ebuild b/acct-user/openrct2/openrct2-0-r1.ebuild
deleted file mode 100644
index fb6e4992b578..000000000000
--- a/acct-user/openrct2/openrct2-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the OpenRCT2 dedicated server"
-
-ACCT_USER_GROUPS=( "openrct2" )
-ACCT_USER_ID="479"
-
-acct-user_add_deps
diff --git a/acct-user/openrct2/openrct2-0-r2.ebuild b/acct-user/openrct2/openrct2-0-r2.ebuild
new file mode 100644
index 000000000000..bd994570f3e6
--- /dev/null
+++ b/acct-user/openrct2/openrct2-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the OpenRCT2 dedicated server"
+
+ACCT_USER_GROUPS=( "openrct2" )
+ACCT_USER_ID="479"
+
+acct-user_add_deps
diff --git a/acct-user/openttd/openttd-0-r1.ebuild b/acct-user/openttd/openttd-0-r1.ebuild
new file mode 100644
index 000000000000..3d6994af0a58
--- /dev/null
+++ b/acct-user/openttd/openttd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for games-simulation/openttd"
+
+ACCT_USER_HOME="/var/lib/openttd"
+ACCT_USER_GROUPS=( "openttd" )
+ACCT_USER_ID="513"
+
+acct-user_add_deps
diff --git a/acct-user/openttd/openttd-0.ebuild b/acct-user/openttd/openttd-0.ebuild
deleted file mode 100644
index 98fea61231ee..000000000000
--- a/acct-user/openttd/openttd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for games-simulation/openttd"
-
-ACCT_USER_HOME="/var/lib/openttd"
-ACCT_USER_GROUPS=( "openttd" )
-ACCT_USER_ID="513"
-
-acct-user_add_deps
diff --git a/acct-user/openvpn/openvpn-0-r1.ebuild b/acct-user/openvpn/openvpn-0-r1.ebuild
deleted file mode 100644
index 006f42138df5..000000000000
--- a/acct-user/openvpn/openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-vpn/openvpn"
-
-ACCT_USER_ID=394
-ACCT_USER_GROUPS=( openvpn )
-
-acct-user_add_deps
diff --git a/acct-user/openvpn/openvpn-0-r2.ebuild b/acct-user/openvpn/openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..910756a921ad
--- /dev/null
+++ b/acct-user/openvpn/openvpn-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-vpn/openvpn"
+
+ACCT_USER_ID=394
+ACCT_USER_GROUPS=( openvpn )
+
+acct-user_add_deps
diff --git a/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild
deleted file mode 100644
index 29f970ce62a2..000000000000
--- a/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for openvpn_exporter"
-ACCT_USER_ID=355
-ACCT_USER_GROUPS=( openvpn_exporter )
-ACCT_USER_HOME=/var/lib/openvpn_exporter
-
-acct-user_add_deps
diff --git a/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..286c269ef79b
--- /dev/null
+++ b/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for openvpn_exporter"
+ACCT_USER_ID=355
+ACCT_USER_GROUPS=( openvpn_exporter )
+ACCT_USER_HOME=/var/lib/openvpn_exporter
+
+acct-user_add_deps
diff --git a/acct-user/opm/opm-0-r1.ebuild b/acct-user/opm/opm-0-r1.ebuild
deleted file mode 100644
index ed82e1d8a36c..000000000000
--- a/acct-user/opm/opm-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for an open proxy monitor"
-ACCT_USER_ID=127
-ACCT_USER_GROUPS=( opm )
-
-acct-user_add_deps
diff --git a/acct-user/opm/opm-0-r2.ebuild b/acct-user/opm/opm-0-r2.ebuild
new file mode 100644
index 000000000000..41599e175ed2
--- /dev/null
+++ b/acct-user/opm/opm-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for an open proxy monitor"
+ACCT_USER_ID=127
+ACCT_USER_GROUPS=( opm )
+
+acct-user_add_deps
diff --git a/acct-user/oprofile/oprofile-0-r1.ebuild b/acct-user/oprofile/oprofile-0-r1.ebuild
deleted file mode 100644
index 2a7a5bafe18d..000000000000
--- a/acct-user/oprofile/oprofile-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-util/oprofile JIT code processing"
-ACCT_USER_ID=492
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/oprofile/oprofile-0-r2.ebuild b/acct-user/oprofile/oprofile-0-r2.ebuild
new file mode 100644
index 000000000000..193a1f38d923
--- /dev/null
+++ b/acct-user/oprofile/oprofile-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-util/oprofile JIT code processing"
+ACCT_USER_ID=492
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/oragono/oragono-0-r1.ebuild b/acct-user/oragono/oragono-0-r1.ebuild
new file mode 100644
index 000000000000..94eddf9061c1
--- /dev/null
+++ b/acct-user/oragono/oragono-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Oragono IRC server"
+ACCT_USER_ID=324
+ACCT_USER_GROUPS=( oragono )
+
+acct-user_add_deps
diff --git a/acct-user/oragono/oragono-0.ebuild b/acct-user/oragono/oragono-0.ebuild
deleted file mode 100644
index 0c0040c559ca..000000000000
--- a/acct-user/oragono/oragono-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Oragono IRC server"
-ACCT_USER_ID=324
-ACCT_USER_GROUPS=( oragono )
-
-acct-user_add_deps
diff --git a/acct-user/ossec/ossec-0-r1.ebuild b/acct-user/ossec/ossec-0-r1.ebuild
deleted file mode 100644
index 875c3884f1f2..000000000000
--- a/acct-user/ossec/ossec-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=330
-ACCT_USER_GROUPS=( ossec )
-ACCT_USER_HOME=/var/ossec
-DESCRIPTION="net-analyzer/ossec-hids (agentlessd, analysisd, monitord)"
-
-acct-user_add_deps
diff --git a/acct-user/ossec/ossec-0-r2.ebuild b/acct-user/ossec/ossec-0-r2.ebuild
new file mode 100644
index 000000000000..a559074b51e8
--- /dev/null
+++ b/acct-user/ossec/ossec-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=330
+ACCT_USER_GROUPS=( ossec )
+ACCT_USER_HOME=/var/ossec
+DESCRIPTION="net-analyzer/ossec-hids (agentlessd, analysisd, monitord)"
+
+acct-user_add_deps
diff --git a/acct-user/ossecm/ossecm-0-r1.ebuild b/acct-user/ossecm/ossecm-0-r1.ebuild
deleted file mode 100644
index f180b5c65102..000000000000
--- a/acct-user/ossecm/ossecm-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=331
-ACCT_USER_GROUPS=( ossec )
-DESCRIPTION="net-analyzer/ossec-hids (csyslogd, maild)"
-
-acct-user_add_deps
diff --git a/acct-user/ossecm/ossecm-0-r2.ebuild b/acct-user/ossecm/ossecm-0-r2.ebuild
new file mode 100644
index 000000000000..6f0937bc3343
--- /dev/null
+++ b/acct-user/ossecm/ossecm-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=331
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (csyslogd, maild)"
+
+acct-user_add_deps
diff --git a/acct-user/ossecr/ossecr-0-r1.ebuild b/acct-user/ossecr/ossecr-0-r1.ebuild
deleted file mode 100644
index 09a1309ef995..000000000000
--- a/acct-user/ossecr/ossecr-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=332
-ACCT_USER_GROUPS=( ossec )
-DESCRIPTION="net-analyzer/ossec-hids (remoted)"
-
-acct-user_add_deps
diff --git a/acct-user/ossecr/ossecr-0-r2.ebuild b/acct-user/ossecr/ossecr-0-r2.ebuild
new file mode 100644
index 000000000000..4ad2a76704e8
--- /dev/null
+++ b/acct-user/ossecr/ossecr-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=332
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (remoted)"
+
+acct-user_add_deps
diff --git a/acct-user/owntracks/owntracks-0-r1.ebuild b/acct-user/owntracks/owntracks-0-r1.ebuild
new file mode 100644
index 000000000000..41f51bcfe485
--- /dev/null
+++ b/acct-user/owntracks/owntracks-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for sci-geosciences/owntracks-recorder"
+ACCT_USER_ID=524
+ACCT_USER_GROUPS=( owntracks )
+
+acct-user_add_deps
diff --git a/acct-user/owntracks/owntracks-0.ebuild b/acct-user/owntracks/owntracks-0.ebuild
deleted file mode 100644
index 6a429d1e7c3e..000000000000
--- a/acct-user/owntracks/owntracks-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for sci-geosciences/owntracks-recorder"
-ACCT_USER_ID=524
-ACCT_USER_GROUPS=( owntracks )
-
-acct-user_add_deps
diff --git a/acct-user/p2p/p2p-0-r1.ebuild b/acct-user/p2p/p2p-0-r1.ebuild
new file mode 100644
index 000000000000..c01f9700cdee
--- /dev/null
+++ b/acct-user/p2p/p2p-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mldonkey"
+ACCT_USER_ID=378
+ACCT_USER_GROUPS=( p2p )
+
+acct-user_add_deps
diff --git a/acct-user/p2p/p2p-0.ebuild b/acct-user/p2p/p2p-0.ebuild
deleted file mode 100644
index ec404415aeb4..000000000000
--- a/acct-user/p2p/p2p-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mldonkey"
-ACCT_USER_ID=378
-ACCT_USER_GROUPS=( p2p )
-
-acct-user_add_deps
diff --git a/acct-user/partimag/partimag-0-r1.ebuild b/acct-user/partimag/partimag-0-r1.ebuild
new file mode 100644
index 000000000000..ca2de473588c
--- /dev/null
+++ b/acct-user/partimag/partimag-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-block/partimag"
+
+ACCT_USER_HOME="/var/lib/partimage"
+ACCT_USER_ID="91"
+ACCT_USER_GROUPS=( "partimag" )
+
+acct-user_add_deps
diff --git a/acct-user/partimag/partimag-0.ebuild b/acct-user/partimag/partimag-0.ebuild
deleted file mode 100644
index 27434b6a4472..000000000000
--- a/acct-user/partimag/partimag-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-block/partimag"
-
-ACCT_USER_HOME="/var/lib/partimage"
-ACCT_USER_ID="91"
-ACCT_USER_GROUPS=( "partimag" )
-
-acct-user_add_deps
diff --git a/acct-user/pcap/pcap-0-r1.ebuild b/acct-user/pcap/pcap-0-r1.ebuild
new file mode 100644
index 000000000000..fcff027697a4
--- /dev/null
+++ b/acct-user/pcap/pcap-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for capturing network traffic"
+ACCT_USER_ID=377
+ACCT_USER_GROUPS=( pcap )
+
+acct-user_add_deps
diff --git a/acct-user/pcap/pcap-0.ebuild b/acct-user/pcap/pcap-0.ebuild
deleted file mode 100644
index 781fd3191925..000000000000
--- a/acct-user/pcap/pcap-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for capturing network traffic"
-ACCT_USER_ID=377
-ACCT_USER_GROUPS=( pcap )
-
-acct-user_add_deps
diff --git a/acct-user/pcscd/pcscd-0-r1.ebuild b/acct-user/pcscd/pcscd-0-r1.ebuild
deleted file mode 100644
index 8341bf973cab..000000000000
--- a/acct-user/pcscd/pcscd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for pcsc-lite"
-ACCT_USER_ID=47
-ACCT_USER_GROUPS=( pcscd openct usb )
-
-acct-user_add_deps
diff --git a/acct-user/pcscd/pcscd-0-r2.ebuild b/acct-user/pcscd/pcscd-0-r2.ebuild
new file mode 100644
index 000000000000..7da6a318dccb
--- /dev/null
+++ b/acct-user/pcscd/pcscd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for pcsc-lite"
+ACCT_USER_ID=47
+ACCT_USER_GROUPS=( pcscd openct usb )
+
+acct-user_add_deps
diff --git a/acct-user/pdns/pdns-0-r1.ebuild b/acct-user/pdns/pdns-0-r1.ebuild
deleted file mode 100644
index 7e7272f48a8c..000000000000
--- a/acct-user/pdns/pdns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=423
-ACCT_USER_GROUPS=( pdns )
-
-acct-user_add_deps
diff --git a/acct-user/pdns/pdns-0-r2.ebuild b/acct-user/pdns/pdns-0-r2.ebuild
new file mode 100644
index 000000000000..08cc83f39d72
--- /dev/null
+++ b/acct-user/pdns/pdns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=423
+ACCT_USER_GROUPS=( pdns )
+
+acct-user_add_deps
diff --git a/acct-user/pdnsd/pdnsd-0-r1.ebuild b/acct-user/pdnsd/pdnsd-0-r1.ebuild
deleted file mode 100644
index 1d7bf049ad29..000000000000
--- a/acct-user/pdnsd/pdnsd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for pdns daemon"
-ACCT_USER_ID=184
-ACCT_USER_HOME=/var/lib/pdnsd
-ACCT_USER_HOME_OWNER=pdnsd:root
-ACCT_USER_GROUPS=( pdnsd )
-
-acct-user_add_deps
diff --git a/acct-user/pdnsd/pdnsd-0-r2.ebuild b/acct-user/pdnsd/pdnsd-0-r2.ebuild
new file mode 100644
index 000000000000..3b3ff7fe51f7
--- /dev/null
+++ b/acct-user/pdnsd/pdnsd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for pdns daemon"
+ACCT_USER_ID=184
+ACCT_USER_HOME=/var/lib/pdnsd
+ACCT_USER_HOME_OWNER=pdnsd:root
+ACCT_USER_GROUPS=( pdnsd )
+
+acct-user_add_deps
diff --git a/acct-user/pgagent/pgagent-0-r1.ebuild b/acct-user/pgagent/pgagent-0-r1.ebuild
new file mode 100644
index 000000000000..9bda2e510d21
--- /dev/null
+++ b/acct-user/pgagent/pgagent-0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="pgagent program user"
+ACCT_USER_ID=135
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_HOME=/var/lib/pgagent
+ACCT_USER_GROUPS=( pgagent )
+acct-user_add_deps
+SLOT="0"
+
+pkg_postinst() {
+ ewarn "The home directory has changed for pgagent."
+ ewarn "You should move files, especially .pgpass, from:"
+ ewarn " /home/pgagent"
+ ewarn "To:"
+ ewarn " ${ACCT_USER_HOME}"
+}
diff --git a/acct-user/pgagent/pgagent-0.ebuild b/acct-user/pgagent/pgagent-0.ebuild
deleted file mode 100644
index da03477a46a1..000000000000
--- a/acct-user/pgagent/pgagent-0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="pgagent program user"
-ACCT_USER_ID=135
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_HOME=/var/lib/pgagent
-ACCT_USER_GROUPS=( pgagent )
-acct-user_add_deps
-SLOT="0"
-
-pkg_postinst() {
- ewarn "The home directory has changed for pgagent."
- ewarn "You should move files, especially .pgpass, from:"
- ewarn " /home/pgagent"
- ewarn "To:"
- ewarn " ${ACCT_USER_HOME}"
-}
diff --git a/acct-user/pgbouncer/pgbouncer-0-r1.ebuild b/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
new file mode 100644
index 000000000000..5903c2bb5c40
--- /dev/null
+++ b/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="PgBouncer program user"
+ACCT_USER_ID=463
+ACCT_USER_GROUPS=( postgres )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/pgbouncer/pgbouncer-0.ebuild b/acct-user/pgbouncer/pgbouncer-0.ebuild
deleted file mode 100644
index 91bdbd6630ff..000000000000
--- a/acct-user/pgbouncer/pgbouncer-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="PgBouncer program user"
-ACCT_USER_ID=463
-ACCT_USER_GROUPS=( postgres )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/pgpool/pgpool-0-r1.ebuild b/acct-user/pgpool/pgpool-0-r1.ebuild
new file mode 100644
index 000000000000..9d5ee1d3cda7
--- /dev/null
+++ b/acct-user/pgpool/pgpool-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/pgpool2"
+
+ACCT_USER_GROUPS=( "postgres" )
+ACCT_USER_ID="106"
+
+acct-user_add_deps
diff --git a/acct-user/pgpool/pgpool-0.ebuild b/acct-user/pgpool/pgpool-0.ebuild
deleted file mode 100644
index 209a4ee7605e..000000000000
--- a/acct-user/pgpool/pgpool-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/pgpool2"
-
-ACCT_USER_GROUPS=( "postgres" )
-ACCT_USER_ID="106"
-
-acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-0-r1.ebuild b/acct-user/pipewire/pipewire-0-r1.ebuild
new file mode 100644
index 000000000000..75bfc8650b44
--- /dev/null
+++ b/acct-user/pipewire/pipewire-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running PipeWire as a system-wide instance"
+ACCT_USER_ID=509
+ACCT_USER_GROUPS=( pipewire audio )
+ACCT_USER_HOME=/var/run/pipewire
+
+acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-0.ebuild b/acct-user/pipewire/pipewire-0.ebuild
deleted file mode 100644
index 7d3ea52b7d16..000000000000
--- a/acct-user/pipewire/pipewire-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running PipeWire as a system-wide instance"
-ACCT_USER_ID=509
-ACCT_USER_GROUPS=( pipewire audio )
-ACCT_USER_HOME=/var/run/pipewire
-
-acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-1.ebuild b/acct-user/pipewire/pipewire-1-r1.ebuild
index 0492f9ffcc2e..0492f9ffcc2e 100644
--- a/acct-user/pipewire/pipewire-1.ebuild
+++ b/acct-user/pipewire/pipewire-1-r1.ebuild
diff --git a/acct-user/placement/placement-0-r1.ebuild b/acct-user/placement/placement-0-r1.ebuild
deleted file mode 100644
index 33bddfb4a00e..000000000000
--- a/acct-user/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the placement openstack service"
-ACCT_USER_ID=448
-ACCT_USER_HOME=/var/lib/placement
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( placement )
-
-acct-user_add_deps
diff --git a/acct-user/placement/placement-0-r2.ebuild b/acct-user/placement/placement-0-r2.ebuild
new file mode 100644
index 000000000000..9a2247f71e46
--- /dev/null
+++ b/acct-user/placement/placement-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the placement openstack service"
+ACCT_USER_ID=448
+ACCT_USER_HOME=/var/lib/placement
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( placement )
+
+acct-user_add_deps
diff --git a/acct-user/plex/plex-0-r1.ebuild b/acct-user/plex/plex-0-r1.ebuild
deleted file mode 100644
index d5e798054bd7..000000000000
--- a/acct-user/plex/plex-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Plex Media Server user"
-ACCT_USER_ID=103
-ACCT_USER_HOME=/var/lib/plexmediaserver
-ACCT_USER_GROUPS=( plex video )
-
-acct-user_add_deps
diff --git a/acct-user/plex/plex-0-r2.ebuild b/acct-user/plex/plex-0-r2.ebuild
new file mode 100644
index 000000000000..10782ef24f9b
--- /dev/null
+++ b/acct-user/plex/plex-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Plex Media Server user"
+ACCT_USER_ID=103
+ACCT_USER_HOME=/var/lib/plexmediaserver
+ACCT_USER_GROUPS=( plex video )
+
+acct-user_add_deps
diff --git a/acct-user/polkitd/polkitd-0-r1.ebuild b/acct-user/polkitd/polkitd-0-r1.ebuild
deleted file mode 100644
index 2d441cd42616..000000000000
--- a/acct-user/polkitd/polkitd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=102
-ACCT_USER_GROUPS=( polkitd )
-ACCT_USER_HOME=/var/lib/polkit-1
-
-acct-user_add_deps
diff --git a/acct-user/polkitd/polkitd-0-r2.ebuild b/acct-user/polkitd/polkitd-0-r2.ebuild
new file mode 100644
index 000000000000..2546ca918d7b
--- /dev/null
+++ b/acct-user/polkitd/polkitd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=102
+ACCT_USER_GROUPS=( polkitd )
+ACCT_USER_HOME=/var/lib/polkit-1
+
+acct-user_add_deps
diff --git a/acct-user/polw/polw-0-r1.ebuild b/acct-user/polw/polw-0-r1.ebuild
new file mode 100644
index 000000000000..7d25130c691c
--- /dev/null
+++ b/acct-user/polw/polw-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/policyd-weight"
+
+ACCT_USER_GROUPS=( "polw" )
+ACCT_USER_ID="263"
+
+acct-user_add_deps
diff --git a/acct-user/polw/polw-0.ebuild b/acct-user/polw/polw-0.ebuild
deleted file mode 100644
index 9a86e4848d40..000000000000
--- a/acct-user/polw/polw-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/policyd-weight"
-
-ACCT_USER_GROUPS=( "polw" )
-ACCT_USER_ID="263"
-
-acct-user_add_deps
diff --git a/acct-user/popa3d/popa3d-0-r1.ebuild b/acct-user/popa3d/popa3d-0-r1.ebuild
new file mode 100644
index 000000000000..dc83868e0236
--- /dev/null
+++ b/acct-user/popa3d/popa3d-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/popa3d"
+ACCT_USER_ID=375
+ACCT_USER_GROUPS=( popa3d )
+
+acct-user_add_deps
diff --git a/acct-user/popa3d/popa3d-0.ebuild b/acct-user/popa3d/popa3d-0.ebuild
deleted file mode 100644
index 7d9064ca0001..000000000000
--- a/acct-user/popa3d/popa3d-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/popa3d"
-ACCT_USER_ID=375
-ACCT_USER_GROUPS=( popa3d )
-
-acct-user_add_deps
diff --git a/acct-user/portage/portage-0-r1.ebuild b/acct-user/portage/portage-0-r2.ebuild
index 5d8cc4b82ab3..5d8cc4b82ab3 100644
--- a/acct-user/portage/portage-0-r1.ebuild
+++ b/acct-user/portage/portage-0-r2.ebuild
diff --git a/acct-user/postfix/postfix-0-r1.ebuild b/acct-user/postfix/postfix-0-r1.ebuild
deleted file mode 100644
index 227740ec875a..000000000000
--- a/acct-user/postfix/postfix-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postfix daemon"
-ACCT_USER_ID=207
-ACCT_USER_GROUPS=( postfix mail )
-
-acct-user_add_deps
diff --git a/acct-user/postfix/postfix-0-r2.ebuild b/acct-user/postfix/postfix-0-r2.ebuild
new file mode 100644
index 000000000000..7543f3afb66e
--- /dev/null
+++ b/acct-user/postfix/postfix-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix daemon"
+ACCT_USER_ID=207
+ACCT_USER_GROUPS=( postfix mail )
+
+acct-user_add_deps
diff --git a/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild
deleted file mode 100644
index b5b31e9b49d2..000000000000
--- a/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postfix_exporter"
-ACCT_USER_ID=356
-ACCT_USER_GROUPS=( postfix_exporter )
-ACCT_USER_HOME=/var/lib/postfix_exporter
-
-acct-user_add_deps
diff --git a/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..eec25c5cbfa1
--- /dev/null
+++ b/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix_exporter"
+ACCT_USER_ID=356
+ACCT_USER_GROUPS=( postfix_exporter )
+ACCT_USER_HOME=/var/lib/postfix_exporter
+
+acct-user_add_deps
diff --git a/acct-user/postfwd/postfwd-0-r1.ebuild b/acct-user/postfwd/postfwd-0-r1.ebuild
new file mode 100644
index 000000000000..a9f9bb00ff8d
--- /dev/null
+++ b/acct-user/postfwd/postfwd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/postfwd"
+
+ACCT_USER_GROUPS=( "postfwd" )
+ACCT_USER_ID="189"
+
+acct-user_add_deps
diff --git a/acct-user/postfwd/postfwd-0.ebuild b/acct-user/postfwd/postfwd-0.ebuild
deleted file mode 100644
index ba5ad6136dfa..000000000000
--- a/acct-user/postfwd/postfwd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for mail-filter/postfwd"
-
-ACCT_USER_GROUPS=( "postfwd" )
-ACCT_USER_ID="189"
-
-acct-user_add_deps
diff --git a/acct-user/postgres/postgres-0-r1.ebuild b/acct-user/postgres/postgres-0-r1.ebuild
deleted file mode 100644
index e420798667c5..000000000000
--- a/acct-user/postgres/postgres-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="PostgreSQL program user"
-ACCT_USER_ID=70
-ACCT_USER_GROUPS=( postgres )
-ACCT_USER_HOME=/var/lib/postgresql
-ACCT_USER_HOME_PERMS=0700
-ACCT_USER_SHELL=/bin/sh
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/postgres/postgres-0-r2.ebuild b/acct-user/postgres/postgres-0-r2.ebuild
new file mode 100644
index 000000000000..4bc70595c4de
--- /dev/null
+++ b/acct-user/postgres/postgres-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="PostgreSQL program user"
+ACCT_USER_ID=70
+ACCT_USER_GROUPS=( postgres )
+ACCT_USER_HOME=/var/lib/postgresql
+ACCT_USER_HOME_PERMS=0700
+ACCT_USER_SHELL=/bin/sh
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild b/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..f451c6f3ed15
--- /dev/null
+++ b/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postgres_exporter"
+ACCT_USER_ID=233
+ACCT_USER_GROUPS=( postgres_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/postgres_exporter/postgres_exporter-0.ebuild b/acct-user/postgres_exporter/postgres_exporter-0.ebuild
deleted file mode 100644
index 4e6d3dd388ba..000000000000
--- a/acct-user/postgres_exporter/postgres_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postgres_exporter"
-ACCT_USER_ID=233
-ACCT_USER_GROUPS=( postgres_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/postgrey/postgrey-0-r1.ebuild b/acct-user/postgrey/postgrey-0-r1.ebuild
new file mode 100644
index 000000000000..11f06cdca018
--- /dev/null
+++ b/acct-user/postgrey/postgrey-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the postgrey mail daemon"
+ACCT_USER_ID=360
+ACCT_USER_GROUPS=( postgrey )
+
+acct-user_add_deps
diff --git a/acct-user/postgrey/postgrey-0.ebuild b/acct-user/postgrey/postgrey-0.ebuild
deleted file mode 100644
index 71d344b37917..000000000000
--- a/acct-user/postgrey/postgrey-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the postgrey mail daemon"
-ACCT_USER_ID=360
-ACCT_USER_GROUPS=( postgrey )
-
-acct-user_add_deps
diff --git a/acct-user/postmaster/postmaster-0-r1.ebuild b/acct-user/postmaster/postmaster-0-r1.ebuild
deleted file mode 100644
index cbf6a9f00c19..000000000000
--- a/acct-user/postmaster/postmaster-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Postmaster user"
-ACCT_USER_ID=14
-ACCT_USER_HOME=/var/spool/mail
-ACCT_USER_HOME_OWNER=root:mail
-ACCT_USER_HOME_PERMS=03775
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/postmaster/postmaster-0-r2.ebuild b/acct-user/postmaster/postmaster-0-r2.ebuild
new file mode 100644
index 000000000000..f2ec25973733
--- /dev/null
+++ b/acct-user/postmaster/postmaster-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Postmaster user"
+ACCT_USER_ID=14
+ACCT_USER_HOME=/var/spool/mail
+ACCT_USER_HOME_OWNER=root:mail
+ACCT_USER_HOME_PERMS=03775
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/privoxy/privoxy-0-r1.ebuild b/acct-user/privoxy/privoxy-0-r1.ebuild
deleted file mode 100644
index 9a3113c42296..000000000000
--- a/acct-user/privoxy/privoxy-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A privoxy: privacy oriented web proxy user"
-ACCT_USER_ID=392
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/privoxy/privoxy-0-r2.ebuild b/acct-user/privoxy/privoxy-0-r2.ebuild
new file mode 100644
index 000000000000..2afb11613a43
--- /dev/null
+++ b/acct-user/privoxy/privoxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A privoxy: privacy oriented web proxy user"
+ACCT_USER_ID=392
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/prometheus/prometheus-0-r1.ebuild b/acct-user/prometheus/prometheus-0-r1.ebuild
deleted file mode 100644
index df0a3191d93d..000000000000
--- a/acct-user/prometheus/prometheus-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for prometheus"
-ACCT_USER_ID=430
-ACCT_USER_GROUPS=( prometheus )
-ACCT_USER_HOME=/var/lib/prometheus
-
-acct-user_add_deps
diff --git a/acct-user/prometheus/prometheus-0-r2.ebuild b/acct-user/prometheus/prometheus-0-r2.ebuild
new file mode 100644
index 000000000000..048869dfe9b9
--- /dev/null
+++ b/acct-user/prometheus/prometheus-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for prometheus"
+ACCT_USER_ID=430
+ACCT_USER_GROUPS=( prometheus )
+ACCT_USER_HOME=/var/lib/prometheus
+
+acct-user_add_deps
diff --git a/acct-user/prosody/prosody-0-r1.ebuild b/acct-user/prosody/prosody-0-r1.ebuild
new file mode 100644
index 000000000000..9d228c8218a7
--- /dev/null
+++ b/acct-user/prosody/prosody-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/prosody"
+
+ACCT_USER_GROUPS=( "prosody" )
+ACCT_USER_ID="115"
+
+acct-user_add_deps
diff --git a/acct-user/prosody/prosody-0.ebuild b/acct-user/prosody/prosody-0.ebuild
deleted file mode 100644
index 223aa45c40f1..000000000000
--- a/acct-user/prosody/prosody-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-im/prosody"
-
-ACCT_USER_GROUPS=( "prosody" )
-ACCT_USER_ID="115"
-
-acct-user_add_deps
diff --git a/acct-user/prowlarr/prowlarr-0-r1.ebuild b/acct-user/prowlarr/prowlarr-0-r1.ebuild
new file mode 100644
index 000000000000..8780c5f0fed3
--- /dev/null
+++ b/acct-user/prowlarr/prowlarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for prowlarr"
+ACCT_USER_HOME=/var/lib/prowlarr
+ACCT_USER_ID=517
+ACCT_USER_GROUPS=( prowlarr )
+
+acct-user_add_deps
diff --git a/acct-user/prowlarr/prowlarr-0.ebuild b/acct-user/prowlarr/prowlarr-0.ebuild
deleted file mode 100644
index be6de1d3e940..000000000000
--- a/acct-user/prowlarr/prowlarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for prowlarr"
-ACCT_USER_HOME=/var/lib/prowlarr
-ACCT_USER_ID=517
-ACCT_USER_GROUPS=( prowlarr )
-
-acct-user_add_deps
diff --git a/acct-user/psybnc/psybnc-0-r1.ebuild b/acct-user/psybnc/psybnc-0-r1.ebuild
new file mode 100644
index 000000000000..5d2635b896c5
--- /dev/null
+++ b/acct-user/psybnc/psybnc-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-irc/psybnc"
+
+ACCT_USER_GROUPS=( "psybnc" )
+ACCT_USER_HOME="/var/lib/psybnc"
+ACCT_USER_ID="259"
+
+acct-user_add_deps
diff --git a/acct-user/psybnc/psybnc-0.ebuild b/acct-user/psybnc/psybnc-0.ebuild
deleted file mode 100644
index 854b5bf822a9..000000000000
--- a/acct-user/psybnc/psybnc-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-irc/psybnc"
-
-ACCT_USER_GROUPS=( "psybnc" )
-ACCT_USER_HOME="/var/lib/psybnc"
-ACCT_USER_ID="259"
-
-acct-user_add_deps
diff --git a/acct-user/pulse/pulse-0-r1.ebuild b/acct-user/pulse/pulse-0-r1.ebuild
new file mode 100644
index 000000000000..88465175512a
--- /dev/null
+++ b/acct-user/pulse/pulse-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the PulseAudio daemon as a system-wide instance"
+ACCT_USER_ID=171
+ACCT_USER_GROUPS=( pulse audio )
+ACCT_USER_HOME=/var/run/pulse
+
+acct-user_add_deps
diff --git a/acct-user/pulse/pulse-0.ebuild b/acct-user/pulse/pulse-0.ebuild
deleted file mode 100644
index 4e885b688f7b..000000000000
--- a/acct-user/pulse/pulse-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the PulseAudio daemon as a system-wide instance"
-ACCT_USER_ID=171
-ACCT_USER_GROUPS=( pulse audio )
-ACCT_USER_HOME=/var/run/pulse
-
-acct-user_add_deps
diff --git a/acct-user/puppet/puppet-0-r1.ebuild b/acct-user/puppet/puppet-0-r1.ebuild
deleted file mode 100644
index 61230a8a6a60..000000000000
--- a/acct-user/puppet/puppet-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for puppet services"
-ACCT_USER_ID=455
-ACCT_USER_HOME=/var/lib/puppet
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( puppet )
-
-acct-user_add_deps
diff --git a/acct-user/puppet/puppet-0-r2.ebuild b/acct-user/puppet/puppet-0-r2.ebuild
new file mode 100644
index 000000000000..4e634ff27bf3
--- /dev/null
+++ b/acct-user/puppet/puppet-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for puppet services"
+ACCT_USER_ID=455
+ACCT_USER_HOME=/var/lib/puppet
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( puppet )
+
+acct-user_add_deps
diff --git a/acct-user/puppetdb/puppetdb-0-r1.ebuild b/acct-user/puppetdb/puppetdb-0-r1.ebuild
deleted file mode 100644
index 7f70113f6559..000000000000
--- a/acct-user/puppetdb/puppetdb-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the puppetdb service"
-ACCT_USER_ID=456
-ACCT_USER_HOME=/opt/puppetlabs/server/data/puppetserver
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( puppetdb )
-
-acct-user_add_deps
diff --git a/acct-user/puppetdb/puppetdb-0-r2.ebuild b/acct-user/puppetdb/puppetdb-0-r2.ebuild
new file mode 100644
index 000000000000..c509fa9a158c
--- /dev/null
+++ b/acct-user/puppetdb/puppetdb-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the puppetdb service"
+ACCT_USER_ID=456
+ACCT_USER_HOME=/opt/puppetlabs/server/data/puppetserver
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( puppetdb )
+
+acct-user_add_deps
diff --git a/acct-user/pushgateway/pushgateway-0-r1.ebuild b/acct-user/pushgateway/pushgateway-0-r1.ebuild
new file mode 100644
index 000000000000..a7a92c4456f9
--- /dev/null
+++ b/acct-user/pushgateway/pushgateway-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/pushgateway"
+
+ACCT_USER_GROUPS=( "pushgateway" )
+ACCT_USER_ID="288"
+
+acct-user_add_deps
diff --git a/acct-user/pushgateway/pushgateway-0.ebuild b/acct-user/pushgateway/pushgateway-0.ebuild
deleted file mode 100644
index dfd5dad5e837..000000000000
--- a/acct-user/pushgateway/pushgateway-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/pushgateway"
-
-ACCT_USER_GROUPS=( "pushgateway" )
-ACCT_USER_ID="288"
-
-acct-user_add_deps
diff --git a/acct-user/pvpgn/pvpgn-0-r1.ebuild b/acct-user/pvpgn/pvpgn-0-r1.ebuild
new file mode 100644
index 000000000000..ddabd61a188e
--- /dev/null
+++ b/acct-user/pvpgn/pvpgn-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for pvpgn (gaming server for Battle.Net compatible clients)"
+ACCT_USER_ID=285
+ACCT_USER_GROUPS=( pvpgn )
+
+acct-user_add_deps
diff --git a/acct-user/pvpgn/pvpgn-0.ebuild b/acct-user/pvpgn/pvpgn-0.ebuild
deleted file mode 100644
index 42d6b6c54788..000000000000
--- a/acct-user/pvpgn/pvpgn-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for pvpgn (gaming server for Battle.Net compatible clients)"
-ACCT_USER_ID=285
-ACCT_USER_GROUPS=( pvpgn )
-
-acct-user_add_deps
diff --git a/acct-user/qemu/qemu-0-r1.ebuild b/acct-user/qemu/qemu-0-r1.ebuild
deleted file mode 100644
index b2c94705fe97..000000000000
--- a/acct-user/qemu/qemu-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=77
-ACCT_USER_GROUPS=( qemu kvm )
-
-acct-user_add_deps
diff --git a/acct-user/qemu/qemu-0-r2.ebuild b/acct-user/qemu/qemu-0-r2.ebuild
new file mode 100644
index 000000000000..ca7ef414b25c
--- /dev/null
+++ b/acct-user/qemu/qemu-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=77
+ACCT_USER_GROUPS=( qemu kvm )
+
+acct-user_add_deps
diff --git a/acct-user/qmaild/qmaild-0-r1.ebuild b/acct-user/qmaild/qmaild-0-r1.ebuild
deleted file mode 100644
index 01104fd99156..000000000000
--- a/acct-user/qmaild/qmaild-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-smtpd"
-ACCT_USER_ID=201
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmaild/qmaild-0-r2.ebuild b/acct-user/qmaild/qmaild-0-r2.ebuild
new file mode 100644
index 000000000000..c5d19a59cf46
--- /dev/null
+++ b/acct-user/qmaild/qmaild-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-smtpd"
+ACCT_USER_ID=201
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmaill/qmaill-0-r1.ebuild b/acct-user/qmaill/qmaill-0-r1.ebuild
deleted file mode 100644
index 52d00df5c450..000000000000
--- a/acct-user/qmaill/qmaill-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail logging"
-ACCT_USER_ID=202
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmaill/qmaill-0-r2.ebuild b/acct-user/qmaill/qmaill-0-r2.ebuild
new file mode 100644
index 000000000000..58863dc7fa00
--- /dev/null
+++ b/acct-user/qmaill/qmaill-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail logging"
+ACCT_USER_ID=202
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmailp/qmailp-0-r1.ebuild b/acct-user/qmailp/qmailp-0-r1.ebuild
deleted file mode 100644
index cce7a11a4dee..000000000000
--- a/acct-user/qmailp/qmailp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-getpw"
-ACCT_USER_ID=203
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmailp/qmailp-0-r2.ebuild b/acct-user/qmailp/qmailp-0-r2.ebuild
new file mode 100644
index 000000000000..cd06f3ce8ccd
--- /dev/null
+++ b/acct-user/qmailp/qmailp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-getpw"
+ACCT_USER_ID=203
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmailq/qmailq-0-r1.ebuild b/acct-user/qmailq/qmailq-0-r1.ebuild
deleted file mode 100644
index f01b4dbb6a5f..000000000000
--- a/acct-user/qmailq/qmailq-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail queue"
-ACCT_USER_ID=204
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmailq/qmailq-0-r2.ebuild b/acct-user/qmailq/qmailq-0-r2.ebuild
new file mode 100644
index 000000000000..3f48c735c70c
--- /dev/null
+++ b/acct-user/qmailq/qmailq-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail queue"
+ACCT_USER_ID=204
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/qmailr/qmailr-0-r1.ebuild b/acct-user/qmailr/qmailr-0-r1.ebuild
deleted file mode 100644
index acc355174d63..000000000000
--- a/acct-user/qmailr/qmailr-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-rspawn and qmail-remote"
-ACCT_USER_ID=205
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmailr/qmailr-0-r2.ebuild b/acct-user/qmailr/qmailr-0-r2.ebuild
new file mode 100644
index 000000000000..dabc73bfed6c
--- /dev/null
+++ b/acct-user/qmailr/qmailr-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-rspawn and qmail-remote"
+ACCT_USER_ID=205
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/qmails/qmails-0-r1.ebuild b/acct-user/qmails/qmails-0-r1.ebuild
deleted file mode 100644
index 67ada5606b16..000000000000
--- a/acct-user/qmails/qmails-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-smtpd"
-ACCT_USER_ID=206
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmails/qmails-0-r2.ebuild b/acct-user/qmails/qmails-0-r2.ebuild
new file mode 100644
index 000000000000..7f26ec2f89b3
--- /dev/null
+++ b/acct-user/qmails/qmails-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-smtpd"
+ACCT_USER_ID=206
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/quagga/quagga-0-r1.ebuild b/acct-user/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index d40e6dace3fe..000000000000
--- a/acct-user/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=424
-ACCT_USER_GROUPS=( quagga )
-
-acct-user_add_deps
diff --git a/acct-user/quagga/quagga-0-r2.ebuild b/acct-user/quagga/quagga-0-r2.ebuild
new file mode 100644
index 000000000000..bf4a158964ed
--- /dev/null
+++ b/acct-user/quagga/quagga-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=424
+ACCT_USER_GROUPS=( quagga )
+
+acct-user_add_deps
diff --git a/acct-user/quassel/quassel-0-r1.ebuild b/acct-user/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index 402d7a01cfca..000000000000
--- a/acct-user/quassel/quassel-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=472
-ACCT_USER_HOME=/var/lib/quassel
-ACCT_USER_GROUPS=( quassel )
-
-acct-user_add_deps
diff --git a/acct-user/quassel/quassel-0-r2.ebuild b/acct-user/quassel/quassel-0-r2.ebuild
new file mode 100644
index 000000000000..4f783f9a351f
--- /dev/null
+++ b/acct-user/quassel/quassel-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=472
+ACCT_USER_HOME=/var/lib/quassel
+ACCT_USER_GROUPS=( quassel )
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq/rabbitmq-0-r1.ebuild b/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
new file mode 100644
index 000000000000..ec27b7545b5b
--- /dev/null
+++ b/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/rabbitmq-server"
+
+ACCT_USER_GROUPS=( "rabbitmq" )
+ACCT_USER_HOME="/var/lib/rabbitmq"
+ACCT_USER_HOME_PERMS="0750"
+ACCT_USER_ID="121"
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq/rabbitmq-0.ebuild b/acct-user/rabbitmq/rabbitmq-0.ebuild
deleted file mode 100644
index 23f7f618a8fc..000000000000
--- a/acct-user/rabbitmq/rabbitmq-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/rabbitmq-server"
-
-ACCT_USER_GROUPS=( "rabbitmq" )
-ACCT_USER_HOME="/var/lib/rabbitmq"
-ACCT_USER_HOME_PERMS="0750"
-ACCT_USER_ID="121"
-
-acct-user_add_deps
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..78248a6b75ff
--- /dev/null
+++ b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/rabbitmq_exporter"
+
+ACCT_USER_ID=107
+ACCT_USER_GROUPS=( rabbitmq_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
deleted file mode 100644
index 89db38665fb8..000000000000
--- a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/rabbitmq_exporter"
-
-ACCT_USER_ID=107
-ACCT_USER_GROUPS=( rabbitmq_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/radarr/radarr-0-r1.ebuild b/acct-user/radarr/radarr-0-r1.ebuild
new file mode 100644
index 000000000000..419aa4591317
--- /dev/null
+++ b/acct-user/radarr/radarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for radarr"
+ACCT_USER_HOME=/var/lib/radarr
+ACCT_USER_ID=516
+ACCT_USER_GROUPS=( radarr )
+
+acct-user_add_deps
diff --git a/acct-user/radarr/radarr-0.ebuild b/acct-user/radarr/radarr-0.ebuild
deleted file mode 100644
index c910ab4636ce..000000000000
--- a/acct-user/radarr/radarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for radarr"
-ACCT_USER_HOME=/var/lib/radarr
-ACCT_USER_ID=516
-ACCT_USER_GROUPS=( radarr )
-
-acct-user_add_deps
diff --git a/acct-user/radicale/radicale-0-r2.ebuild b/acct-user/radicale/radicale-0-r2.ebuild
deleted file mode 100644
index 221d3fb16490..000000000000
--- a/acct-user/radicale/radicale-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/radicale"
-ACCT_USER_ID=327
-ACCT_USER_GROUPS=( radicale )
-ACCT_USER_HOME=/var/lib/radicale
-
-acct-user_add_deps
diff --git a/acct-user/radicale/radicale-0-r3.ebuild b/acct-user/radicale/radicale-0-r3.ebuild
new file mode 100644
index 000000000000..75d00441a126
--- /dev/null
+++ b/acct-user/radicale/radicale-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/radicale"
+ACCT_USER_ID=327
+ACCT_USER_GROUPS=( radicale )
+ACCT_USER_HOME=/var/lib/radicale
+
+acct-user_add_deps
diff --git a/acct-user/radius/radius-0-r1.ebuild b/acct-user/radius/radius-0-r1.ebuild
deleted file mode 100644
index 811870d8e2d6..000000000000
--- a/acct-user/radius/radius-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="FreeRadius program user"
-ACCT_USER_ID=95
-ACCT_USER_GROUPS=( radius )
-acct-user_add_deps
diff --git a/acct-user/radius/radius-0-r2.ebuild b/acct-user/radius/radius-0-r2.ebuild
new file mode 100644
index 000000000000..2611f8b3352a
--- /dev/null
+++ b/acct-user/radius/radius-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="FreeRadius program user"
+ACCT_USER_ID=95
+ACCT_USER_GROUPS=( radius )
+acct-user_add_deps
diff --git a/acct-user/radvd/radvd-0-r1.ebuild b/acct-user/radvd/radvd-0-r1.ebuild
new file mode 100644
index 000000000000..d74fe7916643
--- /dev/null
+++ b/acct-user/radvd/radvd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Router Advertisement Daemon"
+
+ACCT_USER_GROUPS=( "radvd" )
+ACCT_USER_ID="215"
+
+acct-user_add_deps
diff --git a/acct-user/radvd/radvd-0.ebuild b/acct-user/radvd/radvd-0.ebuild
deleted file mode 100644
index 3b51448d28b9..000000000000
--- a/acct-user/radvd/radvd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Router Advertisement Daemon"
-
-ACCT_USER_GROUPS=( "radvd" )
-ACCT_USER_ID="215"
-
-acct-user_add_deps
diff --git a/acct-user/rbldns/rbldns-0-r1.ebuild b/acct-user/rbldns/rbldns-0-r1.ebuild
deleted file mode 100644
index f9ec0841095b..000000000000
--- a/acct-user/rbldns/rbldns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=153
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/rbldns/rbldns-0-r2.ebuild b/acct-user/rbldns/rbldns-0-r2.ebuild
new file mode 100644
index 000000000000..43929c1fad55
--- /dev/null
+++ b/acct-user/rbldns/rbldns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=153
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/rbot/rbot-0-r1.ebuild b/acct-user/rbot/rbot-0-r1.ebuild
new file mode 100644
index 000000000000..bf0c7c145e88
--- /dev/null
+++ b/acct-user/rbot/rbot-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-irc/rbot"
+
+ACCT_USER_GROUPS=( "rbot" )
+ACCT_USER_HOME="/var/lib/rbot"
+ACCT_USER_ID="129"
+
+acct-user_add_deps
diff --git a/acct-user/rbot/rbot-0.ebuild b/acct-user/rbot/rbot-0.ebuild
deleted file mode 100644
index c4e767ac30a0..000000000000
--- a/acct-user/rbot/rbot-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-irc/rbot"
-
-ACCT_USER_GROUPS=( "rbot" )
-ACCT_USER_HOME="/var/lib/rbot"
-ACCT_USER_ID="129"
-
-acct-user_add_deps
diff --git a/acct-user/readarr/readarr-0-r1.ebuild b/acct-user/readarr/readarr-0-r1.ebuild
new file mode 100644
index 000000000000..d782879aa061
--- /dev/null
+++ b/acct-user/readarr/readarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for readarr"
+ACCT_USER_HOME=/var/lib/readarr
+ACCT_USER_ID=521
+ACCT_USER_GROUPS=( readarr )
+
+acct-user_add_deps
diff --git a/acct-user/readarr/readarr-0.ebuild b/acct-user/readarr/readarr-0.ebuild
deleted file mode 100644
index 9998e137f4ad..000000000000
--- a/acct-user/readarr/readarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for readarr"
-ACCT_USER_HOME=/var/lib/readarr
-ACCT_USER_ID=521
-ACCT_USER_GROUPS=( readarr )
-
-acct-user_add_deps
diff --git a/acct-user/redis/redis-0-r1.ebuild b/acct-user/redis/redis-0-r1.ebuild
deleted file mode 100644
index b685af71488c..000000000000
--- a/acct-user/redis/redis-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="Redis program user"
-ACCT_USER_ID=75
-ACCT_USER_GROUPS=( redis )
-acct-user_add_deps
diff --git a/acct-user/redis/redis-0-r2.ebuild b/acct-user/redis/redis-0-r2.ebuild
new file mode 100644
index 000000000000..a9cebb2a7108
--- /dev/null
+++ b/acct-user/redis/redis-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Redis program user"
+ACCT_USER_ID=75
+ACCT_USER_GROUPS=( redis )
+acct-user_add_deps
diff --git a/acct-user/redis_exporter/redis_exporter-0-r1.ebuild b/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..9dc7b65510f4
--- /dev/null
+++ b/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/redis_exporter"
+
+ACCT_USER_HOME=/var/lib/redis_exporter
+ACCT_USER_GROUPS=( "redis_exporter" )
+ACCT_USER_ID="298"
+
+acct-user_add_deps
diff --git a/acct-user/redis_exporter/redis_exporter-0.ebuild b/acct-user/redis_exporter/redis_exporter-0.ebuild
deleted file mode 100644
index 9096283d34a1..000000000000
--- a/acct-user/redis_exporter/redis_exporter-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/redis_exporter"
-
-ACCT_USER_HOME=/var/lib/redis_exporter
-ACCT_USER_GROUPS=( "redis_exporter" )
-ACCT_USER_ID="298"
-
-acct-user_add_deps
diff --git a/acct-user/redmine/redmine-0-r1.ebuild b/acct-user/redmine/redmine-0-r1.ebuild
deleted file mode 100644
index 2c309ee4b3d1..000000000000
--- a/acct-user/redmine/redmine-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Redmine application user"
-ACCT_USER_ID=451
-ACCT_USER_GROUPS=( redmine )
-acct-user_add_deps
diff --git a/acct-user/redmine/redmine-0-r2.ebuild b/acct-user/redmine/redmine-0-r2.ebuild
new file mode 100644
index 000000000000..c46f454cb5c8
--- /dev/null
+++ b/acct-user/redmine/redmine-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Redmine application user"
+ACCT_USER_ID=451
+ACCT_USER_GROUPS=( redmine )
+acct-user_add_deps
diff --git a/acct-user/redsocks/redsocks-0-r1.ebuild b/acct-user/redsocks/redsocks-0-r1.ebuild
deleted file mode 100644
index b59a8084d4d4..000000000000
--- a/acct-user/redsocks/redsocks-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-proxy/redsocks"
-
-ACCT_USER_GROUPS=( "redsocks" )
-ACCT_USER_ID="154"
-
-acct-user_add_deps
diff --git a/acct-user/redsocks/redsocks-0-r2.ebuild b/acct-user/redsocks/redsocks-0-r2.ebuild
new file mode 100644
index 000000000000..bcaa7b06c23d
--- /dev/null
+++ b/acct-user/redsocks/redsocks-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-proxy/redsocks"
+
+ACCT_USER_GROUPS=( "redsocks" )
+ACCT_USER_ID="154"
+
+acct-user_add_deps
diff --git a/acct-user/reg/reg-0-r1.ebuild b/acct-user/reg/reg-0-r1.ebuild
deleted file mode 100644
index 57bb9a6ed18f..000000000000
--- a/acct-user/reg/reg-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-containers/reg"
-
-ACCT_USER_ID=503
-ACCT_USER_GROUPS=( reg )
-ACCT_USER_HOME=/var/lib/reg
-
-acct-user_add_deps
diff --git a/acct-user/reg/reg-0-r2.ebuild b/acct-user/reg/reg-0-r2.ebuild
new file mode 100644
index 000000000000..908843687070
--- /dev/null
+++ b/acct-user/reg/reg-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-containers/reg"
+
+ACCT_USER_ID=503
+ACCT_USER_GROUPS=( reg )
+ACCT_USER_HOME=/var/lib/reg
+
+acct-user_add_deps
diff --git a/acct-user/registry/registry-0-r1.ebuild b/acct-user/registry/registry-0-r1.ebuild
new file mode 100644
index 000000000000..0542f5c6e243
--- /dev/null
+++ b/acct-user/registry/registry-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-containers/docker-registry"
+
+ACCT_USER_GROUPS=( "registry" )
+ACCT_USER_ID="295"
+
+acct-user_add_deps
diff --git a/acct-user/registry/registry-0.ebuild b/acct-user/registry/registry-0.ebuild
deleted file mode 100644
index 5994a8162973..000000000000
--- a/acct-user/registry/registry-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-containers/docker-registry"
-
-ACCT_USER_GROUPS=( "registry" )
-ACCT_USER_ID="295"
-
-acct-user_add_deps
diff --git a/acct-user/root/root-0-r1.ebuild b/acct-user/root/root-0-r1.ebuild
deleted file mode 100644
index ea2e82dfcf29..000000000000
--- a/acct-user/root/root-0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=0
-ACCT_USER_ENFORCE_ID=yes
-ACCT_USER_SHELL="/bin/bash"
-ACCT_USER_HOME="/root"
-ACCT_USER_HOME_PERMS=0700
-ACCT_USER_GROUPS=( root )
-
-# Avoid reverting changes by the sysadmin.
-# https://bugs.gentoo.org/827813
-ACCT_USER_NO_MODIFY=1
-
-acct-user_add_deps
-
-pkg_prerm() {
- # Don't lock out the superuser
- :
-}
diff --git a/acct-user/root/root-0-r2.ebuild b/acct-user/root/root-0-r2.ebuild
new file mode 100644
index 000000000000..886f46d01e36
--- /dev/null
+++ b/acct-user/root/root-0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=0
+ACCT_USER_ENFORCE_ID=yes
+ACCT_USER_SHELL="/bin/bash"
+ACCT_USER_HOME="/root"
+ACCT_USER_HOME_PERMS=0700
+ACCT_USER_GROUPS=( root )
+
+# Avoid reverting changes by the sysadmin.
+# https://bugs.gentoo.org/827813
+ACCT_USER_NO_MODIFY=1
+
+acct-user_add_deps
+
+pkg_prerm() {
+ # Don't lock out the superuser
+ :
+}
diff --git a/acct-user/rplayd/rplayd-0-r1.ebuild b/acct-user/rplayd/rplayd-0-r1.ebuild
new file mode 100644
index 000000000000..d181450d048f
--- /dev/null
+++ b/acct-user/rplayd/rplayd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/rplay"
+
+ACCT_USER_GROUPS=( "rplayd" )
+ACCT_USER_ID="161"
+
+acct-user_add_deps
diff --git a/acct-user/rplayd/rplayd-0.ebuild b/acct-user/rplayd/rplayd-0.ebuild
deleted file mode 100644
index d0f4a9ffa47e..000000000000
--- a/acct-user/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/rplay"
-
-ACCT_USER_GROUPS=( "rplayd" )
-ACCT_USER_ID="161"
-
-acct-user_add_deps
diff --git a/acct-user/rrdcached/rrdcached-0-r1.ebuild b/acct-user/rrdcached/rrdcached-0-r1.ebuild
new file mode 100644
index 000000000000..254b5384bb3f
--- /dev/null
+++ b/acct-user/rrdcached/rrdcached-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/rrdtool"
+
+ACCT_USER_HOME="/var/lib/rrdcached"
+ACCT_USER_ID="511"
+ACCT_USER_GROUPS=( "rrdcached" )
+
+acct-user_add_deps
diff --git a/acct-user/rrdcached/rrdcached-0.ebuild b/acct-user/rrdcached/rrdcached-0.ebuild
deleted file mode 100644
index 1ce6ab3ef294..000000000000
--- a/acct-user/rrdcached/rrdcached-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/rrdtool"
-
-ACCT_USER_HOME="/var/lib/rrdcached"
-ACCT_USER_ID="511"
-ACCT_USER_GROUPS=( "rrdcached" )
-
-acct-user_add_deps
diff --git a/acct-user/rslsync/rslsync-0-r1.ebuild b/acct-user/rslsync/rslsync-0-r1.ebuild
new file mode 100644
index 000000000000..58907429b95f
--- /dev/null
+++ b/acct-user/rslsync/rslsync-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-p2p/resilio-sync"
+
+ACCT_USER_GROUPS=( "rslsync" )
+ACCT_USER_HOME="/var/lib/resilio-sync"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="175"
+
+acct-user_add_deps
diff --git a/acct-user/rslsync/rslsync-0.ebuild b/acct-user/rslsync/rslsync-0.ebuild
deleted file mode 100644
index c0b018b0637e..000000000000
--- a/acct-user/rslsync/rslsync-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-p2p/resilio-sync"
-
-ACCT_USER_GROUPS=( "rslsync" )
-ACCT_USER_HOME="/var/lib/resilio-sync"
-ACCT_USER_HOME_PERMS="0700"
-ACCT_USER_ID="175"
-
-acct-user_add_deps
diff --git a/acct-user/rspamd/rspamd-0-r1.ebuild b/acct-user/rspamd/rspamd-0-r1.ebuild
deleted file mode 100644
index 6c9d403c5892..000000000000
--- a/acct-user/rspamd/rspamd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for rspamd - Rapid spam filtering system"
-ACCT_USER_ID=237
-ACCT_USER_GROUPS=( rspamd )
-
-acct-user_add_deps
diff --git a/acct-user/rspamd/rspamd-0-r2.ebuild b/acct-user/rspamd/rspamd-0-r2.ebuild
new file mode 100644
index 000000000000..445b38c43475
--- /dev/null
+++ b/acct-user/rspamd/rspamd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for rspamd - Rapid spam filtering system"
+ACCT_USER_ID=237
+ACCT_USER_GROUPS=( rspamd )
+
+acct-user_add_deps
diff --git a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild b/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index a77f8b72ddee..000000000000
--- a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sci-mathematics/rstudio"
-ACCT_USER_ID=466
-ACCT_USER_GROUPS=( rstudio-server )
-
-acct-user_add_deps
diff --git a/acct-user/rstudio-server/rstudio-server-0-r2.ebuild b/acct-user/rstudio-server/rstudio-server-0-r2.ebuild
new file mode 100644
index 000000000000..bc297edcdd2d
--- /dev/null
+++ b/acct-user/rstudio-server/rstudio-server-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for sci-mathematics/rstudio"
+ACCT_USER_ID=466
+ACCT_USER_GROUPS=( rstudio-server )
+
+acct-user_add_deps
diff --git a/acct-user/rt/rt-0-r1.ebuild b/acct-user/rt/rt-0-r1.ebuild
new file mode 100644
index 000000000000..ebc3c57938be
--- /dev/null
+++ b/acct-user/rt/rt-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/rt"
+
+ACCT_USER_GROUPS=( "rt" )
+ACCT_USER_ID="126"
+
+acct-user_add_deps
diff --git a/acct-user/rt/rt-0.ebuild b/acct-user/rt/rt-0.ebuild
deleted file mode 100644
index 0cb1f523ec0b..000000000000
--- a/acct-user/rt/rt-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/rt"
-
-ACCT_USER_GROUPS=( "rt" )
-ACCT_USER_ID="126"
-
-acct-user_add_deps
diff --git a/acct-user/rtkit/rtkit-0-r1.ebuild b/acct-user/rtkit/rtkit-0-r1.ebuild
deleted file mode 100644
index 49a940185f8c..000000000000
--- a/acct-user/rtkit/rtkit-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Realtime Policy and Watchdog Daemon"
-ACCT_USER_ID=133
-ACCT_USER_GROUPS=( rtkit )
-
-acct-user_add_deps
diff --git a/acct-user/rtkit/rtkit-0-r2.ebuild b/acct-user/rtkit/rtkit-0-r2.ebuild
new file mode 100644
index 000000000000..e37c9fff14f8
--- /dev/null
+++ b/acct-user/rtkit/rtkit-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the Realtime Policy and Watchdog Daemon"
+ACCT_USER_ID=133
+ACCT_USER_GROUPS=( rtkit )
+
+acct-user_add_deps
diff --git a/acct-user/rundeck/rundeck-0-r1.ebuild b/acct-user/rundeck/rundeck-0-r1.ebuild
new file mode 100644
index 000000000000..076ebd251f6a
--- /dev/null
+++ b/acct-user/rundeck/rundeck-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/rundeck-bin"
+
+ACCT_USER_ID=109
+ACCT_USER_HOME=/var/lib/rundeck
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_GROUPS=( rundeck )
+
+acct-user_add_deps
diff --git a/acct-user/rundeck/rundeck-0.ebuild b/acct-user/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9c34344b34ff..000000000000
--- a/acct-user/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/rundeck-bin"
-
-ACCT_USER_ID=109
-ACCT_USER_HOME=/var/lib/rundeck
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_GROUPS=( rundeck )
-
-acct-user_add_deps
diff --git a/acct-user/rwhoisd/rwhoisd-0-r1.ebuild b/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
new file mode 100644
index 000000000000..7bb46f1728e4
--- /dev/null
+++ b/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/rwhoisd"
+
+ACCT_USER_GROUPS=( "rwhoisd" )
+ACCT_USER_HOME="/var/rwhoisd"
+ACCT_USER_ID="258"
+
+acct-user_add_deps
diff --git a/acct-user/rwhoisd/rwhoisd-0.ebuild b/acct-user/rwhoisd/rwhoisd-0.ebuild
deleted file mode 100644
index b7b112a8db4a..000000000000
--- a/acct-user/rwhoisd/rwhoisd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/rwhoisd"
-
-ACCT_USER_GROUPS=( "rwhoisd" )
-ACCT_USER_HOME="/var/rwhoisd"
-ACCT_USER_ID="258"
-
-acct-user_add_deps
diff --git a/acct-user/sabnzbd/sabnzbd-0-r1.ebuild b/acct-user/sabnzbd/sabnzbd-0-r1.ebuild
deleted file mode 100644
index ee5b6e7c09f5..000000000000
--- a/acct-user/sabnzbd/sabnzbd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="SABnzbd program user"
-
-ACCT_USER_ID=397
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( sabnzbd )
-
-acct-user_add_deps
diff --git a/acct-user/sabnzbd/sabnzbd-0-r2.ebuild b/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
new file mode 100644
index 000000000000..271ae1c22ae7
--- /dev/null
+++ b/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="SABnzbd program user"
+
+ACCT_USER_ID=397
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( sabnzbd )
+
+acct-user_add_deps
diff --git a/acct-user/sagan/sagan-0-r1.ebuild b/acct-user/sagan/sagan-0-r1.ebuild
deleted file mode 100644
index 9ad8931530f3..000000000000
--- a/acct-user/sagan/sagan-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Sagan log monitoring system"
-ACCT_USER_ID=317
-ACCT_USER_GROUPS=( sagan )
-
-acct-user_add_deps
diff --git a/acct-user/sagan/sagan-0-r2.ebuild b/acct-user/sagan/sagan-0-r2.ebuild
new file mode 100644
index 000000000000..4f81071a3b94
--- /dev/null
+++ b/acct-user/sagan/sagan-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the Sagan log monitoring system"
+ACCT_USER_ID=317
+ACCT_USER_GROUPS=( sagan )
+
+acct-user_add_deps
diff --git a/acct-user/samplicator/samplicator-0-r1.ebuild b/acct-user/samplicator/samplicator-0-r1.ebuild
new file mode 100644
index 000000000000..7b60d91482a0
--- /dev/null
+++ b/acct-user/samplicator/samplicator-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/samplicator"
+
+ACCT_USER_GROUPS=( "samplicator" )
+ACCT_USER_HOME="/etc/samplicator"
+ACCT_USER_ID="179"
+
+acct-user_add_deps
diff --git a/acct-user/samplicator/samplicator-0.ebuild b/acct-user/samplicator/samplicator-0.ebuild
deleted file mode 100644
index cbdb6485cf39..000000000000
--- a/acct-user/samplicator/samplicator-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/samplicator"
-
-ACCT_USER_GROUPS=( "samplicator" )
-ACCT_USER_HOME="/etc/samplicator"
-ACCT_USER_ID="179"
-
-acct-user_add_deps
diff --git a/acct-user/sancp/sancp-0-r1.ebuild b/acct-user/sancp/sancp-0-r1.ebuild
new file mode 100644
index 000000000000..012908badf47
--- /dev/null
+++ b/acct-user/sancp/sancp-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/sancp"
+ACCT_USER_ID=382
+ACCT_USER_GROUPS=( sancp )
+
+acct-user_add_deps
diff --git a/acct-user/sancp/sancp-0.ebuild b/acct-user/sancp/sancp-0.ebuild
deleted file mode 100644
index 804e4057270e..000000000000
--- a/acct-user/sancp/sancp-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/sancp"
-ACCT_USER_ID=382
-ACCT_USER_GROUPS=( sancp )
-
-acct-user_add_deps
diff --git a/acct-user/saned/saned-0-r1.ebuild b/acct-user/saned/saned-0-r1.ebuild
new file mode 100644
index 000000000000..43a593335a48
--- /dev/null
+++ b/acct-user/saned/saned-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for media-gfx/sane-backends"
+
+ACCT_USER_GROUPS=( "scanner" )
+ACCT_USER_ID="409"
+
+acct-user_add_deps
diff --git a/acct-user/saned/saned-0.ebuild b/acct-user/saned/saned-0.ebuild
deleted file mode 100644
index cf6954c61297..000000000000
--- a/acct-user/saned/saned-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for media-gfx/sane-backends"
-
-ACCT_USER_GROUPS=( "scanner" )
-ACCT_USER_ID="409"
-
-acct-user_add_deps
diff --git a/acct-user/sanlock/sanlock-0-r1.ebuild b/acct-user/sanlock/sanlock-0-r1.ebuild
deleted file mode 100644
index 839e34bd9bc5..000000000000
--- a/acct-user/sanlock/sanlock-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="shared storage lock manager"
-ACCT_USER_ID=340
-ACCT_USER_HOME=/dev/null
-ACCT_USER_GROUPS=( ${PN} disk )
-
-acct-user_add_deps
diff --git a/acct-user/sanlock/sanlock-0-r2.ebuild b/acct-user/sanlock/sanlock-0-r2.ebuild
new file mode 100644
index 000000000000..8a98a7cacb31
--- /dev/null
+++ b/acct-user/sanlock/sanlock-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="shared storage lock manager"
+ACCT_USER_ID=340
+ACCT_USER_HOME=/dev/null
+ACCT_USER_GROUPS=( ${PN} disk )
+
+acct-user_add_deps
diff --git a/acct-user/sauerbraten/sauerbraten-0-r1.ebuild b/acct-user/sauerbraten/sauerbraten-0-r1.ebuild
deleted file mode 100644
index 1e35c084b798..000000000000
--- a/acct-user/sauerbraten/sauerbraten-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
-ACCT_USER_ID=286
-ACCT_USER_GROUPS=( sauerbraten )
-
-acct-user_add_deps
diff --git a/acct-user/sauerbraten/sauerbraten-0-r2.ebuild b/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
new file mode 100644
index 000000000000..657f44fd672f
--- /dev/null
+++ b/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
+ACCT_USER_ID=286
+ACCT_USER_GROUPS=( sauerbraten )
+
+acct-user_add_deps
diff --git a/acct-user/scanlogd/scanlogd-0-r1.ebuild b/acct-user/scanlogd/scanlogd-0-r1.ebuild
new file mode 100644
index 000000000000..9e823b440fbc
--- /dev/null
+++ b/acct-user/scanlogd/scanlogd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/scanlogd"
+
+ACCT_USER_GROUPS=( "scanlogd" )
+ACCT_USER_ID="166"
+
+acct-user_add_deps
diff --git a/acct-user/scanlogd/scanlogd-0.ebuild b/acct-user/scanlogd/scanlogd-0.ebuild
deleted file mode 100644
index 21ec18b7a255..000000000000
--- a/acct-user/scanlogd/scanlogd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/scanlogd"
-
-ACCT_USER_GROUPS=( "scanlogd" )
-ACCT_USER_ID="166"
-
-acct-user_add_deps
diff --git a/acct-user/scponly/scponly-0-r1.ebuild b/acct-user/scponly/scponly-0-r1.ebuild
deleted file mode 100644
index 329ccf735996..000000000000
--- a/acct-user/scponly/scponly-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for chrooted scponly"
-ACCT_USER_ID=239
-ACCT_USER_GROUPS=( scponly )
-# Not a typo. scponly uses the trailing // to identify the chroot dir.
-ACCT_USER_HOME=/var/chroot/scponly//
-ACCT_USER_HOME_OWNER=root:root
-
-acct-user_add_deps
diff --git a/acct-user/scponly/scponly-0-r2.ebuild b/acct-user/scponly/scponly-0-r2.ebuild
new file mode 100644
index 000000000000..ed12f0b4e2c6
--- /dev/null
+++ b/acct-user/scponly/scponly-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for chrooted scponly"
+ACCT_USER_ID=239
+ACCT_USER_GROUPS=( scponly )
+# Not a typo. scponly uses the trailing // to identify the chroot dir.
+ACCT_USER_HOME=/var/chroot/scponly//
+ACCT_USER_HOME_OWNER=root:root
+
+acct-user_add_deps
diff --git a/acct-user/sddm/sddm-0-r1.ebuild b/acct-user/sddm/sddm-0-r1.ebuild
new file mode 100644
index 000000000000..ee5313288ddd
--- /dev/null
+++ b/acct-user/sddm/sddm-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/sddm"
+
+ACCT_USER_GROUPS=( "sddm" "video" )
+ACCT_USER_HOME="/var/lib/sddm"
+ACCT_USER_ID="219"
+
+acct-user_add_deps
diff --git a/acct-user/sddm/sddm-0.ebuild b/acct-user/sddm/sddm-0.ebuild
deleted file mode 100644
index dbfdeb4679ec..000000000000
--- a/acct-user/sddm/sddm-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for x11-misc/sddm"
-
-ACCT_USER_GROUPS=( "sddm" "video" )
-ACCT_USER_HOME="/var/lib/sddm"
-ACCT_USER_ID="219"
-
-acct-user_add_deps
diff --git a/acct-user/sendpage/sendpage-0-r1.ebuild b/acct-user/sendpage/sendpage-0-r1.ebuild
new file mode 100644
index 000000000000..b0fc5897e520
--- /dev/null
+++ b/acct-user/sendpage/sendpage-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dialup/sendpage"
+
+ACCT_USER_GROUPS=( "sms" )
+ACCT_USER_ID="406"
+
+acct-user_add_deps
diff --git a/acct-user/sendpage/sendpage-0.ebuild b/acct-user/sendpage/sendpage-0.ebuild
deleted file mode 100644
index 02b16c3ad728..000000000000
--- a/acct-user/sendpage/sendpage-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dialup/sendpage"
-
-ACCT_USER_GROUPS=( "sms" )
-ACCT_USER_ID="406"
-
-acct-user_add_deps
diff --git a/acct-user/serf/serf-0-r1.ebuild b/acct-user/serf/serf-0-r1.ebuild
new file mode 100644
index 000000000000..08b4db34860a
--- /dev/null
+++ b/acct-user/serf/serf-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/serf"
+
+ACCT_USER_HOME=/var/lib/serf
+ACCT_USER_GROUPS=( "serf" )
+ACCT_USER_ID="314"
+
+acct-user_add_deps
diff --git a/acct-user/serf/serf-0.ebuild b/acct-user/serf/serf-0.ebuild
deleted file mode 100644
index 69ba27af0770..000000000000
--- a/acct-user/serf/serf-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/serf"
-
-ACCT_USER_HOME=/var/lib/serf
-ACCT_USER_GROUPS=( "serf" )
-ACCT_USER_ID="314"
-
-acct-user_add_deps
diff --git a/acct-user/sguil/sguil-0-r1.ebuild b/acct-user/sguil/sguil-0-r1.ebuild
new file mode 100644
index 000000000000..9c178d7f2dba
--- /dev/null
+++ b/acct-user/sguil/sguil-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/sguil-sensor"
+
+ACCT_USER_GROUPS=( "sguil" )
+ACCT_USER_HOME="/var/lib/sguil"
+ACCT_USER_ID="165"
+
+acct-user_add_deps
diff --git a/acct-user/sguil/sguil-0.ebuild b/acct-user/sguil/sguil-0.ebuild
deleted file mode 100644
index 01910dcc0edd..000000000000
--- a/acct-user/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/sguil-sensor"
-
-ACCT_USER_GROUPS=( "sguil" )
-ACCT_USER_HOME="/var/lib/sguil"
-ACCT_USER_ID="165"
-
-acct-user_add_deps
diff --git a/acct-user/sigh/sigh-0-r1.ebuild b/acct-user/sigh/sigh-0-r1.ebuild
new file mode 100644
index 000000000000..c28ea40470f1
--- /dev/null
+++ b/acct-user/sigh/sigh-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=363
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/sigh/sigh-0.ebuild b/acct-user/sigh/sigh-0.ebuild
deleted file mode 100644
index 13f119b89edf..000000000000
--- a/acct-user/sigh/sigh-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=363
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/sks/sks-0-r1.ebuild b/acct-user/sks/sks-0-r1.ebuild
new file mode 100644
index 000000000000..5844d199183a
--- /dev/null
+++ b/acct-user/sks/sks-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SKS OpenPGP keyserver"
+ACCT_USER_ID=370
+ACCT_USER_GROUPS=( sks )
+
+acct-user_add_deps
diff --git a/acct-user/sks/sks-0.ebuild b/acct-user/sks/sks-0.ebuild
deleted file mode 100644
index 5f78df813304..000000000000
--- a/acct-user/sks/sks-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the SKS OpenPGP keyserver"
-ACCT_USER_ID=370
-ACCT_USER_GROUPS=( sks )
-
-acct-user_add_deps
diff --git a/acct-user/slurm/slurm-0-r1.ebuild b/acct-user/slurm/slurm-0-r1.ebuild
deleted file mode 100644
index 76604870735c..000000000000
--- a/acct-user/slurm/slurm-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the slurm - Highly Scalable Resource Manager"
-ACCT_USER_ID=400
-ACCT_USER_HOME=/var/lib/slurm
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( slurm )
-
-acct-user_add_deps
diff --git a/acct-user/slurm/slurm-0-r2.ebuild b/acct-user/slurm/slurm-0-r2.ebuild
new file mode 100644
index 000000000000..2a2d155f5fec
--- /dev/null
+++ b/acct-user/slurm/slurm-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the slurm - Highly Scalable Resource Manager"
+ACCT_USER_ID=400
+ACCT_USER_HOME=/var/lib/slurm
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( slurm )
+
+acct-user_add_deps
diff --git a/acct-user/smmsp/smmsp-0-r2.ebuild b/acct-user/smmsp/smmsp-0-r2.ebuild
deleted file mode 100644
index e0eda5440e18..000000000000
--- a/acct-user/smmsp/smmsp-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sendmail daemon"
-ACCT_USER_ID=209
-ACCT_USER_GROUPS=( smmsp )
-
-acct-user_add_deps
diff --git a/acct-user/smmsp/smmsp-0-r3.ebuild b/acct-user/smmsp/smmsp-0-r3.ebuild
new file mode 100644
index 000000000000..8a12ba2c6cc4
--- /dev/null
+++ b/acct-user/smmsp/smmsp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for sendmail daemon"
+ACCT_USER_ID=209
+ACCT_USER_GROUPS=( smmsp )
+
+acct-user_add_deps
diff --git a/acct-user/smokeping/smokeping-0-r1.ebuild b/acct-user/smokeping/smokeping-0-r1.ebuild
new file mode 100644
index 000000000000..e53ca960d5b6
--- /dev/null
+++ b/acct-user/smokeping/smokeping-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/smokeping"
+
+ACCT_USER_GROUPS=( "smokeping" )
+ACCT_USER_HOME="/var/lib/smokeping"
+ACCT_USER_ID="164"
+
+acct-user_add_deps
diff --git a/acct-user/smokeping/smokeping-0.ebuild b/acct-user/smokeping/smokeping-0.ebuild
deleted file mode 100644
index b3c157563d54..000000000000
--- a/acct-user/smokeping/smokeping-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/smokeping"
-
-ACCT_USER_GROUPS=( "smokeping" )
-ACCT_USER_HOME="/var/lib/smokeping"
-ACCT_USER_ID="164"
-
-acct-user_add_deps
diff --git a/acct-user/smsd/smsd-0-r1.ebuild b/acct-user/smsd/smsd-0-r1.ebuild
new file mode 100644
index 000000000000..69987ac6919d
--- /dev/null
+++ b/acct-user/smsd/smsd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=359
+ACCT_USER_GROUPS=( sms )
+ACCT_USER_HOME=/var/spool/sms
+
+acct-user_add_deps
diff --git a/acct-user/smsd/smsd-0.ebuild b/acct-user/smsd/smsd-0.ebuild
deleted file mode 100644
index ecad0ea94087..000000000000
--- a/acct-user/smsd/smsd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=359
-ACCT_USER_GROUPS=( sms )
-ACCT_USER_HOME=/var/spool/sms
-
-acct-user_add_deps
diff --git a/acct-user/smtpd/smtpd-0-r1.ebuild b/acct-user/smtpd/smtpd-0-r1.ebuild
deleted file mode 100644
index 1a15db05401e..000000000000
--- a/acct-user/smtpd/smtpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="daemon user for smtpd"
-ACCT_USER_ID=25
-ACCT_USER_GROUPS=( smtpd )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/smtpd/smtpd-0-r2.ebuild b/acct-user/smtpd/smtpd-0-r2.ebuild
new file mode 100644
index 000000000000..58eb0dfaa32e
--- /dev/null
+++ b/acct-user/smtpd/smtpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="daemon user for smtpd"
+ACCT_USER_ID=25
+ACCT_USER_GROUPS=( smtpd )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/smtpq/smtpq-0-r1.ebuild b/acct-user/smtpq/smtpq-0-r1.ebuild
deleted file mode 100644
index 6ba87dc3739b..000000000000
--- a/acct-user/smtpq/smtpq-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="queue user for smtpd"
-ACCT_USER_ID=252
-ACCT_USER_GROUPS=( smtpq )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/smtpq/smtpq-0-r2.ebuild b/acct-user/smtpq/smtpq-0-r2.ebuild
new file mode 100644
index 000000000000..fcf4136aa1eb
--- /dev/null
+++ b/acct-user/smtpq/smtpq-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="queue user for smtpd"
+ACCT_USER_ID=252
+ACCT_USER_GROUPS=( smtpq )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/snapclient/snapclient-0-r1.ebuild b/acct-user/snapclient/snapclient-0-r1.ebuild
new file mode 100644
index 000000000000..8d1da6fe79b3
--- /dev/null
+++ b/acct-user/snapclient/snapclient-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Client user for media-sound/snapcast"
+
+ACCT_USER_GROUPS=( "audio" )
+ACCT_USER_HOME_OWNER="snapserver"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_ID=373
+
+acct-user_add_deps
diff --git a/acct-user/snapclient/snapclient-0.ebuild b/acct-user/snapclient/snapclient-0.ebuild
deleted file mode 100644
index 9bd49cef21f7..000000000000
--- a/acct-user/snapclient/snapclient-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Client user for media-sound/snapcast"
-
-ACCT_USER_GROUPS=( "audio" )
-ACCT_USER_HOME_OWNER="snapserver"
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_ID=373
-
-acct-user_add_deps
diff --git a/acct-user/snapserver/snapserver-0.ebuild b/acct-user/snapserver/snapserver-0-r1.ebuild
index b4b8bbda6968..b4b8bbda6968 100644
--- a/acct-user/snapserver/snapserver-0.ebuild
+++ b/acct-user/snapserver/snapserver-0-r1.ebuild
diff --git a/acct-user/sndiod/sndiod-0-r1.ebuild b/acct-user/sndiod/sndiod-0-r1.ebuild
new file mode 100644
index 000000000000..5e796716760b
--- /dev/null
+++ b/acct-user/sndiod/sndiod-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Daemon user for sndio"
+ACCT_USER_ID=461
+ACCT_USER_GROUPS=( audio )
+
+acct-user_add_deps
diff --git a/acct-user/sndiod/sndiod-0.ebuild b/acct-user/sndiod/sndiod-0.ebuild
deleted file mode 100644
index 19dbeba029c6..000000000000
--- a/acct-user/sndiod/sndiod-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Daemon user for sndio"
-ACCT_USER_ID=461
-ACCT_USER_GROUPS=( audio )
-
-acct-user_add_deps
diff --git a/acct-user/sniproxy/sniproxy-0-r1.ebuild b/acct-user/sniproxy/sniproxy-0-r1.ebuild
new file mode 100644
index 000000000000..5bda56cd6a17
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=366
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/sniproxy/sniproxy-0.ebuild b/acct-user/sniproxy/sniproxy-0.ebuild
deleted file mode 100644
index d7566da9196d..000000000000
--- a/acct-user/sniproxy/sniproxy-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=366
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild b/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..f1b3d5a78eab
--- /dev/null
+++ b/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/snmp_exporter"
+
+ACCT_USER_ID=108
+ACCT_USER_GROUPS=( snmp_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/snmp_exporter/snmp_exporter-0.ebuild b/acct-user/snmp_exporter/snmp_exporter-0.ebuild
deleted file mode 100644
index cc920e57202e..000000000000
--- a/acct-user/snmp_exporter/snmp_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/snmp_exporter"
-
-ACCT_USER_ID=108
-ACCT_USER_GROUPS=( snmp_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/snort/snort-0-r1.ebuild b/acct-user/snort/snort-0-r1.ebuild
new file mode 100644
index 000000000000..6b52f5bbce84
--- /dev/null
+++ b/acct-user/snort/snort-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for snort"
+ACCT_USER_ID=328
+ACCT_USER_GROUPS=( snort )
+
+acct-user_add_deps
diff --git a/acct-user/snort/snort-0.ebuild b/acct-user/snort/snort-0.ebuild
deleted file mode 100644
index 553fa786a9b0..000000000000
--- a/acct-user/snort/snort-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for snort"
-ACCT_USER_ID=328
-ACCT_USER_GROUPS=( snort )
-
-acct-user_add_deps
diff --git a/acct-user/sobby/sobby-0-r1.ebuild b/acct-user/sobby/sobby-0-r1.ebuild
new file mode 100644
index 000000000000..4a8e1a4efd95
--- /dev/null
+++ b/acct-user/sobby/sobby-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running sobby"
+ACCT_USER_ID=322
+ACCT_USER_GROUPS=( sobby )
+ACCT_USER_HOME=/var/lib/sobby
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/sobby/sobby-0.ebuild b/acct-user/sobby/sobby-0.ebuild
deleted file mode 100644
index e3bb30a78d14..000000000000
--- a/acct-user/sobby/sobby-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running sobby"
-ACCT_USER_ID=322
-ACCT_USER_GROUPS=( sobby )
-ACCT_USER_HOME=/var/lib/sobby
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/sobexsrv/sobexsrv-0-r1.ebuild b/acct-user/sobexsrv/sobexsrv-0-r1.ebuild
new file mode 100644
index 000000000000..fab5653ea299
--- /dev/null
+++ b/acct-user/sobexsrv/sobexsrv-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sobexsrv: a secure OBEX server"
+ACCT_USER_ID=387
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME="/var/spool/sobexsrv"
+
+acct-user_add_deps
diff --git a/acct-user/sobexsrv/sobexsrv-0.ebuild b/acct-user/sobexsrv/sobexsrv-0.ebuild
deleted file mode 100644
index 613bd931349c..000000000000
--- a/acct-user/sobexsrv/sobexsrv-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sobexsrv: a secure OBEX server"
-ACCT_USER_ID=387
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME="/var/spool/sobexsrv"
-
-acct-user_add_deps
diff --git a/acct-user/sockd/sockd-0-r1.ebuild b/acct-user/sockd/sockd-0-r1.ebuild
deleted file mode 100644
index 2b3b94b74510..000000000000
--- a/acct-user/sockd/sockd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-proxy/dante"
-
-ACCT_USER_GROUPS=( "sockd" )
-ACCT_USER_ID="214"
-
-acct-user_add_deps
diff --git a/acct-user/sockd/sockd-0-r2.ebuild b/acct-user/sockd/sockd-0-r2.ebuild
new file mode 100644
index 000000000000..582e473c1667
--- /dev/null
+++ b/acct-user/sockd/sockd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-proxy/dante"
+
+ACCT_USER_GROUPS=( "sockd" )
+ACCT_USER_ID="214"
+
+acct-user_add_deps
diff --git a/acct-user/sogo/sogo-0-r1.ebuild b/acct-user/sogo/sogo-0-r1.ebuild
deleted file mode 100644
index bb9f732e18a1..000000000000
--- a/acct-user/sogo/sogo-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for gnustep-apps/sogo"
-ACCT_USER_ID=475
-ACCT_USER_GROUPS=( sogo )
-ACCT_USER_HOME="/var/lib/sogo"
-ACCT_USER_SHELL=/bin/bash
-
-acct-user_add_deps
diff --git a/acct-user/sogo/sogo-0-r2.ebuild b/acct-user/sogo/sogo-0-r2.ebuild
new file mode 100644
index 000000000000..47590bc2fc6d
--- /dev/null
+++ b/acct-user/sogo/sogo-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for gnustep-apps/sogo"
+ACCT_USER_ID=475
+ACCT_USER_GROUPS=( sogo )
+ACCT_USER_HOME="/var/lib/sogo"
+ACCT_USER_SHELL=/bin/bash
+
+acct-user_add_deps
diff --git a/acct-user/soju/soju-0-r1.ebuild b/acct-user/soju/soju-0-r1.ebuild
new file mode 100644
index 000000000000..73240ed21963
--- /dev/null
+++ b/acct-user/soju/soju-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_USER_ID=526
+ACCT_USER_HOME=/var/lib/soju
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( soju )
+
+acct-user_add_deps
diff --git a/acct-user/soju/soju-0.ebuild b/acct-user/soju/soju-0.ebuild
deleted file mode 100644
index 2ca7f2de748b..000000000000
--- a/acct-user/soju/soju-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the net-irc/soju IRC bouncer"
-ACCT_USER_ID=526
-ACCT_USER_HOME=/var/lib/soju
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( soju )
-
-acct-user_add_deps
diff --git a/acct-user/sonarr/sonarr-0-r1.ebuild b/acct-user/sonarr/sonarr-0-r1.ebuild
new file mode 100644
index 000000000000..7343294d3a08
--- /dev/null
+++ b/acct-user/sonarr/sonarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for sonarr"
+ACCT_USER_HOME=/var/lib/sonarr
+ACCT_USER_ID=515
+ACCT_USER_GROUPS=( sonarr )
+
+acct-user_add_deps
diff --git a/acct-user/sonarr/sonarr-0.ebuild b/acct-user/sonarr/sonarr-0.ebuild
deleted file mode 100644
index 1cae0d6f268f..000000000000
--- a/acct-user/sonarr/sonarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for sonarr"
-ACCT_USER_HOME=/var/lib/sonarr
-ACCT_USER_ID=515
-ACCT_USER_GROUPS=( sonarr )
-
-acct-user_add_deps
diff --git a/acct-user/spamd/spamd-0-r1.ebuild b/acct-user/spamd/spamd-0-r1.ebuild
deleted file mode 100644
index e4fcb0a0378a..000000000000
--- a/acct-user/spamd/spamd-0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the SpamAssassin daemon"
-
-ACCT_USER_ID=337
-ACCT_USER_GROUPS=( "${PN}" )
-# The spamd daemon runs as this user. Use a real home directory so
-# that it can hold SA configuration.
-#
-# Since spamd's home contains user-modifiable config files, it's
-# a violation of the Linux FHS for it to be here, but it's been
-# decided it can't be in /home/.
-#
-# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
-# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
-#
-ACCT_USER_HOME="/var/lib/spamd"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/spamd/spamd-0-r2.ebuild b/acct-user/spamd/spamd-0-r2.ebuild
new file mode 100644
index 000000000000..0b184739667c
--- /dev/null
+++ b/acct-user/spamd/spamd-0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SpamAssassin daemon"
+
+ACCT_USER_ID=337
+ACCT_USER_GROUPS=( "${PN}" )
+# The spamd daemon runs as this user. Use a real home directory so
+# that it can hold SA configuration.
+#
+# Since spamd's home contains user-modifiable config files, it's
+# a violation of the Linux FHS for it to be here, but it's been
+# decided it can't be in /home/.
+#
+# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
+# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
+#
+ACCT_USER_HOME="/var/lib/spamd"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/spectrum/spectrum-0-r1.ebuild b/acct-user/spectrum/spectrum-0-r1.ebuild
deleted file mode 100644
index 08902275a61d..000000000000
--- a/acct-user/spectrum/spectrum-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Spectrum messaging transport"
-
-ACCT_USER_GROUPS=( "spectrum" )
-ACCT_USER_HOME="/var/lib/spectrum2"
-ACCT_USER_ID="486"
-
-acct-user_add_deps
diff --git a/acct-user/spectrum/spectrum-0-r2.ebuild b/acct-user/spectrum/spectrum-0-r2.ebuild
new file mode 100644
index 000000000000..54a2098366ef
--- /dev/null
+++ b/acct-user/spectrum/spectrum-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Spectrum messaging transport"
+
+ACCT_USER_GROUPS=( "spectrum" )
+ACCT_USER_HOME="/var/lib/spectrum2"
+ACCT_USER_ID="486"
+
+acct-user_add_deps
diff --git a/acct-user/spire/spire-0-r1.ebuild b/acct-user/spire/spire-0-r1.ebuild
deleted file mode 100644
index da8dc43e7824..000000000000
--- a/acct-user/spire/spire-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for spiffe runtime environment"
-ACCT_USER_ID=271
-ACCT_USER_GROUPS=( spire )
-
-acct-user_add_deps
diff --git a/acct-user/spire/spire-0-r2.ebuild b/acct-user/spire/spire-0-r2.ebuild
new file mode 100644
index 000000000000..18e15e27892e
--- /dev/null
+++ b/acct-user/spire/spire-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for spiffe runtime environment"
+ACCT_USER_ID=271
+ACCT_USER_GROUPS=( spire )
+
+acct-user_add_deps
diff --git a/acct-user/spread/spread-0-r1.ebuild b/acct-user/spread/spread-0-r1.ebuild
new file mode 100644
index 000000000000..14694ac04946
--- /dev/null
+++ b/acct-user/spread/spread-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/spread"
+
+ACCT_USER_GROUPS=( "spread" )
+ACCT_USER_ID="159"
+
+acct-user_add_deps
diff --git a/acct-user/spread/spread-0.ebuild b/acct-user/spread/spread-0.ebuild
deleted file mode 100644
index 25e453efacf3..000000000000
--- a/acct-user/spread/spread-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/spread"
-
-ACCT_USER_GROUPS=( "spread" )
-ACCT_USER_ID="159"
-
-acct-user_add_deps
diff --git a/acct-user/sqlgrey/sqlgrey-0-r1.ebuild b/acct-user/sqlgrey/sqlgrey-0-r1.ebuild
deleted file mode 100644
index b0a125d82524..000000000000
--- a/acct-user/sqlgrey/sqlgrey-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for SQLGrey"
-
-ACCT_USER_ID=336
-ACCT_USER_GROUPS=( sqlgrey )
-ACCT_USER_HOME="/var/spool/sqlgrey"
-
-acct-user_add_deps
diff --git a/acct-user/sqlgrey/sqlgrey-0-r2.ebuild b/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
new file mode 100644
index 000000000000..097a202f2595
--- /dev/null
+++ b/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for SQLGrey"
+
+ACCT_USER_ID=336
+ACCT_USER_GROUPS=( sqlgrey )
+ACCT_USER_HOME="/var/spool/sqlgrey"
+
+acct-user_add_deps
diff --git a/acct-user/squid/squid-0-r1.ebuild b/acct-user/squid/squid-0-r1.ebuild
deleted file mode 100644
index 97e03021f293..000000000000
--- a/acct-user/squid/squid-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for squid web proxy cache"
-ACCT_USER_ID=301
-ACCT_USER_HOME=/var/cache/squid
-ACCT_USER_GROUPS=( squid )
-
-acct-user_add_deps
diff --git a/acct-user/squid/squid-0-r2.ebuild b/acct-user/squid/squid-0-r2.ebuild
new file mode 100644
index 000000000000..e009bd51a92d
--- /dev/null
+++ b/acct-user/squid/squid-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for squid web proxy cache"
+ACCT_USER_ID=301
+ACCT_USER_HOME=/var/cache/squid
+ACCT_USER_GROUPS=( squid )
+
+acct-user_add_deps
diff --git a/acct-user/sshd/sshd-0-r1.ebuild b/acct-user/sshd/sshd-0-r1.ebuild
deleted file mode 100644
index 06703c1956ba..000000000000
--- a/acct-user/sshd/sshd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ssh"
-
-ACCT_USER_ID=22
-ACCT_USER_HOME=/var/empty
-ACCT_USER_HOME_OWNER=root:root
-ACCT_USER_GROUPS=( sshd )
-
-acct-user_add_deps
diff --git a/acct-user/sshd/sshd-0-r2.ebuild b/acct-user/sshd/sshd-0-r2.ebuild
new file mode 100644
index 000000000000..1f398feda6db
--- /dev/null
+++ b/acct-user/sshd/sshd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ssh"
+
+ACCT_USER_ID=22
+ACCT_USER_HOME=/var/empty
+ACCT_USER_HOME_OWNER=root:root
+ACCT_USER_GROUPS=( sshd )
+
+acct-user_add_deps
diff --git a/acct-user/sstpc/sstpc-0-r1.ebuild b/acct-user/sstpc/sstpc-0-r1.ebuild
new file mode 100644
index 000000000000..177d09eeb1f7
--- /dev/null
+++ b/acct-user/sstpc/sstpc-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/sstp-client"
+
+ACCT_USER_GROUPS=( "sstpc" )
+ACCT_USER_ID="257"
+
+acct-user_add_deps
diff --git a/acct-user/sstpc/sstpc-0.ebuild b/acct-user/sstpc/sstpc-0.ebuild
deleted file mode 100644
index 328b3ce93fc7..000000000000
--- a/acct-user/sstpc/sstpc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/sstp-client"
-
-ACCT_USER_GROUPS=( "sstpc" )
-ACCT_USER_ID="257"
-
-acct-user_add_deps
diff --git a/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
new file mode 100644
index 000000000000..7ec9267bc6f2
--- /dev/null
+++ b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing discovery server"
+ACCT_USER_ID=497
+ACCT_USER_HOME=/var/lib/syncthing-discosrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt 1; then
+ ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
+ ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+ break
+ fi
+ done
+ fi
+}
diff --git a/acct-user/stdiscosrv/stdiscosrv-1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1.ebuild
deleted file mode 100644
index fc1db7a4a130..000000000000
--- a/acct-user/stdiscosrv/stdiscosrv-1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing discovery server"
-ACCT_USER_ID=497
-ACCT_USER_HOME=/var/lib/syncthing-discosrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
-
-pkg_postinst() {
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- local rver
- for rver in ${REPLACING_VERSIONS} ; do
- if ver_test "${rver}" -lt 1; then
- ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
- ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
- break
- fi
- done
- fi
-}
diff --git a/acct-user/steamcmd/steamcmd-0-r1.ebuild b/acct-user/steamcmd/steamcmd-0-r1.ebuild
deleted file mode 100644
index d86f0daa649d..000000000000
--- a/acct-user/steamcmd/steamcmd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the SteamCMD server"
-
-ACCT_USER_GROUPS=( "steamcmd" )
-ACCT_USER_HOME="/opt/steamcmd"
-ACCT_USER_ID="489"
-
-acct-user_add_deps
diff --git a/acct-user/steamcmd/steamcmd-0-r2.ebuild b/acct-user/steamcmd/steamcmd-0-r2.ebuild
new file mode 100644
index 000000000000..c587360a5303
--- /dev/null
+++ b/acct-user/steamcmd/steamcmd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the SteamCMD server"
+
+ACCT_USER_GROUPS=( "steamcmd" )
+ACCT_USER_HOME="/opt/steamcmd"
+ACCT_USER_ID="489"
+
+acct-user_add_deps
diff --git a/acct-user/stg/stg-0-r1.ebuild b/acct-user/stg/stg-0-r1.ebuild
new file mode 100644
index 000000000000..5c899c73be93
--- /dev/null
+++ b/acct-user/stg/stg-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/stargazer"
+
+ACCT_USER_GROUPS=( "stg" )
+ACCT_USER_ID="176"
+
+acct-user_add_deps
diff --git a/acct-user/stg/stg-0.ebuild b/acct-user/stg/stg-0.ebuild
deleted file mode 100644
index db254cc77e7e..000000000000
--- a/acct-user/stg/stg-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/stargazer"
-
-ACCT_USER_GROUPS=( "stg" )
-ACCT_USER_ID="176"
-
-acct-user_add_deps
diff --git a/acct-user/strelaysrv/strelaysrv-1-r1.ebuild b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
new file mode 100644
index 000000000000..57f5a650afb1
--- /dev/null
+++ b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing relay server"
+ACCT_USER_ID=496
+ACCT_USER_HOME=/var/lib/syncthing-relaysrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt 1; then
+ ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
+ ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+ break
+ fi
+ done
+ fi
+}
diff --git a/acct-user/strelaysrv/strelaysrv-1.ebuild b/acct-user/strelaysrv/strelaysrv-1.ebuild
deleted file mode 100644
index c4b804d8160c..000000000000
--- a/acct-user/strelaysrv/strelaysrv-1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing relay server"
-ACCT_USER_ID=496
-ACCT_USER_HOME=/var/lib/syncthing-relaysrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
-
-pkg_postinst() {
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- local rver
- for rver in ${REPLACING_VERSIONS} ; do
- if ver_test "${rver}" -lt 1; then
- ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
- ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
- break
- fi
- done
- fi
-}
diff --git a/acct-user/stubby/stubby-0-r1.ebuild b/acct-user/stubby/stubby-0-r1.ebuild
deleted file mode 100644
index bfc4ccc9dbcc..000000000000
--- a/acct-user/stubby/stubby-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Stubby program user (from net-dns/getdns)"
-ACCT_USER_ID=476
-ACCT_USER_GROUPS=( stubby )
-
-acct-user_add_deps
diff --git a/acct-user/stubby/stubby-0-r2.ebuild b/acct-user/stubby/stubby-0-r2.ebuild
new file mode 100644
index 000000000000..c2edde79f5ef
--- /dev/null
+++ b/acct-user/stubby/stubby-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Stubby program user (from net-dns/getdns)"
+ACCT_USER_ID=476
+ACCT_USER_GROUPS=( stubby )
+
+acct-user_add_deps
diff --git a/acct-user/stunnel/stunnel-0-r1.ebuild b/acct-user/stunnel/stunnel-0-r1.ebuild
deleted file mode 100644
index efd92922c779..000000000000
--- a/acct-user/stunnel/stunnel-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for stunnel"
-ACCT_USER_ID=341
-ACCT_USER_GROUPS=( stunnel )
-
-acct-user_add_deps
diff --git a/acct-user/stunnel/stunnel-0-r2.ebuild b/acct-user/stunnel/stunnel-0-r2.ebuild
new file mode 100644
index 000000000000..06aa05483ac0
--- /dev/null
+++ b/acct-user/stunnel/stunnel-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for stunnel"
+ACCT_USER_ID=341
+ACCT_USER_GROUPS=( stunnel )
+
+acct-user_add_deps
diff --git a/acct-user/subsonic/subsonic-0-r1.ebuild b/acct-user/subsonic/subsonic-0-r1.ebuild
deleted file mode 100644
index 6ca134e7f2a6..000000000000
--- a/acct-user/subsonic/subsonic-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/subsonic-bin"
-
-ACCT_USER_GROUPS=( "subsonic" )
-ACCT_USER_HOME="/var/lib/subsonic"
-ACCT_USER_ID="136"
-
-acct-user_add_deps
diff --git a/acct-user/subsonic/subsonic-0-r2.ebuild b/acct-user/subsonic/subsonic-0-r2.ebuild
new file mode 100644
index 000000000000..c5c61c23e2b7
--- /dev/null
+++ b/acct-user/subsonic/subsonic-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/subsonic-bin"
+
+ACCT_USER_GROUPS=( "subsonic" )
+ACCT_USER_HOME="/var/lib/subsonic"
+ACCT_USER_ID="136"
+
+acct-user_add_deps
diff --git a/acct-user/suricata/suricata-0-r1.ebuild b/acct-user/suricata/suricata-0-r1.ebuild
deleted file mode 100644
index 37142d57f340..000000000000
--- a/acct-user/suricata/suricata-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Suricata IDS"
-ACCT_USER_ID=477
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/suricata/suricata-0-r2.ebuild b/acct-user/suricata/suricata-0-r2.ebuild
new file mode 100644
index 000000000000..8542433ac1cb
--- /dev/null
+++ b/acct-user/suricata/suricata-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Suricata IDS"
+ACCT_USER_ID=477
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/svn/svn-0-r1.ebuild b/acct-user/svn/svn-0-r1.ebuild
deleted file mode 100644
index 6f7d567a7edf..000000000000
--- a/acct-user/svn/svn-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=399
-ACCT_USER_GROUPS=( svnusers )
-
-acct-user_add_deps
diff --git a/acct-user/svn/svn-0-r2.ebuild b/acct-user/svn/svn-0-r2.ebuild
new file mode 100644
index 000000000000..ccadd54c2705
--- /dev/null
+++ b/acct-user/svn/svn-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=399
+ACCT_USER_GROUPS=( svnusers )
+
+acct-user_add_deps
diff --git a/acct-user/svxlink/svxlink-0-r1.ebuild b/acct-user/svxlink/svxlink-0-r1.ebuild
new file mode 100644
index 000000000000..a1db366fdc42
--- /dev/null
+++ b/acct-user/svxlink/svxlink-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the svxlink server"
+ACCT_USER_ID=247
+ACCT_USER_GROUPS=( svxlink )
+
+acct-user_add_deps
diff --git a/acct-user/svxlink/svxlink-0.ebuild b/acct-user/svxlink/svxlink-0.ebuild
deleted file mode 100644
index 347fb69f8eca..000000000000
--- a/acct-user/svxlink/svxlink-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the svxlink server"
-ACCT_USER_ID=247
-ACCT_USER_GROUPS=( svxlink )
-
-acct-user_add_deps
diff --git a/acct-user/swift/swift-0-r1.ebuild b/acct-user/swift/swift-0-r1.ebuild
deleted file mode 100644
index efee86cef2da..000000000000
--- a/acct-user/swift/swift-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="USER for swift - Openstack object storage backend"
-ACCT_USER_ID=449
-ACCT_USER_GROUPS=( swift )
-
-acct-user_add_deps
diff --git a/acct-user/swift/swift-0-r2.ebuild b/acct-user/swift/swift-0-r2.ebuild
new file mode 100644
index 000000000000..f3e36ece0c61
--- /dev/null
+++ b/acct-user/swift/swift-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="USER for swift - Openstack object storage backend"
+ACCT_USER_ID=449
+ACCT_USER_GROUPS=( swift )
+
+acct-user_add_deps
diff --git a/acct-user/synapse/synapse-0-r1.ebuild b/acct-user/synapse/synapse-0-r1.ebuild
new file mode 100644
index 000000000000..ad0ebb7a6709
--- /dev/null
+++ b/acct-user/synapse/synapse-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/synapse"
+ACCT_USER_ID=519
+ACCT_USER_GROUPS=( synapse )
+
+acct-user_add_deps
diff --git a/acct-user/synapse/synapse-0.ebuild b/acct-user/synapse/synapse-0.ebuild
deleted file mode 100644
index 0fb650ac5752..000000000000
--- a/acct-user/synapse/synapse-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-im/synapse"
-ACCT_USER_ID=519
-ACCT_USER_GROUPS=( synapse )
-
-acct-user_add_deps
diff --git a/acct-user/syncthing/syncthing-0-r1.ebuild b/acct-user/syncthing/syncthing-0-r1.ebuild
deleted file mode 100644
index a97b75e13343..000000000000
--- a/acct-user/syncthing/syncthing-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-p2p/syncthing server"
-ACCT_USER_ID=499
-ACCT_USER_HOME=/var/lib/syncthing
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
diff --git a/acct-user/syncthing/syncthing-0-r2.ebuild b/acct-user/syncthing/syncthing-0-r2.ebuild
new file mode 100644
index 000000000000..bb5f5ae16039
--- /dev/null
+++ b/acct-user/syncthing/syncthing-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-p2p/syncthing server"
+ACCT_USER_ID=499
+ACCT_USER_HOME=/var/lib/syncthing
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild
deleted file mode 100644
index 24e1948da8c3..000000000000
--- a/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=194
-ACCT_USER_GROUPS=( systemd-coredump )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
new file mode 100644
index 000000000000..c6a2b8a225e9
--- /dev/null
+++ b/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=194
+ACCT_USER_GROUPS=( systemd-coredump )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
deleted file mode 100644
index b05096297b8b..000000000000
--- a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=191
-ACCT_USER_GROUPS=( systemd-journal-remote )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
new file mode 100644
index 000000000000..79477b5fc172
--- /dev/null
+++ b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=191
+ACCT_USER_GROUPS=( systemd-journal-remote )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-network/systemd-network-0-r1.ebuild b/acct-user/systemd-network/systemd-network-0-r1.ebuild
deleted file mode 100644
index bf308627c415..000000000000
--- a/acct-user/systemd-network/systemd-network-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=192
-ACCT_USER_GROUPS=( systemd-network )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-network/systemd-network-0-r2.ebuild b/acct-user/systemd-network/systemd-network-0-r2.ebuild
new file mode 100644
index 000000000000..d4ed5bb35fb1
--- /dev/null
+++ b/acct-user/systemd-network/systemd-network-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=192
+ACCT_USER_GROUPS=( systemd-network )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-oom/systemd-oom-0-r1.ebuild b/acct-user/systemd-oom/systemd-oom-0-r1.ebuild
new file mode 100644
index 000000000000..4cdc4a3944c7
--- /dev/null
+++ b/acct-user/systemd-oom/systemd-oom-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=198
+ACCT_USER_GROUPS=( systemd-oom )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-oom/systemd-oom-0.ebuild b/acct-user/systemd-oom/systemd-oom-0.ebuild
deleted file mode 100644
index 9c3f3e365120..000000000000
--- a/acct-user/systemd-oom/systemd-oom-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=198
-ACCT_USER_GROUPS=( systemd-oom )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild
deleted file mode 100644
index 5eb0b3096dbe..000000000000
--- a/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=193
-ACCT_USER_GROUPS=( systemd-resolve )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
new file mode 100644
index 000000000000..c8316cff5ac1
--- /dev/null
+++ b/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=193
+ACCT_USER_GROUPS=( systemd-resolve )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild
deleted file mode 100644
index 3a09984648ac..000000000000
--- a/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=195
-ACCT_USER_GROUPS=( systemd-timesync )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
new file mode 100644
index 000000000000..3f4554bdacbd
--- /dev/null
+++ b/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=195
+ACCT_USER_GROUPS=( systemd-timesync )
+
+acct-user_add_deps
diff --git a/acct-user/taskd/taskd-0-r1.ebuild b/acct-user/taskd/taskd-0-r1.ebuild
new file mode 100644
index 000000000000..a40214d5f105
--- /dev/null
+++ b/acct-user/taskd/taskd-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/taskd"
+
+ACCT_USER_GROUPS=( "taskd" )
+ACCT_USER_HOME="/var/lib/taskd"
+ACCT_USER_ID="152"
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/taskd/taskd-0.ebuild b/acct-user/taskd/taskd-0.ebuild
deleted file mode 100644
index 013b234af3d5..000000000000
--- a/acct-user/taskd/taskd-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/taskd"
-
-ACCT_USER_GROUPS=( "taskd" )
-ACCT_USER_HOME="/var/lib/taskd"
-ACCT_USER_ID="152"
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/teamspeak/teamspeak-0-r1.ebuild b/acct-user/teamspeak/teamspeak-0-r1.ebuild
deleted file mode 100644
index b0495444ce4f..000000000000
--- a/acct-user/teamspeak/teamspeak-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the TeamSpeak server"
-
-ACCT_USER_GROUPS=( "teamspeak" )
-ACCT_USER_HOME="/opt/teamspeak3-server"
-ACCT_USER_ID="488"
-
-acct-user_add_deps
diff --git a/acct-user/teamspeak/teamspeak-0-r2.ebuild b/acct-user/teamspeak/teamspeak-0-r2.ebuild
new file mode 100644
index 000000000000..4d3115689ebc
--- /dev/null
+++ b/acct-user/teamspeak/teamspeak-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the TeamSpeak server"
+
+ACCT_USER_GROUPS=( "teamspeak" )
+ACCT_USER_HOME="/opt/teamspeak3-server"
+ACCT_USER_ID="488"
+
+acct-user_add_deps
diff --git a/acct-user/telegraf/telegraf-0-r1.ebuild b/acct-user/telegraf/telegraf-0-r1.ebuild
deleted file mode 100644
index 7cfacc19c7c4..000000000000
--- a/acct-user/telegraf/telegraf-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for telegraf"
-ACCT_USER_ID=428
-ACCT_USER_GROUPS=( telegraf )
-
-acct-user_add_deps
diff --git a/acct-user/telegraf/telegraf-0-r2.ebuild b/acct-user/telegraf/telegraf-0-r2.ebuild
new file mode 100644
index 000000000000..a5b9ca2670f9
--- /dev/null
+++ b/acct-user/telegraf/telegraf-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for telegraf"
+ACCT_USER_ID=428
+ACCT_USER_GROUPS=( telegraf )
+
+acct-user_add_deps
diff --git a/acct-user/tenshi/tenshi-0-r1.ebuild b/acct-user/tenshi/tenshi-0-r1.ebuild
new file mode 100644
index 000000000000..4b78147bf97d
--- /dev/null
+++ b/acct-user/tenshi/tenshi-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/tenshi"
+
+ACCT_USER_GROUPS=( "tenshi" )
+ACCT_USER_HOME="/var/lib/tenshi"
+ACCT_USER_ID="283"
+
+acct-user_add_deps
diff --git a/acct-user/tenshi/tenshi-0.ebuild b/acct-user/tenshi/tenshi-0.ebuild
deleted file mode 100644
index e28212db5350..000000000000
--- a/acct-user/tenshi/tenshi-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/tenshi"
-
-ACCT_USER_GROUPS=( "tenshi" )
-ACCT_USER_HOME="/var/lib/tenshi"
-ACCT_USER_ID="283"
-
-acct-user_add_deps
diff --git a/acct-user/thttpd/thttpd-0-r1.ebuild b/acct-user/thttpd/thttpd-0-r1.ebuild
new file mode 100644
index 000000000000..b1c643e901c1
--- /dev/null
+++ b/acct-user/thttpd/thttpd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/thttpd"
+
+ACCT_USER_GROUPS=( "thttpd" )
+ACCT_USER_ID="155"
+
+acct-user_add_deps
diff --git a/acct-user/thttpd/thttpd-0.ebuild b/acct-user/thttpd/thttpd-0.ebuild
deleted file mode 100644
index 4dcafd47f24b..000000000000
--- a/acct-user/thttpd/thttpd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/thttpd"
-
-ACCT_USER_GROUPS=( "thttpd" )
-ACCT_USER_ID="155"
-
-acct-user_add_deps
diff --git a/acct-user/timidity/timidity-0-r1.ebuild b/acct-user/timidity/timidity-0-r1.ebuild
new file mode 100644
index 000000000000..b5ce42f013a5
--- /dev/null
+++ b/acct-user/timidity/timidity-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/timidity++"
+
+ACCT_USER_GROUPS=( "nobody" )
+ACCT_USER_HOME="/var/lib/timidity"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="306"
+
+acct-user_add_deps
diff --git a/acct-user/timidity/timidity-0.ebuild b/acct-user/timidity/timidity-0.ebuild
deleted file mode 100644
index c4e6822876db..000000000000
--- a/acct-user/timidity/timidity-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/timidity++"
-
-ACCT_USER_GROUPS=( "nobody" )
-ACCT_USER_HOME="/var/lib/timidity"
-ACCT_USER_HOME_PERMS="0700"
-ACCT_USER_ID="306"
-
-acct-user_add_deps
diff --git a/acct-user/tinydns/tinydns-0-r1.ebuild b/acct-user/tinydns/tinydns-0-r1.ebuild
new file mode 100644
index 000000000000..91a3a9c097d3
--- /dev/null
+++ b/acct-user/tinydns/tinydns-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=227
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/tinydns/tinydns-0.ebuild b/acct-user/tinydns/tinydns-0.ebuild
deleted file mode 100644
index 2a0ffd69000c..000000000000
--- a/acct-user/tinydns/tinydns-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=227
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/tinyproxy/tinyproxy-0-r1.ebuild b/acct-user/tinyproxy/tinyproxy-0-r1.ebuild
new file mode 100644
index 000000000000..20c6ba419bd0
--- /dev/null
+++ b/acct-user/tinyproxy/tinyproxy-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-proxy/tinyproxy"
+ACCT_USER_ID=186
+ACCT_USER_GROUPS=( tinyproxy )
+
+acct-user_add_deps
diff --git a/acct-user/tinyproxy/tinyproxy-0.ebuild b/acct-user/tinyproxy/tinyproxy-0.ebuild
deleted file mode 100644
index fe5783267fe3..000000000000
--- a/acct-user/tinyproxy/tinyproxy-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-proxy/tinyproxy"
-ACCT_USER_ID=186
-ACCT_USER_GROUPS=( tinyproxy )
-
-acct-user_add_deps
diff --git a/acct-user/tomcat/tomcat-0-r1.ebuild b/acct-user/tomcat/tomcat-0-r1.ebuild
new file mode 100644
index 000000000000..ab1a33ae6172
--- /dev/null
+++ b/acct-user/tomcat/tomcat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Apache Tomcat"
+ACCT_USER_ID=265
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/tomcat/tomcat-0.ebuild b/acct-user/tomcat/tomcat-0.ebuild
deleted file mode 100644
index fd230aa19e0b..000000000000
--- a/acct-user/tomcat/tomcat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Apache Tomcat"
-ACCT_USER_ID=265
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/tor/tor-0-r1.ebuild b/acct-user/tor/tor-0-r1.ebuild
deleted file mode 100644
index 86496b34fe7c..000000000000
--- a/acct-user/tor/tor-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for tor daemon"
-ACCT_USER_ID=43
-ACCT_USER_GROUPS=( tor )
-
-acct-user_add_deps
diff --git a/acct-user/tor/tor-0-r2.ebuild b/acct-user/tor/tor-0-r2.ebuild
new file mode 100644
index 000000000000..9a356fc4f42d
--- /dev/null
+++ b/acct-user/tor/tor-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for tor daemon"
+ACCT_USER_ID=43
+ACCT_USER_GROUPS=( tor )
+
+acct-user_add_deps
diff --git a/acct-user/tox/tox-0-r1.ebuild b/acct-user/tox/tox-0-r1.ebuild
deleted file mode 100644
index b75ed771a3c5..000000000000
--- a/acct-user/tox/tox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for package net-libs/tox"
-
-ACCT_USER_ID=236 #day-month of first tox commit
-ACCT_USER_GROUPS=( tox )
-
-acct-user_add_deps
diff --git a/acct-user/tox/tox-0-r2.ebuild b/acct-user/tox/tox-0-r2.ebuild
new file mode 100644
index 000000000000..f2e835541b0c
--- /dev/null
+++ b/acct-user/tox/tox-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for package net-libs/tox"
+
+ACCT_USER_ID=236 #day-month of first tox commit
+ACCT_USER_GROUPS=( tox )
+
+acct-user_add_deps
diff --git a/acct-user/tpm/tpm-0-r1.ebuild b/acct-user/tpm/tpm-0-r1.ebuild
new file mode 100644
index 000000000000..7423e856b40f
--- /dev/null
+++ b/acct-user/tpm/tpm-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=347
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/var/lib/${PN}
+
+acct-user_add_deps
diff --git a/acct-user/tpm/tpm-0.ebuild b/acct-user/tpm/tpm-0.ebuild
deleted file mode 100644
index 6a4401d03020..000000000000
--- a/acct-user/tpm/tpm-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=347
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/var/lib/${PN}
-
-acct-user_add_deps
diff --git a/acct-user/transmission/transmission-1-r1.ebuild b/acct-user/transmission/transmission-1-r1.ebuild
deleted file mode 100644
index 2f1db989b988..000000000000
--- a/acct-user/transmission/transmission-1-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=169
-ACCT_USER_GROUPS=( transmission )
-
-acct-user_add_deps
diff --git a/acct-user/transmission/transmission-1-r2.ebuild b/acct-user/transmission/transmission-1-r2.ebuild
new file mode 100644
index 000000000000..1f899e09ded8
--- /dev/null
+++ b/acct-user/transmission/transmission-1-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=169
+ACCT_USER_GROUPS=( transmission )
+
+acct-user_add_deps
diff --git a/acct-user/trickster/trickster-0-r1.ebuild b/acct-user/trickster/trickster-0-r1.ebuild
new file mode 100644
index 000000000000..9be7fc094450
--- /dev/null
+++ b/acct-user/trickster/trickster-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/trickster"
+
+ACCT_USER_ID=119
+ACCT_USER_GROUPS=( trickster )
+
+acct-user_add_deps
diff --git a/acct-user/trickster/trickster-0.ebuild b/acct-user/trickster/trickster-0.ebuild
deleted file mode 100644
index fa378b29a456..000000000000
--- a/acct-user/trickster/trickster-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/trickster"
-
-ACCT_USER_ID=119
-ACCT_USER_GROUPS=( trickster )
-
-acct-user_add_deps
diff --git a/acct-user/trojan/trojan-0-r1.ebuild b/acct-user/trojan/trojan-0-r1.ebuild
new file mode 100644
index 000000000000..233972ae9f97
--- /dev/null
+++ b/acct-user/trojan/trojan-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/trojan"
+ACCT_USER_ID=326
+ACCT_USER_GROUPS=( trojan )
+
+acct-user_add_deps
diff --git a/acct-user/trojan/trojan-0.ebuild b/acct-user/trojan/trojan-0.ebuild
deleted file mode 100644
index 4f3784fb3d3e..000000000000
--- a/acct-user/trojan/trojan-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/trojan"
-ACCT_USER_ID=326
-ACCT_USER_GROUPS=( trojan )
-
-acct-user_add_deps
diff --git a/acct-user/tss/tss-0-r1.ebuild b/acct-user/tss/tss-0-r1.ebuild
deleted file mode 100644
index 55a6438895df..000000000000
--- a/acct-user/tss/tss-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Trusted Software Stack for TPMs user"
-ACCT_USER_ID=59
-ACCT_USER_GROUPS=( tss )
-
-acct-user_add_deps
diff --git a/acct-user/tss/tss-0-r2.ebuild b/acct-user/tss/tss-0-r2.ebuild
new file mode 100644
index 000000000000..d5b5b705be41
--- /dev/null
+++ b/acct-user/tss/tss-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Trusted Software Stack for TPMs user"
+ACCT_USER_ID=59
+ACCT_USER_GROUPS=( tss )
+
+acct-user_add_deps
diff --git a/acct-user/ttrssd/ttrssd-0-r1.ebuild b/acct-user/ttrssd/ttrssd-0-r1.ebuild
new file mode 100644
index 000000000000..6068ea16c406
--- /dev/null
+++ b/acct-user/ttrssd/ttrssd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/tt-rss"
+ACCT_USER_ID=386
+ACCT_USER_GROUPS=( ttrssd )
+
+acct-user_add_deps
diff --git a/acct-user/ttrssd/ttrssd-0.ebuild b/acct-user/ttrssd/ttrssd-0.ebuild
deleted file mode 100644
index 1d4f4efcaaf8..000000000000
--- a/acct-user/ttrssd/ttrssd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/tt-rss"
-ACCT_USER_ID=386
-ACCT_USER_GROUPS=( ttrssd )
-
-acct-user_add_deps
diff --git a/acct-user/turnserver/turnserver-0-r1.ebuild b/acct-user/turnserver/turnserver-0-r1.ebuild
deleted file mode 100644
index d84de4a708a1..000000000000
--- a/acct-user/turnserver/turnserver-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for a turn server like coturn"
-
-ACCT_USER_GROUPS=( "turnserver" )
-ACCT_USER_ID="235"
-
-acct-user_add_deps
diff --git a/acct-user/turnserver/turnserver-0-r2.ebuild b/acct-user/turnserver/turnserver-0-r2.ebuild
new file mode 100644
index 000000000000..7b96d5e1bdb3
--- /dev/null
+++ b/acct-user/turnserver/turnserver-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for a turn server like coturn"
+
+ACCT_USER_GROUPS=( "turnserver" )
+ACCT_USER_ID="235"
+
+acct-user_add_deps
diff --git a/acct-user/tvheadend/tvheadend-0-r1.ebuild b/acct-user/tvheadend/tvheadend-0-r1.ebuild
deleted file mode 100644
index 371ace1855fc..000000000000
--- a/acct-user/tvheadend/tvheadend-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for tvheadend"
-ACCT_USER_ID=462
-ACCT_USER_GROUPS=( video )
-ACCT_USER_HOME=/var/lib/tvheadend
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/tvheadend/tvheadend-0-r2.ebuild b/acct-user/tvheadend/tvheadend-0-r2.ebuild
new file mode 100644
index 000000000000..81c83454fa65
--- /dev/null
+++ b/acct-user/tvheadend/tvheadend-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for tvheadend"
+ACCT_USER_ID=462
+ACCT_USER_GROUPS=( video )
+ACCT_USER_HOME=/var/lib/tvheadend
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/ulogd/ulogd-0-r1.ebuild b/acct-user/ulogd/ulogd-0-r1.ebuild
new file mode 100644
index 000000000000..b188dd0e935b
--- /dev/null
+++ b/acct-user/ulogd/ulogd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ulogd"
+ACCT_USER_ID=311
+ACCT_USER_GROUPS=( ulogd )
+
+acct-user_add_deps
diff --git a/acct-user/ulogd/ulogd-0.ebuild b/acct-user/ulogd/ulogd-0.ebuild
deleted file mode 100644
index 0058aa8e7aff..000000000000
--- a/acct-user/ulogd/ulogd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ulogd"
-ACCT_USER_ID=311
-ACCT_USER_GROUPS=( ulogd )
-
-acct-user_add_deps
diff --git a/acct-user/ultimaker/ultimaker-0-r1.ebuild b/acct-user/ultimaker/ultimaker-0-r1.ebuild
deleted file mode 100644
index 547a4b09a66d..000000000000
--- a/acct-user/ultimaker/ultimaker-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ultimaker"
-ACCT_USER_ID=369
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/ultimaker/ultimaker-0-r2.ebuild b/acct-user/ultimaker/ultimaker-0-r2.ebuild
new file mode 100644
index 000000000000..9d9286777842
--- /dev/null
+++ b/acct-user/ultimaker/ultimaker-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ultimaker"
+ACCT_USER_ID=369
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild
new file mode 100644
index 000000000000..2ea65c1a449e
--- /dev/null
+++ b/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for unbound-telemetry"
+ACCT_USER_ID=279
+ACCT_USER_GROUPS=( unbound-telemetry unbound )
+
+acct-user_add_deps
diff --git a/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild
deleted file mode 100644
index 5c4d78d7b701..000000000000
--- a/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for unbound-telemetry"
-ACCT_USER_ID=279
-ACCT_USER_GROUPS=( unbound-telemetry unbound )
-
-acct-user_add_deps
diff --git a/acct-user/unbound/unbound-0-r1.ebuild b/acct-user/unbound/unbound-0-r1.ebuild
deleted file mode 100644
index 13a6f407ad87..000000000000
--- a/acct-user/unbound/unbound-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="unbound program user"
-
-ACCT_USER_ID=391
-ACCT_USER_HOME="/etc/${PN}"
-ACCT_USER_HOME_OWNER="root:${PN}"
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/unbound/unbound-0-r2.ebuild b/acct-user/unbound/unbound-0-r2.ebuild
new file mode 100644
index 000000000000..df1e218524b2
--- /dev/null
+++ b/acct-user/unbound/unbound-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="unbound program user"
+
+ACCT_USER_ID=391
+ACCT_USER_HOME="/etc/${PN}"
+ACCT_USER_HOME_OWNER="root:${PN}"
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/unifi-video/unifi-video-0-r1.ebuild b/acct-user/unifi-video/unifi-video-0-r1.ebuild
new file mode 100644
index 000000000000..61784923cdd6
--- /dev/null
+++ b/acct-user/unifi-video/unifi-video-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Unifi Video"
+ACCT_USER_ID=348
+ACCT_USER_GROUPS=( unifi-video )
+
+acct-user_add_deps
diff --git a/acct-user/unifi-video/unifi-video-0.ebuild b/acct-user/unifi-video/unifi-video-0.ebuild
deleted file mode 100644
index eb80d98698e0..000000000000
--- a/acct-user/unifi-video/unifi-video-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Unifi Video"
-ACCT_USER_ID=348
-ACCT_USER_GROUPS=( unifi-video )
-
-acct-user_add_deps
diff --git a/acct-user/unifi/unifi-0-r1.ebuild b/acct-user/unifi/unifi-0-r2.ebuild
index 6e7e3dae218f..6e7e3dae218f 100644
--- a/acct-user/unifi/unifi-0-r1.ebuild
+++ b/acct-user/unifi/unifi-0-r2.ebuild
diff --git a/acct-user/unrealircd/unrealircd-0-r1.ebuild b/acct-user/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index b405153f3985..000000000000
--- a/acct-user/unrealircd/unrealircd-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=494
-ACCT_USER_GROUPS=( unrealircd )
-
-acct-user_add_deps
diff --git a/acct-user/unrealircd/unrealircd-0-r2.ebuild b/acct-user/unrealircd/unrealircd-0-r2.ebuild
new file mode 100644
index 000000000000..a0ce96a834d8
--- /dev/null
+++ b/acct-user/unrealircd/unrealircd-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=494
+ACCT_USER_GROUPS=( unrealircd )
+
+acct-user_add_deps
diff --git a/acct-user/upmpdcli/upmpdcli-0-r1.ebuild b/acct-user/upmpdcli/upmpdcli-0-r1.ebuild
new file mode 100644
index 000000000000..29d8cc165013
--- /dev/null
+++ b/acct-user/upmpdcli/upmpdcli-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for upmpdcli"
+ACCT_USER_ID=372
+ACCT_USER_GROUPS=( upmpdcli )
+
+acct-user_add_deps
diff --git a/acct-user/upmpdcli/upmpdcli-0.ebuild b/acct-user/upmpdcli/upmpdcli-0.ebuild
deleted file mode 100644
index 8ec71887042a..000000000000
--- a/acct-user/upmpdcli/upmpdcli-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for upmpdcli"
-ACCT_USER_ID=372
-ACCT_USER_GROUPS=( upmpdcli )
-
-acct-user_add_deps
diff --git a/acct-user/uptimed/uptimed-0-r2.ebuild b/acct-user/uptimed/uptimed-0-r2.ebuild
deleted file mode 100644
index cc93c4ae6ea6..000000000000
--- a/acct-user/uptimed/uptimed-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for uptime daemon"
-
-ACCT_USER_ID="220"
-ACCT_USER_GROUPS=( "uptimed" )
-
-acct-user_add_deps
diff --git a/acct-user/uptimed/uptimed-0-r3.ebuild b/acct-user/uptimed/uptimed-0-r3.ebuild
new file mode 100644
index 000000000000..c1c42c2dc37c
--- /dev/null
+++ b/acct-user/uptimed/uptimed-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for uptime daemon"
+
+ACCT_USER_ID="220"
+ACCT_USER_GROUPS=( "uptimed" )
+
+acct-user_add_deps
diff --git a/acct-user/usbmux/usbmux-0-r1.ebuild b/acct-user/usbmux/usbmux-0-r1.ebuild
deleted file mode 100644
index 6607c1e3c5c8..000000000000
--- a/acct-user/usbmux/usbmux-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the usbmuxd daemon"
-ACCT_USER_ID=418
-ACCT_USER_GROUPS=( usb plugdev )
-
-acct-user_add_deps
diff --git a/acct-user/usbmux/usbmux-0-r2.ebuild b/acct-user/usbmux/usbmux-0-r2.ebuild
new file mode 100644
index 000000000000..e3eef86c0e7e
--- /dev/null
+++ b/acct-user/usbmux/usbmux-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the usbmuxd daemon"
+ACCT_USER_ID=418
+ACCT_USER_GROUPS=( usb plugdev )
+
+acct-user_add_deps
diff --git a/acct-user/ushare/ushare-0-r1.ebuild b/acct-user/ushare/ushare-0-r1.ebuild
new file mode 100644
index 000000000000..86e0e2ed7b1b
--- /dev/null
+++ b/acct-user/ushare/ushare-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for uShare"
+ACCT_USER_ID=349
+ACCT_USER_GROUPS=( ushare )
+
+acct-user_add_deps
diff --git a/acct-user/ushare/ushare-0.ebuild b/acct-user/ushare/ushare-0.ebuild
deleted file mode 100644
index aaa047c4f218..000000000000
--- a/acct-user/ushare/ushare-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for uShare"
-ACCT_USER_ID=349
-ACCT_USER_GROUPS=( ushare )
-
-acct-user_add_deps
diff --git a/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..ec75b2e127f1
--- /dev/null
+++ b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/uwsgi_exporter"
+
+ACCT_USER_GROUPS=( "uwsgi_exporter" )
+ACCT_USER_ID="289"
+
+acct-user_add_deps
diff --git a/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild
deleted file mode 100644
index 616326db2f4b..000000000000
--- a/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/uwsgi_exporter"
-
-ACCT_USER_GROUPS=( "uwsgi_exporter" )
-ACCT_USER_ID="289"
-
-acct-user_add_deps
diff --git a/acct-user/vacation/vacation-0-r1.ebuild b/acct-user/vacation/vacation-0-r1.ebuild
new file mode 100644
index 000000000000..a08d55604bb1
--- /dev/null
+++ b/acct-user/vacation/vacation-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/postfixadmin"
+
+ACCT_USER_GROUPS=( "vacation" )
+ACCT_USER_ID="125"
+
+acct-user_add_deps
diff --git a/acct-user/vacation/vacation-0.ebuild b/acct-user/vacation/vacation-0.ebuild
deleted file mode 100644
index 318ff1bf4acb..000000000000
--- a/acct-user/vacation/vacation-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/postfixadmin"
-
-ACCT_USER_GROUPS=( "vacation" )
-ACCT_USER_ID="125"
-
-acct-user_add_deps
diff --git a/acct-user/varnish/varnish-0-r1.ebuild b/acct-user/varnish/varnish-0-r1.ebuild
deleted file mode 100644
index 009609104d11..000000000000
--- a/acct-user/varnish/varnish-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for varnish"
-ACCT_USER_ID=474
-ACCT_USER_GROUPS=( varnish )
-ACCT_USER_HOME=/var/lib/varnish
-ACCT_USER_HOME_PERMS=0750
-
-acct-user_add_deps
diff --git a/acct-user/varnish/varnish-0-r2.ebuild b/acct-user/varnish/varnish-0-r2.ebuild
new file mode 100644
index 000000000000..5727e7795c24
--- /dev/null
+++ b/acct-user/varnish/varnish-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for varnish"
+ACCT_USER_ID=474
+ACCT_USER_GROUPS=( varnish )
+ACCT_USER_HOME=/var/lib/varnish
+ACCT_USER_HOME_PERMS=0750
+
+acct-user_add_deps
diff --git a/acct-user/vault/vault-0-r1.ebuild b/acct-user/vault/vault-0-r1.ebuild
deleted file mode 100644
index baa714562281..000000000000
--- a/acct-user/vault/vault-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for vault"
-ACCT_USER_ID=410
-ACCT_USER_GROUPS=( vault )
-
-acct-user_add_deps
diff --git a/acct-user/vault/vault-0-r2.ebuild b/acct-user/vault/vault-0-r2.ebuild
new file mode 100644
index 000000000000..a47d6ed16eec
--- /dev/null
+++ b/acct-user/vault/vault-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for vault"
+ACCT_USER_ID=410
+ACCT_USER_GROUPS=( vault )
+
+acct-user_add_deps
diff --git a/acct-user/vault_exporter/vault_exporter-0-r1.ebuild b/acct-user/vault_exporter/vault_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..a1be409f83a2
--- /dev/null
+++ b/acct-user/vault_exporter/vault_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/vault_exporter"
+
+ACCT_USER_GROUPS=( "vault_exporter" )
+ACCT_USER_ID="323"
+
+acct-user_add_deps
diff --git a/acct-user/vault_exporter/vault_exporter-0.ebuild b/acct-user/vault_exporter/vault_exporter-0.ebuild
deleted file mode 100644
index 876469c0a6aa..000000000000
--- a/acct-user/vault_exporter/vault_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/vault_exporter"
-
-ACCT_USER_GROUPS=( "vault_exporter" )
-ACCT_USER_ID="323"
-
-acct-user_add_deps
diff --git a/acct-user/vboxguest/vboxguest-0-r1.ebuild b/acct-user/vboxguest/vboxguest-0-r1.ebuild
deleted file mode 100644
index 1abd618bc469..000000000000
--- a/acct-user/vboxguest/vboxguest-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for virtualbox-guest-additions"
-ACCT_USER_ID=305
-ACCT_USER_GROUPS=( vboxguest )
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/vboxguest/vboxguest-0-r2.ebuild b/acct-user/vboxguest/vboxguest-0-r2.ebuild
new file mode 100644
index 000000000000..dc0bced73287
--- /dev/null
+++ b/acct-user/vboxguest/vboxguest-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for virtualbox-guest-additions"
+ACCT_USER_ID=305
+ACCT_USER_GROUPS=( vboxguest )
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
diff --git a/acct-user/vdr/vdr-0-r1.ebuild b/acct-user/vdr/vdr-0-r1.ebuild
deleted file mode 100644
index 7871f9fcef97..000000000000
--- a/acct-user/vdr/vdr-0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user user-info
-
-ACCT_USER_ID=452
-ACCT_USER_HOME=/var/lib/vdr
-ACCT_USER_GROUPS=( vdr audio cdrom video )
-
-DESCRIPTION="VDR (VideoDiskRecorder) service user"
-IUSE="graphlcd legacy-homedir remote serial systemd"
-
-acct-user_add_deps
-
-pkg_setup() {
- # if user wants to preserve his existing vdr installation,
- # he can set USE=legacy-homedir
- use legacy-homedir && ACCT_USER_HOME=/var/vdr
-
- # media-plugins/vdr-graphlcd
- use graphlcd && ACCT_USER_GROUPS+=( lp usb )
-
- # media-plugins/vdr-remote, _only_ when systemd is installed
- if use remote; then
- if use systemd; then
- ACCT_USER_GROUPS+=( input )
- else
- einfo "use-flag remote has no effect on systemd systems"
- fi
- fi
-
- # media-plugins/vdr-serial: add group to access /dev/ttyS*
- # on systemd systems: add "dialout"
- # non-systemd systems: add "uucp"
- if use serial; then
- if use systemd; then
- ACCT_USER_GROUPS+=( dialout )
- else
- ACCT_USER_GROUPS+=( uucp )
- fi
- fi
-}
-
-pkg_preinst() {
- # if useflag legacy-homedir is _not_ set, check if user vdr exists and what his homedir is
- if ! use legacy-homedir; then
- local EXISTING_HOME=$(egethome vdr)
- if [[ "${EXISTING_HOME}" = "/var/vdr" ]]; then
- ewarn "The user \"vdr\" exists on this system, his current home directory is \"/var/vdr\""
- ewarn "The new default home directory for user vdr is \"/var/lib/vdr\""
- ewarn "You have three options to continue:"
- ewarn " - set USE=legacy-homedir for ${CATEGORY}/${PN} to continue to use /var/vdr"
- ewarn " - move /var/vdr to /var/lib/vdr manually and repeat to install ${CATEGORY}/${PN}"
- ewarn " - move /var/vdr to /var/vdr.old or anywhere else (to keep it as your backup), repeat to"
- ewarn " install ${CATEGORY}/${PN} and let the installation create a fresh /var/lib/vdr"
- ewarn "the emerge will stop here."
- die "user action required"
- fi
- fi
- acct-user_pkg_preinst
-}
diff --git a/acct-user/vdr/vdr-0-r2.ebuild b/acct-user/vdr/vdr-0-r2.ebuild
new file mode 100644
index 000000000000..7c25955a8feb
--- /dev/null
+++ b/acct-user/vdr/vdr-0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user user-info
+
+ACCT_USER_ID=452
+ACCT_USER_HOME=/var/lib/vdr
+ACCT_USER_GROUPS=( vdr audio cdrom video )
+
+DESCRIPTION="VDR (VideoDiskRecorder) service user"
+IUSE="graphlcd legacy-homedir remote serial systemd"
+
+acct-user_add_deps
+
+pkg_setup() {
+ # if user wants to preserve his existing vdr installation,
+ # he can set USE=legacy-homedir
+ use legacy-homedir && ACCT_USER_HOME=/var/vdr
+
+ # media-plugins/vdr-graphlcd
+ use graphlcd && ACCT_USER_GROUPS+=( lp usb )
+
+ # media-plugins/vdr-remote, _only_ when systemd is installed
+ if use remote; then
+ if use systemd; then
+ ACCT_USER_GROUPS+=( input )
+ else
+ einfo "use-flag remote has no effect on systemd systems"
+ fi
+ fi
+
+ # media-plugins/vdr-serial: add group to access /dev/ttyS*
+ # on systemd systems: add "dialout"
+ # non-systemd systems: add "uucp"
+ if use serial; then
+ if use systemd; then
+ ACCT_USER_GROUPS+=( dialout )
+ else
+ ACCT_USER_GROUPS+=( uucp )
+ fi
+ fi
+}
+
+pkg_preinst() {
+ # if useflag legacy-homedir is _not_ set, check if user vdr exists and what his homedir is
+ if ! use legacy-homedir; then
+ local EXISTING_HOME=$(egethome vdr)
+ if [[ "${EXISTING_HOME}" = "/var/vdr" ]]; then
+ ewarn "The user \"vdr\" exists on this system, his current home directory is \"/var/vdr\""
+ ewarn "The new default home directory for user vdr is \"/var/lib/vdr\""
+ ewarn "You have three options to continue:"
+ ewarn " - set USE=legacy-homedir for ${CATEGORY}/${PN} to continue to use /var/vdr"
+ ewarn " - move /var/vdr to /var/lib/vdr manually and repeat to install ${CATEGORY}/${PN}"
+ ewarn " - move /var/vdr to /var/vdr.old or anywhere else (to keep it as your backup), repeat to"
+ ewarn " install ${CATEGORY}/${PN} and let the installation create a fresh /var/lib/vdr"
+ ewarn "the emerge will stop here."
+ die "user action required"
+ fi
+ fi
+ acct-user_pkg_preinst
+}
diff --git a/acct-user/vdradmin/vdradmin-0-r1.ebuild b/acct-user/vdradmin/vdradmin-0-r1.ebuild
deleted file mode 100644
index 5e76895dfb57..000000000000
--- a/acct-user/vdradmin/vdradmin-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-misc/vdradmin-am"
-
-ACCT_USER_ID=453
-ACCT_USER_GROUPS=( vdradmin )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/vdradmin "
-RDEPEND+=" acct-group/vdradmin "
diff --git a/acct-user/vdradmin/vdradmin-0-r2.ebuild b/acct-user/vdradmin/vdradmin-0-r2.ebuild
new file mode 100644
index 000000000000..59912a877e0d
--- /dev/null
+++ b/acct-user/vdradmin/vdradmin-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-misc/vdradmin-am"
+
+ACCT_USER_ID=453
+ACCT_USER_GROUPS=( vdradmin )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/vdradmin "
+RDEPEND+=" acct-group/vdradmin "
diff --git a/acct-user/vnstat/vnstat-0-r1.ebuild b/acct-user/vnstat/vnstat-0-r1.ebuild
new file mode 100644
index 000000000000..d141e2298d5d
--- /dev/null
+++ b/acct-user/vnstat/vnstat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for vnstat network monitoring"
+ACCT_USER_ID=229
+ACCT_USER_GROUPS=( vnstat )
+
+acct-user_add_deps
diff --git a/acct-user/vnstat/vnstat-0.ebuild b/acct-user/vnstat/vnstat-0.ebuild
deleted file mode 100644
index c1ed848bd7f3..000000000000
--- a/acct-user/vnstat/vnstat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for vnstat network monitoring"
-ACCT_USER_ID=229
-ACCT_USER_GROUPS=( vnstat )
-
-acct-user_add_deps
diff --git a/acct-user/vpopmail/vpopmail-0-r1.ebuild b/acct-user/vpopmail/vpopmail-0-r1.ebuild
deleted file mode 100644
index 01a50ab30112..000000000000
--- a/acct-user/vpopmail/vpopmail-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for vpopmail"
-ACCT_USER_ID=89
-ACCT_USER_HOME=/var/vpopmail
-ACCT_USER_GROUPS=( vpopmail )
-
-acct-user_add_deps
diff --git a/acct-user/vpopmail/vpopmail-0-r2.ebuild b/acct-user/vpopmail/vpopmail-0-r2.ebuild
new file mode 100644
index 000000000000..1992b9dc7f63
--- /dev/null
+++ b/acct-user/vpopmail/vpopmail-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for vpopmail"
+ACCT_USER_ID=89
+ACCT_USER_HOME=/var/vpopmail
+ACCT_USER_GROUPS=( vpopmail )
+
+acct-user_add_deps
diff --git a/acct-user/wesnoth/wesnoth-0-r1.ebuild b/acct-user/wesnoth/wesnoth-0-r1.ebuild
deleted file mode 100644
index cf9126ff0b8f..000000000000
--- a/acct-user/wesnoth/wesnoth-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for games-strategy/wesnoth"
-ACCT_USER_ID=419
-ACCT_USER_GROUPS=( wesnoth )
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/wesnoth/wesnoth-0-r2.ebuild b/acct-user/wesnoth/wesnoth-0-r2.ebuild
new file mode 100644
index 000000000000..f7391c12fca0
--- /dev/null
+++ b/acct-user/wesnoth/wesnoth-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for games-strategy/wesnoth"
+ACCT_USER_ID=419
+ACCT_USER_GROUPS=( wesnoth )
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/wwwoffle/wwwoffle-0-r1.ebuild b/acct-user/wwwoffle/wwwoffle-0-r1.ebuild
new file mode 100644
index 000000000000..0af0edc9861f
--- /dev/null
+++ b/acct-user/wwwoffle/wwwoffle-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/wwwoffle"
+
+ACCT_USER_GROUPS=( "wwwoffle" )
+ACCT_USER_HOME="/var/spool/wwwoffle"
+ACCT_USER_ID="251"
+
+acct-user_add_deps
diff --git a/acct-user/wwwoffle/wwwoffle-0.ebuild b/acct-user/wwwoffle/wwwoffle-0.ebuild
deleted file mode 100644
index f5b8f4755b25..000000000000
--- a/acct-user/wwwoffle/wwwoffle-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/wwwoffle"
-
-ACCT_USER_GROUPS=( "wwwoffle" )
-ACCT_USER_HOME="/var/spool/wwwoffle"
-ACCT_USER_ID="251"
-
-acct-user_add_deps
diff --git a/acct-user/x2goprint/x2goprint-0-r1.ebuild b/acct-user/x2goprint/x2goprint-0-r1.ebuild
deleted file mode 100644
index 3f4463098a69..000000000000
--- a/acct-user/x2goprint/x2goprint-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/x2goserver"
-ACCT_USER_ID=292
-ACCT_USER_GROUPS=( x2goprint )
-ACCT_USER_HOME="/var/spool/x2goprint"
-
-acct-user_add_deps
diff --git a/acct-user/x2goprint/x2goprint-0-r2.ebuild b/acct-user/x2goprint/x2goprint-0-r2.ebuild
new file mode 100644
index 000000000000..adfa585f2ef9
--- /dev/null
+++ b/acct-user/x2goprint/x2goprint-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=292
+ACCT_USER_GROUPS=( x2goprint )
+ACCT_USER_HOME="/var/spool/x2goprint"
+
+acct-user_add_deps
diff --git a/acct-user/x2gouser/x2gouser-0-r1.ebuild b/acct-user/x2gouser/x2gouser-0-r1.ebuild
deleted file mode 100644
index e386b7496085..000000000000
--- a/acct-user/x2gouser/x2gouser-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/x2goserver"
-ACCT_USER_ID=291
-ACCT_USER_GROUPS=( x2gouser )
-ACCT_USER_HOME="/var/lib/x2go"
-
-acct-user_add_deps
diff --git a/acct-user/x2gouser/x2gouser-0-r2.ebuild b/acct-user/x2gouser/x2gouser-0-r2.ebuild
new file mode 100644
index 000000000000..b510b563a401
--- /dev/null
+++ b/acct-user/x2gouser/x2gouser-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=291
+ACCT_USER_GROUPS=( x2gouser )
+ACCT_USER_HOME="/var/lib/x2go"
+
+acct-user_add_deps
diff --git a/acct-user/xrootd/xrootd-0-r1.ebuild b/acct-user/xrootd/xrootd-0-r1.ebuild
deleted file mode 100644
index a0267ea66311..000000000000
--- a/acct-user/xrootd/xrootd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the XRootD server"
-ACCT_USER_ID=469
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/xrootd/xrootd-0-r2.ebuild b/acct-user/xrootd/xrootd-0-r2.ebuild
new file mode 100644
index 000000000000..3e5b2c648ea4
--- /dev/null
+++ b/acct-user/xrootd/xrootd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the XRootD server"
+ACCT_USER_ID=469
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
index 1997a39e2cc8..1997a39e2cc8 100644
--- a/acct-user/yubihsm-connector/yubihsm-connector-0.ebuild
+++ b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
diff --git a/acct-user/zabbix/zabbix-0-r1.ebuild b/acct-user/zabbix/zabbix-0-r1.ebuild
new file mode 100644
index 000000000000..e446f599587e
--- /dev/null
+++ b/acct-user/zabbix/zabbix-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Zabbix"
+ACCT_USER_ID=329
+# see https://www.zabbix.com/documentation/current/manual/installation/install
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=770
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/zabbix/zabbix-0.ebuild b/acct-user/zabbix/zabbix-0.ebuild
deleted file mode 100644
index 35b1bc820d1e..000000000000
--- a/acct-user/zabbix/zabbix-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Zabbix"
-ACCT_USER_ID=329
-# see https://www.zabbix.com/documentation/current/manual/installation/install
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_PERMS=770
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/zeppelin/zeppelin-0-r1.ebuild b/acct-user/zeppelin/zeppelin-0-r1.ebuild
deleted file mode 100644
index 22a7f3d7ceee..000000000000
--- a/acct-user/zeppelin/zeppelin-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for system-wide www-apps/zeppelin-bin"
-ACCT_USER_ID=224
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/home/zeppelin
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/zeppelin/zeppelin-0-r2.ebuild b/acct-user/zeppelin/zeppelin-0-r2.ebuild
new file mode 100644
index 000000000000..582d17bb219c
--- /dev/null
+++ b/acct-user/zeppelin/zeppelin-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for system-wide www-apps/zeppelin-bin"
+ACCT_USER_ID=224
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/home/zeppelin
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/zetcd/zetcd-0-r1.ebuild b/acct-user/zetcd/zetcd-0-r1.ebuild
new file mode 100644
index 000000000000..1062f1a71837
--- /dev/null
+++ b/acct-user/zetcd/zetcd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for sys-cluster/zetcd"
+
+ACCT_USER_GROUPS=( "zetcd" )
+ACCT_USER_ID="253"
+
+acct-user_add_deps
diff --git a/acct-user/zetcd/zetcd-0.ebuild b/acct-user/zetcd/zetcd-0.ebuild
deleted file mode 100644
index 2570323db374..000000000000
--- a/acct-user/zetcd/zetcd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for sys-cluster/zetcd"
-
-ACCT_USER_GROUPS=( "zetcd" )
-ACCT_USER_ID="253"
-
-acct-user_add_deps
diff --git a/acct-user/ziproxy/ziproxy-0-r1.ebuild b/acct-user/ziproxy/ziproxy-0-r1.ebuild
new file mode 100644
index 000000000000..aa9df06ff0dc
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=367
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/ziproxy/ziproxy-0.ebuild b/acct-user/ziproxy/ziproxy-0.ebuild
deleted file mode 100644
index ea999861d750..000000000000
--- a/acct-user/ziproxy/ziproxy-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=367
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/znc/znc-0-r1.ebuild b/acct-user/znc/znc-0-r1.ebuild
deleted file mode 100644
index 9848611f21f2..000000000000
--- a/acct-user/znc/znc-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-irc/znc"
-ACCT_USER_ID=421
-ACCT_USER_GROUPS=( ${PN} )
-# The systemd unit needs HOME to be set
-# https://bugs.gentoo.org/521916
-ACCT_USER_HOME=/var/lib/znc
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/znc/znc-0-r2.ebuild b/acct-user/znc/znc-0-r2.ebuild
new file mode 100644
index 000000000000..9381b0301b03
--- /dev/null
+++ b/acct-user/znc/znc-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-irc/znc"
+ACCT_USER_ID=421
+ACCT_USER_GROUPS=( ${PN} )
+# The systemd unit needs HOME to be set
+# https://bugs.gentoo.org/521916
+ACCT_USER_HOME=/var/lib/znc
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/zookeeper/zookeeper-0-r1.ebuild b/acct-user/zookeeper/zookeeper-0-r1.ebuild
new file mode 100644
index 000000000000..668e3452c457
--- /dev/null
+++ b/acct-user/zookeeper/zookeeper-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-cluster/zookeeper-bin"
+
+ACCT_USER_GROUPS=( "zookeeper" )
+ACCT_USER_HOME="/var/lib/zookeeper"
+ACCT_USER_ID="211"
+
+acct-user_add_deps
diff --git a/acct-user/zookeeper/zookeeper-0.ebuild b/acct-user/zookeeper/zookeeper-0.ebuild
deleted file mode 100644
index a1b678140d58..000000000000
--- a/acct-user/zookeeper/zookeeper-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-cluster/zookeeper-bin"
-
-ACCT_USER_GROUPS=( "zookeeper" )
-ACCT_USER_HOME="/var/lib/zookeeper"
-ACCT_USER_ID="211"
-
-acct-user_add_deps