summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'acct-group')
-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
933 files changed, 4113 insertions, 4113 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