summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'acct-user')
-rw-r--r--acct-user/_cron-failure/_cron-failure-0-r1.ebuild12
-rw-r--r--acct-user/_cron-failure/_cron-failure-0.ebuild12
-rw-r--r--acct-user/abrt/abrt-0-r1.ebuild12
-rw-r--r--acct-user/abrt/metadata.xml8
-rw-r--r--acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild13
-rw-r--r--acct-user/aerospike-amc/aerospike-amc-0.ebuild13
-rw-r--r--acct-user/airdcppd/airdcppd-0-r1.ebuild16
-rw-r--r--acct-user/airdcppd/airdcppd-0-r2.ebuild16
-rw-r--r--acct-user/alertmanager/alertmanager-0-r1.ebuild12
-rw-r--r--acct-user/alertmanager/alertmanager-0.ebuild12
-rw-r--r--acct-user/alias/alias-0-r1.ebuild18
-rw-r--r--acct-user/alias/alias-0-r2.ebuild18
-rw-r--r--acct-user/amanda/amanda-0-r1.ebuild12
-rw-r--r--acct-user/amanda/amanda-0.ebuild12
-rw-r--r--acct-user/amavis/amavis-0-r1.ebuild13
-rw-r--r--acct-user/amavis/amavis-0-r2.ebuild13
-rw-r--r--acct-user/amule/amule-0-r2.ebuild14
-rw-r--r--acct-user/amule/amule-0-r3.ebuild14
-rw-r--r--acct-user/anope/anope-0-r1.ebuild12
-rw-r--r--acct-user/anope/anope-0-r2.ebuild12
-rw-r--r--acct-user/apache/apache-0-r2.ebuild12
-rw-r--r--acct-user/apache/apache-0-r3.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild12
-rw-r--r--acct-user/argus/argus-0-r1.ebuild13
-rw-r--r--acct-user/argus/argus-0.ebuild13
-rw-r--r--acct-user/arpwatch/arpwatch-0-r1.ebuild13
-rw-r--r--acct-user/arpwatch/arpwatch-0.ebuild13
-rw-r--r--acct-user/artifactory/artifactory-0.ebuild14
-rw-r--r--acct-user/artifactory/metadata.xml5
-rw-r--r--acct-user/aspnet/aspnet-0-r1.ebuild13
-rw-r--r--acct-user/aspnet/aspnet-0.ebuild13
-rw-r--r--acct-user/asterisk/asterisk-0-r1.ebuild12
-rw-r--r--acct-user/asterisk/asterisk-0-r2.ebuild12
-rw-r--r--acct-user/at/at-0-r1.ebuild12
-rw-r--r--acct-user/at/at-0.ebuild12
-rw-r--r--acct-user/atheme-services/atheme-services-0-r1.ebuild12
-rw-r--r--acct-user/atheme-services/atheme-services-0-r2.ebuild12
-rw-r--r--acct-user/automatic/automatic-0-r1.ebuild (renamed from acct-user/automatic/automatic-0.ebuild)0
-rw-r--r--acct-user/automx2/automx2-0-r1.ebuild14
-rw-r--r--acct-user/automx2/automx2-0-r2.ebuild14
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild12
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild12
-rw-r--r--acct-user/avahi/avahi-0-r1.ebuild12
-rw-r--r--acct-user/avahi/avahi-0-r2.ebuild12
-rw-r--r--acct-user/axtls/axtls-0-r1.ebuild13
-rw-r--r--acct-user/axtls/axtls-0.ebuild13
-rw-r--r--acct-user/backuppc/backuppc-0-r1.ebuild15
-rw-r--r--acct-user/backuppc/backuppc-0.ebuild15
-rw-r--r--acct-user/bacula/bacula-0-r1.ebuild13
-rw-r--r--acct-user/bacula/bacula-0-r2.ebuild13
-rw-r--r--acct-user/bareos/bareos-0-r1.ebuild13
-rw-r--r--acct-user/bareos/bareos-0-r2.ebuild13
-rw-r--r--acct-user/beanstalk/beanstalk-0-r1.ebuild14
-rw-r--r--acct-user/beanstalk/beanstalk-0.ebuild14
-rw-r--r--acct-user/bedrock/bedrock-0-r1.ebuild13
-rw-r--r--acct-user/bedrock/bedrock-0-r2.ebuild13
-rw-r--r--acct-user/biboumi/biboumi-0-r1.ebuild12
-rw-r--r--acct-user/biboumi/biboumi-0.ebuild12
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r1.ebuild12
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r2.ebuild12
-rw-r--r--acct-user/bird/bird-0-r1.ebuild13
-rw-r--r--acct-user/bird/bird-0.ebuild13
-rw-r--r--acct-user/bitcoin/bitcoin-0-r1.ebuild12
-rw-r--r--acct-user/bitcoin/bitcoin-0-r2.ebuild12
-rw-r--r--acct-user/bitflu/bitflu-0-r1.ebuild14
-rw-r--r--acct-user/bitflu/bitflu-0.ebuild14
-rw-r--r--acct-user/bitlbee/bitlbee-0-r1.ebuild12
-rw-r--r--acct-user/bitlbee/bitlbee-0-r2.ebuild12
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild12
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0.ebuild12
-rw-r--r--acct-user/boinc/boinc-0-r1.ebuild14
-rw-r--r--acct-user/boinc/boinc-0.ebuild14
-rw-r--r--acct-user/brltty/brltty-0-r1.ebuild13
-rw-r--r--acct-user/brltty/brltty-0.ebuild13
-rw-r--r--acct-user/buildbot/buildbot-0-r1.ebuild12
-rw-r--r--acct-user/buildbot/buildbot-0-r2.ebuild12
-rw-r--r--acct-user/burp/burp-0-r1.ebuild12
-rw-r--r--acct-user/burp/burp-0-r2.ebuild12
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild12
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild12
-rw-r--r--acct-user/cadvisor/cadvisor-0-r1.ebuild12
-rw-r--r--acct-user/cadvisor/cadvisor-0-r2.ebuild12
-rw-r--r--acct-user/cancd/cancd-0-r1.ebuild13
-rw-r--r--acct-user/cancd/cancd-0-r2.ebuild13
-rw-r--r--acct-user/carbon/carbon-0-r1.ebuild12
-rw-r--r--acct-user/carbon/carbon-0-r2.ebuild12
-rw-r--r--acct-user/ceph/ceph-0-r2.ebuild (renamed from acct-user/ceph/ceph-0-r1.ebuild)0
-rw-r--r--acct-user/cgit/cgit-0-r1.ebuild13
-rw-r--r--acct-user/cgit/cgit-0.ebuild13
-rw-r--r--acct-user/chronograf/chronograf-0-r1.ebuild13
-rw-r--r--acct-user/chronograf/chronograf-0-r2.ebuild13
-rw-r--r--acct-user/cinder/cinder-0-r1.ebuild14
-rw-r--r--acct-user/cinder/metadata.xml8
-rw-r--r--acct-user/clair/clair-0-r1.ebuild12
-rw-r--r--acct-user/clair/clair-0-r2.ebuild12
-rw-r--r--acct-user/clamav/clamav-0-r1.ebuild11
-rw-r--r--acct-user/clamav/clamav-0-r2.ebuild11
-rw-r--r--acct-user/cntlm/cntlm-0-r1.ebuild13
-rw-r--r--acct-user/cntlm/cntlm-0.ebuild13
-rw-r--r--acct-user/cockroach/cockroach-0-r1.ebuild15
-rw-r--r--acct-user/cockroach/cockroach-0.ebuild15
-rw-r--r--acct-user/collectd/collectd-0-r1.ebuild14
-rw-r--r--acct-user/collectd/collectd-0.ebuild14
-rw-r--r--acct-user/colord/colord-0-r1.ebuild13
-rw-r--r--acct-user/colord/colord-0.ebuild13
-rw-r--r--acct-user/consul-template/consul-template-0-r1.ebuild12
-rw-r--r--acct-user/consul-template/consul-template-0-r2.ebuild12
-rw-r--r--acct-user/consul/consul-0-r1.ebuild13
-rw-r--r--acct-user/consul/consul-0-r2.ebuild13
-rw-r--r--acct-user/consul_exporter/consul_exporter-0-r1.ebuild12
-rw-r--r--acct-user/consul_exporter/consul_exporter-0.ebuild12
-rw-r--r--acct-user/coredns/coredns-0-r1.ebuild14
-rw-r--r--acct-user/coredns/coredns-0.ebuild14
-rw-r--r--acct-user/croc/croc-0-r1.ebuild12
-rw-r--r--acct-user/croc/croc-0.ebuild12
-rw-r--r--acct-user/croc/metadata.xml5
-rw-r--r--acct-user/cron/cron-0-r2.ebuild16
-rw-r--r--acct-user/cron/cron-0.ebuild14
-rw-r--r--acct-user/cron/metadata.xml4
-rw-r--r--acct-user/cvmfs/cvmfs-0-r1.ebuild12
-rw-r--r--acct-user/cvmfs/cvmfs-0-r2.ebuild12
-rw-r--r--acct-user/cyrus/cyrus-0-r2.ebuild12
-rw-r--r--acct-user/cyrus/cyrus-0-r3.ebuild12
-rw-r--r--acct-user/darkstat/darkstat-0-r1.ebuild12
-rw-r--r--acct-user/darkstat/darkstat-0.ebuild12
-rw-r--r--acct-user/davfs2/davfs2-0-r1.ebuild11
-rw-r--r--acct-user/davfs2/davfs2-0-r2.ebuild11
-rw-r--r--acct-user/dbmail/dbmail-0-r1.ebuild11
-rw-r--r--acct-user/dbmail/dbmail-0.ebuild11
-rw-r--r--acct-user/dbskkd/dbskkd-0-r1.ebuild13
-rw-r--r--acct-user/dbskkd/dbskkd-0.ebuild13
-rw-r--r--acct-user/ddclient/ddclient-0-r1.ebuild13
-rw-r--r--acct-user/ddclient/ddclient-0-r2.ebuild13
-rw-r--r--acct-user/defang/defang-0-r1.ebuild13
-rw-r--r--acct-user/defang/defang-0.ebuild13
-rw-r--r--acct-user/dehydrated/dehydrated-0-r1.ebuild14
-rw-r--r--acct-user/dehydrated/dehydrated-0.ebuild14
-rw-r--r--acct-user/deluge/deluge-0-r1.ebuild12
-rw-r--r--acct-user/deluge/deluge-0-r2.ebuild13
-rw-r--r--acct-user/dhcp/dhcp-0-r1.ebuild12
-rw-r--r--acct-user/dhcp/dhcp-0-r2.ebuild12
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r1.ebuild13
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r2.ebuild13
-rw-r--r--acct-user/dictd/dictd-0-r1.ebuild12
-rw-r--r--acct-user/dictd/dictd-0.ebuild12
-rw-r--r--acct-user/dirsrv/dirsrv-0-r1.ebuild12
-rw-r--r--acct-user/dirsrv/dirsrv-0.ebuild12
-rw-r--r--acct-user/distcc/distcc-1-r1.ebuild12
-rw-r--r--acct-user/distcc/distcc-1.ebuild12
-rw-r--r--acct-user/dnrd/dnrd-0-r1.ebuild13
-rw-r--r--acct-user/dnrd/dnrd-0.ebuild13
-rw-r--r--acct-user/dnscache/dnscache-0-r1.ebuild11
-rw-r--r--acct-user/dnscache/dnscache-0.ebuild11
-rw-r--r--acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild12
-rw-r--r--acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild12
-rw-r--r--acct-user/dnsdist/dnsdist-0-r1.ebuild13
-rw-r--r--acct-user/dnsdist/dnsdist-0-r2.ebuild13
-rw-r--r--acct-user/dnslog/dnslog-0-r1.ebuild11
-rw-r--r--acct-user/dnslog/dnslog-0.ebuild11
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r1.ebuild13
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r2.ebuild13
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild12
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild12
-rw-r--r--acct-user/docker_auth/docker_auth-0-r1.ebuild12
-rw-r--r--acct-user/docker_auth/docker_auth-0-r2.ebuild12
-rw-r--r--acct-user/dovecot/dovecot-0-r1.ebuild12
-rw-r--r--acct-user/dovecot/dovecot-0-r2.ebuild12
-rw-r--r--acct-user/dovenull/dovenull-0-r1.ebuild12
-rw-r--r--acct-user/dovenull/dovenull-0-r2.ebuild12
-rw-r--r--acct-user/drone/drone-0-r1.ebuild14
-rw-r--r--acct-user/drone/drone-0.ebuild14
-rw-r--r--acct-user/duende/duende-0-r1.ebuild14
-rw-r--r--acct-user/duende/duende-0-r2.ebuild14
-rw-r--r--acct-user/duende/metadata.xml5
-rw-r--r--acct-user/ejabberd/ejabberd-2-r1.ebuild22
-rw-r--r--acct-user/ejabberd/ejabberd-2.ebuild22
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r1.ebuild13
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r2.ebuild13
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild12
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild12
-rw-r--r--acct-user/energi3/energi3-0-r1.ebuild12
-rw-r--r--acct-user/energi3/energi3-0.ebuild12
-rw-r--r--acct-user/epmd/epmd-0-r1.ebuild12
-rw-r--r--acct-user/epmd/epmd-0-r2.ebuild12
-rw-r--r--acct-user/err/err-0-r1.ebuild11
-rw-r--r--acct-user/err/err-0.ebuild11
-rw-r--r--acct-user/etcd/etcd-0-r1.ebuild14
-rw-r--r--acct-user/etcd/etcd-0-r2.ebuild14
-rw-r--r--acct-user/exabgp/exabgp-0-r1.ebuild13
-rw-r--r--acct-user/exabgp/exabgp-0-r2.ebuild13
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild14
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0.ebuild14
-rw-r--r--acct-user/fax/fax-0-r1.ebuild13
-rw-r--r--acct-user/fax/fax-0.ebuild13
-rw-r--r--acct-user/fcron/fcron-0-r1.ebuild13
-rw-r--r--acct-user/fcron/fcron-0.ebuild13
-rw-r--r--acct-user/fdm/fdm-0-r1.ebuild13
-rw-r--r--acct-user/fdm/fdm-0.ebuild13
-rw-r--r--acct-user/fetchmail/fetchmail-0-r1.ebuild14
-rw-r--r--acct-user/fetchmail/fetchmail-0-r2.ebuild14
-rw-r--r--acct-user/fhem/fhem-0-r1.ebuild14
-rw-r--r--acct-user/fhem/fhem-0-r2.ebuild14
-rw-r--r--acct-user/firebird/firebird-0-r2.ebuild18
-rw-r--r--acct-user/firebird/firebird-0-r3.ebuild18
-rw-r--r--acct-user/flatpak/flatpak-0-r1.ebuild10
-rw-r--r--acct-user/flatpak/flatpak-0.ebuild10
-rw-r--r--acct-user/flows/flows-0-r1.ebuild13
-rw-r--r--acct-user/flows/flows-0.ebuild13
-rw-r--r--acct-user/fluentd/fluentd-0-r1.ebuild12
-rw-r--r--acct-user/fluentd/fluentd-0-r2.ebuild12
-rw-r--r--acct-user/fnord/fnord-0-r1.ebuild14
-rw-r--r--acct-user/fnord/fnord-0.ebuild14
-rw-r--r--acct-user/fnordlog/fnordlog-0-r1.ebuild14
-rw-r--r--acct-user/fnordlog/fnordlog-0.ebuild14
-rw-r--r--acct-user/foldingathome/foldingathome-0-r1.ebuild14
-rw-r--r--acct-user/foldingathome/foldingathome-0.ebuild14
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild14
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0.ebuild14
-rw-r--r--acct-user/freenet/freenet-0-r1.ebuild14
-rw-r--r--acct-user/freenet/freenet-0.ebuild14
-rw-r--r--acct-user/freenet/metadata.xml5
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild13
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild13
-rw-r--r--acct-user/frr/frr-0-r1.ebuild11
-rw-r--r--acct-user/frr/frr-0.ebuild11
-rw-r--r--acct-user/frr/metadata.xml4
-rw-r--r--acct-user/ftp/ftp-0-r3.ebuild15
-rw-r--r--acct-user/ftp/ftp-0-r4.ebuild15
-rw-r--r--acct-user/ftpproxy/ftpproxy-0-r1.ebuild15
-rw-r--r--acct-user/ftpproxy/ftpproxy-0.ebuild15
-rw-r--r--acct-user/gatling/gatling-0-r1.ebuild12
-rw-r--r--acct-user/gatling/gatling-0-r2.ebuild12
-rw-r--r--acct-user/gauth/gauth-0-r1.ebuild13
-rw-r--r--acct-user/gauth/gauth-0.ebuild13
-rw-r--r--acct-user/gdm/gdm-0-r1.ebuild13
-rw-r--r--acct-user/gdm/gdm-0.ebuild13
-rw-r--r--acct-user/geneweb/geneweb-0-r1.ebuild14
-rw-r--r--acct-user/geneweb/geneweb-0-r2.ebuild14
-rw-r--r--acct-user/geoclue/geoclue-0-r1.ebuild13
-rw-r--r--acct-user/geoclue/geoclue-0.ebuild13
-rw-r--r--acct-user/gerbera/gerbera-0-r1.ebuild13
-rw-r--r--acct-user/gerbera/gerbera-0-r2.ebuild13
-rw-r--r--acct-user/git/git-0-r3.ebuild (renamed from acct-user/git/git-0-r2.ebuild)0
-rw-r--r--acct-user/github-exporter/github-exporter-0-r1.ebuild12
-rw-r--r--acct-user/github-exporter/github-exporter-0.ebuild12
-rw-r--r--acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild16
-rw-r--r--acct-user/gitlab-runner/gitlab-runner-1.ebuild16
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r1.ebuild12
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r2.ebuild12
-rw-r--r--acct-user/glance/glance-0-r1.ebuild14
-rw-r--r--acct-user/glance/metadata.xml8
-rw-r--r--acct-user/gluster/gluster-0-r1.ebuild14
-rw-r--r--acct-user/gluster/gluster-0-r2.ebuild14
-rw-r--r--acct-user/gns3/gns3-0-r1.ebuild12
-rw-r--r--acct-user/gns3/gns3-0.ebuild12
-rw-r--r--acct-user/gnump3d/gnump3d-0-r1.ebuild13
-rw-r--r--acct-user/gnump3d/gnump3d-0.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild13
-rw-r--r--acct-user/goaccess/goaccess-0-r1.ebuild (renamed from acct-user/goaccess/goaccess-0.ebuild)0
-rw-r--r--acct-user/gopher/gopher-0-r1.ebuild12
-rw-r--r--acct-user/gopher/gopher-0.ebuild12
-rw-r--r--acct-user/gopherd/gopherd-0-r1.ebuild14
-rw-r--r--acct-user/gopherd/gopherd-0.ebuild14
-rw-r--r--acct-user/gpsd/gpsd-0-r2.ebuild13
-rw-r--r--acct-user/gpsd/gpsd-0-r3.ebuild13
-rw-r--r--acct-user/grafana/grafana-0-r1.ebuild13
-rw-r--r--acct-user/grafana/grafana-0-r2.ebuild13
-rw-r--r--acct-user/graylog/graylog-0-r1.ebuild11
-rw-r--r--acct-user/graylog/graylog-0-r2.ebuild11
-rw-r--r--acct-user/greetd/greetd-0-r1.ebuild12
-rw-r--r--acct-user/greetd/greetd-0-r2.ebuild12
-rw-r--r--acct-user/grok_exporter/grok_exporter-0-r1.ebuild12
-rw-r--r--acct-user/grok_exporter/grok_exporter-0.ebuild12
-rw-r--r--acct-user/groonga/groonga-0-r1.ebuild13
-rw-r--r--acct-user/groonga/groonga-0.ebuild13
-rw-r--r--acct-user/gvm/gvm-0-r1.ebuild13
-rw-r--r--acct-user/gvm/gvm-0-r2.ebuild13
-rw-r--r--acct-user/h2o/h2o-0-r1.ebuild13
-rw-r--r--acct-user/h2o/h2o-0.ebuild13
-rw-r--r--acct-user/hacluster/hacluster-0-r1.ebuild14
-rw-r--r--acct-user/hacluster/hacluster-0.ebuild14
-rw-r--r--acct-user/haproxy/haproxy-0-r1.ebuild11
-rw-r--r--acct-user/haproxy/haproxy-0-r2.ebuild11
-rw-r--r--acct-user/havp/havp-0-r2.ebuild13
-rw-r--r--acct-user/havp/havp-0.ebuild14
-rw-r--r--acct-user/headscale/headscale-0-r1.ebuild (renamed from acct-user/headscale/headscale-0.ebuild)0
-rw-r--r--acct-user/heat/heat-0-r1.ebuild14
-rw-r--r--acct-user/heat/metadata.xml8
-rw-r--r--acct-user/hsqldb/hsqldb-0-r1.ebuild12
-rw-r--r--acct-user/hsqldb/hsqldb-0.ebuild12
-rw-r--r--acct-user/http/http-0-r1.ebuild14
-rw-r--r--acct-user/http/http-0.ebuild14
-rw-r--r--acct-user/i2p/i2p-0-r1.ebuild13
-rw-r--r--acct-user/i2p/i2p-0-r2.ebuild13
-rw-r--r--acct-user/i2pd/i2pd-0-r1.ebuild14
-rw-r--r--acct-user/i2pd/i2pd-0-r2.ebuild14
-rw-r--r--acct-user/icecast/icecast-0-r1.ebuild13
-rw-r--r--acct-user/icecast/icecast-0.ebuild13
-rw-r--r--acct-user/icecream/icecream-0-r1.ebuild14
-rw-r--r--acct-user/icecream/icecream-0.ebuild14
-rw-r--r--acct-user/ices/ices-0-r1.ebuild13
-rw-r--r--acct-user/ices/ices-0.ebuild13
-rw-r--r--acct-user/icinga/icinga-0-r1.ebuild13
-rw-r--r--acct-user/icinga/icinga-0-r2.ebuild13
-rw-r--r--acct-user/icingadirector/icingadirector-0-r1.ebuild13
-rw-r--r--acct-user/icingadirector/icingadirector-0.ebuild13
-rw-r--r--acct-user/inadyn/inadyn-0-r1.ebuild14
-rw-r--r--acct-user/inadyn/metadata.xml8
-rw-r--r--acct-user/influxdb/influxdb-0-r1.ebuild13
-rw-r--r--acct-user/influxdb/influxdb-0-r2.ebuild13
-rw-r--r--acct-user/inspircd/inspircd-0-r1.ebuild12
-rw-r--r--acct-user/inspircd/inspircd-0-r2.ebuild12
-rw-r--r--acct-user/ipfs/ipfs-0-r1.ebuild14
-rw-r--r--acct-user/ipfs/ipfs-0-r2.ebuild14
-rw-r--r--acct-user/ippl/ippl-0-r1.ebuild12
-rw-r--r--acct-user/ippl/ippl-0-r2.ebuild12
-rw-r--r--acct-user/ipsec/ipsec-0-r1.ebuild13
-rw-r--r--acct-user/ipsec/ipsec-0.ebuild13
-rw-r--r--acct-user/ipsentinel/ipsentinel-0-r1.ebuild13
-rw-r--r--acct-user/ipsentinel/ipsentinel-0.ebuild13
-rw-r--r--acct-user/iroffer/iroffer-0-r1.ebuild11
-rw-r--r--acct-user/iroffer/iroffer-0.ebuild11
-rw-r--r--acct-user/iroffer/metadata.xml5
-rw-r--r--acct-user/jackett/jackett-0-r1.ebuild13
-rw-r--r--acct-user/jackett/metadata.xml20
-rw-r--r--acct-user/jellyfin/jellyfin-0-r1.ebuild12
-rw-r--r--acct-user/jellyfin/jellyfin-0-r2.ebuild12
-rw-r--r--acct-user/jenkins/jenkins-0-r1.ebuild14
-rw-r--r--acct-user/jenkins/jenkins-0.ebuild14
-rw-r--r--acct-user/kafka/kafka-0-r1.ebuild15
-rw-r--r--acct-user/kafka/kafka-0-r2.ebuild15
-rw-r--r--acct-user/kapacitor/kapacitor-0-r1.ebuild13
-rw-r--r--acct-user/kapacitor/kapacitor-0-r2.ebuild13
-rw-r--r--acct-user/karma/karma-0-r1.ebuild13
-rw-r--r--acct-user/karma/karma-0.ebuild13
-rw-r--r--acct-user/keystone/keystone-0-r1.ebuild14
-rw-r--r--acct-user/keystone/metadata.xml8
-rw-r--r--acct-user/kibana/kibana-0-r1.ebuild13
-rw-r--r--acct-user/kibana/kibana-0-r2.ebuild13
-rw-r--r--acct-user/kismet/kismet-0-r1.ebuild15
-rw-r--r--acct-user/kismet/kismet-0-r2.ebuild15
-rw-r--r--acct-user/knot-resolver/knot-resolver-0-r1.ebuild12
-rw-r--r--acct-user/knot-resolver/knot-resolver-0.ebuild12
-rw-r--r--acct-user/knot/knot-0-r1.ebuild13
-rw-r--r--acct-user/knot/knot-0-r2.ebuild13
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild12
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild12
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild12
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild12
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild12
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild12
-rw-r--r--acct-user/ldap/ldap-0-r1.ebuild16
-rw-r--r--acct-user/ldap/ldap-0.ebuild16
-rw-r--r--acct-user/libreoffice/libreoffice-0-r1.ebuild14
-rw-r--r--acct-user/libreoffice/libreoffice-0.ebuild14
-rw-r--r--acct-user/lidarr/lidarr-0-r1.ebuild13
-rw-r--r--acct-user/lidarr/metadata.xml20
-rw-r--r--acct-user/lightdm/lightdm-0-r1.ebuild14
-rw-r--r--acct-user/lightdm/lightdm-0.ebuild14
-rw-r--r--acct-user/lighttpd/lighttpd-0-r1.ebuild12
-rw-r--r--acct-user/lighttpd/lighttpd-0-r2.ebuild12
-rw-r--r--acct-user/litecoin/litecoin-0.ebuild14
-rw-r--r--acct-user/litecoin/metadata.xml5
-rw-r--r--acct-user/lldpd/lldpd-0-r1.ebuild13
-rw-r--r--acct-user/lldpd/lldpd-0-r2.ebuild13
-rw-r--r--acct-user/logcheck/logcheck-0-r3.ebuild23
-rw-r--r--acct-user/logcheck/logcheck-0.ebuild13
-rw-r--r--acct-user/logcheck/metadata.xml9
-rw-r--r--acct-user/logstash/logstash-0-r1.ebuild13
-rw-r--r--acct-user/logstash/logstash-0-r2.ebuild13
-rw-r--r--acct-user/logsurfer/logsurfer-0-r1.ebuild13
-rw-r--r--acct-user/logsurfer/logsurfer-0.ebuild13
-rw-r--r--acct-user/lxc/lxc-0-r1.ebuild12
-rw-r--r--acct-user/lxc/lxc-0.ebuild12
-rw-r--r--acct-user/mail/mail-0-r1.ebuild15
-rw-r--r--acct-user/mail/mail-0-r2.ebuild15
-rw-r--r--acct-user/man/man-1-r1.ebuild11
-rw-r--r--acct-user/man/man-1-r2.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r1.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r2.ebuild11
-rw-r--r--acct-user/maradns/metadata.xml5
-rw-r--r--acct-user/memcached/memcached-0-r1.ebuild12
-rw-r--r--acct-user/memcached/memcached-0-r2.ebuild12
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild12
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0.ebuild12
-rw-r--r--acct-user/messagebus/messagebus-0-r1.ebuild11
-rw-r--r--acct-user/messagebus/messagebus-0-r2.ebuild11
-rw-r--r--acct-user/mgraph/mgraph-0-r1.ebuild14
-rw-r--r--acct-user/mgraph/mgraph-0.ebuild14
-rw-r--r--acct-user/milter-regex/milter-regex-0-r1.ebuild13
-rw-r--r--acct-user/milter-regex/milter-regex-0-r2.ebuild13
-rw-r--r--acct-user/minbif/metadata.xml5
-rw-r--r--acct-user/minbif/minbif-0.ebuild14
-rw-r--r--acct-user/minecraft/minecraft-0-r1.ebuild14
-rw-r--r--acct-user/minecraft/minecraft-0-r2.ebuild14
-rw-r--r--acct-user/minetest/minetest-1-r1.ebuild14
-rw-r--r--acct-user/minetest/minetest-1-r2.ebuild14
-rw-r--r--acct-user/minidlna/minidlna-0-r1.ebuild11
-rw-r--r--acct-user/minidlna/minidlna-0.ebuild11
-rw-r--r--acct-user/miniflux/miniflux-0-r1.ebuild12
-rw-r--r--acct-user/miniflux/miniflux-0.ebuild12
-rw-r--r--acct-user/minio/metadata.xml5
-rw-r--r--acct-user/minio/minio-0.ebuild13
-rw-r--r--acct-user/mogile/mogile-0-r1.ebuild13
-rw-r--r--acct-user/mogile/mogile-0.ebuild13
-rw-r--r--acct-user/mongodb/mongodb-0-r1.ebuild13
-rw-r--r--acct-user/mongodb/mongodb-0-r2.ebuild13
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild12
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0.ebuild12
-rw-r--r--acct-user/monitorix/monitorix-0-r1.ebuild12
-rw-r--r--acct-user/monitorix/monitorix-0-r2.ebuild12
-rw-r--r--acct-user/monkeyd/monkeyd-0-r1.ebuild15
-rw-r--r--acct-user/monkeyd/monkeyd-0.ebuild15
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r1.ebuild16
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r2.ebuild16
-rw-r--r--acct-user/mosquitto/mosquitto-0-r1.ebuild12
-rw-r--r--acct-user/mosquitto/mosquitto-0-r2.ebuild12
-rw-r--r--acct-user/motion/motion-0-r1.ebuild12
-rw-r--r--acct-user/motion/motion-0-r2.ebuild12
-rw-r--r--acct-user/mpd/mpd-0-r1.ebuild13
-rw-r--r--acct-user/mpd/mpd-0-r2.ebuild13
-rw-r--r--acct-user/msmtpd/msmtpd-0-r1.ebuild12
-rw-r--r--acct-user/msmtpd/msmtpd-0-r2.ebuild12
-rw-r--r--acct-user/munge/munge-0-r1.ebuild14
-rw-r--r--acct-user/munge/munge-0.ebuild14
-rw-r--r--acct-user/munin-async/munin-async-0-r2.ebuild (renamed from acct-user/munin-async/munin-async-0-r1.ebuild)0
-rw-r--r--acct-user/munin/munin-0-r2.ebuild (renamed from acct-user/munin/munin-0-r1.ebuild)0
-rw-r--r--acct-user/murmur/murmur-0-r1.ebuild15
-rw-r--r--acct-user/murmur/murmur-0-r2.ebuild15
-rw-r--r--acct-user/mysql/mysql-0-r1.ebuild12
-rw-r--r--acct-user/mysql/mysql-0-r2.ebuild12
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild14
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild14
-rw-r--r--acct-user/mythtv/mythtv-0-r1.ebuild14
-rw-r--r--acct-user/mythtv/mythtv-0-r2.ebuild14
-rw-r--r--acct-user/nagios/nagios-0-r1.ebuild11
-rw-r--r--acct-user/nagios/nagios-0-r2.ebuild11
-rw-r--r--acct-user/named/named-0-r2.ebuild (renamed from acct-user/named/named-0-r1.ebuild)0
-rw-r--r--acct-user/netbox/metadata.xml5
-rw-r--r--acct-user/netbox/netbox-0-r1.ebuild13
-rw-r--r--acct-user/netdata/netdata-1-r1.ebuild13
-rw-r--r--acct-user/netdata/netdata-1.ebuild13
-rw-r--r--acct-user/netperf/netperf-0-r1.ebuild13
-rw-r--r--acct-user/netperf/netperf-0.ebuild13
-rw-r--r--acct-user/neutron/metadata.xml8
-rw-r--r--acct-user/neutron/neutron-0-r1.ebuild14
-rw-r--r--acct-user/nginx-unit/nginx-unit-0-r1.ebuild (renamed from acct-user/nginx-unit/nginx-unit-0.ebuild)0
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild12
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild12
-rw-r--r--acct-user/nginx/nginx-0-r1.ebuild12
-rw-r--r--acct-user/nginx/nginx-0.ebuild12
-rw-r--r--acct-user/ngircd/ngircd-0-r1.ebuild12
-rw-r--r--acct-user/ngircd/ngircd-0-r2.ebuild12
-rw-r--r--acct-user/ngrep/ngrep-0-r1.ebuild13
-rw-r--r--acct-user/ngrep/ngrep-0-r2.ebuild13
-rw-r--r--acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild13
-rw-r--r--acct-user/nm-openconnect/nm-openconnect-0.ebuild13
-rw-r--r--acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild13
-rw-r--r--acct-user/nm-openvpn/nm-openvpn-0.ebuild13
-rw-r--r--acct-user/nobody/nobody-0-r1.ebuild17
-rw-r--r--acct-user/nobody/nobody-0.ebuild17
-rw-r--r--acct-user/node_exporter/node_exporter-0-r1.ebuild12
-rw-r--r--acct-user/node_exporter/node_exporter-0-r2.ebuild12
-rw-r--r--acct-user/notary/notary-0-r1.ebuild13
-rw-r--r--acct-user/notary/notary-0.ebuild13
-rw-r--r--acct-user/nova/metadata.xml8
-rw-r--r--acct-user/nova/nova-0-r1.ebuild14
-rw-r--r--acct-user/nsd/nsd-0-r1.ebuild12
-rw-r--r--acct-user/nsd/nsd-0-r2.ebuild12
-rw-r--r--acct-user/nslcd/nslcd-0-r1.ebuild13
-rw-r--r--acct-user/nslcd/nslcd-0-r2.ebuild13
-rw-r--r--acct-user/ntopng/ntopng-0-r1.ebuild12
-rw-r--r--acct-user/ntopng/ntopng-0.ebuild12
-rw-r--r--acct-user/ntp/ntp-0-r1.ebuild12
-rw-r--r--acct-user/ntp/ntp-0-r2.ebuild12
-rw-r--r--acct-user/nullmail/nullmail-0-r1.ebuild14
-rw-r--r--acct-user/nullmail/nullmail-0.ebuild14
-rw-r--r--acct-user/nut/nut-0-r1.ebuild14
-rw-r--r--acct-user/nut/nut-0-r2.ebuild14
-rw-r--r--acct-user/nvpd/nvpd-0-r1.ebuild12
-rw-r--r--acct-user/nvpd/nvpd-0.ebuild12
-rw-r--r--acct-user/nzbget/nzbget-0-r1.ebuild16
-rw-r--r--acct-user/nzbget/nzbget-0.ebuild16
-rw-r--r--acct-user/oidentd/oidentd-0-r1.ebuild11
-rw-r--r--acct-user/oidentd/oidentd-0-r2.ebuild11
-rw-r--r--acct-user/openctd/openctd-0-r1.ebuild13
-rw-r--r--acct-user/openctd/openctd-0.ebuild13
-rw-r--r--acct-user/opendkim/opendkim-0-r1.ebuild13
-rw-r--r--acct-user/opendkim/opendkim-0-r2.ebuild13
-rw-r--r--acct-user/opendmarc/opendmarc-0-r1.ebuild16
-rw-r--r--acct-user/opendmarc/opendmarc-0.ebuild16
-rw-r--r--acct-user/opendnssec/opendnssec-0-r1.ebuild13
-rw-r--r--acct-user/opendnssec/opendnssec-0.ebuild13
-rw-r--r--acct-user/openntpd/openntpd-0-r1.ebuild14
-rw-r--r--acct-user/openntpd/openntpd-0-r2.ebuild14
-rw-r--r--acct-user/openrct2/openrct2-0-r1.ebuild13
-rw-r--r--acct-user/openrct2/openrct2-0-r2.ebuild13
-rw-r--r--acct-user/openttd/openttd-0-r1.ebuild14
-rw-r--r--acct-user/openttd/openttd-0.ebuild14
-rw-r--r--acct-user/openvpn/openvpn-0-r1.ebuild13
-rw-r--r--acct-user/openvpn/openvpn-0-r2.ebuild13
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild13
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild13
-rw-r--r--acct-user/opm/opm-0-r1.ebuild12
-rw-r--r--acct-user/opm/opm-0-r2.ebuild12
-rw-r--r--acct-user/oprofile/oprofile-0-r1.ebuild12
-rw-r--r--acct-user/oprofile/oprofile-0-r2.ebuild12
-rw-r--r--acct-user/oragono/oragono-0-r1.ebuild12
-rw-r--r--acct-user/oragono/oragono-0.ebuild12
-rw-r--r--acct-user/ossec/ossec-0-r1.ebuild13
-rw-r--r--acct-user/ossec/ossec-0-r2.ebuild13
-rw-r--r--acct-user/ossecm/ossecm-0-r1.ebuild12
-rw-r--r--acct-user/ossecm/ossecm-0-r2.ebuild12
-rw-r--r--acct-user/ossecr/ossecr-0-r1.ebuild12
-rw-r--r--acct-user/ossecr/ossecr-0-r2.ebuild12
-rw-r--r--acct-user/owntracks/owntracks-0-r1.ebuild12
-rw-r--r--acct-user/owntracks/owntracks-0.ebuild12
-rw-r--r--acct-user/p2p/p2p-0-r1.ebuild12
-rw-r--r--acct-user/p2p/p2p-0.ebuild12
-rw-r--r--acct-user/partimag/partimag-0-r1.ebuild14
-rw-r--r--acct-user/partimag/partimag-0.ebuild14
-rw-r--r--acct-user/pcap/pcap-0-r1.ebuild12
-rw-r--r--acct-user/pcap/pcap-0.ebuild12
-rw-r--r--acct-user/pcscd/pcscd-0-r1.ebuild12
-rw-r--r--acct-user/pcscd/pcscd-0-r2.ebuild12
-rw-r--r--acct-user/pdns/pdns-0-r1.ebuild11
-rw-r--r--acct-user/pdns/pdns-0-r2.ebuild11
-rw-r--r--acct-user/pdnsd/pdnsd-0-r1.ebuild14
-rw-r--r--acct-user/pdnsd/pdnsd-0-r2.ebuild14
-rw-r--r--acct-user/pgagent/pgagent-0-r1.ebuild22
-rw-r--r--acct-user/pgagent/pgagent-0.ebuild22
-rw-r--r--acct-user/pgbouncer/pgbouncer-0-r1.ebuild12
-rw-r--r--acct-user/pgbouncer/pgbouncer-0.ebuild12
-rw-r--r--acct-user/pgpool/pgpool-0-r1.ebuild13
-rw-r--r--acct-user/pgpool/pgpool-0.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-0-r1.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-0.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-1-r1.ebuild (renamed from acct-user/pipewire/pipewire-1.ebuild)0
-rw-r--r--acct-user/placement/metadata.xml8
-rw-r--r--acct-user/placement/placement-0-r1.ebuild14
-rw-r--r--acct-user/plex/plex-0-r1.ebuild13
-rw-r--r--acct-user/plex/plex-0-r2.ebuild13
-rw-r--r--acct-user/polkitd/polkitd-0-r1.ebuild12
-rw-r--r--acct-user/polkitd/polkitd-0-r2.ebuild12
-rw-r--r--acct-user/polw/polw-0-r1.ebuild13
-rw-r--r--acct-user/polw/polw-0.ebuild13
-rw-r--r--acct-user/popa3d/popa3d-0-r1.ebuild12
-rw-r--r--acct-user/popa3d/popa3d-0.ebuild12
-rw-r--r--acct-user/portage/portage-0-r2.ebuild12
-rw-r--r--acct-user/portage/portage-0.ebuild12
-rw-r--r--acct-user/postfix/postfix-0-r1.ebuild12
-rw-r--r--acct-user/postfix/postfix-0-r2.ebuild12
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild13
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild13
-rw-r--r--acct-user/postfwd/postfwd-0-r1.ebuild13
-rw-r--r--acct-user/postfwd/postfwd-0.ebuild13
-rw-r--r--acct-user/postgres/postgres-0-r1.ebuild15
-rw-r--r--acct-user/postgres/postgres-0-r2.ebuild15
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild12
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0.ebuild12
-rw-r--r--acct-user/postgrey/postgrey-0-r1.ebuild12
-rw-r--r--acct-user/postgrey/postgrey-0.ebuild12
-rw-r--r--acct-user/postmaster/postmaster-0-r1.ebuild15
-rw-r--r--acct-user/postmaster/postmaster-0-r2.ebuild15
-rw-r--r--acct-user/privoxy/privoxy-0-r1.ebuild12
-rw-r--r--acct-user/privoxy/privoxy-0-r2.ebuild12
-rw-r--r--acct-user/prometheus/prometheus-0-r1.ebuild13
-rw-r--r--acct-user/prometheus/prometheus-0-r2.ebuild13
-rw-r--r--acct-user/prosody/prosody-0-r1.ebuild13
-rw-r--r--acct-user/prosody/prosody-0.ebuild13
-rw-r--r--acct-user/prowlarr/prowlarr-0-r1.ebuild13
-rw-r--r--acct-user/prowlarr/prowlarr-0.ebuild13
-rw-r--r--acct-user/psybnc/psybnc-0-r1.ebuild14
-rw-r--r--acct-user/psybnc/psybnc-0.ebuild14
-rw-r--r--acct-user/pulse/pulse-0-r1.ebuild13
-rw-r--r--acct-user/pulse/pulse-0.ebuild13
-rw-r--r--acct-user/puppet/puppet-0-r1.ebuild14
-rw-r--r--acct-user/puppet/puppet-0-r2.ebuild14
-rw-r--r--acct-user/puppetdb/puppetdb-0-r1.ebuild14
-rw-r--r--acct-user/puppetdb/puppetdb-0-r2.ebuild14
-rw-r--r--acct-user/pushgateway/pushgateway-0-r1.ebuild13
-rw-r--r--acct-user/pushgateway/pushgateway-0.ebuild13
-rw-r--r--acct-user/pvpgn/pvpgn-0-r1.ebuild12
-rw-r--r--acct-user/pvpgn/pvpgn-0.ebuild12
-rw-r--r--acct-user/qemu/qemu-0-r1.ebuild11
-rw-r--r--acct-user/qemu/qemu-0-r2.ebuild11
-rw-r--r--acct-user/qmaild/qmaild-0-r1.ebuild12
-rw-r--r--acct-user/qmaild/qmaild-0-r2.ebuild12
-rw-r--r--acct-user/qmaill/qmaill-0-r1.ebuild12
-rw-r--r--acct-user/qmaill/qmaill-0-r2.ebuild12
-rw-r--r--acct-user/qmailp/qmailp-0-r1.ebuild12
-rw-r--r--acct-user/qmailp/qmailp-0-r2.ebuild12
-rw-r--r--acct-user/qmailq/qmailq-0-r1.ebuild12
-rw-r--r--acct-user/qmailq/qmailq-0-r2.ebuild12
-rw-r--r--acct-user/qmailr/qmailr-0-r1.ebuild12
-rw-r--r--acct-user/qmailr/qmailr-0-r2.ebuild12
-rw-r--r--acct-user/qmails/qmails-0-r1.ebuild12
-rw-r--r--acct-user/qmails/qmails-0-r2.ebuild12
-rw-r--r--acct-user/quagga/metadata.xml8
-rw-r--r--acct-user/quagga/quagga-0-r1.ebuild11
-rw-r--r--acct-user/quassel/quassel-0-r1.ebuild12
-rw-r--r--acct-user/quassel/quassel-0-r2.ebuild12
-rw-r--r--acct-user/rabbitmq/rabbitmq-0-r1.ebuild15
-rw-r--r--acct-user/rabbitmq/rabbitmq-0.ebuild15
-rw-r--r--acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild12
-rw-r--r--acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild12
-rw-r--r--acct-user/radarr/radarr-0-r1.ebuild13
-rw-r--r--acct-user/radarr/radarr-0.ebuild13
-rw-r--r--acct-user/radicale/radicale-0-r2.ebuild13
-rw-r--r--acct-user/radicale/radicale-0-r3.ebuild13
-rw-r--r--acct-user/radius/radius-0-r1.ebuild11
-rw-r--r--acct-user/radius/radius-0-r2.ebuild11
-rw-r--r--acct-user/radvd/radvd-0-r1.ebuild13
-rw-r--r--acct-user/radvd/radvd-0.ebuild13
-rw-r--r--acct-user/rbldns/rbldns-0-r1.ebuild11
-rw-r--r--acct-user/rbldns/rbldns-0-r2.ebuild11
-rw-r--r--acct-user/rbot/rbot-0-r1.ebuild14
-rw-r--r--acct-user/rbot/rbot-0.ebuild14
-rw-r--r--acct-user/readarr/readarr-0-r1.ebuild13
-rw-r--r--acct-user/readarr/readarr-0.ebuild13
-rw-r--r--acct-user/redis/redis-0-r1.ebuild11
-rw-r--r--acct-user/redis/redis-0-r2.ebuild11
-rw-r--r--acct-user/redis_exporter/redis_exporter-0-r1.ebuild14
-rw-r--r--acct-user/redis_exporter/redis_exporter-0.ebuild14
-rw-r--r--acct-user/redmine/redmine-0-r1.ebuild11
-rw-r--r--acct-user/redmine/redmine-0-r2.ebuild11
-rw-r--r--acct-user/redsocks/redsocks-0-r1.ebuild13
-rw-r--r--acct-user/redsocks/redsocks-0-r2.ebuild13
-rw-r--r--acct-user/reg/reg-0-r1.ebuild13
-rw-r--r--acct-user/reg/reg-0-r2.ebuild13
-rw-r--r--acct-user/registry/registry-0-r1.ebuild13
-rw-r--r--acct-user/registry/registry-0.ebuild13
-rw-r--r--acct-user/root/root-0-r1.ebuild24
-rw-r--r--acct-user/root/root-0-r2.ebuild24
-rw-r--r--acct-user/rplayd/metadata.xml8
-rw-r--r--acct-user/rplayd/rplayd-0.ebuild13
-rw-r--r--acct-user/rrdcached/rrdcached-0-r1.ebuild14
-rw-r--r--acct-user/rrdcached/rrdcached-0.ebuild14
-rw-r--r--acct-user/rslsync/rslsync-0-r1.ebuild15
-rw-r--r--acct-user/rslsync/rslsync-0.ebuild15
-rw-r--r--acct-user/rspamd/rspamd-0-r1.ebuild12
-rw-r--r--acct-user/rspamd/rspamd-0-r2.ebuild12
-rw-r--r--acct-user/rstudio-server/metadata.xml8
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r1.ebuild12
-rw-r--r--acct-user/rt/rt-0-r1.ebuild13
-rw-r--r--acct-user/rt/rt-0.ebuild13
-rw-r--r--acct-user/rtkit/rtkit-0-r1.ebuild12
-rw-r--r--acct-user/rtkit/rtkit-0-r2.ebuild12
-rw-r--r--acct-user/rundeck/metadata.xml8
-rw-r--r--acct-user/rundeck/rundeck-0.ebuild14
-rw-r--r--acct-user/rwhoisd/rwhoisd-0-r1.ebuild14
-rw-r--r--acct-user/rwhoisd/rwhoisd-0.ebuild14
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r1.ebuild15
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r2.ebuild15
-rw-r--r--acct-user/sagan/sagan-0-r1.ebuild12
-rw-r--r--acct-user/sagan/sagan-0-r2.ebuild12
-rw-r--r--acct-user/samplicator/samplicator-0-r1.ebuild14
-rw-r--r--acct-user/samplicator/samplicator-0.ebuild14
-rw-r--r--acct-user/sancp/sancp-0-r1.ebuild12
-rw-r--r--acct-user/sancp/sancp-0.ebuild12
-rw-r--r--acct-user/saned/saned-0-r1.ebuild13
-rw-r--r--acct-user/saned/saned-0.ebuild13
-rw-r--r--acct-user/sanlock/sanlock-0-r1.ebuild13
-rw-r--r--acct-user/sanlock/sanlock-0-r2.ebuild13
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r1.ebuild12
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r2.ebuild12
-rw-r--r--acct-user/scanlogd/scanlogd-0-r1.ebuild13
-rw-r--r--acct-user/scanlogd/scanlogd-0.ebuild13
-rw-r--r--acct-user/scponly/scponly-0-r1.ebuild15
-rw-r--r--acct-user/scponly/scponly-0-r2.ebuild15
-rw-r--r--acct-user/sddm/sddm-0-r1.ebuild14
-rw-r--r--acct-user/sddm/sddm-0.ebuild14
-rw-r--r--acct-user/sendpage/sendpage-0-r1.ebuild13
-rw-r--r--acct-user/sendpage/sendpage-0.ebuild13
-rw-r--r--acct-user/serf/serf-0-r1.ebuild14
-rw-r--r--acct-user/serf/serf-0.ebuild14
-rw-r--r--acct-user/sguil/metadata.xml8
-rw-r--r--acct-user/sguil/sguil-0.ebuild14
-rw-r--r--acct-user/shellinaboxd/metadata.xml12
-rw-r--r--acct-user/shellinaboxd/shellinaboxd-0-r1.ebuild12
-rw-r--r--acct-user/sigh/metadata.xml8
-rw-r--r--acct-user/sigh/sigh-0.ebuild11
-rw-r--r--acct-user/sks/sks-0-r1.ebuild12
-rw-r--r--acct-user/sks/sks-0.ebuild12
-rw-r--r--acct-user/slurm/slurm-0-r1.ebuild14
-rw-r--r--acct-user/slurm/slurm-0-r2.ebuild14
-rw-r--r--acct-user/smmsp/smmsp-0-r2.ebuild12
-rw-r--r--acct-user/smmsp/smmsp-0-r3.ebuild12
-rw-r--r--acct-user/smokeping/metadata.xml8
-rw-r--r--acct-user/smokeping/smokeping-0.ebuild14
-rw-r--r--acct-user/smsd/smsd-0-r1.ebuild12
-rw-r--r--acct-user/smsd/smsd-0.ebuild12
-rw-r--r--acct-user/smtpd/smtpd-0-r1.ebuild13
-rw-r--r--acct-user/smtpd/smtpd-0-r2.ebuild13
-rw-r--r--acct-user/smtpq/smtpq-0-r1.ebuild13
-rw-r--r--acct-user/smtpq/smtpq-0-r2.ebuild13
-rw-r--r--acct-user/snapclient/snapclient-0-r1.ebuild15
-rw-r--r--acct-user/snapclient/snapclient-0.ebuild15
-rw-r--r--acct-user/snapserver/snapserver-0-r1.ebuild (renamed from acct-user/snapserver/snapserver-0.ebuild)0
-rw-r--r--acct-user/sndiod/sndiod-0-r1.ebuild12
-rw-r--r--acct-user/sndiod/sndiod-0.ebuild12
-rw-r--r--acct-user/sniproxy/sniproxy-0-r1.ebuild11
-rw-r--r--acct-user/sniproxy/sniproxy-0.ebuild11
-rw-r--r--acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild12
-rw-r--r--acct-user/snmp_exporter/snmp_exporter-0.ebuild12
-rw-r--r--acct-user/snort/snort-0-r1.ebuild12
-rw-r--r--acct-user/snort/snort-0.ebuild12
-rw-r--r--acct-user/sobby/metadata.xml5
-rw-r--r--acct-user/sobby/sobby-0.ebuild14
-rw-r--r--acct-user/sobexsrv/sobexsrv-0-r1.ebuild13
-rw-r--r--acct-user/sobexsrv/sobexsrv-0.ebuild13
-rw-r--r--acct-user/sockd/sockd-0-r1.ebuild13
-rw-r--r--acct-user/sockd/sockd-0-r2.ebuild13
-rw-r--r--acct-user/sogo/sogo-0-r1.ebuild14
-rw-r--r--acct-user/sogo/sogo-0-r2.ebuild14
-rw-r--r--acct-user/soju/soju-0-r1.ebuild14
-rw-r--r--acct-user/soju/soju-0.ebuild14
-rw-r--r--acct-user/sonarr/sonarr-0-r1.ebuild13
-rw-r--r--acct-user/sonarr/sonarr-0.ebuild13
-rw-r--r--acct-user/spamd/spamd-0-r1.ebuild25
-rw-r--r--acct-user/spamd/spamd-0-r2.ebuild25
-rw-r--r--acct-user/spectrum/spectrum-0-r1.ebuild14
-rw-r--r--acct-user/spectrum/spectrum-0-r2.ebuild14
-rw-r--r--acct-user/spire/spire-0-r1.ebuild12
-rw-r--r--acct-user/spire/spire-0-r2.ebuild12
-rw-r--r--acct-user/spread/metadata.xml8
-rw-r--r--acct-user/spread/spread-0.ebuild13
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r1.ebuild14
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r2.ebuild14
-rw-r--r--acct-user/squid/squid-0-r1.ebuild13
-rw-r--r--acct-user/squid/squid-0-r2.ebuild13
-rw-r--r--acct-user/sshd/sshd-0-r1.ebuild15
-rw-r--r--acct-user/sshd/sshd-0-r2.ebuild15
-rw-r--r--acct-user/sstpc/sstpc-0-r1.ebuild13
-rw-r--r--acct-user/sstpc/sstpc-0.ebuild13
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild27
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-1.ebuild27
-rw-r--r--acct-user/steamcmd/steamcmd-0-r1.ebuild14
-rw-r--r--acct-user/steamcmd/steamcmd-0-r2.ebuild14
-rw-r--r--acct-user/stg/metadata.xml12
-rw-r--r--acct-user/stg/stg-0.ebuild13
-rw-r--r--acct-user/strelaysrv/strelaysrv-1-r1.ebuild27
-rw-r--r--acct-user/strelaysrv/strelaysrv-1.ebuild27
-rw-r--r--acct-user/stubby/stubby-0-r1.ebuild12
-rw-r--r--acct-user/stubby/stubby-0-r2.ebuild12
-rw-r--r--acct-user/stunnel/stunnel-0-r1.ebuild12
-rw-r--r--acct-user/stunnel/stunnel-0-r2.ebuild12
-rw-r--r--acct-user/subsonic/subsonic-0-r1.ebuild14
-rw-r--r--acct-user/subsonic/subsonic-0-r2.ebuild14
-rw-r--r--acct-user/suricata/suricata-0-r1.ebuild12
-rw-r--r--acct-user/suricata/suricata-0-r2.ebuild12
-rw-r--r--acct-user/svn/svn-0-r1.ebuild11
-rw-r--r--acct-user/svn/svn-0-r2.ebuild11
-rw-r--r--acct-user/svxlink/svxlink-0-r1.ebuild12
-rw-r--r--acct-user/svxlink/svxlink-0.ebuild12
-rw-r--r--acct-user/swift/metadata.xml8
-rw-r--r--acct-user/swift/swift-0-r1.ebuild12
-rw-r--r--acct-user/synapse/synapse-0-r1.ebuild12
-rw-r--r--acct-user/synapse/synapse-0.ebuild12
-rw-r--r--acct-user/syncthing/syncthing-0-r1.ebuild14
-rw-r--r--acct-user/syncthing/syncthing-0-r2.ebuild14
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild11
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild11
-rw-r--r--acct-user/systemd-network/systemd-network-0-r1.ebuild11
-rw-r--r--acct-user/systemd-network/systemd-network-0-r2.ebuild11
-rw-r--r--acct-user/systemd-oom/systemd-oom-0-r1.ebuild11
-rw-r--r--acct-user/systemd-oom/systemd-oom-0.ebuild11
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild11
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild11
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild11
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild11
-rw-r--r--acct-user/taskd/taskd-0-r1.ebuild15
-rw-r--r--acct-user/taskd/taskd-0.ebuild15
-rw-r--r--acct-user/teamspeak/teamspeak-0-r1.ebuild14
-rw-r--r--acct-user/teamspeak/teamspeak-0-r2.ebuild14
-rw-r--r--acct-user/telegraf/telegraf-0-r1.ebuild12
-rw-r--r--acct-user/telegraf/telegraf-0-r2.ebuild12
-rw-r--r--acct-user/tenshi/tenshi-0-r1.ebuild14
-rw-r--r--acct-user/tenshi/tenshi-0.ebuild14
-rw-r--r--acct-user/thttpd/metadata.xml5
-rw-r--r--acct-user/thttpd/thttpd-0.ebuild13
-rw-r--r--acct-user/timidity/timidity-0-r1.ebuild15
-rw-r--r--acct-user/timidity/timidity-0.ebuild15
-rw-r--r--acct-user/tinydns/tinydns-0-r1.ebuild11
-rw-r--r--acct-user/tinydns/tinydns-0.ebuild11
-rw-r--r--acct-user/tinyproxy/tinyproxy-0-r1.ebuild12
-rw-r--r--acct-user/tinyproxy/tinyproxy-0.ebuild12
-rw-r--r--acct-user/tomcat/tomcat-0-r1.ebuild12
-rw-r--r--acct-user/tomcat/tomcat-0.ebuild12
-rw-r--r--acct-user/tor/tor-0-r1.ebuild12
-rw-r--r--acct-user/tor/tor-0-r2.ebuild12
-rw-r--r--acct-user/tox/tox-0-r1.ebuild13
-rw-r--r--acct-user/tox/tox-0-r2.ebuild13
-rw-r--r--acct-user/tpm/tpm-0-r1.ebuild12
-rw-r--r--acct-user/tpm/tpm-0.ebuild12
-rw-r--r--acct-user/transmission/transmission-1-r1.ebuild11
-rw-r--r--acct-user/transmission/transmission-1-r2.ebuild11
-rw-r--r--acct-user/trickster/trickster-0-r1.ebuild13
-rw-r--r--acct-user/trickster/trickster-0.ebuild13
-rw-r--r--acct-user/trojan/trojan-0-r1.ebuild12
-rw-r--r--acct-user/trojan/trojan-0.ebuild12
-rw-r--r--acct-user/tss/tss-0-r1.ebuild12
-rw-r--r--acct-user/tss/tss-0-r2.ebuild12
-rw-r--r--acct-user/ttrssd/ttrssd-0-r1.ebuild12
-rw-r--r--acct-user/ttrssd/ttrssd-0.ebuild12
-rw-r--r--acct-user/turnserver/turnserver-0-r1.ebuild13
-rw-r--r--acct-user/turnserver/turnserver-0-r2.ebuild13
-rw-r--r--acct-user/tvheadend/tvheadend-0-r1.ebuild14
-rw-r--r--acct-user/tvheadend/tvheadend-0-r2.ebuild14
-rw-r--r--acct-user/ulogd/ulogd-0-r1.ebuild12
-rw-r--r--acct-user/ulogd/ulogd-0.ebuild12
-rw-r--r--acct-user/ultimaker/ultimaker-0-r1.ebuild12
-rw-r--r--acct-user/ultimaker/ultimaker-0-r2.ebuild12
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild12
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1.ebuild12
-rw-r--r--acct-user/unbound/unbound-0-r1.ebuild16
-rw-r--r--acct-user/unbound/unbound-0-r2.ebuild16
-rw-r--r--acct-user/unifi-video/unifi-video-0-r1.ebuild12
-rw-r--r--acct-user/unifi-video/unifi-video-0.ebuild12
-rw-r--r--acct-user/unifi/unifi-0-r2.ebuild (renamed from acct-user/unifi/unifi-0-r1.ebuild)0
-rw-r--r--acct-user/unrealircd/unrealircd-0-r1.ebuild11
-rw-r--r--acct-user/unrealircd/unrealircd-0-r2.ebuild11
-rw-r--r--acct-user/upmpdcli/upmpdcli-0-r1.ebuild12
-rw-r--r--acct-user/upmpdcli/upmpdcli-0.ebuild12
-rw-r--r--acct-user/uptimed/uptimed-0-r2.ebuild13
-rw-r--r--acct-user/uptimed/uptimed-0-r3.ebuild13
-rw-r--r--acct-user/usbmux/usbmux-0-r1.ebuild12
-rw-r--r--acct-user/usbmux/usbmux-0-r2.ebuild12
-rw-r--r--acct-user/ushare/ushare-0-r1.ebuild12
-rw-r--r--acct-user/ushare/ushare-0.ebuild12
-rw-r--r--acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild13
-rw-r--r--acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild13
-rw-r--r--acct-user/vacation/vacation-0-r1.ebuild13
-rw-r--r--acct-user/vacation/vacation-0.ebuild13
-rw-r--r--acct-user/varnish/varnish-0-r1.ebuild14
-rw-r--r--acct-user/varnish/varnish-0-r2.ebuild14
-rw-r--r--acct-user/vault/vault-0-r1.ebuild12
-rw-r--r--acct-user/vault/vault-0-r2.ebuild12
-rw-r--r--acct-user/vault_exporter/vault_exporter-0-r1.ebuild13
-rw-r--r--acct-user/vault_exporter/vault_exporter-0.ebuild13
-rw-r--r--acct-user/vboxguest/vboxguest-0-r1.ebuild13
-rw-r--r--acct-user/vboxguest/vboxguest-0-r2.ebuild13
-rw-r--r--acct-user/vdr/vdr-0-r1.ebuild63
-rw-r--r--acct-user/vdr/vdr-0-r2.ebuild63
-rw-r--r--acct-user/vdradmin/vdradmin-0-r1.ebuild16
-rw-r--r--acct-user/vdradmin/vdradmin-0-r2.ebuild16
-rw-r--r--acct-user/vnstat/vnstat-0-r1.ebuild12
-rw-r--r--acct-user/vnstat/vnstat-0.ebuild12
-rw-r--r--acct-user/vpopmail/vpopmail-0-r1.ebuild13
-rw-r--r--acct-user/vpopmail/vpopmail-0-r2.ebuild13
-rw-r--r--acct-user/wesnoth/wesnoth-0-r1.ebuild13
-rw-r--r--acct-user/wesnoth/wesnoth-0-r2.ebuild13
-rw-r--r--acct-user/wwwoffle/wwwoffle-0-r1.ebuild14
-rw-r--r--acct-user/wwwoffle/wwwoffle-0.ebuild14
-rw-r--r--acct-user/x2goprint/x2goprint-0-r1.ebuild13
-rw-r--r--acct-user/x2goprint/x2goprint-0-r2.ebuild13
-rw-r--r--acct-user/x2gouser/x2gouser-0-r1.ebuild13
-rw-r--r--acct-user/x2gouser/x2gouser-0-r2.ebuild13
-rw-r--r--acct-user/xrootd/xrootd-0-r1.ebuild12
-rw-r--r--acct-user/xrootd/xrootd-0-r2.ebuild12
-rw-r--r--acct-user/yubihsm-connector/metadata.xml8
-rw-r--r--acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild12
-rw-r--r--acct-user/zabbix/zabbix-0-r1.ebuild15
-rw-r--r--acct-user/zabbix/zabbix-0.ebuild15
-rw-r--r--acct-user/zeppelin/zeppelin-0-r1.ebuild14
-rw-r--r--acct-user/zeppelin/zeppelin-0-r2.ebuild14
-rw-r--r--acct-user/zetcd/zetcd-0-r1.ebuild13
-rw-r--r--acct-user/zetcd/zetcd-0.ebuild13
-rw-r--r--acct-user/ziproxy/ziproxy-0-r1.ebuild11
-rw-r--r--acct-user/ziproxy/ziproxy-0.ebuild11
-rw-r--r--acct-user/znc/znc-0-r1.ebuild16
-rw-r--r--acct-user/znc/znc-0-r2.ebuild16
-rw-r--r--acct-user/zookeeper/zookeeper-0-r1.ebuild14
-rw-r--r--acct-user/zookeeper/zookeeper-0.ebuild14
878 files changed, 5386 insertions, 5811 deletions
diff --git a/acct-user/_cron-failure/_cron-failure-0-r1.ebuild b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..d521c8d59f17
--- /dev/null
+++ b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/systemd-cron failure emails"
+ACCT_USER_ID="520"
+ACCT_USER_GROUPS=( _cron-failure )
+
+acct-user_add_deps
diff --git a/acct-user/_cron-failure/_cron-failure-0.ebuild b/acct-user/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index bf25d6b1fc4d..000000000000
--- a/acct-user/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/systemd-cron failure emails"
-ACCT_USER_ID="520"
-ACCT_USER_GROUPS=( _cron-failure )
-
-acct-user_add_deps
diff --git a/acct-user/abrt/abrt-0-r1.ebuild b/acct-user/abrt/abrt-0-r1.ebuild
deleted file mode 100644
index ca0f60d5930c..000000000000
--- a/acct-user/abrt/abrt-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the automatic bug detection and reporting tool"
-ACCT_USER_ID=422
-ACCT_USER_GROUPS=( abrt )
-
-acct-user_add_deps
diff --git a/acct-user/abrt/metadata.xml b/acct-user/abrt/metadata.xml
deleted file mode 100644
index c300b31b6a76..000000000000
--- a/acct-user/abrt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild b/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
new file mode 100644
index 000000000000..dd0e1d7b8aa0
--- /dev/null
+++ b/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/aerospike-amc-community"
+
+ACCT_USER_GROUPS=( "aerospike-amc" )
+ACCT_USER_ID="210"
+
+acct-user_add_deps
diff --git a/acct-user/aerospike-amc/aerospike-amc-0.ebuild b/acct-user/aerospike-amc/aerospike-amc-0.ebuild
deleted file mode 100644
index c73b7ab51d09..000000000000
--- a/acct-user/aerospike-amc/aerospike-amc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/aerospike-amc-community"
-
-ACCT_USER_GROUPS=( "aerospike-amc" )
-ACCT_USER_ID="210"
-
-acct-user_add_deps
diff --git a/acct-user/airdcppd/airdcppd-0-r1.ebuild b/acct-user/airdcppd/airdcppd-0-r1.ebuild
deleted file mode 100644
index 75df52a65b7d..000000000000
--- a/acct-user/airdcppd/airdcppd-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/airdcpp-webclient"
-ACCT_USER_ID=464
-ACCT_USER_GROUPS=( ${PN} )
-# Settings are stored in $HOME
-ACCT_USER_HOME=/var/lib/airdcppd
-# Grant write access to group members
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/airdcppd/airdcppd-0-r2.ebuild b/acct-user/airdcppd/airdcppd-0-r2.ebuild
new file mode 100644
index 000000000000..11aec89a5d06
--- /dev/null
+++ b/acct-user/airdcppd/airdcppd-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/airdcpp-webclient"
+ACCT_USER_ID=464
+ACCT_USER_GROUPS=( ${PN} )
+# Settings are stored in $HOME
+ACCT_USER_HOME=/var/lib/airdcppd
+# Grant write access to group members
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/alertmanager/alertmanager-0-r1.ebuild b/acct-user/alertmanager/alertmanager-0-r1.ebuild
new file mode 100644
index 000000000000..867ecaa994db
--- /dev/null
+++ b/acct-user/alertmanager/alertmanager-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for alertmanager"
+ACCT_USER_ID=294
+ACCT_USER_GROUPS=( alertmanager )
+
+acct-user_add_deps
diff --git a/acct-user/alertmanager/alertmanager-0.ebuild b/acct-user/alertmanager/alertmanager-0.ebuild
deleted file mode 100644
index 78028f69692f..000000000000
--- a/acct-user/alertmanager/alertmanager-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for alertmanager"
-ACCT_USER_ID=294
-ACCT_USER_GROUPS=( alertmanager )
-
-acct-user_add_deps
diff --git a/acct-user/alias/alias-0-r1.ebuild b/acct-user/alias/alias-0-r1.ebuild
deleted file mode 100644
index 9910f7b0ae6b..000000000000
--- a/acct-user/alias/alias-0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="alias user for qmail mail delivery"
-ACCT_USER_ID=200
-ACCT_USER_HOME=/var/qmail/alias
-ACCT_USER_HOME_OWNER=alias:qmail
-ACCT_USER_HOME_PERMS=02755
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/qmail "
-RDEPEND+=" acct-group/qmail "
diff --git a/acct-user/alias/alias-0-r2.ebuild b/acct-user/alias/alias-0-r2.ebuild
new file mode 100644
index 000000000000..e02890f71c60
--- /dev/null
+++ b/acct-user/alias/alias-0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="alias user for qmail mail delivery"
+ACCT_USER_ID=200
+ACCT_USER_HOME=/var/qmail/alias
+ACCT_USER_HOME_OWNER=alias:qmail
+ACCT_USER_HOME_PERMS=02755
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/qmail "
+RDEPEND+=" acct-group/qmail "
diff --git a/acct-user/amanda/amanda-0-r1.ebuild b/acct-user/amanda/amanda-0-r1.ebuild
new file mode 100644
index 000000000000..0bfd30545fc1
--- /dev/null
+++ b/acct-user/amanda/amanda-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=362
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/var/spool/amanda
+
+acct-user_add_deps
diff --git a/acct-user/amanda/amanda-0.ebuild b/acct-user/amanda/amanda-0.ebuild
deleted file mode 100644
index 18c4485c8eba..000000000000
--- a/acct-user/amanda/amanda-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=362
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/var/spool/amanda
-
-acct-user_add_deps
diff --git a/acct-user/amavis/amavis-0-r1.ebuild b/acct-user/amavis/amavis-0-r1.ebuild
deleted file mode 100644
index 7fb7c66fadeb..000000000000
--- a/acct-user/amavis/amavis-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=333
-ACCT_USER_GROUPS=( amavis )
-ACCT_USER_HOME=/var/lib/amavishome
-DESCRIPTION="User for mail-filter/amavisd-new"
-
-acct-user_add_deps
diff --git a/acct-user/amavis/amavis-0-r2.ebuild b/acct-user/amavis/amavis-0-r2.ebuild
new file mode 100644
index 000000000000..cea1b1964c03
--- /dev/null
+++ b/acct-user/amavis/amavis-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=333
+ACCT_USER_GROUPS=( amavis )
+ACCT_USER_HOME=/var/lib/amavishome
+DESCRIPTION="User for mail-filter/amavisd-new"
+
+acct-user_add_deps
diff --git a/acct-user/amule/amule-0-r2.ebuild b/acct-user/amule/amule-0-r2.ebuild
deleted file mode 100644
index 545f68eb371a..000000000000
--- a/acct-user/amule/amule-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/amule"
-
-ACCT_USER_GROUPS=( "amule" )
-ACCT_USER_HOME="/var/lib/amule"
-ACCT_USER_ID="468"
-
-acct-user_add_deps
diff --git a/acct-user/amule/amule-0-r3.ebuild b/acct-user/amule/amule-0-r3.ebuild
new file mode 100644
index 000000000000..68f824126c23
--- /dev/null
+++ b/acct-user/amule/amule-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/amule"
+
+ACCT_USER_GROUPS=( "amule" )
+ACCT_USER_HOME="/var/lib/amule"
+ACCT_USER_ID="468"
+
+acct-user_add_deps
diff --git a/acct-user/anope/anope-0-r1.ebuild b/acct-user/anope/anope-0-r1.ebuild
deleted file mode 100644
index e2080507f913..000000000000
--- a/acct-user/anope/anope-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for Anope IRC services"
-ACCT_USER_ID=417
-ACCT_USER_GROUPS=( anope )
-
-acct-user_add_deps
diff --git a/acct-user/anope/anope-0-r2.ebuild b/acct-user/anope/anope-0-r2.ebuild
new file mode 100644
index 000000000000..1af9d55b98f6
--- /dev/null
+++ b/acct-user/anope/anope-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for Anope IRC services"
+ACCT_USER_ID=417
+ACCT_USER_GROUPS=( anope )
+
+acct-user_add_deps
diff --git a/acct-user/apache/apache-0-r2.ebuild b/acct-user/apache/apache-0-r2.ebuild
deleted file mode 100644
index 47626ba98bd7..000000000000
--- a/acct-user/apache/apache-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID="81"
-ACCT_USER_GROUPS=( "apache" )
-ACCT_USER_HOME="/var/www"
-
-acct-user_add_deps
diff --git a/acct-user/apache/apache-0-r3.ebuild b/acct-user/apache/apache-0-r3.ebuild
new file mode 100644
index 000000000000..1d0b8a4e54b9
--- /dev/null
+++ b/acct-user/apache/apache-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="81"
+ACCT_USER_GROUPS=( "apache" )
+ACCT_USER_HOME="/var/www"
+
+acct-user_add_deps
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
new file mode 100644
index 000000000000..5ff5cdddbc60
--- /dev/null
+++ b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for apt-cacher-ng"
+ACCT_USER_ID=319
+ACCT_USER_GROUPS=( apt-cacher-ng )
+
+acct-user_add_deps
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild
deleted file mode 100644
index b51ca6c88ad3..000000000000
--- a/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for apt-cacher-ng"
-ACCT_USER_ID=319
-ACCT_USER_GROUPS=( apt-cacher-ng )
-
-acct-user_add_deps
diff --git a/acct-user/argus/argus-0-r1.ebuild b/acct-user/argus/argus-0-r1.ebuild
new file mode 100644
index 000000000000..52b0c4b0a391
--- /dev/null
+++ b/acct-user/argus/argus-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/argus"
+ACCT_USER_ID=383
+ACCT_USER_HOME=/var/lib/argus
+ACCT_USER_GROUPS=( argus )
+
+acct-user_add_deps
diff --git a/acct-user/argus/argus-0.ebuild b/acct-user/argus/argus-0.ebuild
deleted file mode 100644
index dc0f6e2dffb1..000000000000
--- a/acct-user/argus/argus-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/argus"
-ACCT_USER_ID=383
-ACCT_USER_HOME=/var/lib/argus
-ACCT_USER_GROUPS=( argus )
-
-acct-user_add_deps
diff --git a/acct-user/arpwatch/arpwatch-0-r1.ebuild b/acct-user/arpwatch/arpwatch-0-r1.ebuild
new file mode 100644
index 000000000000..e85389c061ea
--- /dev/null
+++ b/acct-user/arpwatch/arpwatch-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/arpwatch"
+
+ACCT_USER_GROUPS=( "arpwatch" )
+ACCT_USER_ID="170"
+
+acct-user_add_deps
diff --git a/acct-user/arpwatch/arpwatch-0.ebuild b/acct-user/arpwatch/arpwatch-0.ebuild
deleted file mode 100644
index 24f4e8b490e2..000000000000
--- a/acct-user/arpwatch/arpwatch-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/arpwatch"
-
-ACCT_USER_GROUPS=( "arpwatch" )
-ACCT_USER_ID="170"
-
-acct-user_add_deps
diff --git a/acct-user/artifactory/artifactory-0.ebuild b/acct-user/artifactory/artifactory-0.ebuild
deleted file mode 100644
index f1132d14b63c..000000000000
--- a/acct-user/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-util/artifactory-bin"
-
-ACCT_USER_GROUPS=( "artifactory" )
-ACCT_USER_ID="264"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/artifactory/metadata.xml b/acct-user/artifactory/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-user/artifactory/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/aspnet/aspnet-0-r1.ebuild b/acct-user/aspnet/aspnet-0-r1.ebuild
new file mode 100644
index 000000000000..051c267d59f8
--- /dev/null
+++ b/acct-user/aspnet/aspnet-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the www-servers/xsp dotnet server"
+
+ACCT_USER_ID=216
+ACCT_USER_GROUPS=( aspnet )
+
+acct-user_add_deps
diff --git a/acct-user/aspnet/aspnet-0.ebuild b/acct-user/aspnet/aspnet-0.ebuild
deleted file mode 100644
index 8dec86be7001..000000000000
--- a/acct-user/aspnet/aspnet-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the www-servers/xsp dotnet server"
-
-ACCT_USER_ID=216
-ACCT_USER_GROUPS=( aspnet )
-
-acct-user_add_deps
diff --git a/acct-user/asterisk/asterisk-0-r1.ebuild b/acct-user/asterisk/asterisk-0-r1.ebuild
deleted file mode 100644
index 30e23737ef8f..000000000000
--- a/acct-user/asterisk/asterisk-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for asterisk"
-ACCT_USER_ID=242
-ACCT_USER_GROUPS=( asterisk dialout )
-
-acct-user_add_deps
diff --git a/acct-user/asterisk/asterisk-0-r2.ebuild b/acct-user/asterisk/asterisk-0-r2.ebuild
new file mode 100644
index 000000000000..03d2d8b69fe0
--- /dev/null
+++ b/acct-user/asterisk/asterisk-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for asterisk"
+ACCT_USER_ID=242
+ACCT_USER_GROUPS=( asterisk dialout )
+
+acct-user_add_deps
diff --git a/acct-user/at/at-0-r1.ebuild b/acct-user/at/at-0-r1.ebuild
new file mode 100644
index 000000000000..4ab9f746daa6
--- /dev/null
+++ b/acct-user/at/at-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for at daemon"
+ACCT_USER_ID=246
+ACCT_USER_GROUPS=( at )
+
+acct-user_add_deps
diff --git a/acct-user/at/at-0.ebuild b/acct-user/at/at-0.ebuild
deleted file mode 100644
index 74ef92246e38..000000000000
--- a/acct-user/at/at-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for at daemon"
-ACCT_USER_ID=246
-ACCT_USER_GROUPS=( at )
-
-acct-user_add_deps
diff --git a/acct-user/atheme-services/atheme-services-0-r1.ebuild b/acct-user/atheme-services/atheme-services-0-r1.ebuild
deleted file mode 100644
index ada83054fdae..000000000000
--- a/acct-user/atheme-services/atheme-services-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Atheme IRC services"
-ACCT_USER_ID=412
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/atheme-services/atheme-services-0-r2.ebuild b/acct-user/atheme-services/atheme-services-0-r2.ebuild
new file mode 100644
index 000000000000..ced19e695ddd
--- /dev/null
+++ b/acct-user/atheme-services/atheme-services-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Atheme IRC services"
+ACCT_USER_ID=412
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/automatic/automatic-0.ebuild b/acct-user/automatic/automatic-0-r1.ebuild
index 8972c4583c61..8972c4583c61 100644
--- a/acct-user/automatic/automatic-0.ebuild
+++ b/acct-user/automatic/automatic-0-r1.ebuild
diff --git a/acct-user/automx2/automx2-0-r1.ebuild b/acct-user/automx2/automx2-0-r1.ebuild
deleted file mode 100644
index c4effe2e71e2..000000000000
--- a/acct-user/automx2/automx2-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/automx2"
-
-ACCT_USER_ID=437
-ACCT_USER_GROUPS=( automx2 )
-ACCT_USER_HOME="/var/lib/automx2"
-
-acct-user_add_deps
diff --git a/acct-user/automx2/automx2-0-r2.ebuild b/acct-user/automx2/automx2-0-r2.ebuild
new file mode 100644
index 000000000000..c35accc7997d
--- /dev/null
+++ b/acct-user/automx2/automx2-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/automx2"
+
+ACCT_USER_ID=437
+ACCT_USER_GROUPS=( automx2 )
+ACCT_USER_HOME="/var/lib/automx2"
+
+acct-user_add_deps
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild
deleted file mode 100644
index e932d8b44c26..000000000000
--- a/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for avahi-autoipd"
-ACCT_USER_ID=62
-ACCT_USER_GROUPS=( avahi-autoipd )
-
-acct-user_add_deps
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
new file mode 100644
index 000000000000..871a5fe4d3c5
--- /dev/null
+++ b/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi-autoipd"
+ACCT_USER_ID=62
+ACCT_USER_GROUPS=( avahi-autoipd )
+
+acct-user_add_deps
diff --git a/acct-user/avahi/avahi-0-r1.ebuild b/acct-user/avahi/avahi-0-r1.ebuild
deleted file mode 100644
index 60dcf3053d7c..000000000000
--- a/acct-user/avahi/avahi-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for avahi"
-ACCT_USER_ID=61
-ACCT_USER_GROUPS=( avahi )
-
-acct-user_add_deps
diff --git a/acct-user/avahi/avahi-0-r2.ebuild b/acct-user/avahi/avahi-0-r2.ebuild
new file mode 100644
index 000000000000..0db7ea604121
--- /dev/null
+++ b/acct-user/avahi/avahi-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi"
+ACCT_USER_ID=61
+ACCT_USER_GROUPS=( avahi )
+
+acct-user_add_deps
diff --git a/acct-user/axtls/axtls-0-r1.ebuild b/acct-user/axtls/axtls-0-r1.ebuild
new file mode 100644
index 000000000000..9dc12cc02cf7
--- /dev/null
+++ b/acct-user/axtls/axtls-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-libs/axtls"
+
+ACCT_USER_GROUPS=( "axtls" )
+ACCT_USER_ID="147"
+
+acct-user_add_deps
diff --git a/acct-user/axtls/axtls-0.ebuild b/acct-user/axtls/axtls-0.ebuild
deleted file mode 100644
index b85720579f78..000000000000
--- a/acct-user/axtls/axtls-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-libs/axtls"
-
-ACCT_USER_GROUPS=( "axtls" )
-ACCT_USER_ID="147"
-
-acct-user_add_deps
diff --git a/acct-user/backuppc/backuppc-0-r1.ebuild b/acct-user/backuppc/backuppc-0-r1.ebuild
new file mode 100644
index 000000000000..f5b1713025df
--- /dev/null
+++ b/acct-user/backuppc/backuppc-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-backup/backuppc"
+
+ACCT_USER_GROUPS=( "backuppc" )
+ACCT_USER_HOME="/var/lib/backuppc"
+ACCT_USER_ID="282"
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/backuppc/backuppc-0.ebuild b/acct-user/backuppc/backuppc-0.ebuild
deleted file mode 100644
index 3b5a50c9c7a9..000000000000
--- a/acct-user/backuppc/backuppc-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-backup/backuppc"
-
-ACCT_USER_GROUPS=( "backuppc" )
-ACCT_USER_HOME="/var/lib/backuppc"
-ACCT_USER_ID="282"
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/bacula/bacula-0-r1.ebuild b/acct-user/bacula/bacula-0-r1.ebuild
deleted file mode 100644
index 4c2114bfcaf0..000000000000
--- a/acct-user/bacula/bacula-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A group for the bacula backup system"
-ACCT_USER_ID=273
-ACCT_USER_HOME=/var/lib/bacula
-ACCT_USER_GROUPS=( bacula disk tape cdrom )
-
-acct-user_add_deps
diff --git a/acct-user/bacula/bacula-0-r2.ebuild b/acct-user/bacula/bacula-0-r2.ebuild
new file mode 100644
index 000000000000..4158074868d5
--- /dev/null
+++ b/acct-user/bacula/bacula-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A group for the bacula backup system"
+ACCT_USER_ID=273
+ACCT_USER_HOME=/var/lib/bacula
+ACCT_USER_GROUPS=( bacula disk tape cdrom )
+
+acct-user_add_deps
diff --git a/acct-user/bareos/bareos-0-r1.ebuild b/acct-user/bareos/bareos-0-r1.ebuild
deleted file mode 100644
index a382943a3403..000000000000
--- a/acct-user/bareos/bareos-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the bareos network backup suite"
-ACCT_USER_ID=403
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_GROUPS=( ${PN} disk tape cdrom )
-
-acct-user_add_deps
diff --git a/acct-user/bareos/bareos-0-r2.ebuild b/acct-user/bareos/bareos-0-r2.ebuild
new file mode 100644
index 000000000000..d466e8c22273
--- /dev/null
+++ b/acct-user/bareos/bareos-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the bareos network backup suite"
+ACCT_USER_ID=403
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_GROUPS=( ${PN} disk tape cdrom )
+
+acct-user_add_deps
diff --git a/acct-user/beanstalk/beanstalk-0-r1.ebuild b/acct-user/beanstalk/beanstalk-0-r1.ebuild
new file mode 100644
index 000000000000..9aa2f7e50a26
--- /dev/null
+++ b/acct-user/beanstalk/beanstalk-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/beanstalkd"
+
+ACCT_USER_GROUPS=( "beanstalk" )
+ACCT_USER_HOME="/var/lib/beanstalkd"
+ACCT_USER_ID="137"
+
+acct-user_add_deps
diff --git a/acct-user/beanstalk/beanstalk-0.ebuild b/acct-user/beanstalk/beanstalk-0.ebuild
deleted file mode 100644
index a17083ef609d..000000000000
--- a/acct-user/beanstalk/beanstalk-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/beanstalkd"
-
-ACCT_USER_GROUPS=( "beanstalk" )
-ACCT_USER_HOME="/var/lib/beanstalkd"
-ACCT_USER_ID="137"
-
-acct-user_add_deps
diff --git a/acct-user/bedrock/bedrock-0-r1.ebuild b/acct-user/bedrock/bedrock-0-r1.ebuild
deleted file mode 100644
index 454126f27b07..000000000000
--- a/acct-user/bedrock/bedrock-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minecraft Bedrock server"
-
-ACCT_USER_GROUPS=( "bedrock" )
-ACCT_USER_ID="485"
-
-acct-user_add_deps
diff --git a/acct-user/bedrock/bedrock-0-r2.ebuild b/acct-user/bedrock/bedrock-0-r2.ebuild
new file mode 100644
index 000000000000..a96d60d2e1d0
--- /dev/null
+++ b/acct-user/bedrock/bedrock-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft Bedrock server"
+
+ACCT_USER_GROUPS=( "bedrock" )
+ACCT_USER_ID="485"
+
+acct-user_add_deps
diff --git a/acct-user/biboumi/biboumi-0-r1.ebuild b/acct-user/biboumi/biboumi-0-r1.ebuild
new file mode 100644
index 000000000000..3d9df0b62339
--- /dev/null
+++ b/acct-user/biboumi/biboumi-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/biboumi"
+ACCT_USER_ID=508
+ACCT_USER_GROUPS=( biboumi )
+
+acct-user_add_deps
diff --git a/acct-user/biboumi/biboumi-0.ebuild b/acct-user/biboumi/biboumi-0.ebuild
deleted file mode 100644
index 8cd114a9a893..000000000000
--- a/acct-user/biboumi/biboumi-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/biboumi"
-ACCT_USER_ID=508
-ACCT_USER_GROUPS=( biboumi )
-
-acct-user_add_deps
diff --git a/acct-user/bind_exporter/bind_exporter-0-r1.ebuild b/acct-user/bind_exporter/bind_exporter-0-r1.ebuild
deleted file mode 100644
index c1e86aa002ff..000000000000
--- a/acct-user/bind_exporter/bind_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for bind_exporter"
-ACCT_USER_ID=276
-ACCT_USER_GROUPS=( bind_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/bind_exporter/bind_exporter-0-r2.ebuild b/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..bfb761c4b06a
--- /dev/null
+++ b/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for bind_exporter"
+ACCT_USER_ID=276
+ACCT_USER_GROUPS=( bind_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/bird/bird-0-r1.ebuild b/acct-user/bird/bird-0-r1.ebuild
new file mode 100644
index 000000000000..fd0539f6f221
--- /dev/null
+++ b/acct-user/bird/bird-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for BIRD"
+# TCP port 179, but 179 is already used by acct-group/_bgpd
+ACCT_USER_ID=180
+ACCT_USER_GROUPS=( bird )
+
+acct-user_add_deps
diff --git a/acct-user/bird/bird-0.ebuild b/acct-user/bird/bird-0.ebuild
deleted file mode 100644
index 177b8ca80b68..000000000000
--- a/acct-user/bird/bird-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for BIRD"
-# TCP port 179, but 179 is already used by acct-group/_bgpd
-ACCT_USER_ID=180
-ACCT_USER_GROUPS=( bird )
-
-acct-user_add_deps
diff --git a/acct-user/bitcoin/bitcoin-0-r1.ebuild b/acct-user/bitcoin/bitcoin-0-r1.ebuild
deleted file mode 100644
index 1a0d89f8c698..000000000000
--- a/acct-user/bitcoin/bitcoin-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="System-wide Bitcoin services user"
-ACCT_USER_ID=483
-ACCT_USER_GROUPS=( bitcoin )
-
-acct-user_add_deps
diff --git a/acct-user/bitcoin/bitcoin-0-r2.ebuild b/acct-user/bitcoin/bitcoin-0-r2.ebuild
new file mode 100644
index 000000000000..b19975c4a120
--- /dev/null
+++ b/acct-user/bitcoin/bitcoin-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="System-wide Bitcoin services user"
+ACCT_USER_ID=483
+ACCT_USER_GROUPS=( bitcoin )
+
+acct-user_add_deps
diff --git a/acct-user/bitflu/bitflu-0-r1.ebuild b/acct-user/bitflu/bitflu-0-r1.ebuild
new file mode 100644
index 000000000000..239af8cbb540
--- /dev/null
+++ b/acct-user/bitflu/bitflu-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-p2p/bitflu"
+
+ACCT_USER_GROUPS=( "bitflu" )
+ACCT_USER_HOME="/var/lib/bitflu"
+ACCT_USER_ID="148"
+
+acct-user_add_deps
diff --git a/acct-user/bitflu/bitflu-0.ebuild b/acct-user/bitflu/bitflu-0.ebuild
deleted file mode 100644
index 11ea87038ad9..000000000000
--- a/acct-user/bitflu/bitflu-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-p2p/bitflu"
-
-ACCT_USER_GROUPS=( "bitflu" )
-ACCT_USER_HOME="/var/lib/bitflu"
-ACCT_USER_ID="148"
-
-acct-user_add_deps
diff --git a/acct-user/bitlbee/bitlbee-0-r1.ebuild b/acct-user/bitlbee/bitlbee-0-r1.ebuild
deleted file mode 100644
index 31daee37ce52..000000000000
--- a/acct-user/bitlbee/bitlbee-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for biltbee"
-ACCT_USER_ID=407
-ACCT_USER_GROUPS=( bitlbee )
-
-acct-user_add_deps
diff --git a/acct-user/bitlbee/bitlbee-0-r2.ebuild b/acct-user/bitlbee/bitlbee-0-r2.ebuild
new file mode 100644
index 000000000000..7a1497cec9eb
--- /dev/null
+++ b/acct-user/bitlbee/bitlbee-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for biltbee"
+ACCT_USER_ID=407
+ACCT_USER_GROUPS=( bitlbee )
+
+acct-user_add_deps
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..c4ac2c198c67
--- /dev/null
+++ b/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for blackbox_exporter"
+ACCT_USER_ID=293
+ACCT_USER_GROUPS=( blackbox_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild
deleted file mode 100644
index ca262a5dade3..000000000000
--- a/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for blackbox_exporter"
-ACCT_USER_ID=293
-ACCT_USER_GROUPS=( blackbox_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/boinc/boinc-0-r1.ebuild b/acct-user/boinc/boinc-0-r1.ebuild
new file mode 100644
index 000000000000..5ed25f7d5ffd
--- /dev/null
+++ b/acct-user/boinc/boinc-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for sci-misc/boinc"
+ACCT_USER_ID=352
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( boinc video )
+
+acct-user_add_deps
diff --git a/acct-user/boinc/boinc-0.ebuild b/acct-user/boinc/boinc-0.ebuild
deleted file mode 100644
index c96379bc4fbf..000000000000
--- a/acct-user/boinc/boinc-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for sci-misc/boinc"
-ACCT_USER_ID=352
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( boinc video )
-
-acct-user_add_deps
diff --git a/acct-user/brltty/brltty-0-r1.ebuild b/acct-user/brltty/brltty-0-r1.ebuild
new file mode 100644
index 000000000000..5ec59c18540d
--- /dev/null
+++ b/acct-user/brltty/brltty-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for brltty"
+ACCT_USER_ID=506
+ACCT_USER_HOME=/var/lib/brltty
+ACCT_USER_GROUPS=( brltty audio brlapi dialout input pulse-access root tty )
+
+acct-user_add_deps
diff --git a/acct-user/brltty/brltty-0.ebuild b/acct-user/brltty/brltty-0.ebuild
deleted file mode 100644
index 69bff2c3c0ee..000000000000
--- a/acct-user/brltty/brltty-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for brltty"
-ACCT_USER_ID=506
-ACCT_USER_HOME=/var/lib/brltty
-ACCT_USER_GROUPS=( brltty audio brlapi dialout input pulse-access root tty )
-
-acct-user_add_deps
diff --git a/acct-user/buildbot/buildbot-0-r1.ebuild b/acct-user/buildbot/buildbot-0-r1.ebuild
deleted file mode 100644
index f0570fc26f0b..000000000000
--- a/acct-user/buildbot/buildbot-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Buildbot program user"
-ACCT_USER_ID=393
-ACCT_USER_GROUPS=( buildbot )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/buildbot/buildbot-0-r2.ebuild b/acct-user/buildbot/buildbot-0-r2.ebuild
new file mode 100644
index 000000000000..3ecc7b0a3f19
--- /dev/null
+++ b/acct-user/buildbot/buildbot-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Buildbot program user"
+ACCT_USER_ID=393
+ACCT_USER_GROUPS=( buildbot )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/burp/burp-0-r1.ebuild b/acct-user/burp/burp-0-r1.ebuild
deleted file mode 100644
index 646ad79a442c..000000000000
--- a/acct-user/burp/burp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the app-backup/burp server"
-ACCT_USER_ID=498
-ACCT_USER_GROUPS=( burp )
-
-acct-user_add_deps
diff --git a/acct-user/burp/burp-0-r2.ebuild b/acct-user/burp/burp-0-r2.ebuild
new file mode 100644
index 000000000000..e39e2f77d21a
--- /dev/null
+++ b/acct-user/burp/burp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the app-backup/burp server"
+ACCT_USER_ID=498
+ACCT_USER_GROUPS=( burp )
+
+acct-user_add_deps
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
deleted file mode 100644
index 2985c39db4ca..000000000000
--- a/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/burrow_exporter"
-
-ACCT_USER_ID=502
-ACCT_USER_GROUPS=( burrow_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ef0c97a228f5
--- /dev/null
+++ b/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/burrow_exporter"
+
+ACCT_USER_ID=502
+ACCT_USER_GROUPS=( burrow_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/cadvisor/cadvisor-0-r1.ebuild b/acct-user/cadvisor/cadvisor-0-r1.ebuild
deleted file mode 100644
index a464a6029a1c..000000000000
--- a/acct-user/cadvisor/cadvisor-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for cadvisor"
-ACCT_USER_ID=427
-ACCT_USER_GROUPS=( cadvisor )
-
-acct-user_add_deps
diff --git a/acct-user/cadvisor/cadvisor-0-r2.ebuild b/acct-user/cadvisor/cadvisor-0-r2.ebuild
new file mode 100644
index 000000000000..e4fbf56e0e6c
--- /dev/null
+++ b/acct-user/cadvisor/cadvisor-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for cadvisor"
+ACCT_USER_ID=427
+ACCT_USER_GROUPS=( cadvisor )
+
+acct-user_add_deps
diff --git a/acct-user/cancd/cancd-0-r1.ebuild b/acct-user/cancd/cancd-0-r1.ebuild
deleted file mode 100644
index 41284202bbcb..000000000000
--- a/acct-user/cancd/cancd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the CA NetConsole Daemon"
-
-ACCT_USER_GROUPS=( "cancd" )
-ACCT_USER_ID="213"
-
-acct-user_add_deps
diff --git a/acct-user/cancd/cancd-0-r2.ebuild b/acct-user/cancd/cancd-0-r2.ebuild
new file mode 100644
index 000000000000..d5f370bd4a36
--- /dev/null
+++ b/acct-user/cancd/cancd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the CA NetConsole Daemon"
+
+ACCT_USER_GROUPS=( "cancd" )
+ACCT_USER_ID="213"
+
+acct-user_add_deps
diff --git a/acct-user/carbon/carbon-0-r1.ebuild b/acct-user/carbon/carbon-0-r1.ebuild
deleted file mode 100644
index ba8999d6020d..000000000000
--- a/acct-user/carbon/carbon-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for graphite/carbon suite"
-ACCT_USER_ID=230
-ACCT_USER_GROUPS=( carbon )
-
-acct-user_add_deps
diff --git a/acct-user/carbon/carbon-0-r2.ebuild b/acct-user/carbon/carbon-0-r2.ebuild
new file mode 100644
index 000000000000..c7145d21b9ab
--- /dev/null
+++ b/acct-user/carbon/carbon-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for graphite/carbon suite"
+ACCT_USER_ID=230
+ACCT_USER_GROUPS=( carbon )
+
+acct-user_add_deps
diff --git a/acct-user/ceph/ceph-0-r1.ebuild b/acct-user/ceph/ceph-0-r2.ebuild
index 56098366e894..56098366e894 100644
--- a/acct-user/ceph/ceph-0-r1.ebuild
+++ b/acct-user/ceph/ceph-0-r2.ebuild
diff --git a/acct-user/cgit/cgit-0-r1.ebuild b/acct-user/cgit/cgit-0-r1.ebuild
new file mode 100644
index 000000000000..24d621614f49
--- /dev/null
+++ b/acct-user/cgit/cgit-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="a fast web-interface for git repositories"
+
+ACCT_USER_ID=197
+ACCT_USER_GROUPS=( cgit )
+
+acct-user_add_deps
diff --git a/acct-user/cgit/cgit-0.ebuild b/acct-user/cgit/cgit-0.ebuild
deleted file mode 100644
index 5f8c9f85490a..000000000000
--- a/acct-user/cgit/cgit-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="a fast web-interface for git repositories"
-
-ACCT_USER_ID=197
-ACCT_USER_GROUPS=( cgit )
-
-acct-user_add_deps
diff --git a/acct-user/chronograf/chronograf-0-r1.ebuild b/acct-user/chronograf/chronograf-0-r1.ebuild
deleted file mode 100644
index b441506a5d5a..000000000000
--- a/acct-user/chronograf/chronograf-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for chronograf"
-ACCT_USER_ID=344
-ACCT_USER_GROUPS=( chronograf )
-ACCT_USER_HOME=/var/lib/chronograf
-
-acct-user_add_deps
diff --git a/acct-user/chronograf/chronograf-0-r2.ebuild b/acct-user/chronograf/chronograf-0-r2.ebuild
new file mode 100644
index 000000000000..825dece24629
--- /dev/null
+++ b/acct-user/chronograf/chronograf-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for chronograf"
+ACCT_USER_ID=344
+ACCT_USER_GROUPS=( chronograf )
+ACCT_USER_HOME=/var/lib/chronograf
+
+acct-user_add_deps
diff --git a/acct-user/cinder/cinder-0-r1.ebuild b/acct-user/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index 3576a06cec02..000000000000
--- a/acct-user/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack cinder service"
-ACCT_USER_ID=442
-ACCT_USER_HOME=/var/lib/cinder
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( cinder )
-
-acct-user_add_deps
diff --git a/acct-user/cinder/metadata.xml b/acct-user/cinder/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-user/cinder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/clair/clair-0-r1.ebuild b/acct-user/clair/clair-0-r1.ebuild
deleted file mode 100644
index c8af2edf912f..000000000000
--- a/acct-user/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for clair"
-ACCT_USER_ID=307
-ACCT_USER_GROUPS=( clair )
-
-acct-user_add_deps
diff --git a/acct-user/clair/clair-0-r2.ebuild b/acct-user/clair/clair-0-r2.ebuild
new file mode 100644
index 000000000000..20127fc6d174
--- /dev/null
+++ b/acct-user/clair/clair-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for clair"
+ACCT_USER_ID=307
+ACCT_USER_GROUPS=( clair )
+
+acct-user_add_deps
diff --git a/acct-user/clamav/clamav-0-r1.ebuild b/acct-user/clamav/clamav-0-r1.ebuild
deleted file mode 100644
index 98649dc699aa..000000000000
--- a/acct-user/clamav/clamav-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=435
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/clamav/clamav-0-r2.ebuild b/acct-user/clamav/clamav-0-r2.ebuild
new file mode 100644
index 000000000000..957eecb6b483
--- /dev/null
+++ b/acct-user/clamav/clamav-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=435
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/cntlm/cntlm-0-r1.ebuild b/acct-user/cntlm/cntlm-0-r1.ebuild
new file mode 100644
index 000000000000..938462f1b567
--- /dev/null
+++ b/acct-user/cntlm/cntlm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/cntlm"
+
+ACCT_USER_GROUPS=( "cntlm" )
+ACCT_USER_ID="255"
+
+acct-user_add_deps
diff --git a/acct-user/cntlm/cntlm-0.ebuild b/acct-user/cntlm/cntlm-0.ebuild
deleted file mode 100644
index 03ab9195b999..000000000000
--- a/acct-user/cntlm/cntlm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/cntlm"
-
-ACCT_USER_GROUPS=( "cntlm" )
-ACCT_USER_ID="255"
-
-acct-user_add_deps
diff --git a/acct-user/cockroach/cockroach-0-r1.ebuild b/acct-user/cockroach/cockroach-0-r1.ebuild
new file mode 100644
index 000000000000..5be8db3263c9
--- /dev/null
+++ b/acct-user/cockroach/cockroach-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/cockroach"
+
+ACCT_USER_ID=110
+ACCT_USER_GROUPS=( cockroach )
+ACCT_USER_HOME=/var/lib/cockroach
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/cockroach/cockroach-0.ebuild b/acct-user/cockroach/cockroach-0.ebuild
deleted file mode 100644
index 404244332221..000000000000
--- a/acct-user/cockroach/cockroach-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/cockroach"
-
-ACCT_USER_ID=110
-ACCT_USER_GROUPS=( cockroach )
-ACCT_USER_HOME=/var/lib/cockroach
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/collectd/collectd-0-r1.ebuild b/acct-user/collectd/collectd-0-r1.ebuild
new file mode 100644
index 000000000000..8ca7b28f5fa9
--- /dev/null
+++ b/acct-user/collectd/collectd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="collectd program user"
+
+ACCT_USER_ID=440
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/collectd/collectd-0.ebuild b/acct-user/collectd/collectd-0.ebuild
deleted file mode 100644
index f1af4a6b69b1..000000000000
--- a/acct-user/collectd/collectd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="collectd program user"
-
-ACCT_USER_ID=440
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/colord/colord-0-r1.ebuild b/acct-user/colord/colord-0-r1.ebuild
new file mode 100644
index 000000000000..7ad884c93ae1
--- /dev/null
+++ b/acct-user/colord/colord-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the colord service"
+ACCT_USER_ID=350
+ACCT_USER_GROUPS=( colord )
+ACCT_USER_HOME=/var/lib/colord
+
+acct-user_add_deps
diff --git a/acct-user/colord/colord-0.ebuild b/acct-user/colord/colord-0.ebuild
deleted file mode 100644
index e5387b5b0f7a..000000000000
--- a/acct-user/colord/colord-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the colord service"
-ACCT_USER_ID=350
-ACCT_USER_GROUPS=( colord )
-ACCT_USER_HOME=/var/lib/colord
-
-acct-user_add_deps
diff --git a/acct-user/consul-template/consul-template-0-r1.ebuild b/acct-user/consul-template/consul-template-0-r1.ebuild
deleted file mode 100644
index 9976bf6fafda..000000000000
--- a/acct-user/consul-template/consul-template-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for consul-template"
-ACCT_USER_ID=408
-ACCT_USER_GROUPS=( consul-template )
-
-acct-user_add_deps
diff --git a/acct-user/consul-template/consul-template-0-r2.ebuild b/acct-user/consul-template/consul-template-0-r2.ebuild
new file mode 100644
index 000000000000..52a1fcfde90a
--- /dev/null
+++ b/acct-user/consul-template/consul-template-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for consul-template"
+ACCT_USER_ID=408
+ACCT_USER_GROUPS=( consul-template )
+
+acct-user_add_deps
diff --git a/acct-user/consul/consul-0-r1.ebuild b/acct-user/consul/consul-0-r1.ebuild
deleted file mode 100644
index 49c0d5a31b06..000000000000
--- a/acct-user/consul/consul-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for consul"
-ACCT_USER_HOME=/var/lib/consul
-ACCT_USER_ID=411
-ACCT_USER_GROUPS=( consul )
-
-acct-user_add_deps
diff --git a/acct-user/consul/consul-0-r2.ebuild b/acct-user/consul/consul-0-r2.ebuild
new file mode 100644
index 000000000000..8cf68af0bd7c
--- /dev/null
+++ b/acct-user/consul/consul-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for consul"
+ACCT_USER_HOME=/var/lib/consul
+ACCT_USER_ID=411
+ACCT_USER_GROUPS=( consul )
+
+acct-user_add_deps
diff --git a/acct-user/consul_exporter/consul_exporter-0-r1.ebuild b/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..90b769bcce2f
--- /dev/null
+++ b/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for consul_exporter"
+ACCT_USER_ID=278
+ACCT_USER_GROUPS=( consul_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/consul_exporter/consul_exporter-0.ebuild b/acct-user/consul_exporter/consul_exporter-0.ebuild
deleted file mode 100644
index 2ea0df3bb057..000000000000
--- a/acct-user/consul_exporter/consul_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for consul_exporter"
-ACCT_USER_ID=278
-ACCT_USER_GROUPS=( consul_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/coredns/coredns-0-r1.ebuild b/acct-user/coredns/coredns-0-r1.ebuild
new file mode 100644
index 000000000000..49377d1566d4
--- /dev/null
+++ b/acct-user/coredns/coredns-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/coredns"
+
+ACCT_USER_HOME=/var/lib/coredns
+ACCT_USER_GROUPS=( "coredns" )
+ACCT_USER_ID="312"
+
+acct-user_add_deps
diff --git a/acct-user/coredns/coredns-0.ebuild b/acct-user/coredns/coredns-0.ebuild
deleted file mode 100644
index 2811839307e2..000000000000
--- a/acct-user/coredns/coredns-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/coredns"
-
-ACCT_USER_HOME=/var/lib/coredns
-ACCT_USER_GROUPS=( "coredns" )
-ACCT_USER_ID="312"
-
-acct-user_add_deps
diff --git a/acct-user/croc/croc-0-r1.ebuild b/acct-user/croc/croc-0-r1.ebuild
new file mode 100644
index 000000000000..ec221b097a29
--- /dev/null
+++ b/acct-user/croc/croc-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/croc"
+ACCT_USER_ID=310
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/croc/croc-0.ebuild b/acct-user/croc/croc-0.ebuild
deleted file mode 100644
index 84f75f78aac4..000000000000
--- a/acct-user/croc/croc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/croc"
-ACCT_USER_ID=310
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/croc/metadata.xml b/acct-user/croc/metadata.xml
index 866d79c79519..115e9d64a669 100644
--- a/acct-user/croc/metadata.xml
+++ b/acct-user/croc/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>sultan@gentoo.org</email>
- <name>Stephan Hartmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/cron/cron-0-r2.ebuild b/acct-user/cron/cron-0-r2.ebuild
new file mode 100644
index 000000000000..882965270c4e
--- /dev/null
+++ b/acct-user/cron/cron-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/cronbase"
+
+ACCT_USER_GROUPS=( "cron" )
+ACCT_USER_HOME="/var/spool/cron"
+ACCT_USER_ID="16"
+ACCT_USER_HOME_OWNER="root:cron"
+ACCT_USER_HOME_PERMS="0750"
+
+acct-user_add_deps
diff --git a/acct-user/cron/cron-0.ebuild b/acct-user/cron/cron-0.ebuild
deleted file mode 100644
index 7ec64484762e..000000000000
--- a/acct-user/cron/cron-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/cronbase"
-
-ACCT_USER_GROUPS=( "cron" )
-ACCT_USER_HOME="/var/spool/cron"
-ACCT_USER_ID="16"
-
-acct-user_add_deps
diff --git a/acct-user/cron/metadata.xml b/acct-user/cron/metadata.xml
index 115e9d64a669..65e1fc82d859 100644
--- a/acct-user/cron/metadata.xml
+++ b/acct-user/cron/metadata.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-user/cvmfs/cvmfs-0-r1.ebuild b/acct-user/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 9296d50fb9c1..000000000000
--- a/acct-user/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the CernVM-FS network file system"
-ACCT_USER_ID=268
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/cvmfs/cvmfs-0-r2.ebuild b/acct-user/cvmfs/cvmfs-0-r2.ebuild
new file mode 100644
index 000000000000..aa027b43a791
--- /dev/null
+++ b/acct-user/cvmfs/cvmfs-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the CernVM-FS network file system"
+ACCT_USER_ID=268
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/cyrus/cyrus-0-r2.ebuild b/acct-user/cyrus/cyrus-0-r2.ebuild
deleted file mode 100644
index 7c200b7856e4..000000000000
--- a/acct-user/cyrus/cyrus-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for cyrus-imapd daemon"
-ACCT_USER_ID=415
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/cyrus/cyrus-0-r3.ebuild b/acct-user/cyrus/cyrus-0-r3.ebuild
new file mode 100644
index 000000000000..44c206ccbbc0
--- /dev/null
+++ b/acct-user/cyrus/cyrus-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for cyrus-imapd daemon"
+ACCT_USER_ID=415
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/darkstat/darkstat-0-r1.ebuild b/acct-user/darkstat/darkstat-0-r1.ebuild
new file mode 100644
index 000000000000..27c0e44a253f
--- /dev/null
+++ b/acct-user/darkstat/darkstat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/darkstat"
+ACCT_USER_ID=380
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/darkstat/darkstat-0.ebuild b/acct-user/darkstat/darkstat-0.ebuild
deleted file mode 100644
index f4dfa5bc3f6e..000000000000
--- a/acct-user/darkstat/darkstat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/darkstat"
-ACCT_USER_ID=380
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/davfs2/davfs2-0-r1.ebuild b/acct-user/davfs2/davfs2-0-r1.ebuild
deleted file mode 100644
index fcc2e117501e..000000000000
--- a/acct-user/davfs2/davfs2-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=420
-ACCT_USER_GROUPS=( davfs2 )
-
-acct-user_add_deps
diff --git a/acct-user/davfs2/davfs2-0-r2.ebuild b/acct-user/davfs2/davfs2-0-r2.ebuild
new file mode 100644
index 000000000000..eb92b96293fa
--- /dev/null
+++ b/acct-user/davfs2/davfs2-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=420
+ACCT_USER_GROUPS=( davfs2 )
+
+acct-user_add_deps
diff --git a/acct-user/dbmail/dbmail-0-r1.ebuild b/acct-user/dbmail/dbmail-0-r1.ebuild
new file mode 100644
index 000000000000..ac0c219fdba1
--- /dev/null
+++ b/acct-user/dbmail/dbmail-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=365
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/dbmail/dbmail-0.ebuild b/acct-user/dbmail/dbmail-0.ebuild
deleted file mode 100644
index 273ecbb4ddce..000000000000
--- a/acct-user/dbmail/dbmail-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=365
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/dbskkd/dbskkd-0-r1.ebuild b/acct-user/dbskkd/dbskkd-0-r1.ebuild
new file mode 100644
index 000000000000..fe53f18a5880
--- /dev/null
+++ b/acct-user/dbskkd/dbskkd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-i18n/dbskkd-cdb"
+
+ACCT_USER_GROUPS=( "dbskkd" )
+ACCT_USER_ID="146"
+
+acct-user_add_deps
diff --git a/acct-user/dbskkd/dbskkd-0.ebuild b/acct-user/dbskkd/dbskkd-0.ebuild
deleted file mode 100644
index 07abb14a7d7e..000000000000
--- a/acct-user/dbskkd/dbskkd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-i18n/dbskkd-cdb"
-
-ACCT_USER_GROUPS=( "dbskkd" )
-ACCT_USER_ID="146"
-
-acct-user_add_deps
diff --git a/acct-user/ddclient/ddclient-0-r1.ebuild b/acct-user/ddclient/ddclient-0-r1.ebuild
deleted file mode 100644
index 60bac047e757..000000000000
--- a/acct-user/ddclient/ddclient-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the dynamic DNS client"
-
-ACCT_USER_GROUPS=( "ddclient" )
-ACCT_USER_ID="487"
-
-acct-user_add_deps
diff --git a/acct-user/ddclient/ddclient-0-r2.ebuild b/acct-user/ddclient/ddclient-0-r2.ebuild
new file mode 100644
index 000000000000..0ae2a8ad0574
--- /dev/null
+++ b/acct-user/ddclient/ddclient-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the dynamic DNS client"
+
+ACCT_USER_GROUPS=( "ddclient" )
+ACCT_USER_ID="487"
+
+acct-user_add_deps
diff --git a/acct-user/defang/defang-0-r1.ebuild b/acct-user/defang/defang-0-r1.ebuild
new file mode 100644
index 000000000000..168d014590de
--- /dev/null
+++ b/acct-user/defang/defang-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/mimedefang"
+
+ACCT_USER_GROUPS=( "defang" )
+ACCT_USER_ID="181"
+
+acct-user_add_deps
diff --git a/acct-user/defang/defang-0.ebuild b/acct-user/defang/defang-0.ebuild
deleted file mode 100644
index 295e77995907..000000000000
--- a/acct-user/defang/defang-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for mail-filter/mimedefang"
-
-ACCT_USER_GROUPS=( "defang" )
-ACCT_USER_ID="181"
-
-acct-user_add_deps
diff --git a/acct-user/dehydrated/dehydrated-0-r1.ebuild b/acct-user/dehydrated/dehydrated-0-r1.ebuild
new file mode 100644
index 000000000000..fa49bb0e2d49
--- /dev/null
+++ b/acct-user/dehydrated/dehydrated-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="dehydrated program user"
+
+ACCT_USER_ID=361
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+acct-user_add_deps
diff --git a/acct-user/dehydrated/dehydrated-0.ebuild b/acct-user/dehydrated/dehydrated-0.ebuild
deleted file mode 100644
index a6ec59958704..000000000000
--- a/acct-user/dehydrated/dehydrated-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="dehydrated program user"
-
-ACCT_USER_ID=361
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/lib/${PN}
-
-acct-user_add_deps
diff --git a/acct-user/deluge/deluge-0-r1.ebuild b/acct-user/deluge/deluge-0-r1.ebuild
deleted file mode 100644
index 90041a5c4ee5..000000000000
--- a/acct-user/deluge/deluge-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for deluge"
-ACCT_USER_ID=454
-ACCT_USER_GROUPS=( deluge )
-
-acct-user_add_deps
diff --git a/acct-user/deluge/deluge-0-r2.ebuild b/acct-user/deluge/deluge-0-r2.ebuild
new file mode 100644
index 000000000000..328da7731618
--- /dev/null
+++ b/acct-user/deluge/deluge-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for deluge"
+ACCT_USER_ID=454
+ACCT_USER_GROUPS=( deluge )
+ACCT_USER_HOME=/var/lib/deluge
+
+acct-user_add_deps
diff --git a/acct-user/dhcp/dhcp-0-r1.ebuild b/acct-user/dhcp/dhcp-0-r1.ebuild
deleted file mode 100644
index d27eca296a9d..000000000000
--- a/acct-user/dhcp/dhcp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dhcp daemon"
-ACCT_USER_ID=300
-ACCT_USER_GROUPS=( dhcp )
-
-acct-user_add_deps
diff --git a/acct-user/dhcp/dhcp-0-r2.ebuild b/acct-user/dhcp/dhcp-0-r2.ebuild
new file mode 100644
index 000000000000..c526b058b798
--- /dev/null
+++ b/acct-user/dhcp/dhcp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dhcp daemon"
+ACCT_USER_ID=300
+ACCT_USER_GROUPS=( dhcp )
+
+acct-user_add_deps
diff --git a/acct-user/dhcpcd/dhcpcd-0-r1.ebuild b/acct-user/dhcpcd/dhcpcd-0-r1.ebuild
deleted file mode 100644
index 6673dab0fffe..000000000000
--- a/acct-user/dhcpcd/dhcpcd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dhcpcd client"
-ACCT_USER_ID=303
-ACCT_USER_GROUPS=( dhcpcd )
-ACCT_USER_HOME="/var/chroot/dhcpcd"
-
-acct-user_add_deps
diff --git a/acct-user/dhcpcd/dhcpcd-0-r2.ebuild b/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
new file mode 100644
index 000000000000..b9d9b0944546
--- /dev/null
+++ b/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dhcpcd client"
+ACCT_USER_ID=303
+ACCT_USER_GROUPS=( dhcpcd )
+ACCT_USER_HOME="/var/chroot/dhcpcd"
+
+acct-user_add_deps
diff --git a/acct-user/dictd/dictd-0-r1.ebuild b/acct-user/dictd/dictd-0-r1.ebuild
new file mode 100644
index 000000000000..8b54a5ae197f
--- /dev/null
+++ b/acct-user/dictd/dictd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for app-text/dictd"
+ACCT_USER_ID=381
+ACCT_USER_GROUPS=( dictd )
+
+acct-user_add_deps
diff --git a/acct-user/dictd/dictd-0.ebuild b/acct-user/dictd/dictd-0.ebuild
deleted file mode 100644
index 1e32eaaad282..000000000000
--- a/acct-user/dictd/dictd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for app-text/dictd"
-ACCT_USER_ID=381
-ACCT_USER_GROUPS=( dictd )
-
-acct-user_add_deps
diff --git a/acct-user/dirsrv/dirsrv-0-r1.ebuild b/acct-user/dirsrv/dirsrv-0-r1.ebuild
new file mode 100644
index 000000000000..047daaddeedd
--- /dev/null
+++ b/acct-user/dirsrv/dirsrv-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-nds/389-ds-base"
+ACCT_USER_ID=346
+ACCT_USER_GROUPS=( dirsrv )
+
+acct-user_add_deps
diff --git a/acct-user/dirsrv/dirsrv-0.ebuild b/acct-user/dirsrv/dirsrv-0.ebuild
deleted file mode 100644
index 993383e06415..000000000000
--- a/acct-user/dirsrv/dirsrv-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-nds/389-ds-base"
-ACCT_USER_ID=346
-ACCT_USER_GROUPS=( dirsrv )
-
-acct-user_add_deps
diff --git a/acct-user/distcc/distcc-1-r1.ebuild b/acct-user/distcc/distcc-1-r1.ebuild
new file mode 100644
index 000000000000..47daaacfdefa
--- /dev/null
+++ b/acct-user/distcc/distcc-1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User used to run distcc daemon"
+ACCT_USER_ID=240
+ACCT_USER_GROUPS=( distcc )
+
+acct-user_add_deps
diff --git a/acct-user/distcc/distcc-1.ebuild b/acct-user/distcc/distcc-1.ebuild
deleted file mode 100644
index e04e0ea8603b..000000000000
--- a/acct-user/distcc/distcc-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User used to run distcc daemon"
-ACCT_USER_ID=240
-ACCT_USER_GROUPS=( distcc )
-
-acct-user_add_deps
diff --git a/acct-user/dnrd/dnrd-0-r1.ebuild b/acct-user/dnrd/dnrd-0-r1.ebuild
new file mode 100644
index 000000000000..3ec8bafd53e9
--- /dev/null
+++ b/acct-user/dnrd/dnrd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnrd"
+
+ACCT_USER_GROUPS=( "dnrd" )
+ACCT_USER_ID="262"
+
+acct-user_add_deps
diff --git a/acct-user/dnrd/dnrd-0.ebuild b/acct-user/dnrd/dnrd-0.ebuild
deleted file mode 100644
index ef1ebf9041e3..000000000000
--- a/acct-user/dnrd/dnrd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnrd"
-
-ACCT_USER_GROUPS=( "dnrd" )
-ACCT_USER_ID="262"
-
-acct-user_add_deps
diff --git a/acct-user/dnscache/dnscache-0-r1.ebuild b/acct-user/dnscache/dnscache-0-r1.ebuild
new file mode 100644
index 000000000000..c0b54fd7cad7
--- /dev/null
+++ b/acct-user/dnscache/dnscache-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=225
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/dnscache/dnscache-0.ebuild b/acct-user/dnscache/dnscache-0.ebuild
deleted file mode 100644
index e4716c571e77..000000000000
--- a/acct-user/dnscache/dnscache-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=225
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
deleted file mode 100644
index ef741ba82993..000000000000
--- a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnscrypt-proxy"
-ACCT_USER_ID=353
-ACCT_USER_GROUPS=( dnscrypt-proxy )
-
-acct-user_add_deps
diff --git a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..3075854092bd
--- /dev/null
+++ b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnscrypt-proxy"
+ACCT_USER_ID=353
+ACCT_USER_GROUPS=( dnscrypt-proxy )
+
+acct-user_add_deps
diff --git a/acct-user/dnsdist/dnsdist-0-r1.ebuild b/acct-user/dnsdist/dnsdist-0-r1.ebuild
deleted file mode 100644
index 64f3d8922ace..000000000000
--- a/acct-user/dnsdist/dnsdist-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/dnsdist"
-
-ACCT_USER_GROUPS=( "dnsdist" )
-ACCT_USER_ID="414"
-
-acct-user_add_deps
diff --git a/acct-user/dnsdist/dnsdist-0-r2.ebuild b/acct-user/dnsdist/dnsdist-0-r2.ebuild
new file mode 100644
index 000000000000..8b89e209e152
--- /dev/null
+++ b/acct-user/dnsdist/dnsdist-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/dnsdist"
+
+ACCT_USER_GROUPS=( "dnsdist" )
+ACCT_USER_ID="414"
+
+acct-user_add_deps
diff --git a/acct-user/dnslog/dnslog-0-r1.ebuild b/acct-user/dnslog/dnslog-0-r1.ebuild
new file mode 100644
index 000000000000..0c794b383e53
--- /dev/null
+++ b/acct-user/dnslog/dnslog-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=226
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/dnslog/dnslog-0.ebuild b/acct-user/dnslog/dnslog-0.ebuild
deleted file mode 100644
index b961aa923436..000000000000
--- a/acct-user/dnslog/dnslog-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=226
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq/dnsmasq-0-r1.ebuild b/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
deleted file mode 100644
index bf98c0fc929b..000000000000
--- a/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnsmasq"
-
-ACCT_USER_ID=275
-ACCT_USER_GROUPS=( dnsmasq )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq/dnsmasq-0-r2.ebuild b/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
new file mode 100644
index 000000000000..548af2c0d5a4
--- /dev/null
+++ b/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnsmasq"
+
+ACCT_USER_ID=275
+ACCT_USER_GROUPS=( dnsmasq )
+
+acct-user_add_deps
diff --git a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
deleted file mode 100644
index 3bad6b64097a..000000000000
--- a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dnsmasq_exporter"
-ACCT_USER_ID=274
-ACCT_USER_GROUPS=( dnsmasq_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..aafd1d549d4b
--- /dev/null
+++ b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dnsmasq_exporter"
+ACCT_USER_ID=274
+ACCT_USER_GROUPS=( dnsmasq_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/docker_auth/docker_auth-0-r1.ebuild b/acct-user/docker_auth/docker_auth-0-r1.ebuild
deleted file mode 100644
index c6af83062e39..000000000000
--- a/acct-user/docker_auth/docker_auth-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for docker_auth"
-ACCT_USER_ID=345
-ACCT_USER_GROUPS=( docker_auth )
-
-acct-user_add_deps
diff --git a/acct-user/docker_auth/docker_auth-0-r2.ebuild b/acct-user/docker_auth/docker_auth-0-r2.ebuild
new file mode 100644
index 000000000000..4b43ec91c96f
--- /dev/null
+++ b/acct-user/docker_auth/docker_auth-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for docker_auth"
+ACCT_USER_ID=345
+ACCT_USER_GROUPS=( docker_auth )
+
+acct-user_add_deps
diff --git a/acct-user/dovecot/dovecot-0-r1.ebuild b/acct-user/dovecot/dovecot-0-r1.ebuild
deleted file mode 100644
index 661e3706f564..000000000000
--- a/acct-user/dovecot/dovecot-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dovecot daemon"
-ACCT_USER_ID=76
-ACCT_USER_GROUPS=( dovecot )
-
-acct-user_add_deps
diff --git a/acct-user/dovecot/dovecot-0-r2.ebuild b/acct-user/dovecot/dovecot-0-r2.ebuild
new file mode 100644
index 000000000000..107dc2b7bf7d
--- /dev/null
+++ b/acct-user/dovecot/dovecot-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dovecot daemon"
+ACCT_USER_ID=76
+ACCT_USER_GROUPS=( dovecot )
+
+acct-user_add_deps
diff --git a/acct-user/dovenull/dovenull-0-r1.ebuild b/acct-user/dovenull/dovenull-0-r1.ebuild
deleted file mode 100644
index 40d476bdc4eb..000000000000
--- a/acct-user/dovenull/dovenull-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dovecot daemon"
-ACCT_USER_ID=74
-ACCT_USER_GROUPS=( dovenull )
-
-acct-user_add_deps
diff --git a/acct-user/dovenull/dovenull-0-r2.ebuild b/acct-user/dovenull/dovenull-0-r2.ebuild
new file mode 100644
index 000000000000..b1fd15df1755
--- /dev/null
+++ b/acct-user/dovenull/dovenull-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dovecot daemon"
+ACCT_USER_ID=74
+ACCT_USER_GROUPS=( dovenull )
+
+acct-user_add_deps
diff --git a/acct-user/drone/drone-0-r1.ebuild b/acct-user/drone/drone-0-r1.ebuild
new file mode 100644
index 000000000000..9cd5b314e13e
--- /dev/null
+++ b/acct-user/drone/drone-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-util/drone"
+
+ACCT_USER_ID=112
+ACCT_USER_GROUPS=( drone )
+ACCT_USER_HOME=/var/lib/drone
+
+acct-user_add_deps
diff --git a/acct-user/drone/drone-0.ebuild b/acct-user/drone/drone-0.ebuild
deleted file mode 100644
index 3f0bfb9afded..000000000000
--- a/acct-user/drone/drone-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-util/drone"
-
-ACCT_USER_ID=112
-ACCT_USER_GROUPS=( drone )
-ACCT_USER_HOME=/var/lib/drone
-
-acct-user_add_deps
diff --git a/acct-user/duende/duende-0-r1.ebuild b/acct-user/duende/duende-0-r1.ebuild
deleted file mode 100644
index b7ad1e5a6dbf..000000000000
--- a/acct-user/duende/duende-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=66
-ACCT_USER_GROUPS=( "maradns" )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/maradns "
-RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/duende/duende-0-r2.ebuild b/acct-user/duende/duende-0-r2.ebuild
new file mode 100644
index 000000000000..9606fcf3d80c
--- /dev/null
+++ b/acct-user/duende/duende-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=66
+ACCT_USER_GROUPS=( "maradns" )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/maradns "
+RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/duende/metadata.xml b/acct-user/duende/metadata.xml
index 8ac26ba5990d..115e9d64a669 100644
--- a/acct-user/duende/metadata.xml
+++ b/acct-user/duende/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slashbeast@gentoo.org</email>
- <name>Piotr Karbowski</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/ejabberd/ejabberd-2-r1.ebuild b/acct-user/ejabberd/ejabberd-2-r1.ebuild
new file mode 100644
index 000000000000..08408483d2ce
--- /dev/null
+++ b/acct-user/ejabberd/ejabberd-2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/ejabberd"
+
+ACCT_USER_ID=114
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+IUSE="pam"
+
+RDEPEND="pam? ( acct-group/epam )"
+
+acct-user_add_deps
+
+pkg_setup() {
+ use pam && ACCT_USER_GROUPS+=( epam )
+}
diff --git a/acct-user/ejabberd/ejabberd-2.ebuild b/acct-user/ejabberd/ejabberd-2.ebuild
deleted file mode 100644
index 70c1280b36b2..000000000000
--- a/acct-user/ejabberd/ejabberd-2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/ejabberd"
-
-ACCT_USER_ID=114
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/lib/${PN}
-
-IUSE="pam"
-
-RDEPEND="pam? ( acct-group/epam )"
-
-acct-user_add_deps
-
-pkg_setup() {
- use pam && ACCT_USER_GROUPS+=( epam )
-}
diff --git a/acct-user/elasticsearch/elasticsearch-0-r1.ebuild b/acct-user/elasticsearch/elasticsearch-0-r1.ebuild
deleted file mode 100644
index 397e25fe4fde..000000000000
--- a/acct-user/elasticsearch/elasticsearch-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Elasticsearch program user"
-ACCT_USER_ID=183
-ACCT_USER_HOME=/usr/share/elasticsearch
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( elasticsearch )
-acct-user_add_deps
diff --git a/acct-user/elasticsearch/elasticsearch-0-r2.ebuild b/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
new file mode 100644
index 000000000000..e1b91dea15cb
--- /dev/null
+++ b/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Elasticsearch program user"
+ACCT_USER_ID=183
+ACCT_USER_HOME=/usr/share/elasticsearch
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( elasticsearch )
+acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
deleted file mode 100644
index 0641a19753f0..000000000000
--- a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/elasticsearch_exporter"
-
-ACCT_USER_ID=501
-ACCT_USER_GROUPS=( elasticsearch_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4d8aef4a88c1
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/elasticsearch_exporter"
+
+ACCT_USER_ID=501
+ACCT_USER_GROUPS=( elasticsearch_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/energi3/energi3-0-r1.ebuild b/acct-user/energi3/energi3-0-r1.ebuild
new file mode 100644
index 000000000000..c4c06a942c1a
--- /dev/null
+++ b/acct-user/energi3/energi3-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/energi3"
+ACCT_USER_ID=218
+ACCT_USER_GROUPS=( energi3 )
+
+acct-user_add_deps
diff --git a/acct-user/energi3/energi3-0.ebuild b/acct-user/energi3/energi3-0.ebuild
deleted file mode 100644
index 3672377d2cc4..000000000000
--- a/acct-user/energi3/energi3-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/energi3"
-ACCT_USER_ID=218
-ACCT_USER_GROUPS=( energi3 )
-
-acct-user_add_deps
diff --git a/acct-user/epmd/epmd-0-r1.ebuild b/acct-user/epmd/epmd-0-r1.ebuild
deleted file mode 100644
index 5648cf82fb26..000000000000
--- a/acct-user/epmd/epmd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Erlang Portmapper Daemon"
-ACCT_USER_ID=335
-ACCT_USER_GROUPS=( epmd )
-
-acct-user_add_deps
diff --git a/acct-user/epmd/epmd-0-r2.ebuild b/acct-user/epmd/epmd-0-r2.ebuild
new file mode 100644
index 000000000000..093ecbc957b1
--- /dev/null
+++ b/acct-user/epmd/epmd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Erlang Portmapper Daemon"
+ACCT_USER_ID=335
+ACCT_USER_GROUPS=( epmd )
+
+acct-user_add_deps
diff --git a/acct-user/err/err-0-r1.ebuild b/acct-user/err/err-0-r1.ebuild
new file mode 100644
index 000000000000..0def72aa8a34
--- /dev/null
+++ b/acct-user/err/err-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=325
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/err/err-0.ebuild b/acct-user/err/err-0.ebuild
deleted file mode 100644
index 1663b0acc907..000000000000
--- a/acct-user/err/err-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=325
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/etcd/etcd-0-r1.ebuild b/acct-user/etcd/etcd-0-r1.ebuild
deleted file mode 100644
index d682dc9b6422..000000000000
--- a/acct-user/etcd/etcd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for etcd"
-ACCT_USER_HOME=/var/lib/etcd
-ACCT_USER_HOME_PERMS=700
-ACCT_USER_ID=426
-ACCT_USER_GROUPS=( etcd )
-
-acct-user_add_deps
diff --git a/acct-user/etcd/etcd-0-r2.ebuild b/acct-user/etcd/etcd-0-r2.ebuild
new file mode 100644
index 000000000000..0af97deddaa8
--- /dev/null
+++ b/acct-user/etcd/etcd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for etcd"
+ACCT_USER_HOME=/var/lib/etcd
+ACCT_USER_HOME_PERMS=700
+ACCT_USER_ID=426
+ACCT_USER_GROUPS=( etcd )
+
+acct-user_add_deps
diff --git a/acct-user/exabgp/exabgp-0-r1.ebuild b/acct-user/exabgp/exabgp-0-r1.ebuild
deleted file mode 100644
index a78e30a7b12a..000000000000
--- a/acct-user/exabgp/exabgp-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/exabgp"
-
-ACCT_USER_ID=316
-ACCT_USER_GROUPS=( exabgp )
-
-acct-user_add_deps
diff --git a/acct-user/exabgp/exabgp-0-r2.ebuild b/acct-user/exabgp/exabgp-0-r2.ebuild
new file mode 100644
index 000000000000..06853b063cb3
--- /dev/null
+++ b/acct-user/exabgp/exabgp-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/exabgp"
+
+ACCT_USER_ID=316
+ACCT_USER_GROUPS=( exabgp )
+
+acct-user_add_deps
diff --git a/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild b/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
new file mode 100644
index 000000000000..92be78693837
--- /dev/null
+++ b/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/ez-ipupdate"
+
+ACCT_USER_GROUPS=( "ez-ipupd" )
+ACCT_USER_HOME="/var/cache/ez-ipupdate"
+ACCT_USER_ID="261"
+
+acct-user_add_deps
diff --git a/acct-user/ez-ipupd/ez-ipupd-0.ebuild b/acct-user/ez-ipupd/ez-ipupd-0.ebuild
deleted file mode 100644
index 79656896dc6e..000000000000
--- a/acct-user/ez-ipupd/ez-ipupd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/ez-ipupdate"
-
-ACCT_USER_GROUPS=( "ez-ipupd" )
-ACCT_USER_HOME="/var/cache/ez-ipupdate"
-ACCT_USER_ID="261"
-
-acct-user_add_deps
diff --git a/acct-user/fax/fax-0-r1.ebuild b/acct-user/fax/fax-0-r1.ebuild
new file mode 100644
index 000000000000..3ced3405070d
--- /dev/null
+++ b/acct-user/fax/fax-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dialup/mgetty"
+
+ACCT_USER_GROUPS=( "fax" )
+ACCT_USER_ID="320"
+
+acct-user_add_deps
diff --git a/acct-user/fax/fax-0.ebuild b/acct-user/fax/fax-0.ebuild
deleted file mode 100644
index cbc57fbfd4b1..000000000000
--- a/acct-user/fax/fax-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dialup/mgetty"
-
-ACCT_USER_GROUPS=( "fax" )
-ACCT_USER_ID="320"
-
-acct-user_add_deps
diff --git a/acct-user/fcron/fcron-0-r1.ebuild b/acct-user/fcron/fcron-0-r1.ebuild
new file mode 100644
index 000000000000..ca25b3a170af
--- /dev/null
+++ b/acct-user/fcron/fcron-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/fcron"
+
+ACCT_USER_GROUPS=( "fcron" )
+ACCT_USER_ID="120"
+
+acct-user_add_deps
diff --git a/acct-user/fcron/fcron-0.ebuild b/acct-user/fcron/fcron-0.ebuild
deleted file mode 100644
index 2cf35de584c6..000000000000
--- a/acct-user/fcron/fcron-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/fcron"
-
-ACCT_USER_GROUPS=( "fcron" )
-ACCT_USER_ID="120"
-
-acct-user_add_deps
diff --git a/acct-user/fdm/fdm-0-r1.ebuild b/acct-user/fdm/fdm-0-r1.ebuild
new file mode 100644
index 000000000000..646dc4cf50fd
--- /dev/null
+++ b/acct-user/fdm/fdm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/fdm"
+
+ACCT_USER_GROUPS=( "fdm" )
+ACCT_USER_ID="248"
+
+acct-user_add_deps
diff --git a/acct-user/fdm/fdm-0.ebuild b/acct-user/fdm/fdm-0.ebuild
deleted file mode 100644
index 8f0d4e8d7814..000000000000
--- a/acct-user/fdm/fdm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/fdm"
-
-ACCT_USER_GROUPS=( "fdm" )
-ACCT_USER_ID="248"
-
-acct-user_add_deps
diff --git a/acct-user/fetchmail/fetchmail-0-r1.ebuild b/acct-user/fetchmail/fetchmail-0-r1.ebuild
deleted file mode 100644
index 306170f9841a..000000000000
--- a/acct-user/fetchmail/fetchmail-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/fetchmail"
-ACCT_USER_ID=124
-ACCT_USER_GROUPS=( fetchmail )
-ACCT_USER_HOME="/var/lib/fetchmail"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/fetchmail/fetchmail-0-r2.ebuild b/acct-user/fetchmail/fetchmail-0-r2.ebuild
new file mode 100644
index 000000000000..4101dcfa26b4
--- /dev/null
+++ b/acct-user/fetchmail/fetchmail-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/fetchmail"
+ACCT_USER_ID=124
+ACCT_USER_GROUPS=( fetchmail )
+ACCT_USER_HOME="/var/lib/fetchmail"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/fhem/fhem-0-r1.ebuild b/acct-user/fhem/fhem-0-r1.ebuild
deleted file mode 100644
index 00ea760c48fe..000000000000
--- a/acct-user/fhem/fhem-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the FHEM perl server for house automation"
-
-ACCT_USER_GROUPS=( "fhem" )
-ACCT_USER_HOME="/opt/fhem"
-ACCT_USER_ID="491"
-
-acct-user_add_deps
diff --git a/acct-user/fhem/fhem-0-r2.ebuild b/acct-user/fhem/fhem-0-r2.ebuild
new file mode 100644
index 000000000000..51c17069a9a7
--- /dev/null
+++ b/acct-user/fhem/fhem-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the FHEM perl server for house automation"
+
+ACCT_USER_GROUPS=( "fhem" )
+ACCT_USER_HOME="/opt/fhem"
+ACCT_USER_ID="491"
+
+acct-user_add_deps
diff --git a/acct-user/firebird/firebird-0-r2.ebuild b/acct-user/firebird/firebird-0-r2.ebuild
deleted file mode 100644
index e34d2c1a8ac7..000000000000
--- a/acct-user/firebird/firebird-0-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/firebird"
-
-ACCT_USER_GROUPS=( "firebird" )
-ACCT_USER_ID="450"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
-
-pkg_setup() {
- ACCT_USER_HOME="/usr/$(get_libdir)/firebird"
-}
diff --git a/acct-user/firebird/firebird-0-r3.ebuild b/acct-user/firebird/firebird-0-r3.ebuild
new file mode 100644
index 000000000000..9e881781fdf6
--- /dev/null
+++ b/acct-user/firebird/firebird-0-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/firebird"
+
+ACCT_USER_GROUPS=( "firebird" )
+ACCT_USER_ID="450"
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
+
+pkg_setup() {
+ ACCT_USER_HOME="/usr/$(get_libdir)/firebird"
+}
diff --git a/acct-user/flatpak/flatpak-0-r1.ebuild b/acct-user/flatpak/flatpak-0-r1.ebuild
new file mode 100644
index 000000000000..aaead0d36975
--- /dev/null
+++ b/acct-user/flatpak/flatpak-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=313
+ACCT_USER_GROUPS=( flatpak )
+acct-user_add_deps
diff --git a/acct-user/flatpak/flatpak-0.ebuild b/acct-user/flatpak/flatpak-0.ebuild
deleted file mode 100644
index fb1fa5a77512..000000000000
--- a/acct-user/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=313
-ACCT_USER_GROUPS=( flatpak )
-acct-user_add_deps
diff --git a/acct-user/flows/flows-0-r1.ebuild b/acct-user/flows/flows-0-r1.ebuild
new file mode 100644
index 000000000000..2d265636ba43
--- /dev/null
+++ b/acct-user/flows/flows-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/flow-tools"
+ACCT_USER_ID=384
+ACCT_USER_HOME=/var/lib/flows
+ACCT_USER_GROUPS=( flows )
+
+acct-user_add_deps
diff --git a/acct-user/flows/flows-0.ebuild b/acct-user/flows/flows-0.ebuild
deleted file mode 100644
index dbfdd9f98492..000000000000
--- a/acct-user/flows/flows-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/flow-tools"
-ACCT_USER_ID=384
-ACCT_USER_HOME=/var/lib/flows
-ACCT_USER_GROUPS=( flows )
-
-acct-user_add_deps
diff --git a/acct-user/fluentd/fluentd-0-r1.ebuild b/acct-user/fluentd/fluentd-0-r1.ebuild
deleted file mode 100644
index b25d51d0046a..000000000000
--- a/acct-user/fluentd/fluentd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/fluentd"
-
-ACCT_USER_ID=504
-ACCT_USER_GROUPS=( fluentd )
-
-acct-user_add_deps
diff --git a/acct-user/fluentd/fluentd-0-r2.ebuild b/acct-user/fluentd/fluentd-0-r2.ebuild
new file mode 100644
index 000000000000..15b390b4f36b
--- /dev/null
+++ b/acct-user/fluentd/fluentd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/fluentd"
+
+ACCT_USER_ID=504
+ACCT_USER_GROUPS=( fluentd )
+
+acct-user_add_deps
diff --git a/acct-user/fnord/fnord-0-r1.ebuild b/acct-user/fnord/fnord-0-r1.ebuild
new file mode 100644
index 000000000000..2a104f9cbaeb
--- /dev/null
+++ b/acct-user/fnord/fnord-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-servers/fnord"
+
+ACCT_USER_GROUPS=( "nofiles" )
+ACCT_USER_HOME="/etc/fnord"
+ACCT_USER_ID="402"
+
+acct-user_add_deps
diff --git a/acct-user/fnord/fnord-0.ebuild b/acct-user/fnord/fnord-0.ebuild
deleted file mode 100644
index fe97d10637a2..000000000000
--- a/acct-user/fnord/fnord-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-servers/fnord"
-
-ACCT_USER_GROUPS=( "nofiles" )
-ACCT_USER_HOME="/etc/fnord"
-ACCT_USER_ID="402"
-
-acct-user_add_deps
diff --git a/acct-user/fnordlog/fnordlog-0-r1.ebuild b/acct-user/fnordlog/fnordlog-0-r1.ebuild
new file mode 100644
index 000000000000..9fb95c7fbad1
--- /dev/null
+++ b/acct-user/fnordlog/fnordlog-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-servers/fnord"
+
+ACCT_USER_GROUPS=( "nofiles" )
+ACCT_USER_HOME="/etc/fnord"
+ACCT_USER_ID="385"
+
+acct-user_add_deps
diff --git a/acct-user/fnordlog/fnordlog-0.ebuild b/acct-user/fnordlog/fnordlog-0.ebuild
deleted file mode 100644
index 25b7383a8575..000000000000
--- a/acct-user/fnordlog/fnordlog-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-servers/fnord"
-
-ACCT_USER_GROUPS=( "nofiles" )
-ACCT_USER_HOME="/etc/fnord"
-ACCT_USER_ID="385"
-
-acct-user_add_deps
diff --git a/acct-user/foldingathome/foldingathome-0-r1.ebuild b/acct-user/foldingathome/foldingathome-0-r1.ebuild
new file mode 100644
index 000000000000..4f01d42def53
--- /dev/null
+++ b/acct-user/foldingathome/foldingathome-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sci-biology/foldingathome"
+
+ACCT_USER_GROUPS=( "foldingathome" "video" )
+ACCT_USER_HOME="/opt/foldingathome"
+ACCT_USER_ID="128"
+
+acct-user_add_deps
diff --git a/acct-user/foldingathome/foldingathome-0.ebuild b/acct-user/foldingathome/foldingathome-0.ebuild
deleted file mode 100644
index a09b52cd1831..000000000000
--- a/acct-user/foldingathome/foldingathome-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sci-biology/foldingathome"
-
-ACCT_USER_GROUPS=( "foldingathome" "video" )
-ACCT_USER_HOME="/opt/foldingathome"
-ACCT_USER_ID="128"
-
-acct-user_add_deps
diff --git a/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild b/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
new file mode 100644
index 000000000000..0397363b2c62
--- /dev/null
+++ b/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/fp-multiuser"
+
+ACCT_USER_HOME=/var/lib/fp-multiuser
+ACCT_USER_GROUPS=( "fp-multiuser" )
+ACCT_USER_ID="318"
+
+acct-user_add_deps
diff --git a/acct-user/fp-multiuser/fp-multiuser-0.ebuild b/acct-user/fp-multiuser/fp-multiuser-0.ebuild
deleted file mode 100644
index bbaef0f6ce78..000000000000
--- a/acct-user/fp-multiuser/fp-multiuser-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/fp-multiuser"
-
-ACCT_USER_HOME=/var/lib/fp-multiuser
-ACCT_USER_GROUPS=( "fp-multiuser" )
-ACCT_USER_ID="318"
-
-acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0-r1.ebuild b/acct-user/freenet/freenet-0-r1.ebuild
new file mode 100644
index 000000000000..c03cfb616ecc
--- /dev/null
+++ b/acct-user/freenet/freenet-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/freenet"
+ACCT_USER_ID=105
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/freenet
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0.ebuild b/acct-user/freenet/freenet-0.ebuild
deleted file mode 100644
index 3f624fa01977..000000000000
--- a/acct-user/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/freenet"
-ACCT_USER_ID=105
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/freenet
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/freenet/metadata.xml b/acct-user/freenet/metadata.xml
index 8e4916babcbf..115e9d64a669 100644
--- a/acct-user/freenet/metadata.xml
+++ b/acct-user/freenet/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>tommy@gentoo.org</email>
- <name>Thomas Sachau (Tommy[D])</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..8cc42b2fe072
--- /dev/null
+++ b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="FRITZ!Box Smart Home Exporter User"
+
+ACCT_USER_ID=228
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
deleted file mode 100644
index 7b7ec26bde35..000000000000
--- a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="FRITZ!Box Smart Home Exporter User"
-
-ACCT_USER_ID=228
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/frr/frr-0-r1.ebuild b/acct-user/frr/frr-0-r1.ebuild
new file mode 100644
index 000000000000..8a2f7caed68f
--- /dev/null
+++ b/acct-user/frr/frr-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=371
+ACCT_USER_GROUPS=( frr )
+
+acct-user_add_deps
diff --git a/acct-user/frr/frr-0.ebuild b/acct-user/frr/frr-0.ebuild
deleted file mode 100644
index ec7cc1f8d314..000000000000
--- a/acct-user/frr/frr-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=371
-ACCT_USER_GROUPS=( frr )
-
-acct-user_add_deps
diff --git a/acct-user/frr/metadata.xml b/acct-user/frr/metadata.xml
index b3726e9bf59e..4c1f213dd4ed 100644
--- a/acct-user/frr/metadata.xml
+++ b/acct-user/frr/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
+ <email>jsmolic@gentoo.org</email>
+ <name>Jakov Smolić</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/ftp/ftp-0-r3.ebuild b/acct-user/ftp/ftp-0-r3.ebuild
deleted file mode 100644
index d82683fffe97..000000000000
--- a/acct-user/ftp/ftp-0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="File Transfer Protocol (FTP) server user"
-
-ACCT_USER_GROUPS=( "ftp" )
-ACCT_USER_HOME="/var/lib/ftp"
-ACCT_USER_HOME_OWNER="root:ftp"
-ACCT_USER_ID="21"
-
-acct-user_add_deps
diff --git a/acct-user/ftp/ftp-0-r4.ebuild b/acct-user/ftp/ftp-0-r4.ebuild
new file mode 100644
index 000000000000..9d7d85fa77b3
--- /dev/null
+++ b/acct-user/ftp/ftp-0-r4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="File Transfer Protocol (FTP) server user"
+
+ACCT_USER_GROUPS=( "ftp" )
+ACCT_USER_HOME="/var/lib/ftp"
+ACCT_USER_HOME_OWNER="root:ftp"
+ACCT_USER_ID="21"
+
+acct-user_add_deps
diff --git a/acct-user/ftpproxy/ftpproxy-0-r1.ebuild b/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
new file mode 100644
index 000000000000..4a50399145da
--- /dev/null
+++ b/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-ftp/frox"
+
+ACCT_USER_GROUPS=( "ftpproxy" )
+ACCT_USER_HOME="/var/spool/frox"
+ACCT_USER_HOME_PERMS="700"
+ACCT_USER_ID="182"
+
+acct-user_add_deps
diff --git a/acct-user/ftpproxy/ftpproxy-0.ebuild b/acct-user/ftpproxy/ftpproxy-0.ebuild
deleted file mode 100644
index 0a05768729d5..000000000000
--- a/acct-user/ftpproxy/ftpproxy-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-ftp/frox"
-
-ACCT_USER_GROUPS=( "ftpproxy" )
-ACCT_USER_HOME="/var/spool/frox"
-ACCT_USER_HOME_PERMS="700"
-ACCT_USER_ID="182"
-
-acct-user_add_deps
diff --git a/acct-user/gatling/gatling-0-r1.ebuild b/acct-user/gatling/gatling-0-r1.ebuild
deleted file mode 100644
index ea4d268d2c40..000000000000
--- a/acct-user/gatling/gatling-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_GROUPS=( gatling )
-ACCT_USER_HOME=/var/www/localhost
-ACCT_USER_ID=364 # matches acct-group/gatling
-
-acct-user_add_deps
diff --git a/acct-user/gatling/gatling-0-r2.ebuild b/acct-user/gatling/gatling-0-r2.ebuild
new file mode 100644
index 000000000000..9c2708333635
--- /dev/null
+++ b/acct-user/gatling/gatling-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_GROUPS=( gatling )
+ACCT_USER_HOME=/var/www/localhost
+ACCT_USER_ID=364 # matches acct-group/gatling
+
+acct-user_add_deps
diff --git a/acct-user/gauth/gauth-0-r1.ebuild b/acct-user/gauth/gauth-0-r1.ebuild
new file mode 100644
index 000000000000..4ba3f3f025b3
--- /dev/null
+++ b/acct-user/gauth/gauth-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-auth/google-authenticator-wrappers"
+
+ACCT_USER_GROUPS=( "gauth" )
+ACCT_USER_ID="138"
+
+acct-user_add_deps
diff --git a/acct-user/gauth/gauth-0.ebuild b/acct-user/gauth/gauth-0.ebuild
deleted file mode 100644
index 97ad122a12bb..000000000000
--- a/acct-user/gauth/gauth-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-auth/google-authenticator-wrappers"
-
-ACCT_USER_GROUPS=( "gauth" )
-ACCT_USER_ID="138"
-
-acct-user_add_deps
diff --git a/acct-user/gdm/gdm-0-r1.ebuild b/acct-user/gdm/gdm-0-r1.ebuild
new file mode 100644
index 000000000000..9d57eb6782f5
--- /dev/null
+++ b/acct-user/gdm/gdm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running GDM"
+ACCT_USER_ID=32
+ACCT_USER_GROUPS=( gdm video )
+ACCT_USER_HOME=/var/lib/gdm
+
+acct-user_add_deps
diff --git a/acct-user/gdm/gdm-0.ebuild b/acct-user/gdm/gdm-0.ebuild
deleted file mode 100644
index dcbdc40a98e1..000000000000
--- a/acct-user/gdm/gdm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running GDM"
-ACCT_USER_ID=32
-ACCT_USER_GROUPS=( gdm video )
-ACCT_USER_HOME=/var/lib/gdm
-
-acct-user_add_deps
diff --git a/acct-user/geneweb/geneweb-0-r1.ebuild b/acct-user/geneweb/geneweb-0-r1.ebuild
deleted file mode 100644
index ddb7933984a2..000000000000
--- a/acct-user/geneweb/geneweb-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user id for geneweb daemon"
-
-ACCT_USER_ID=467
-ACCT_USER_HOME=/var/lib/geneweb
-ACCT_USER_GROUPS=( geneweb )
-
-acct-user_add_deps
diff --git a/acct-user/geneweb/geneweb-0-r2.ebuild b/acct-user/geneweb/geneweb-0-r2.ebuild
new file mode 100644
index 000000000000..c63d14d893c0
--- /dev/null
+++ b/acct-user/geneweb/geneweb-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user id for geneweb daemon"
+
+ACCT_USER_ID=467
+ACCT_USER_HOME=/var/lib/geneweb
+ACCT_USER_GROUPS=( geneweb )
+
+acct-user_add_deps
diff --git a/acct-user/geoclue/geoclue-0-r1.ebuild b/acct-user/geoclue/geoclue-0-r1.ebuild
new file mode 100644
index 000000000000..e679be2efdf6
--- /dev/null
+++ b/acct-user/geoclue/geoclue-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the GeoClue D-Bus geolocation service"
+ACCT_USER_ID=351
+ACCT_USER_GROUPS=( geoclue )
+ACCT_USER_HOME=/var/lib/geoclue
+
+acct-user_add_deps
diff --git a/acct-user/geoclue/geoclue-0.ebuild b/acct-user/geoclue/geoclue-0.ebuild
deleted file mode 100644
index 0a6888d43ee4..000000000000
--- a/acct-user/geoclue/geoclue-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the GeoClue D-Bus geolocation service"
-ACCT_USER_ID=351
-ACCT_USER_GROUPS=( geoclue )
-ACCT_USER_HOME=/var/lib/geoclue
-
-acct-user_add_deps
diff --git a/acct-user/gerbera/gerbera-0-r1.ebuild b/acct-user/gerbera/gerbera-0-r1.ebuild
deleted file mode 100644
index ded9049718c7..000000000000
--- a/acct-user/gerbera/gerbera-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Gerbera UPnP Media Server user"
-ACCT_USER_ID=429
-ACCT_USER_HOME=/var/lib/gerbera
-ACCT_USER_GROUPS=( gerbera video )
-
-acct-user_add_deps
diff --git a/acct-user/gerbera/gerbera-0-r2.ebuild b/acct-user/gerbera/gerbera-0-r2.ebuild
new file mode 100644
index 000000000000..6d7dd80afe5c
--- /dev/null
+++ b/acct-user/gerbera/gerbera-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Gerbera UPnP Media Server user"
+ACCT_USER_ID=429
+ACCT_USER_HOME=/var/lib/gerbera
+ACCT_USER_GROUPS=( gerbera video )
+
+acct-user_add_deps
diff --git a/acct-user/git/git-0-r2.ebuild b/acct-user/git/git-0-r3.ebuild
index d6388db32836..d6388db32836 100644
--- a/acct-user/git/git-0-r2.ebuild
+++ b/acct-user/git/git-0-r3.ebuild
diff --git a/acct-user/github-exporter/github-exporter-0-r1.ebuild b/acct-user/github-exporter/github-exporter-0-r1.ebuild
new file mode 100644
index 000000000000..26444dd97aef
--- /dev/null
+++ b/acct-user/github-exporter/github-exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for github-exporter"
+ACCT_USER_ID=238
+ACCT_USER_GROUPS=( github-exporter )
+
+acct-user_add_deps
diff --git a/acct-user/github-exporter/github-exporter-0.ebuild b/acct-user/github-exporter/github-exporter-0.ebuild
deleted file mode 100644
index 5fc6470f9cdc..000000000000
--- a/acct-user/github-exporter/github-exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for github-exporter"
-ACCT_USER_ID=238
-ACCT_USER_GROUPS=( github-exporter )
-
-acct-user_add_deps
diff --git a/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild b/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
new file mode 100644
index 000000000000..0dcd40188c58
--- /dev/null
+++ b/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Dedicated user for gitlab-runner"
+
+ACCT_USER_ID=510
+ACCT_USER_GROUPS=( gitlab-runner )
+
+ACCT_USER_HOME=/var/lib/gitlab-runner
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/gitlab-runner/gitlab-runner-1.ebuild b/acct-user/gitlab-runner/gitlab-runner-1.ebuild
deleted file mode 100644
index 927761e522c4..000000000000
--- a/acct-user/gitlab-runner/gitlab-runner-1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Dedicated user for gitlab-runner"
-
-ACCT_USER_ID=510
-ACCT_USER_GROUPS=( gitlab-runner )
-
-ACCT_USER_HOME=/var/lib/gitlab-runner
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/gkrellmd/gkrellmd-0-r1.ebuild b/acct-user/gkrellmd/gkrellmd-0-r1.ebuild
deleted file mode 100644
index 419393f02f51..000000000000
--- a/acct-user/gkrellmd/gkrellmd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for gkrellm daemon"
-ACCT_USER_ID=221
-ACCT_USER_GROUPS=( gkrellmd )
-
-acct-user_add_deps
diff --git a/acct-user/gkrellmd/gkrellmd-0-r2.ebuild b/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
new file mode 100644
index 000000000000..a174866f976a
--- /dev/null
+++ b/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for gkrellm daemon"
+ACCT_USER_ID=221
+ACCT_USER_GROUPS=( gkrellmd )
+
+acct-user_add_deps
diff --git a/acct-user/glance/glance-0-r1.ebuild b/acct-user/glance/glance-0-r1.ebuild
deleted file mode 100644
index bf1992f35860..000000000000
--- a/acct-user/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the glance openstack service"
-ACCT_USER_ID=443
-ACCT_USER_HOME=/var/lib/glance
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( glance )
-
-acct-user_add_deps
diff --git a/acct-user/glance/metadata.xml b/acct-user/glance/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-user/glance/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/gluster/gluster-0-r1.ebuild b/acct-user/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index 7b4597c69810..000000000000
--- a/acct-user/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-# Needed for statedumps
-# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
-
-ACCT_USER_ID=416
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/gluster/gluster-0-r2.ebuild b/acct-user/gluster/gluster-0-r2.ebuild
new file mode 100644
index 000000000000..f76614e4e886
--- /dev/null
+++ b/acct-user/gluster/gluster-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+# Needed for statedumps
+# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+
+ACCT_USER_ID=416
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/gns3/gns3-0-r1.ebuild b/acct-user/gns3/gns3-0-r1.ebuild
new file mode 100644
index 000000000000..3f5fd4abf6f3
--- /dev/null
+++ b/acct-user/gns3/gns3-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=522
+ACCT_USER_HOME=/var/lib/gns3
+ACCT_USER_GROUPS=( gns3 ubridge )
+
+acct-user_add_deps
diff --git a/acct-user/gns3/gns3-0.ebuild b/acct-user/gns3/gns3-0.ebuild
deleted file mode 100644
index c3e289d69213..000000000000
--- a/acct-user/gns3/gns3-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=522
-ACCT_USER_HOME=/var/lib/gns3
-ACCT_USER_GROUPS=( gns3 ubridge )
-
-acct-user_add_deps
diff --git a/acct-user/gnump3d/gnump3d-0-r1.ebuild b/acct-user/gnump3d/gnump3d-0-r1.ebuild
new file mode 100644
index 000000000000..19f4d5e4fb9b
--- /dev/null
+++ b/acct-user/gnump3d/gnump3d-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/gnump3d"
+
+ACCT_USER_GROUPS=( "gnump3d" )
+ACCT_USER_ID="160"
+
+acct-user_add_deps
diff --git a/acct-user/gnump3d/gnump3d-0.ebuild b/acct-user/gnump3d/gnump3d-0.ebuild
deleted file mode 100644
index 131534a55167..000000000000
--- a/acct-user/gnump3d/gnump3d-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/gnump3d"
-
-ACCT_USER_GROUPS=( "gnump3d" )
-ACCT_USER_ID="160"
-
-acct-user_add_deps
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
new file mode 100644
index 000000000000..dfbbe919c7ce
--- /dev/null
+++ b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_USER_GROUPS=( "gnupg-pkcs11-scd-proxy" "gnupg-pkcs11" )
+ACCT_USER_ID="281"
+
+acct-user_add_deps
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
deleted file mode 100644
index a0fafbbe430f..000000000000
--- a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_USER_GROUPS=( "gnupg-pkcs11-scd-proxy" "gnupg-pkcs11" )
-ACCT_USER_ID="281"
-
-acct-user_add_deps
diff --git a/acct-user/goaccess/goaccess-0.ebuild b/acct-user/goaccess/goaccess-0-r1.ebuild
index bc260252062a..bc260252062a 100644
--- a/acct-user/goaccess/goaccess-0.ebuild
+++ b/acct-user/goaccess/goaccess-0-r1.ebuild
diff --git a/acct-user/gopher/gopher-0-r1.ebuild b/acct-user/gopher/gopher-0-r1.ebuild
new file mode 100644
index 000000000000..4edc807d798c
--- /dev/null
+++ b/acct-user/gopher/gopher-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for gofish"
+ACCT_USER_ID=287
+ACCT_USER_GROUPS=( gopher )
+
+acct-user_add_deps
diff --git a/acct-user/gopher/gopher-0.ebuild b/acct-user/gopher/gopher-0.ebuild
deleted file mode 100644
index 6bfe8e00e98f..000000000000
--- a/acct-user/gopher/gopher-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for gofish"
-ACCT_USER_ID=287
-ACCT_USER_GROUPS=( gopher )
-
-acct-user_add_deps
diff --git a/acct-user/gopherd/gopherd-0-r1.ebuild b/acct-user/gopherd/gopherd-0-r1.ebuild
new file mode 100644
index 000000000000..8b8b389b9eef
--- /dev/null
+++ b/acct-user/gopherd/gopherd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/geomyidae"
+
+ACCT_USER_GROUPS=( "gopherd" )
+ACCT_USER_HOME="/var/gopher"
+ACCT_USER_ID="132"
+
+acct-user_add_deps
diff --git a/acct-user/gopherd/gopherd-0.ebuild b/acct-user/gopherd/gopherd-0.ebuild
deleted file mode 100644
index fe62a2eccb04..000000000000
--- a/acct-user/gopherd/gopherd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/geomyidae"
-
-ACCT_USER_GROUPS=( "gopherd" )
-ACCT_USER_HOME="/var/gopher"
-ACCT_USER_ID="132"
-
-acct-user_add_deps
diff --git a/acct-user/gpsd/gpsd-0-r2.ebuild b/acct-user/gpsd/gpsd-0-r2.ebuild
deleted file mode 100644
index 50e1fb06a35d..000000000000
--- a/acct-user/gpsd/gpsd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for gpsd"
-ACCT_USER_ID=299
-# bug #744982
-ACCT_USER_GROUPS=( dialout uucp )
-
-acct-user_add_deps
diff --git a/acct-user/gpsd/gpsd-0-r3.ebuild b/acct-user/gpsd/gpsd-0-r3.ebuild
new file mode 100644
index 000000000000..02e5bd60b85a
--- /dev/null
+++ b/acct-user/gpsd/gpsd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for gpsd"
+ACCT_USER_ID=299
+# bug #744982
+ACCT_USER_GROUPS=( dialout uucp )
+
+acct-user_add_deps
diff --git a/acct-user/grafana/grafana-0-r1.ebuild b/acct-user/grafana/grafana-0-r1.ebuild
deleted file mode 100644
index 3ba21e568192..000000000000
--- a/acct-user/grafana/grafana-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="grafana program user"
-
-ACCT_USER_ID=389
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/grafana/grafana-0-r2.ebuild b/acct-user/grafana/grafana-0-r2.ebuild
new file mode 100644
index 000000000000..b990bfa8bda8
--- /dev/null
+++ b/acct-user/grafana/grafana-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="grafana program user"
+
+ACCT_USER_ID=389
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/graylog/graylog-0-r1.ebuild b/acct-user/graylog/graylog-0-r1.ebuild
deleted file mode 100644
index e9da0964abcc..000000000000
--- a/acct-user/graylog/graylog-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Graylog program user"
-ACCT_USER_ID=478
-ACCT_USER_GROUPS=( graylog )
-acct-user_add_deps
diff --git a/acct-user/graylog/graylog-0-r2.ebuild b/acct-user/graylog/graylog-0-r2.ebuild
new file mode 100644
index 000000000000..eb3ad26ddeb4
--- /dev/null
+++ b/acct-user/graylog/graylog-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Graylog program user"
+ACCT_USER_ID=478
+ACCT_USER_GROUPS=( graylog )
+acct-user_add_deps
diff --git a/acct-user/greetd/greetd-0-r1.ebuild b/acct-user/greetd/greetd-0-r1.ebuild
deleted file mode 100644
index 9578715d3bbe..000000000000
--- a/acct-user/greetd/greetd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=396
-ACCT_USER_GROUPS=( greetd video )
-DESCRIPTION="User for gui-libs/greetd"
-
-acct-user_add_deps
diff --git a/acct-user/greetd/greetd-0-r2.ebuild b/acct-user/greetd/greetd-0-r2.ebuild
new file mode 100644
index 000000000000..48f4b6d94f38
--- /dev/null
+++ b/acct-user/greetd/greetd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=396
+ACCT_USER_GROUPS=( greetd video )
+DESCRIPTION="User for gui-libs/greetd"
+
+acct-user_add_deps
diff --git a/acct-user/grok_exporter/grok_exporter-0-r1.ebuild b/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..87a17187d7ed
--- /dev/null
+++ b/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/grok_exporter"
+
+ACCT_USER_ID=104
+ACCT_USER_GROUPS=( grok_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/grok_exporter/grok_exporter-0.ebuild b/acct-user/grok_exporter/grok_exporter-0.ebuild
deleted file mode 100644
index c58147fb8bc5..000000000000
--- a/acct-user/grok_exporter/grok_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/grok_exporter"
-
-ACCT_USER_ID=104
-ACCT_USER_GROUPS=( grok_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/groonga/groonga-0-r1.ebuild b/acct-user/groonga/groonga-0-r1.ebuild
new file mode 100644
index 000000000000..6647b44bb496
--- /dev/null
+++ b/acct-user/groonga/groonga-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-text/groonga"
+
+ACCT_USER_GROUPS=( "groonga" )
+ACCT_USER_ID="266"
+
+acct-user_add_deps
diff --git a/acct-user/groonga/groonga-0.ebuild b/acct-user/groonga/groonga-0.ebuild
deleted file mode 100644
index 7df7ee2917a9..000000000000
--- a/acct-user/groonga/groonga-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-text/groonga"
-
-ACCT_USER_GROUPS=( "groonga" )
-ACCT_USER_ID="266"
-
-acct-user_add_deps
diff --git a/acct-user/gvm/gvm-0-r1.ebuild b/acct-user/gvm/gvm-0-r1.ebuild
deleted file mode 100644
index a6d2af7e6b4f..000000000000
--- a/acct-user/gvm/gvm-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Greenbone vulnerability management program user"
-ACCT_USER_ID=495
-ACCT_USER_HOME=/var/lib/gvm
-ACCT_USER_GROUPS=( gvm )
-
-acct-user_add_deps
diff --git a/acct-user/gvm/gvm-0-r2.ebuild b/acct-user/gvm/gvm-0-r2.ebuild
new file mode 100644
index 000000000000..bafded17a742
--- /dev/null
+++ b/acct-user/gvm/gvm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Greenbone vulnerability management program user"
+ACCT_USER_ID=495
+ACCT_USER_HOME=/var/lib/gvm
+ACCT_USER_GROUPS=( gvm )
+
+acct-user_add_deps
diff --git a/acct-user/h2o/h2o-0-r1.ebuild b/acct-user/h2o/h2o-0-r1.ebuild
new file mode 100644
index 000000000000..d01ee4c8ca23
--- /dev/null
+++ b/acct-user/h2o/h2o-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/h2o"
+
+ACCT_USER_GROUPS=( "h2o" )
+ACCT_USER_ID="141"
+
+acct-user_add_deps
diff --git a/acct-user/h2o/h2o-0.ebuild b/acct-user/h2o/h2o-0.ebuild
deleted file mode 100644
index 356f1e56ec29..000000000000
--- a/acct-user/h2o/h2o-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/h2o"
-
-ACCT_USER_GROUPS=( "h2o" )
-ACCT_USER_ID="141"
-
-acct-user_add_deps
diff --git a/acct-user/hacluster/hacluster-0-r1.ebuild b/acct-user/hacluster/hacluster-0-r1.ebuild
new file mode 100644
index 000000000000..becc65512d90
--- /dev/null
+++ b/acct-user/hacluster/hacluster-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-cluster/cluster-glue"
+
+ACCT_USER_GROUPS=( "haclient" )
+ACCT_USER_HOME="/var/lib/heartbeat"
+ACCT_USER_ID="304"
+
+acct-user_add_deps
diff --git a/acct-user/hacluster/hacluster-0.ebuild b/acct-user/hacluster/hacluster-0.ebuild
deleted file mode 100644
index 7558b70e8c0d..000000000000
--- a/acct-user/hacluster/hacluster-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-cluster/cluster-glue"
-
-ACCT_USER_GROUPS=( "haclient" )
-ACCT_USER_HOME="/var/lib/heartbeat"
-ACCT_USER_ID="304"
-
-acct-user_add_deps
diff --git a/acct-user/haproxy/haproxy-0-r1.ebuild b/acct-user/haproxy/haproxy-0-r1.ebuild
deleted file mode 100644
index 7306045a6a3e..000000000000
--- a/acct-user/haproxy/haproxy-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=188
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/haproxy/haproxy-0-r2.ebuild b/acct-user/haproxy/haproxy-0-r2.ebuild
new file mode 100644
index 000000000000..03c81ce79b9b
--- /dev/null
+++ b/acct-user/haproxy/haproxy-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=188
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/havp/havp-0-r2.ebuild b/acct-user/havp/havp-0-r2.ebuild
new file mode 100644
index 000000000000..9b8f3542221f
--- /dev/null
+++ b/acct-user/havp/havp-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/havp"
+
+ACCT_USER_GROUPS=( "havp" )
+ACCT_USER_ID="254"
+
+acct-user_add_deps
diff --git a/acct-user/havp/havp-0.ebuild b/acct-user/havp/havp-0.ebuild
deleted file mode 100644
index 60523308202c..000000000000
--- a/acct-user/havp/havp-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/havp"
-
-ACCT_USER_GROUPS=( "havp" )
-ACCT_HOME_USER="/etc/havp"
-ACCT_USER_ID="254"
-
-acct-user_add_deps
diff --git a/acct-user/headscale/headscale-0.ebuild b/acct-user/headscale/headscale-0-r1.ebuild
index 23080db987f7..23080db987f7 100644
--- a/acct-user/headscale/headscale-0.ebuild
+++ b/acct-user/headscale/headscale-0-r1.ebuild
diff --git a/acct-user/heat/heat-0-r1.ebuild b/acct-user/heat/heat-0-r1.ebuild
deleted file mode 100644
index d721c2e9d042..000000000000
--- a/acct-user/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the heat openstack service"
-ACCT_USER_ID=444
-ACCT_USER_HOME=/var/lib/heat
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( heat )
-
-acct-user_add_deps
diff --git a/acct-user/heat/metadata.xml b/acct-user/heat/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-user/heat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/hsqldb/hsqldb-0-r1.ebuild b/acct-user/hsqldb/hsqldb-0-r1.ebuild
new file mode 100644
index 000000000000..18eddffbea04
--- /dev/null
+++ b/acct-user/hsqldb/hsqldb-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for hsqldb"
+ACCT_USER_ID=217
+ACCT_USER_GROUPS=( hsqldb )
+
+acct-user_add_deps
diff --git a/acct-user/hsqldb/hsqldb-0.ebuild b/acct-user/hsqldb/hsqldb-0.ebuild
deleted file mode 100644
index 887cecb0627e..000000000000
--- a/acct-user/hsqldb/hsqldb-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for hsqldb"
-ACCT_USER_ID=217
-ACCT_USER_GROUPS=( hsqldb )
-
-acct-user_add_deps
diff --git a/acct-user/http/http-0-r1.ebuild b/acct-user/http/http-0-r1.ebuild
new file mode 100644
index 000000000000..01da8bc68a00
--- /dev/null
+++ b/acct-user/http/http-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/caddy"
+
+ACCT_USER_HOME=/var/lib/http
+ACCT_USER_GROUPS=( "http" )
+ACCT_USER_ID="297"
+
+acct-user_add_deps
diff --git a/acct-user/http/http-0.ebuild b/acct-user/http/http-0.ebuild
deleted file mode 100644
index b33130fdf84e..000000000000
--- a/acct-user/http/http-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/caddy"
-
-ACCT_USER_HOME=/var/lib/http
-ACCT_USER_GROUPS=( "http" )
-ACCT_USER_ID="297"
-
-acct-user_add_deps
diff --git a/acct-user/i2p/i2p-0-r1.ebuild b/acct-user/i2p/i2p-0-r1.ebuild
deleted file mode 100644
index 3acdb2cf83f0..000000000000
--- a/acct-user/i2p/i2p-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for system-wide net-vpn/i2p"
-ACCT_USER_ID=471
-ACCT_USER_GROUPS=( i2p )
-ACCT_USER_HOME=/var/lib/i2p
-
-acct-user_add_deps
diff --git a/acct-user/i2p/i2p-0-r2.ebuild b/acct-user/i2p/i2p-0-r2.ebuild
new file mode 100644
index 000000000000..03e1a11909f6
--- /dev/null
+++ b/acct-user/i2p/i2p-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for system-wide net-vpn/i2p"
+ACCT_USER_ID=471
+ACCT_USER_GROUPS=( i2p )
+ACCT_USER_HOME=/var/lib/i2p
+
+acct-user_add_deps
diff --git a/acct-user/i2pd/i2pd-0-r1.ebuild b/acct-user/i2pd/i2pd-0-r1.ebuild
deleted file mode 100644
index b46cb5b6fb3a..000000000000
--- a/acct-user/i2pd/i2pd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-vpn/i2pd server"
-ACCT_USER_ID=470
-ACCT_USER_GROUPS=( i2pd )
-ACCT_USER_HOME=/var/lib/i2pd
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/i2pd/i2pd-0-r2.ebuild b/acct-user/i2pd/i2pd-0-r2.ebuild
new file mode 100644
index 000000000000..5260bcec21a1
--- /dev/null
+++ b/acct-user/i2pd/i2pd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-vpn/i2pd server"
+ACCT_USER_ID=470
+ACCT_USER_GROUPS=( i2pd )
+ACCT_USER_HOME=/var/lib/i2pd
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/icecast/icecast-0-r1.ebuild b/acct-user/icecast/icecast-0-r1.ebuild
new file mode 100644
index 000000000000..b303a86666d0
--- /dev/null
+++ b/acct-user/icecast/icecast-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/icecast"
+
+ACCT_USER_GROUPS=( "icecast" )
+ACCT_USER_ID="131"
+
+acct-user_add_deps
diff --git a/acct-user/icecast/icecast-0.ebuild b/acct-user/icecast/icecast-0.ebuild
deleted file mode 100644
index 50f822213b0b..000000000000
--- a/acct-user/icecast/icecast-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/icecast"
-
-ACCT_USER_GROUPS=( "icecast" )
-ACCT_USER_ID="131"
-
-acct-user_add_deps
diff --git a/acct-user/icecream/icecream-0-r1.ebuild b/acct-user/icecream/icecream-0-r1.ebuild
new file mode 100644
index 000000000000..955f96208772
--- /dev/null
+++ b/acct-user/icecream/icecream-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-devel/icecream"
+
+ACCT_USER_GROUPS=( "icecream" )
+ACCT_USER_HOME="/var/cache/icecream"
+ACCT_USER_ID="145"
+
+acct-user_add_deps
diff --git a/acct-user/icecream/icecream-0.ebuild b/acct-user/icecream/icecream-0.ebuild
deleted file mode 100644
index 267a068e5776..000000000000
--- a/acct-user/icecream/icecream-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-devel/icecream"
-
-ACCT_USER_GROUPS=( "icecream" )
-ACCT_USER_HOME="/var/cache/icecream"
-ACCT_USER_ID="145"
-
-acct-user_add_deps
diff --git a/acct-user/ices/ices-0-r1.ebuild b/acct-user/ices/ices-0-r1.ebuild
new file mode 100644
index 000000000000..0cc042ce665d
--- /dev/null
+++ b/acct-user/ices/ices-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ices"
+
+ACCT_USER_GROUPS=( "ices" )
+ACCT_USER_ID="162"
+
+acct-user_add_deps
diff --git a/acct-user/ices/ices-0.ebuild b/acct-user/ices/ices-0.ebuild
deleted file mode 100644
index f5e3508280b0..000000000000
--- a/acct-user/ices/ices-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/ices"
-
-ACCT_USER_GROUPS=( "ices" )
-ACCT_USER_ID="162"
-
-acct-user_add_deps
diff --git a/acct-user/icinga/icinga-0-r1.ebuild b/acct-user/icinga/icinga-0-r1.ebuild
deleted file mode 100644
index 015dc5c32ff5..000000000000
--- a/acct-user/icinga/icinga-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Icinga User"
-ACCT_USER_ID=457
-ACCT_USER_HOME=/var/lib/icinga2
-ACCT_USER_GROUPS=( icinga icingacmd nagios )
-
-acct-user_add_deps
diff --git a/acct-user/icinga/icinga-0-r2.ebuild b/acct-user/icinga/icinga-0-r2.ebuild
new file mode 100644
index 000000000000..8d2976baab64
--- /dev/null
+++ b/acct-user/icinga/icinga-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Icinga User"
+ACCT_USER_ID=457
+ACCT_USER_HOME=/var/lib/icinga2
+ACCT_USER_GROUPS=( icinga icingacmd nagios )
+
+acct-user_add_deps
diff --git a/acct-user/icingadirector/icingadirector-0-r1.ebuild b/acct-user/icingadirector/icingadirector-0-r1.ebuild
new file mode 100644
index 000000000000..e2684ec08fc9
--- /dev/null
+++ b/acct-user/icingadirector/icingadirector-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Icinga Director User"
+ACCT_USER_ID=231
+ACCT_USER_HOME=/var/lib/icingadirector
+ACCT_USER_GROUPS=( icingaweb2 )
+
+acct-user_add_deps
diff --git a/acct-user/icingadirector/icingadirector-0.ebuild b/acct-user/icingadirector/icingadirector-0.ebuild
deleted file mode 100644
index f82b14af5783..000000000000
--- a/acct-user/icingadirector/icingadirector-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="Icinga Director User"
-ACCT_USER_ID=231
-ACCT_USER_HOME=/var/lib/icingadirector
-ACCT_USER_GROUPS=( icingaweb2 )
-
-acct-user_add_deps
diff --git a/acct-user/inadyn/inadyn-0-r1.ebuild b/acct-user/inadyn/inadyn-0-r1.ebuild
new file mode 100644
index 000000000000..62fcbf9f94b0
--- /dev/null
+++ b/acct-user/inadyn/inadyn-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/inadyn"
+
+ACCT_USER_HOME="/var/lib/inadyn"
+ACCT_USER_ID="529"
+ACCT_USER_GROUPS=( "inadyn" )
+
+acct-user_add_deps
diff --git a/acct-user/inadyn/metadata.xml b/acct-user/inadyn/metadata.xml
new file mode 100644
index 000000000000..c07e13d4a6bd
--- /dev/null
+++ b/acct-user/inadyn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/influxdb/influxdb-0-r1.ebuild b/acct-user/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 9f92875d2fdf..000000000000
--- a/acct-user/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for influxdb"
-ACCT_USER_ID=342
-ACCT_USER_GROUPS=( influxdb )
-ACCT_USER_HOME=/var/lib/influxdb
-
-acct-user_add_deps
diff --git a/acct-user/influxdb/influxdb-0-r2.ebuild b/acct-user/influxdb/influxdb-0-r2.ebuild
new file mode 100644
index 000000000000..21d7eb55e107
--- /dev/null
+++ b/acct-user/influxdb/influxdb-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for influxdb"
+ACCT_USER_ID=342
+ACCT_USER_GROUPS=( influxdb )
+ACCT_USER_HOME=/var/lib/influxdb
+
+acct-user_add_deps
diff --git a/acct-user/inspircd/inspircd-0-r1.ebuild b/acct-user/inspircd/inspircd-0-r1.ebuild
deleted file mode 100644
index 7719ce203cbd..000000000000
--- a/acct-user/inspircd/inspircd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for InspIRCd server daemon"
-ACCT_USER_ID=167
-ACCT_USER_GROUPS=( inspircd )
-
-acct-user_add_deps
diff --git a/acct-user/inspircd/inspircd-0-r2.ebuild b/acct-user/inspircd/inspircd-0-r2.ebuild
new file mode 100644
index 000000000000..387ce15f89bd
--- /dev/null
+++ b/acct-user/inspircd/inspircd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for InspIRCd server daemon"
+ACCT_USER_ID=167
+ACCT_USER_GROUPS=( inspircd )
+
+acct-user_add_deps
diff --git a/acct-user/ipfs/ipfs-0-r1.ebuild b/acct-user/ipfs/ipfs-0-r1.ebuild
deleted file mode 100644
index 54ddc40e854c..000000000000
--- a/acct-user/ipfs/ipfs-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-p2p/go-ipfs-bin server"
-ACCT_USER_ID=484
-ACCT_USER_HOME=/var/lib/ipfs
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( ipfs )
-
-acct-user_add_deps
diff --git a/acct-user/ipfs/ipfs-0-r2.ebuild b/acct-user/ipfs/ipfs-0-r2.ebuild
new file mode 100644
index 000000000000..b9df15adae9e
--- /dev/null
+++ b/acct-user/ipfs/ipfs-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-p2p/go-ipfs-bin server"
+ACCT_USER_ID=484
+ACCT_USER_HOME=/var/lib/ipfs
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( ipfs )
+
+acct-user_add_deps
diff --git a/acct-user/ippl/ippl-0-r1.ebuild b/acct-user/ippl/ippl-0-r1.ebuild
deleted file mode 100644
index 24bf022a7c8c..000000000000
--- a/acct-user/ippl/ippl-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for net-analyzer/ippl"
-ACCT_USER_ID=465
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/ippl/ippl-0-r2.ebuild b/acct-user/ippl/ippl-0-r2.ebuild
new file mode 100644
index 000000000000..151c567ab853
--- /dev/null
+++ b/acct-user/ippl/ippl-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for net-analyzer/ippl"
+ACCT_USER_ID=465
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/ipsec/ipsec-0-r1.ebuild b/acct-user/ipsec/ipsec-0-r1.ebuild
new file mode 100644
index 000000000000..a5697b99a67a
--- /dev/null
+++ b/acct-user/ipsec/ipsec-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="ipsec (strongswan) program user"
+
+ACCT_USER_ID=199
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/ipsec/ipsec-0.ebuild b/acct-user/ipsec/ipsec-0.ebuild
deleted file mode 100644
index 738b68f43199..000000000000
--- a/acct-user/ipsec/ipsec-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="ipsec (strongswan) program user"
-
-ACCT_USER_ID=199
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/ipsentinel/ipsentinel-0-r1.ebuild b/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
new file mode 100644
index 000000000000..8c7be37bbd69
--- /dev/null
+++ b/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ip-sentinel"
+
+ACCT_USER_GROUPS=( "ipsentinel" )
+ACCT_USER_ID="163"
+
+acct-user_add_deps
diff --git a/acct-user/ipsentinel/ipsentinel-0.ebuild b/acct-user/ipsentinel/ipsentinel-0.ebuild
deleted file mode 100644
index 1dceb5b8104a..000000000000
--- a/acct-user/ipsentinel/ipsentinel-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/ip-sentinel"
-
-ACCT_USER_GROUPS=( "ipsentinel" )
-ACCT_USER_ID="163"
-
-acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0-r1.ebuild b/acct-user/iroffer/iroffer-0-r1.ebuild
new file mode 100644
index 000000000000..a44bed6da0d0
--- /dev/null
+++ b/acct-user/iroffer/iroffer-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=187
+ACCT_USER_GROUPS=( iroffer )
+
+acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0.ebuild b/acct-user/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 452a50f2f547..000000000000
--- a/acct-user/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=187
-ACCT_USER_GROUPS=( iroffer )
-
-acct-user_add_deps
diff --git a/acct-user/iroffer/metadata.xml b/acct-user/iroffer/metadata.xml
index b3726e9bf59e..115e9d64a669 100644
--- a/acct-user/iroffer/metadata.xml
+++ b/acct-user/iroffer/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/jackett/jackett-0-r1.ebuild b/acct-user/jackett/jackett-0-r1.ebuild
new file mode 100644
index 000000000000..46f1c53bafa4
--- /dev/null
+++ b/acct-user/jackett/jackett-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for jackett"
+ACCT_USER_HOME=/var/lib/jackett
+ACCT_USER_ID=531
+ACCT_USER_GROUPS=( jackett )
+
+acct-user_add_deps
diff --git a/acct-user/jackett/metadata.xml b/acct-user/jackett/metadata.xml
new file mode 100644
index 000000000000..7b06c9eb2c55
--- /dev/null
+++ b/acct-user/jackett/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>PF4Public@mail.ru</email>
+ <name>PF4Public</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Jackett/Jackett</remote-id>
+ <bugs-to>https://github.com/Jackett/Jackett/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/acct-user/jellyfin/jellyfin-0-r1.ebuild b/acct-user/jellyfin/jellyfin-0-r1.ebuild
deleted file mode 100644
index 80de5e231296..000000000000
--- a/acct-user/jellyfin/jellyfin-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_HOME=/var/lib/jellyfin
-ACCT_USER_ID=518
-ACCT_USER_GROUPS=( jellyfin render video )
-
-acct-user_add_deps
diff --git a/acct-user/jellyfin/jellyfin-0-r2.ebuild b/acct-user/jellyfin/jellyfin-0-r2.ebuild
new file mode 100644
index 000000000000..c19f4a25d127
--- /dev/null
+++ b/acct-user/jellyfin/jellyfin-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_HOME=/var/lib/jellyfin
+ACCT_USER_ID=518
+ACCT_USER_GROUPS=( jellyfin render video )
+
+acct-user_add_deps
diff --git a/acct-user/jenkins/jenkins-0-r1.ebuild b/acct-user/jenkins/jenkins-0-r1.ebuild
new file mode 100644
index 000000000000..fe4befe0583b
--- /dev/null
+++ b/acct-user/jenkins/jenkins-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Jenkins program user"
+
+ACCT_USER_ID=473
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/jenkins/jenkins-0.ebuild b/acct-user/jenkins/jenkins-0.ebuild
deleted file mode 100644
index e568647b1f02..000000000000
--- a/acct-user/jenkins/jenkins-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Jenkins program user"
-
-ACCT_USER_ID=473
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/kafka/kafka-0-r1.ebuild b/acct-user/kafka/kafka-0-r1.ebuild
deleted file mode 100644
index f69be4e3ece8..000000000000
--- a/acct-user/kafka/kafka-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for kafka"
-
-ACCT_USER_ID=425
-ACCT_USER_HOME=/var/lib/kafka
-ACCT_USER_SHELL=/bin/sh
-ACCT_USER_GROUPS=( kafka )
-
-acct-user_add_deps
diff --git a/acct-user/kafka/kafka-0-r2.ebuild b/acct-user/kafka/kafka-0-r2.ebuild
new file mode 100644
index 000000000000..2b3793a80e93
--- /dev/null
+++ b/acct-user/kafka/kafka-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for kafka"
+
+ACCT_USER_ID=425
+ACCT_USER_HOME=/var/lib/kafka
+ACCT_USER_SHELL=/bin/sh
+ACCT_USER_GROUPS=( kafka )
+
+acct-user_add_deps
diff --git a/acct-user/kapacitor/kapacitor-0-r1.ebuild b/acct-user/kapacitor/kapacitor-0-r1.ebuild
deleted file mode 100644
index abc1cc404a05..000000000000
--- a/acct-user/kapacitor/kapacitor-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for kapacitor"
-ACCT_USER_ID=343
-ACCT_USER_GROUPS=( kapacitor )
-ACCT_USER_HOME=/var/lib/kapacitor
-
-acct-user_add_deps
diff --git a/acct-user/kapacitor/kapacitor-0-r2.ebuild b/acct-user/kapacitor/kapacitor-0-r2.ebuild
new file mode 100644
index 000000000000..b61f9fbd2c9a
--- /dev/null
+++ b/acct-user/kapacitor/kapacitor-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for kapacitor"
+ACCT_USER_ID=343
+ACCT_USER_GROUPS=( kapacitor )
+ACCT_USER_HOME=/var/lib/kapacitor
+
+acct-user_add_deps
diff --git a/acct-user/karma/karma-0-r1.ebuild b/acct-user/karma/karma-0-r1.ebuild
new file mode 100644
index 000000000000..420c7da0121f
--- /dev/null
+++ b/acct-user/karma/karma-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/karma-bin"
+
+ACCT_USER_ID=118
+ACCT_USER_GROUPS=( karma )
+
+acct-user_add_deps
diff --git a/acct-user/karma/karma-0.ebuild b/acct-user/karma/karma-0.ebuild
deleted file mode 100644
index e125361d1e72..000000000000
--- a/acct-user/karma/karma-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/karma-bin"
-
-ACCT_USER_ID=118
-ACCT_USER_GROUPS=( karma )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/keystone-0-r1.ebuild b/acct-user/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 1519aa941e90..000000000000
--- a/acct-user/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the keystone openstack service"
-ACCT_USER_ID=445
-ACCT_USER_HOME=/var/lib/keystone
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( keystone )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/metadata.xml b/acct-user/keystone/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-user/keystone/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/kibana/kibana-0-r1.ebuild b/acct-user/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index b04ba4aacc1d..000000000000
--- a/acct-user/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Kibana program user"
-ACCT_USER_ID=269
-ACCT_USER_HOME=/var/lib/kibana
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( kibana )
-acct-user_add_deps
diff --git a/acct-user/kibana/kibana-0-r2.ebuild b/acct-user/kibana/kibana-0-r2.ebuild
new file mode 100644
index 000000000000..4a188fc20953
--- /dev/null
+++ b/acct-user/kibana/kibana-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Kibana program user"
+ACCT_USER_ID=269
+ACCT_USER_HOME=/var/lib/kibana
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( kibana )
+acct-user_add_deps
diff --git a/acct-user/kismet/kismet-0-r1.ebuild b/acct-user/kismet/kismet-0-r1.ebuild
deleted file mode 100644
index 76f56775cac5..000000000000
--- a/acct-user/kismet/kismet-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="net-wireless/kismet"
-ACCT_USER_ID="388"
-ACCT_USER_GROUPS=( kismet )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/kismet "
-RDEPEND+=" acct-group/kismet "
diff --git a/acct-user/kismet/kismet-0-r2.ebuild b/acct-user/kismet/kismet-0-r2.ebuild
new file mode 100644
index 000000000000..7d3a4b49839d
--- /dev/null
+++ b/acct-user/kismet/kismet-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_USER_ID="388"
+ACCT_USER_GROUPS=( kismet )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/kismet "
+RDEPEND+=" acct-group/kismet "
diff --git a/acct-user/knot-resolver/knot-resolver-0-r1.ebuild b/acct-user/knot-resolver/knot-resolver-0-r1.ebuild
new file mode 100644
index 000000000000..726a5d2c673f
--- /dev/null
+++ b/acct-user/knot-resolver/knot-resolver-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=525
+ACCT_USER_HOME=/var/lib/knot-resolver
+ACCT_USER_GROUPS=( knot-resolver )
+
+acct-user_add_deps
diff --git a/acct-user/knot-resolver/knot-resolver-0.ebuild b/acct-user/knot-resolver/knot-resolver-0.ebuild
deleted file mode 100644
index acac705b4619..000000000000
--- a/acct-user/knot-resolver/knot-resolver-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=525
-ACCT_USER_HOME=/var/lib/knot-resolver
-ACCT_USER_GROUPS=( knot-resolver )
-
-acct-user_add_deps
diff --git a/acct-user/knot/knot-0-r1.ebuild b/acct-user/knot/knot-0-r1.ebuild
deleted file mode 100644
index 5be8df72f20f..000000000000
--- a/acct-user/knot/knot-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for knot DNS server"
-ACCT_USER_ID=53
-ACCT_USER_HOME=/var/lib/knot
-ACCT_USER_GROUPS=( knot )
-
-acct-user_add_deps
diff --git a/acct-user/knot/knot-0-r2.ebuild b/acct-user/knot/knot-0-r2.ebuild
new file mode 100644
index 000000000000..e1589d0acc7f
--- /dev/null
+++ b/acct-user/knot/knot-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for knot DNS server"
+ACCT_USER_ID=53
+ACCT_USER_HOME=/var/lib/knot
+ACCT_USER_GROUPS=( knot )
+
+acct-user_add_deps
diff --git a/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild
deleted file mode 100644
index 7ec98102fdae..000000000000
--- a/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-apiserver"
-ACCT_USER_ID=432
-ACCT_USER_GROUPS=( kube-apiserver )
-
-acct-user_add_deps
diff --git a/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
new file mode 100644
index 000000000000..0ca7505f290c
--- /dev/null
+++ b/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-apiserver"
+ACCT_USER_ID=432
+ACCT_USER_GROUPS=( kube-apiserver )
+
+acct-user_add_deps
diff --git a/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild
deleted file mode 100644
index 6ba2b48ee468..000000000000
--- a/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-controller-manager"
-ACCT_USER_ID=433
-ACCT_USER_GROUPS=( kube-controller-manager )
-
-acct-user_add_deps
diff --git a/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild
new file mode 100644
index 000000000000..472ccc1d16f7
--- /dev/null
+++ b/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-controller-manager"
+ACCT_USER_ID=433
+ACCT_USER_GROUPS=( kube-controller-manager )
+
+acct-user_add_deps
diff --git a/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild
deleted file mode 100644
index 913fcb70494d..000000000000
--- a/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-scheduler"
-ACCT_USER_ID=434
-ACCT_USER_GROUPS=( kube-scheduler )
-
-acct-user_add_deps
diff --git a/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
new file mode 100644
index 000000000000..a6fcaaa54979
--- /dev/null
+++ b/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-scheduler"
+ACCT_USER_ID=434
+ACCT_USER_GROUPS=( kube-scheduler )
+
+acct-user_add_deps
diff --git a/acct-user/ldap/ldap-0-r1.ebuild b/acct-user/ldap/ldap-0-r1.ebuild
new file mode 100644
index 000000000000..46d4c83ae93e
--- /dev/null
+++ b/acct-user/ldap/ldap-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for ldap"
+ACCT_USER_ID=439
+ACCT_USER_GROUPS=( ldap )
+
+acct-user_add_deps
+
+pkg_setup() {
+ ACCT_USER_HOME=/usr/$(get_libdir)/openldap
+}
diff --git a/acct-user/ldap/ldap-0.ebuild b/acct-user/ldap/ldap-0.ebuild
deleted file mode 100644
index dbb6a9e79d87..000000000000
--- a/acct-user/ldap/ldap-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for ldap"
-ACCT_USER_ID=439
-ACCT_USER_GROUPS=( ldap )
-
-acct-user_add_deps
-
-pkg_setup() {
- ACCT_USER_HOME=/usr/$(get_libdir)/openldap
-}
diff --git a/acct-user/libreoffice/libreoffice-0-r1.ebuild b/acct-user/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..aa08fcfb70de
--- /dev/null
+++ b/acct-user/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for the headless LibreOffice server"
+
+ACCT_USER_GROUPS=( "libreoffice" )
+ACCT_USER_HOME="/var/lib/libreoffice"
+ACCT_USER_ID="512"
+
+acct-user_add_deps
diff --git a/acct-user/libreoffice/libreoffice-0.ebuild b/acct-user/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index 59f859ea5a19..000000000000
--- a/acct-user/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for the headless LibreOffice server"
-
-ACCT_USER_GROUPS=( "libreoffice" )
-ACCT_USER_HOME="/var/lib/libreoffice"
-ACCT_USER_ID="512"
-
-acct-user_add_deps
diff --git a/acct-user/lidarr/lidarr-0-r1.ebuild b/acct-user/lidarr/lidarr-0-r1.ebuild
new file mode 100644
index 000000000000..3201247ce1dc
--- /dev/null
+++ b/acct-user/lidarr/lidarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for lidarr"
+ACCT_USER_HOME=/var/lib/lidarr
+ACCT_USER_ID=530
+ACCT_USER_GROUPS=( lidarr )
+
+acct-user_add_deps
diff --git a/acct-user/lidarr/metadata.xml b/acct-user/lidarr/metadata.xml
new file mode 100644
index 000000000000..65c6cb6b33aa
--- /dev/null
+++ b/acct-user/lidarr/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>PF4Public@mail.ru</email>
+ <name>PF4Public</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Lidarr/Lidarr</remote-id>
+ <bugs-to>https://github.com/Lidarr/Lidarr/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/acct-user/lightdm/lightdm-0-r1.ebuild b/acct-user/lightdm/lightdm-0-r1.ebuild
new file mode 100644
index 000000000000..25af3b9c7f54
--- /dev/null
+++ b/acct-user/lightdm/lightdm-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/lightdm"
+
+ACCT_USER_GROUPS=( "lightdm" "video" )
+ACCT_USER_HOME="/var/lib/lightdm"
+ACCT_USER_ID="134"
+
+acct-user_add_deps
diff --git a/acct-user/lightdm/lightdm-0.ebuild b/acct-user/lightdm/lightdm-0.ebuild
deleted file mode 100644
index 43ea49e4ee73..000000000000
--- a/acct-user/lightdm/lightdm-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for x11-misc/lightdm"
-
-ACCT_USER_GROUPS=( "lightdm" "video" )
-ACCT_USER_HOME="/var/lib/lightdm"
-ACCT_USER_ID="134"
-
-acct-user_add_deps
diff --git a/acct-user/lighttpd/lighttpd-0-r1.ebuild b/acct-user/lighttpd/lighttpd-0-r1.ebuild
deleted file mode 100644
index 5534663d206b..000000000000
--- a/acct-user/lighttpd/lighttpd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for lighttpd"
-ACCT_USER_ID=302
-ACCT_USER_GROUPS=( lighttpd )
-
-acct-user_add_deps
diff --git a/acct-user/lighttpd/lighttpd-0-r2.ebuild b/acct-user/lighttpd/lighttpd-0-r2.ebuild
new file mode 100644
index 000000000000..155cf8661c81
--- /dev/null
+++ b/acct-user/lighttpd/lighttpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for lighttpd"
+ACCT_USER_ID=302
+ACCT_USER_GROUPS=( lighttpd )
+
+acct-user_add_deps
diff --git a/acct-user/litecoin/litecoin-0.ebuild b/acct-user/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 2a9cad12ecb1..000000000000
--- a/acct-user/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/litecoind"
-
-ACCT_USER_GROUPS=( "litecoin" )
-ACCT_USER_HOME="/var/lib/litecoin"
-ACCT_USER_ID="256"
-
-acct-user_add_deps
diff --git a/acct-user/litecoin/metadata.xml b/acct-user/litecoin/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-user/litecoin/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/lldpd/lldpd-0-r1.ebuild b/acct-user/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 1b1593fc3a76..000000000000
--- a/acct-user/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/lldpd"
-
-ACCT_USER_ID=315
-ACCT_USER_GROUPS=( lldpd )
-
-acct-user_add_deps
diff --git a/acct-user/lldpd/lldpd-0-r2.ebuild b/acct-user/lldpd/lldpd-0-r2.ebuild
new file mode 100644
index 000000000000..e8ac77195bf3
--- /dev/null
+++ b/acct-user/lldpd/lldpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/lldpd"
+
+ACCT_USER_ID=315
+ACCT_USER_GROUPS=( lldpd )
+
+acct-user_add_deps
diff --git a/acct-user/logcheck/logcheck-0-r3.ebuild b/acct-user/logcheck/logcheck-0-r3.ebuild
new file mode 100644
index 000000000000..17b949d61f95
--- /dev/null
+++ b/acct-user/logcheck/logcheck-0-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logcheck"
+IUSE="systemd"
+
+ACCT_USER_GROUPS=( "logcheck" )
+ACCT_USER_ID="284"
+
+RDEPEND="systemd? ( acct-group/systemd-journal )"
+
+acct-user_add_deps
+
+pkg_setup() {
+ # Allow the 'logcheck' user to view the systemd journal.
+ if use systemd; then
+ ACCT_USER_GROUPS+=( systemd-journal )
+ fi
+}
diff --git a/acct-user/logcheck/logcheck-0.ebuild b/acct-user/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 4dfb987a1636..000000000000
--- a/acct-user/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logcheck"
-
-ACCT_USER_GROUPS=( "logcheck" )
-ACCT_USER_ID="284"
-
-acct-user_add_deps
diff --git a/acct-user/logcheck/metadata.xml b/acct-user/logcheck/metadata.xml
index 115e9d64a669..7530d08266f4 100644
--- a/acct-user/logcheck/metadata.xml
+++ b/acct-user/logcheck/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>foti.giuseppe@gmail.com</email>
+ <name>Giuseppe Foti</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-user/logstash/logstash-0-r1.ebuild b/acct-user/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 748b9f907d0d..000000000000
--- a/acct-user/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Logstash program user"
-ACCT_USER_ID=270
-ACCT_USER_HOME=/var/lib/logstash
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( logstash )
-acct-user_add_deps
diff --git a/acct-user/logstash/logstash-0-r2.ebuild b/acct-user/logstash/logstash-0-r2.ebuild
new file mode 100644
index 000000000000..44658d2d4261
--- /dev/null
+++ b/acct-user/logstash/logstash-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Logstash program user"
+ACCT_USER_ID=270
+ACCT_USER_HOME=/var/lib/logstash
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( logstash )
+acct-user_add_deps
diff --git a/acct-user/logsurfer/logsurfer-0-r1.ebuild b/acct-user/logsurfer/logsurfer-0-r1.ebuild
new file mode 100644
index 000000000000..f55cf8a7802d
--- /dev/null
+++ b/acct-user/logsurfer/logsurfer-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logsurfer"
+
+ACCT_USER_GROUPS=( "logsurfer" )
+ACCT_USER_ID="249"
+
+acct-user_add_deps
diff --git a/acct-user/logsurfer/logsurfer-0.ebuild b/acct-user/logsurfer/logsurfer-0.ebuild
deleted file mode 100644
index be3a125870b5..000000000000
--- a/acct-user/logsurfer/logsurfer-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logsurfer"
-
-ACCT_USER_GROUPS=( "logsurfer" )
-ACCT_USER_ID="249"
-
-acct-user_add_deps
diff --git a/acct-user/lxc/lxc-0-r1.ebuild b/acct-user/lxc/lxc-0-r1.ebuild
new file mode 100644
index 000000000000..503091786bb5
--- /dev/null
+++ b/acct-user/lxc/lxc-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-containers/lxc"
+ACCT_USER_ID=358
+ACCT_USER_GROUPS=( lxc )
+
+acct-user_add_deps
diff --git a/acct-user/lxc/lxc-0.ebuild b/acct-user/lxc/lxc-0.ebuild
deleted file mode 100644
index 1ea4ec8d2826..000000000000
--- a/acct-user/lxc/lxc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-containers/lxc"
-ACCT_USER_ID=358
-ACCT_USER_GROUPS=( lxc )
-
-acct-user_add_deps
diff --git a/acct-user/mail/mail-0-r1.ebuild b/acct-user/mail/mail-0-r1.ebuild
deleted file mode 100644
index da2aeb27f123..000000000000
--- a/acct-user/mail/mail-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Mail program user"
-ACCT_USER_ID=8
-ACCT_USER_HOME=/var/spool/mail
-ACCT_USER_HOME_OWNER=root:mail
-ACCT_USER_HOME_PERMS=03775
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/mail/mail-0-r2.ebuild b/acct-user/mail/mail-0-r2.ebuild
new file mode 100644
index 000000000000..7e265e0f4c6f
--- /dev/null
+++ b/acct-user/mail/mail-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Mail program user"
+ACCT_USER_ID=8
+ACCT_USER_HOME=/var/spool/mail
+ACCT_USER_HOME_OWNER=root:mail
+ACCT_USER_HOME_PERMS=03775
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/man/man-1-r1.ebuild b/acct-user/man/man-1-r1.ebuild
deleted file mode 100644
index 7fc43e801d0b..000000000000
--- a/acct-user/man/man-1-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=13
-ACCT_USER_GROUPS=( man )
-
-acct-user_add_deps
diff --git a/acct-user/man/man-1-r2.ebuild b/acct-user/man/man-1-r2.ebuild
new file mode 100644
index 000000000000..95551cbfed4e
--- /dev/null
+++ b/acct-user/man/man-1-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=13
+ACCT_USER_GROUPS=( man )
+
+acct-user_add_deps
diff --git a/acct-user/maradns/maradns-0-r1.ebuild b/acct-user/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index c2a756d077b5..000000000000
--- a/acct-user/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=99
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/maradns/maradns-0-r2.ebuild b/acct-user/maradns/maradns-0-r2.ebuild
new file mode 100644
index 000000000000..7448e405ec94
--- /dev/null
+++ b/acct-user/maradns/maradns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=99
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/maradns/metadata.xml b/acct-user/maradns/metadata.xml
index 8ac26ba5990d..115e9d64a669 100644
--- a/acct-user/maradns/metadata.xml
+++ b/acct-user/maradns/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slashbeast@gentoo.org</email>
- <name>Piotr Karbowski</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/memcached/memcached-0-r1.ebuild b/acct-user/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 65ff4babf81f..000000000000
--- a/acct-user/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the memcached service"
-ACCT_USER_ID=441
-ACCT_USER_GROUPS=( memcached )
-
-acct-user_add_deps
diff --git a/acct-user/memcached/memcached-0-r2.ebuild b/acct-user/memcached/memcached-0-r2.ebuild
new file mode 100644
index 000000000000..17e00df26495
--- /dev/null
+++ b/acct-user/memcached/memcached-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the memcached service"
+ACCT_USER_ID=441
+ACCT_USER_GROUPS=( memcached )
+
+acct-user_add_deps
diff --git a/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild b/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..78a563f0de1e
--- /dev/null
+++ b/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for memcached_exporter"
+ACCT_USER_ID=234
+ACCT_USER_GROUPS=( memcached_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/memcached_exporter/memcached_exporter-0.ebuild b/acct-user/memcached_exporter/memcached_exporter-0.ebuild
deleted file mode 100644
index 289d72e5eb68..000000000000
--- a/acct-user/memcached_exporter/memcached_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for memcached_exporter"
-ACCT_USER_ID=234
-ACCT_USER_GROUPS=( memcached_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/messagebus/messagebus-0-r1.ebuild b/acct-user/messagebus/messagebus-0-r1.ebuild
deleted file mode 100644
index 4dbd5fc10439..000000000000
--- a/acct-user/messagebus/messagebus-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=101
-ACCT_USER_GROUPS=( messagebus )
-
-acct-user_add_deps
diff --git a/acct-user/messagebus/messagebus-0-r2.ebuild b/acct-user/messagebus/messagebus-0-r2.ebuild
new file mode 100644
index 000000000000..c75cc7874852
--- /dev/null
+++ b/acct-user/messagebus/messagebus-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=101
+ACCT_USER_GROUPS=( messagebus )
+
+acct-user_add_deps
diff --git a/acct-user/mgraph/mgraph-0-r1.ebuild b/acct-user/mgraph/mgraph-0-r1.ebuild
new file mode 100644
index 000000000000..fd1fee37a63d
--- /dev/null
+++ b/acct-user/mgraph/mgraph-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/mailgraph"
+ACCT_USER_ID=376
+ACCT_USER_GROUPS=( mgraph adm )
+ACCT_USER_HOME="/var/lib/mailgraph"
+ACCT_USER_HOME_PERMS=750
+
+acct-user_add_deps
diff --git a/acct-user/mgraph/mgraph-0.ebuild b/acct-user/mgraph/mgraph-0.ebuild
deleted file mode 100644
index 4dc665546fd0..000000000000
--- a/acct-user/mgraph/mgraph-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/mailgraph"
-ACCT_USER_ID=376
-ACCT_USER_GROUPS=( mgraph adm )
-ACCT_USER_HOME="/var/lib/mailgraph"
-ACCT_USER_HOME_PERMS=750
-
-acct-user_add_deps
diff --git a/acct-user/milter-regex/milter-regex-0-r1.ebuild b/acct-user/milter-regex/milter-regex-0-r1.ebuild
deleted file mode 100644
index 973ab9bf9783..000000000000
--- a/acct-user/milter-regex/milter-regex-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/milter-regex"
-
-ACCT_USER_ID=438
-ACCT_USER_GROUPS=( milter-regex )
-
-acct-user_add_deps
diff --git a/acct-user/milter-regex/milter-regex-0-r2.ebuild b/acct-user/milter-regex/milter-regex-0-r2.ebuild
new file mode 100644
index 000000000000..666063185127
--- /dev/null
+++ b/acct-user/milter-regex/milter-regex-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/milter-regex"
+
+ACCT_USER_ID=438
+ACCT_USER_GROUPS=( milter-regex )
+
+acct-user_add_deps
diff --git a/acct-user/minbif/metadata.xml b/acct-user/minbif/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-user/minbif/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/minbif/minbif-0.ebuild b/acct-user/minbif/minbif-0.ebuild
deleted file mode 100644
index e93ddf7c984a..000000000000
--- a/acct-user/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/minbif"
-
-ACCT_USER_GROUPS=( "minbif" )
-ACCT_USER_HOME="/var/lib/minbif"
-ACCT_USER_ID="260"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/minecraft-0-r1.ebuild b/acct-user/minecraft/minecraft-0-r1.ebuild
deleted file mode 100644
index c4290868b526..000000000000
--- a/acct-user/minecraft/minecraft-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minecraft server"
-
-ACCT_USER_GROUPS=( "minecraft" )
-ACCT_USER_HOME="/var/lib/minecraft-server"
-ACCT_USER_ID="490"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/minecraft-0-r2.ebuild b/acct-user/minecraft/minecraft-0-r2.ebuild
new file mode 100644
index 000000000000..b591f5313e6b
--- /dev/null
+++ b/acct-user/minecraft/minecraft-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft server"
+
+ACCT_USER_GROUPS=( "minecraft" )
+ACCT_USER_HOME="/var/lib/minecraft-server"
+ACCT_USER_ID="490"
+
+acct-user_add_deps
diff --git a/acct-user/minetest/minetest-1-r1.ebuild b/acct-user/minetest/minetest-1-r1.ebuild
deleted file mode 100644
index 728978354ba5..000000000000
--- a/acct-user/minetest/minetest-1-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minetest server"
-
-ACCT_USER_GROUPS=( "minetest" )
-ACCT_USER_ID="480"
-ACCT_USER_HOME="/var/lib/minetest"
-
-acct-user_add_deps
diff --git a/acct-user/minetest/minetest-1-r2.ebuild b/acct-user/minetest/minetest-1-r2.ebuild
new file mode 100644
index 000000000000..4af1d2ed9392
--- /dev/null
+++ b/acct-user/minetest/minetest-1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minetest server"
+
+ACCT_USER_GROUPS=( "minetest" )
+ACCT_USER_ID="480"
+ACCT_USER_HOME="/var/lib/minetest"
+
+acct-user_add_deps
diff --git a/acct-user/minidlna/minidlna-0-r1.ebuild b/acct-user/minidlna/minidlna-0-r1.ebuild
new file mode 100644
index 000000000000..cbf710b89ee5
--- /dev/null
+++ b/acct-user/minidlna/minidlna-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=339
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/minidlna/minidlna-0.ebuild b/acct-user/minidlna/minidlna-0.ebuild
deleted file mode 100644
index df5a7d15b91f..000000000000
--- a/acct-user/minidlna/minidlna-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=339
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/miniflux/miniflux-0-r1.ebuild b/acct-user/miniflux/miniflux-0-r1.ebuild
new file mode 100644
index 000000000000..b2317ab7f2e7
--- /dev/null
+++ b/acct-user/miniflux/miniflux-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/miniflux"
+ACCT_USER_ID=404
+ACCT_USER_GROUPS=( nobody )
+
+acct-user_add_deps
diff --git a/acct-user/miniflux/miniflux-0.ebuild b/acct-user/miniflux/miniflux-0.ebuild
deleted file mode 100644
index 941a566e7309..000000000000
--- a/acct-user/miniflux/miniflux-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/miniflux"
-ACCT_USER_ID=404
-ACCT_USER_GROUPS=( nobody )
-
-acct-user_add_deps
diff --git a/acct-user/minio/metadata.xml b/acct-user/minio/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-user/minio/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/minio/minio-0.ebuild b/acct-user/minio/minio-0.ebuild
deleted file mode 100644
index 1c8765edb840..000000000000
--- a/acct-user/minio/minio-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for minio"
-ACCT_USER_ID=309
-ACCT_USER_HOME=/var/lib/minio
-ACCT_USER_GROUPS=( minio )
-
-acct-user_add_deps
diff --git a/acct-user/mogile/mogile-0-r1.ebuild b/acct-user/mogile/mogile-0-r1.ebuild
new file mode 100644
index 000000000000..407e8ab74359
--- /dev/null
+++ b/acct-user/mogile/mogile-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MogileFS user"
+ACCT_USER_ID=460
+ACCT_USER_ENFORCE_ID=1
+ACCT_USER_GROUPS=( mogile )
+
+acct-user_add_deps
diff --git a/acct-user/mogile/mogile-0.ebuild b/acct-user/mogile/mogile-0.ebuild
deleted file mode 100644
index 2441a86d5f14..000000000000
--- a/acct-user/mogile/mogile-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MogileFS user"
-ACCT_USER_ID=460
-ACCT_USER_ENFORCE_ID=1
-ACCT_USER_GROUPS=( mogile )
-
-acct-user_add_deps
diff --git a/acct-user/mongodb/mongodb-0-r1.ebuild b/acct-user/mongodb/mongodb-0-r1.ebuild
deleted file mode 100644
index b52e1ce055b5..000000000000
--- a/acct-user/mongodb/mongodb-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MongoDB program user"
-ACCT_USER_ID=481
-ACCT_USER_HOME=/var/lib/mongodb
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( mongodb )
-acct-user_add_deps
diff --git a/acct-user/mongodb/mongodb-0-r2.ebuild b/acct-user/mongodb/mongodb-0-r2.ebuild
new file mode 100644
index 000000000000..e1b6eeb17d80
--- /dev/null
+++ b/acct-user/mongodb/mongodb-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MongoDB program user"
+ACCT_USER_ID=481
+ACCT_USER_HOME=/var/lib/mongodb
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( mongodb )
+acct-user_add_deps
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..6b855f4acfef
--- /dev/null
+++ b/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for mongodb_exporter"
+ACCT_USER_ID=277
+ACCT_USER_GROUPS=( mongodb_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
deleted file mode 100644
index aadf83004efd..000000000000
--- a/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for mongodb_exporter"
-ACCT_USER_ID=277
-ACCT_USER_GROUPS=( mongodb_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/monitorix/monitorix-0-r1.ebuild b/acct-user/monitorix/monitorix-0-r1.ebuild
deleted file mode 100644
index 4109068cc47f..000000000000
--- a/acct-user/monitorix/monitorix-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Monitorix system tool user"
-ACCT_USER_ID=401
-ACCT_USER_GROUPS=( monitorix )
-
-acct-user_add_deps
diff --git a/acct-user/monitorix/monitorix-0-r2.ebuild b/acct-user/monitorix/monitorix-0-r2.ebuild
new file mode 100644
index 000000000000..e9c54be3e683
--- /dev/null
+++ b/acct-user/monitorix/monitorix-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Monitorix system tool user"
+ACCT_USER_ID=401
+ACCT_USER_GROUPS=( monitorix )
+
+acct-user_add_deps
diff --git a/acct-user/monkeyd/monkeyd-0-r1.ebuild b/acct-user/monkeyd/monkeyd-0-r1.ebuild
new file mode 100644
index 000000000000..228bd178732e
--- /dev/null
+++ b/acct-user/monkeyd/monkeyd-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/monkeyd"
+
+ACCT_USER_GROUPS=( "monkeyd" )
+ACCT_USER_HOME="/var/tmp/monkeyd"
+ACCT_USER_HOME_PERMS="0770"
+ACCT_USER_ID="149"
+
+acct-user_add_deps
diff --git a/acct-user/monkeyd/monkeyd-0.ebuild b/acct-user/monkeyd/monkeyd-0.ebuild
deleted file mode 100644
index 55cb3b5ff5d2..000000000000
--- a/acct-user/monkeyd/monkeyd-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/monkeyd"
-
-ACCT_USER_GROUPS=( "monkeyd" )
-ACCT_USER_HOME="/var/tmp/monkeyd"
-ACCT_USER_HOME_PERMS="0770"
-ACCT_USER_ID="149"
-
-acct-user_add_deps
diff --git a/acct-user/monkeysphere/monkeysphere-0-r1.ebuild b/acct-user/monkeysphere/monkeysphere-0-r1.ebuild
deleted file mode 100644
index a4288b053b5a..000000000000
--- a/acct-user/monkeysphere/monkeysphere-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="monkeysphere program user"
-
-ACCT_USER_ID=390
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_HOME_OWNER="root:${PN}"
-ACCT_USER_HOME_PERMS=0751
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/monkeysphere/monkeysphere-0-r2.ebuild b/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
new file mode 100644
index 000000000000..5bf080cb25de
--- /dev/null
+++ b/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="monkeysphere program user"
+
+ACCT_USER_ID=390
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_OWNER="root:${PN}"
+ACCT_USER_HOME_PERMS=0751
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/mosquitto/mosquitto-0-r1.ebuild b/acct-user/mosquitto/mosquitto-0-r1.ebuild
deleted file mode 100644
index b894117073bd..000000000000
--- a/acct-user/mosquitto/mosquitto-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the mosquitto MQTT broker"
-ACCT_USER_ID=482
-ACCT_USER_GROUPS=( mosquitto )
-
-acct-user_add_deps
diff --git a/acct-user/mosquitto/mosquitto-0-r2.ebuild b/acct-user/mosquitto/mosquitto-0-r2.ebuild
new file mode 100644
index 000000000000..450a523203e3
--- /dev/null
+++ b/acct-user/mosquitto/mosquitto-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the mosquitto MQTT broker"
+ACCT_USER_ID=482
+ACCT_USER_GROUPS=( mosquitto )
+
+acct-user_add_deps
diff --git a/acct-user/motion/motion-0-r1.ebuild b/acct-user/motion/motion-0-r1.ebuild
deleted file mode 100644
index bb4695efc896..000000000000
--- a/acct-user/motion/motion-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="added by portage for motion, a software motion detector"
-ACCT_USER_ID=395
-ACCT_USER_GROUPS=( motion video )
-
-acct-user_add_deps
diff --git a/acct-user/motion/motion-0-r2.ebuild b/acct-user/motion/motion-0-r2.ebuild
new file mode 100644
index 000000000000..2580f7f8db61
--- /dev/null
+++ b/acct-user/motion/motion-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="added by portage for motion, a software motion detector"
+ACCT_USER_ID=395
+ACCT_USER_GROUPS=( motion video )
+
+acct-user_add_deps
diff --git a/acct-user/mpd/mpd-0-r1.ebuild b/acct-user/mpd/mpd-0-r1.ebuild
deleted file mode 100644
index a941e48d0f2e..000000000000
--- a/acct-user/mpd/mpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for music player daemon (mpd)"
-ACCT_USER_ID=45
-ACCT_USER_HOME=/var/lib/mpd
-ACCT_USER_GROUPS=( audio )
-
-acct-user_add_deps
diff --git a/acct-user/mpd/mpd-0-r2.ebuild b/acct-user/mpd/mpd-0-r2.ebuild
new file mode 100644
index 000000000000..7bf030d369de
--- /dev/null
+++ b/acct-user/mpd/mpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for music player daemon (mpd)"
+ACCT_USER_ID=45
+ACCT_USER_HOME=/var/lib/mpd
+ACCT_USER_GROUPS=( audio )
+
+acct-user_add_deps
diff --git a/acct-user/msmtpd/msmtpd-0-r1.ebuild b/acct-user/msmtpd/msmtpd-0-r1.ebuild
deleted file mode 100644
index 897476f00345..000000000000
--- a/acct-user/msmtpd/msmtpd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for msmtp daemon"
-ACCT_USER_ID=222
-ACCT_USER_GROUPS=( msmtpd )
-
-acct-user_add_deps
diff --git a/acct-user/msmtpd/msmtpd-0-r2.ebuild b/acct-user/msmtpd/msmtpd-0-r2.ebuild
new file mode 100644
index 000000000000..f635313b24c0
--- /dev/null
+++ b/acct-user/msmtpd/msmtpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for msmtp daemon"
+ACCT_USER_ID=222
+ACCT_USER_GROUPS=( msmtpd )
+
+acct-user_add_deps
diff --git a/acct-user/munge/munge-0-r1.ebuild b/acct-user/munge/munge-0-r1.ebuild
new file mode 100644
index 000000000000..51037b9634ff
--- /dev/null
+++ b/acct-user/munge/munge-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-auth/munge"
+
+ACCT_USER_GROUPS=( "munge" )
+ACCT_USER_HOME="/var/lib/munge"
+ACCT_USER_ID="144"
+
+acct-user_add_deps
diff --git a/acct-user/munge/munge-0.ebuild b/acct-user/munge/munge-0.ebuild
deleted file mode 100644
index fa2e7d4fe227..000000000000
--- a/acct-user/munge/munge-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-auth/munge"
-
-ACCT_USER_GROUPS=( "munge" )
-ACCT_USER_HOME="/var/lib/munge"
-ACCT_USER_ID="144"
-
-acct-user_add_deps
diff --git a/acct-user/munin-async/munin-async-0-r1.ebuild b/acct-user/munin-async/munin-async-0-r2.ebuild
index a11cabd62269..a11cabd62269 100644
--- a/acct-user/munin-async/munin-async-0-r1.ebuild
+++ b/acct-user/munin-async/munin-async-0-r2.ebuild
diff --git a/acct-user/munin/munin-0-r1.ebuild b/acct-user/munin/munin-0-r2.ebuild
index 08f9f00552be..08f9f00552be 100644
--- a/acct-user/munin/munin-0-r1.ebuild
+++ b/acct-user/munin/munin-0-r2.ebuild
diff --git a/acct-user/murmur/murmur-0-r1.ebuild b/acct-user/murmur/murmur-0-r1.ebuild
deleted file mode 100644
index 10429cb587b3..000000000000
--- a/acct-user/murmur/murmur-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for murmur daemon"
-ACCT_USER_ID=122
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_OWNER=${PN}:root
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( murmur )
-
-acct-user_add_deps
diff --git a/acct-user/murmur/murmur-0-r2.ebuild b/acct-user/murmur/murmur-0-r2.ebuild
new file mode 100644
index 000000000000..b6d3fcb6fa7c
--- /dev/null
+++ b/acct-user/murmur/murmur-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for murmur daemon"
+ACCT_USER_ID=122
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_OWNER=${PN}:root
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( murmur )
+
+acct-user_add_deps
diff --git a/acct-user/mysql/mysql-0-r1.ebuild b/acct-user/mysql/mysql-0-r1.ebuild
deleted file mode 100644
index 85cead7ce2e0..000000000000
--- a/acct-user/mysql/mysql-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MySQL program user"
-ACCT_USER_ID=60
-ACCT_USER_GROUPS=( mysql )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/mysql/mysql-0-r2.ebuild b/acct-user/mysql/mysql-0-r2.ebuild
new file mode 100644
index 000000000000..e198373af282
--- /dev/null
+++ b/acct-user/mysql/mysql-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MySQL program user"
+ACCT_USER_ID=60
+ACCT_USER_GROUPS=( mysql )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild
deleted file mode 100644
index 2dda2325009a..000000000000
--- a/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="mysqld_exporter User"
-ACCT_USER_ID=308
-ACCT_USER_HOME=/var/lib/mysqld_exporter
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( mysqld_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7e5666e46909
--- /dev/null
+++ b/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="mysqld_exporter User"
+ACCT_USER_ID=308
+ACCT_USER_HOME=/var/lib/mysqld_exporter
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( mysqld_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/mythtv/mythtv-0-r1.ebuild b/acct-user/mythtv/mythtv-0-r1.ebuild
deleted file mode 100644
index 79984187e86a..000000000000
--- a/acct-user/mythtv/mythtv-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Mythtv mythbackend server/daemon user"
-ACCT_USER_ID=117
-ACCT_USER_GROUPS=( mythtv video audio cdrom tty )
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_HOME=/var/lib/mythtv
-
-acct-user_add_deps
diff --git a/acct-user/mythtv/mythtv-0-r2.ebuild b/acct-user/mythtv/mythtv-0-r2.ebuild
new file mode 100644
index 000000000000..43fc7503be63
--- /dev/null
+++ b/acct-user/mythtv/mythtv-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Mythtv mythbackend server/daemon user"
+ACCT_USER_ID=117
+ACCT_USER_GROUPS=( mythtv video audio cdrom tty )
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_HOME=/var/lib/mythtv
+
+acct-user_add_deps
diff --git a/acct-user/nagios/nagios-0-r1.ebuild b/acct-user/nagios/nagios-0-r1.ebuild
deleted file mode 100644
index c092b1d3ae8b..000000000000
--- a/acct-user/nagios/nagios-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=436
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/nagios/nagios-0-r2.ebuild b/acct-user/nagios/nagios-0-r2.ebuild
new file mode 100644
index 000000000000..b20dbf0f431b
--- /dev/null
+++ b/acct-user/nagios/nagios-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=436
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/named/named-0-r1.ebuild b/acct-user/named/named-0-r2.ebuild
index 4ca236119be0..4ca236119be0 100644
--- a/acct-user/named/named-0-r1.ebuild
+++ b/acct-user/named/named-0-r2.ebuild
diff --git a/acct-user/netbox/metadata.xml b/acct-user/netbox/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-user/netbox/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/netbox/netbox-0-r1.ebuild b/acct-user/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 1d47bf20c233..000000000000
--- a/acct-user/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netbox"
-ACCT_USER_ID=431
-ACCT_USER_GROUPS=( netbox )
-ACCT_USER_HOME=/var/lib/netbox
-
-acct-user_add_deps
diff --git a/acct-user/netdata/netdata-1-r1.ebuild b/acct-user/netdata/netdata-1-r1.ebuild
new file mode 100644
index 000000000000..6b571b269430
--- /dev/null
+++ b/acct-user/netdata/netdata-1-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for netdata"
+ACCT_USER_ID=290
+ACCT_USER_GROUPS=( netdata )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/netdata/netdata-1.ebuild b/acct-user/netdata/netdata-1.ebuild
deleted file mode 100644
index 0d66b49653cd..000000000000
--- a/acct-user/netdata/netdata-1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netdata"
-ACCT_USER_ID=290
-ACCT_USER_GROUPS=( netdata )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/netperf/netperf-0-r1.ebuild b/acct-user/netperf/netperf-0-r1.ebuild
new file mode 100644
index 000000000000..b255ae4a2f28
--- /dev/null
+++ b/acct-user/netperf/netperf-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/netperf"
+
+ACCT_USER_GROUPS=( "netperf" )
+ACCT_USER_ID="168"
+
+acct-user_add_deps
diff --git a/acct-user/netperf/netperf-0.ebuild b/acct-user/netperf/netperf-0.ebuild
deleted file mode 100644
index 479d3788dbaa..000000000000
--- a/acct-user/netperf/netperf-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/netperf"
-
-ACCT_USER_GROUPS=( "netperf" )
-ACCT_USER_ID="168"
-
-acct-user_add_deps
diff --git a/acct-user/neutron/metadata.xml b/acct-user/neutron/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-user/neutron/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/neutron/neutron-0-r1.ebuild b/acct-user/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 8f58ff4800e9..000000000000
--- a/acct-user/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack neutron service"
-ACCT_USER_ID=446
-ACCT_USER_HOME=/var/lib/neutron
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( neutron )
-
-acct-user_add_deps
diff --git a/acct-user/nginx-unit/nginx-unit-0.ebuild b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
index 25bc84af7397..25bc84af7397 100644
--- a/acct-user/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
diff --git a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
deleted file mode 100644
index a066f8e465cf..000000000000
--- a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for nginx-vts-exporter"
-ACCT_USER_ID=354
-ACCT_USER_GROUPS=( nginx-vts-exporter )
-
-acct-user_add_deps
diff --git a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ede97d226773
--- /dev/null
+++ b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for nginx-vts-exporter"
+ACCT_USER_ID=354
+ACCT_USER_GROUPS=( nginx-vts-exporter )
+
+acct-user_add_deps
diff --git a/acct-user/nginx/nginx-0-r1.ebuild b/acct-user/nginx/nginx-0-r1.ebuild
new file mode 100644
index 000000000000..f6b6ea4ea30f
--- /dev/null
+++ b/acct-user/nginx/nginx-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="82"
+ACCT_USER_GROUPS=( "nginx" )
+ACCT_USER_HOME="/var/lib/nginx"
+
+acct-user_add_deps
diff --git a/acct-user/nginx/nginx-0.ebuild b/acct-user/nginx/nginx-0.ebuild
deleted file mode 100644
index 959c00fdf8c4..000000000000
--- a/acct-user/nginx/nginx-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID="82"
-ACCT_USER_GROUPS=( "nginx" )
-ACCT_USER_HOME="/var/lib/nginx"
-
-acct-user_add_deps
diff --git a/acct-user/ngircd/ngircd-0-r1.ebuild b/acct-user/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 19028a9bee20..000000000000
--- a/acct-user/ngircd/ngircd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for ngircd (IRC daemon)"
-ACCT_USER_ID=413
-ACCT_USER_GROUPS=( ngircd )
-
-acct-user_add_deps
diff --git a/acct-user/ngircd/ngircd-0-r2.ebuild b/acct-user/ngircd/ngircd-0-r2.ebuild
new file mode 100644
index 000000000000..79639b6b8e4c
--- /dev/null
+++ b/acct-user/ngircd/ngircd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for ngircd (IRC daemon)"
+ACCT_USER_ID=413
+ACCT_USER_GROUPS=( ngircd )
+
+acct-user_add_deps
diff --git a/acct-user/ngrep/ngrep-0-r1.ebuild b/acct-user/ngrep/ngrep-0-r1.ebuild
deleted file mode 100644
index 4851b7fcb10f..000000000000
--- a/acct-user/ngrep/ngrep-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/ngrep"
-
-ACCT_USER_GROUPS=( "ngrep" )
-ACCT_USER_ID="185"
-
-acct-user_add_deps
diff --git a/acct-user/ngrep/ngrep-0-r2.ebuild b/acct-user/ngrep/ngrep-0-r2.ebuild
new file mode 100644
index 000000000000..810bddcee9f5
--- /dev/null
+++ b/acct-user/ngrep/ngrep-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/ngrep"
+
+ACCT_USER_GROUPS=( "ngrep" )
+ACCT_USER_ID="185"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild b/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
new file mode 100644
index 000000000000..5f0a81f394f3
--- /dev/null
+++ b/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/networkmanager-openconnect"
+
+ACCT_USER_GROUPS=( "nm-openconnect" )
+ACCT_USER_ID="142"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openconnect/nm-openconnect-0.ebuild b/acct-user/nm-openconnect/nm-openconnect-0.ebuild
deleted file mode 100644
index aee4002155c4..000000000000
--- a/acct-user/nm-openconnect/nm-openconnect-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/networkmanager-openconnect"
-
-ACCT_USER_GROUPS=( "nm-openconnect" )
-ACCT_USER_ID="142"
-
-acct-user_add_deps
diff --git a/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild b/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
new file mode 100644
index 000000000000..24e46f7d19a1
--- /dev/null
+++ b/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/networkmanager-openvpn"
+
+ACCT_USER_GROUPS=( "nm-openvpn" )
+ACCT_USER_ID="143"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openvpn/nm-openvpn-0.ebuild b/acct-user/nm-openvpn/nm-openvpn-0.ebuild
deleted file mode 100644
index 6a7cef1e2ce4..000000000000
--- a/acct-user/nm-openvpn/nm-openvpn-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/networkmanager-openvpn"
-
-ACCT_USER_GROUPS=( "nm-openvpn" )
-ACCT_USER_ID="143"
-
-acct-user_add_deps
diff --git a/acct-user/nobody/nobody-0-r1.ebuild b/acct-user/nobody/nobody-0-r1.ebuild
new file mode 100644
index 000000000000..8ee787fc00b2
--- /dev/null
+++ b/acct-user/nobody/nobody-0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=65534
+ACCT_USER_ENFORCE_ID=yes
+ACCT_USER_HOME="/var/empty"
+ACCT_USER_HOME_OWNER="root:root"
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( nobody )
+
+acct-user_add_deps
+
+RDEPEND+=" acct-user/root"
diff --git a/acct-user/nobody/nobody-0.ebuild b/acct-user/nobody/nobody-0.ebuild
deleted file mode 100644
index 444addd883b0..000000000000
--- a/acct-user/nobody/nobody-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=65534
-ACCT_USER_ENFORCE_ID=yes
-ACCT_USER_HOME="/var/empty"
-ACCT_USER_HOME_OWNER="root:root"
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( nobody )
-
-acct-user_add_deps
-
-RDEPEND+=" acct-user/root"
diff --git a/acct-user/node_exporter/node_exporter-0-r1.ebuild b/acct-user/node_exporter/node_exporter-0-r1.ebuild
deleted file mode 100644
index 9bd941f4b72f..000000000000
--- a/acct-user/node_exporter/node_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="node_exporter User"
-ACCT_USER_ID=459
-ACCT_USER_GROUPS=( node_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/node_exporter/node_exporter-0-r2.ebuild b/acct-user/node_exporter/node_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2ca85112dfde
--- /dev/null
+++ b/acct-user/node_exporter/node_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="node_exporter User"
+ACCT_USER_ID=459
+ACCT_USER_GROUPS=( node_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/notary/notary-0-r1.ebuild b/acct-user/notary/notary-0-r1.ebuild
new file mode 100644
index 000000000000..754a4408efe1
--- /dev/null
+++ b/acct-user/notary/notary-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-misc/notary"
+
+ACCT_USER_GROUPS=( "notary" )
+ACCT_USER_ID="280"
+
+acct-user_add_deps
diff --git a/acct-user/notary/notary-0.ebuild b/acct-user/notary/notary-0.ebuild
deleted file mode 100644
index 4b852c14c7f0..000000000000
--- a/acct-user/notary/notary-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-misc/notary"
-
-ACCT_USER_GROUPS=( "notary" )
-ACCT_USER_ID="280"
-
-acct-user_add_deps
diff --git a/acct-user/nova/metadata.xml b/acct-user/nova/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-user/nova/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/nova/nova-0-r1.ebuild b/acct-user/nova/nova-0-r1.ebuild
deleted file mode 100644
index 660f668cf623..000000000000
--- a/acct-user/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack nova service"
-ACCT_USER_ID=447
-ACCT_USER_HOME=/var/lib/nova
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( nova )
-
-acct-user_add_deps
diff --git a/acct-user/nsd/nsd-0-r1.ebuild b/acct-user/nsd/nsd-0-r1.ebuild
deleted file mode 100644
index 127c286f9a84..000000000000
--- a/acct-user/nsd/nsd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for nsd daemon"
-ACCT_USER_ID=223
-ACCT_USER_GROUPS=( nsd )
-
-acct-user_add_deps
diff --git a/acct-user/nsd/nsd-0-r2.ebuild b/acct-user/nsd/nsd-0-r2.ebuild
new file mode 100644
index 000000000000..be5ee197a884
--- /dev/null
+++ b/acct-user/nsd/nsd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for nsd daemon"
+ACCT_USER_ID=223
+ACCT_USER_GROUPS=( nsd )
+
+acct-user_add_deps
diff --git a/acct-user/nslcd/nslcd-0-r1.ebuild b/acct-user/nslcd/nslcd-0-r1.ebuild
deleted file mode 100644
index c783848cf4bb..000000000000
--- a/acct-user/nslcd/nslcd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for nss-pam-ldapd"
-
-ACCT_USER_ID=357
-ACCT_USER_GROUPS=( nslcd )
-
-acct-user_add_deps
diff --git a/acct-user/nslcd/nslcd-0-r2.ebuild b/acct-user/nslcd/nslcd-0-r2.ebuild
new file mode 100644
index 000000000000..2b6742845a63
--- /dev/null
+++ b/acct-user/nslcd/nslcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for nss-pam-ldapd"
+
+ACCT_USER_ID=357
+ACCT_USER_GROUPS=( nslcd )
+
+acct-user_add_deps
diff --git a/acct-user/ntopng/ntopng-0-r1.ebuild b/acct-user/ntopng/ntopng-0-r1.ebuild
new file mode 100644
index 000000000000..4697c8d589a8
--- /dev/null
+++ b/acct-user/ntopng/ntopng-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ntopng"
+ACCT_USER_ID=296
+ACCT_USER_GROUPS=( ntopng )
+
+acct-user_add_deps
diff --git a/acct-user/ntopng/ntopng-0.ebuild b/acct-user/ntopng/ntopng-0.ebuild
deleted file mode 100644
index f6a1885ae868..000000000000
--- a/acct-user/ntopng/ntopng-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ntopng"
-ACCT_USER_ID=296
-ACCT_USER_GROUPS=( ntopng )
-
-acct-user_add_deps
diff --git a/acct-user/ntp/ntp-0-r1.ebuild b/acct-user/ntp/ntp-0-r1.ebuild
deleted file mode 100644
index cd5fe5a72db6..000000000000
--- a/acct-user/ntp/ntp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for ntp daemon"
-ACCT_USER_ID=123
-ACCT_USER_GROUPS=( ntp )
-
-acct-user_add_deps
diff --git a/acct-user/ntp/ntp-0-r2.ebuild b/acct-user/ntp/ntp-0-r2.ebuild
new file mode 100644
index 000000000000..0e38e0cb70d3
--- /dev/null
+++ b/acct-user/ntp/ntp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for ntp daemon"
+ACCT_USER_ID=123
+ACCT_USER_GROUPS=( ntp )
+
+acct-user_add_deps
diff --git a/acct-user/nullmail/nullmail-0-r1.ebuild b/acct-user/nullmail/nullmail-0-r1.ebuild
new file mode 100644
index 000000000000..ed75e88c8a6f
--- /dev/null
+++ b/acct-user/nullmail/nullmail-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the nullmailer"
+
+ACCT_USER_GROUPS=( "nullmail" )
+ACCT_USER_HOME="/var/spool/nullmailer"
+ACCT_USER_ID="88"
+
+acct-user_add_deps
diff --git a/acct-user/nullmail/nullmail-0.ebuild b/acct-user/nullmail/nullmail-0.ebuild
deleted file mode 100644
index 01b773208aeb..000000000000
--- a/acct-user/nullmail/nullmail-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the nullmailer"
-
-ACCT_USER_GROUPS=( "nullmail" )
-ACCT_USER_HOME="/var/spool/nullmailer"
-ACCT_USER_ID="88"
-
-acct-user_add_deps
diff --git a/acct-user/nut/nut-0-r1.ebuild b/acct-user/nut/nut-0-r1.ebuild
deleted file mode 100644
index e0c09e02a34b..000000000000
--- a/acct-user/nut/nut-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Network-UPS Tools"
-
-ACCT_USER_GROUPS=( "nut" "uucp" )
-ACCT_USER_HOME="/var/lib/nut"
-ACCT_USER_ID="84"
-
-acct-user_add_deps
diff --git a/acct-user/nut/nut-0-r2.ebuild b/acct-user/nut/nut-0-r2.ebuild
new file mode 100644
index 000000000000..d9c746f626db
--- /dev/null
+++ b/acct-user/nut/nut-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Network-UPS Tools"
+
+ACCT_USER_GROUPS=( "nut" "uucp" )
+ACCT_USER_HOME="/var/lib/nut"
+ACCT_USER_ID="84"
+
+acct-user_add_deps
diff --git a/acct-user/nvpd/nvpd-0-r1.ebuild b/acct-user/nvpd/nvpd-0-r1.ebuild
new file mode 100644
index 000000000000..072adc5d8abc
--- /dev/null
+++ b/acct-user/nvpd/nvpd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for nvidia-persistenced"
+ACCT_USER_ID=458
+ACCT_USER_GROUPS=( video )
+
+acct-user_add_deps
diff --git a/acct-user/nvpd/nvpd-0.ebuild b/acct-user/nvpd/nvpd-0.ebuild
deleted file mode 100644
index fa3633c7862e..000000000000
--- a/acct-user/nvpd/nvpd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for nvidia-persistenced"
-ACCT_USER_ID=458
-ACCT_USER_GROUPS=( video )
-
-acct-user_add_deps
diff --git a/acct-user/nzbget/nzbget-0-r1.ebuild b/acct-user/nzbget/nzbget-0-r1.ebuild
new file mode 100644
index 000000000000..7bf7f87f0097
--- /dev/null
+++ b/acct-user/nzbget/nzbget-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-nntp/nzbget"
+ACCT_USER_ID=398
+ACCT_USER_GROUPS=( ${PN} )
+# Downloads are stored there
+ACCT_USER_HOME=/var/lib/nzbget
+# Grant write access to group members
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/nzbget/nzbget-0.ebuild b/acct-user/nzbget/nzbget-0.ebuild
deleted file mode 100644
index d7b1ff8b1a14..000000000000
--- a/acct-user/nzbget/nzbget-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-nntp/nzbget"
-ACCT_USER_ID=398
-ACCT_USER_GROUPS=( ${PN} )
-# Downloads are stored there
-ACCT_USER_HOME=/var/lib/nzbget
-# Grant write access to group members
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/oidentd/oidentd-0-r1.ebuild b/acct-user/oidentd/oidentd-0-r1.ebuild
deleted file mode 100644
index c4c59907e3bc..000000000000
--- a/acct-user/oidentd/oidentd-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=493
-ACCT_USER_GROUPS=( oidentd )
-
-acct-user_add_deps
diff --git a/acct-user/oidentd/oidentd-0-r2.ebuild b/acct-user/oidentd/oidentd-0-r2.ebuild
new file mode 100644
index 000000000000..e750efb495d8
--- /dev/null
+++ b/acct-user/oidentd/oidentd-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=493
+ACCT_USER_GROUPS=( oidentd )
+
+acct-user_add_deps
diff --git a/acct-user/openctd/openctd-0-r1.ebuild b/acct-user/openctd/openctd-0-r1.ebuild
new file mode 100644
index 000000000000..e5943719af29
--- /dev/null
+++ b/acct-user/openctd/openctd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for dev-libs/openct"
+
+ACCT_USER_GROUPS=( "openct" )
+ACCT_USER_ID="46"
+
+acct-user_add_deps
diff --git a/acct-user/openctd/openctd-0.ebuild b/acct-user/openctd/openctd-0.ebuild
deleted file mode 100644
index 71d19f1fd648..000000000000
--- a/acct-user/openctd/openctd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-libs/openct"
-
-ACCT_USER_GROUPS=( "openct" )
-ACCT_USER_ID="46"
-
-acct-user_add_deps
diff --git a/acct-user/opendkim/opendkim-0-r1.ebuild b/acct-user/opendkim/opendkim-0-r1.ebuild
deleted file mode 100644
index 6e82e3c1bc82..000000000000
--- a/acct-user/opendkim/opendkim-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for OpenDKIM"
-
-ACCT_USER_ID=334
-ACCT_USER_GROUPS=( opendkim )
-
-acct-user_add_deps
diff --git a/acct-user/opendkim/opendkim-0-r2.ebuild b/acct-user/opendkim/opendkim-0-r2.ebuild
new file mode 100644
index 000000000000..45820b9fe19e
--- /dev/null
+++ b/acct-user/opendkim/opendkim-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for OpenDKIM"
+
+ACCT_USER_ID=334
+ACCT_USER_GROUPS=( opendkim )
+
+acct-user_add_deps
diff --git a/acct-user/opendmarc/opendmarc-0-r1.ebuild b/acct-user/opendmarc/opendmarc-0-r1.ebuild
new file mode 100644
index 000000000000..f7defc95688f
--- /dev/null
+++ b/acct-user/opendmarc/opendmarc-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/opendmarc"
+
+ACCT_USER_ID=244
+ACCT_USER_GROUPS=( opendmarc )
+
+ACCT_USER_HOME="/var/lib/opendmarc"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/opendmarc/opendmarc-0.ebuild b/acct-user/opendmarc/opendmarc-0.ebuild
deleted file mode 100644
index bd9a6b89f925..000000000000
--- a/acct-user/opendmarc/opendmarc-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/opendmarc"
-
-ACCT_USER_ID=244
-ACCT_USER_GROUPS=( opendmarc )
-
-ACCT_USER_HOME="/var/lib/opendmarc"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/opendnssec/opendnssec-0-r1.ebuild b/acct-user/opendnssec/opendnssec-0-r1.ebuild
new file mode 100644
index 000000000000..3684c42cbf0e
--- /dev/null
+++ b/acct-user/opendnssec/opendnssec-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/opendnssec"
+
+ACCT_USER_GROUPS=( "opendnssec" )
+ACCT_USER_ID="151"
+
+acct-user_add_deps
diff --git a/acct-user/opendnssec/opendnssec-0.ebuild b/acct-user/opendnssec/opendnssec-0.ebuild
deleted file mode 100644
index 620602fb74b7..000000000000
--- a/acct-user/opendnssec/opendnssec-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/opendnssec"
-
-ACCT_USER_GROUPS=( "opendnssec" )
-ACCT_USER_ID="151"
-
-acct-user_add_deps
diff --git a/acct-user/openntpd/openntpd-0-r1.ebuild b/acct-user/openntpd/openntpd-0-r1.ebuild
deleted file mode 100644
index 9210523ff425..000000000000
--- a/acct-user/openntpd/openntpd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for openntpd daemon"
-ACCT_USER_ID=321
-ACCT_USER_GROUPS=( openntpd )
-ACCT_USER_HOME=/var/lib/openntpd/chroot
-ACCT_USER_HOME_OWNER=root:root
-
-acct-user_add_deps
diff --git a/acct-user/openntpd/openntpd-0-r2.ebuild b/acct-user/openntpd/openntpd-0-r2.ebuild
new file mode 100644
index 000000000000..64e9497fe4be
--- /dev/null
+++ b/acct-user/openntpd/openntpd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for openntpd daemon"
+ACCT_USER_ID=321
+ACCT_USER_GROUPS=( openntpd )
+ACCT_USER_HOME=/var/lib/openntpd/chroot
+ACCT_USER_HOME_OWNER=root:root
+
+acct-user_add_deps
diff --git a/acct-user/openrct2/openrct2-0-r1.ebuild b/acct-user/openrct2/openrct2-0-r1.ebuild
deleted file mode 100644
index fb6e4992b578..000000000000
--- a/acct-user/openrct2/openrct2-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the OpenRCT2 dedicated server"
-
-ACCT_USER_GROUPS=( "openrct2" )
-ACCT_USER_ID="479"
-
-acct-user_add_deps
diff --git a/acct-user/openrct2/openrct2-0-r2.ebuild b/acct-user/openrct2/openrct2-0-r2.ebuild
new file mode 100644
index 000000000000..bd994570f3e6
--- /dev/null
+++ b/acct-user/openrct2/openrct2-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the OpenRCT2 dedicated server"
+
+ACCT_USER_GROUPS=( "openrct2" )
+ACCT_USER_ID="479"
+
+acct-user_add_deps
diff --git a/acct-user/openttd/openttd-0-r1.ebuild b/acct-user/openttd/openttd-0-r1.ebuild
new file mode 100644
index 000000000000..3d6994af0a58
--- /dev/null
+++ b/acct-user/openttd/openttd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for games-simulation/openttd"
+
+ACCT_USER_HOME="/var/lib/openttd"
+ACCT_USER_GROUPS=( "openttd" )
+ACCT_USER_ID="513"
+
+acct-user_add_deps
diff --git a/acct-user/openttd/openttd-0.ebuild b/acct-user/openttd/openttd-0.ebuild
deleted file mode 100644
index 98fea61231ee..000000000000
--- a/acct-user/openttd/openttd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for games-simulation/openttd"
-
-ACCT_USER_HOME="/var/lib/openttd"
-ACCT_USER_GROUPS=( "openttd" )
-ACCT_USER_ID="513"
-
-acct-user_add_deps
diff --git a/acct-user/openvpn/openvpn-0-r1.ebuild b/acct-user/openvpn/openvpn-0-r1.ebuild
deleted file mode 100644
index 006f42138df5..000000000000
--- a/acct-user/openvpn/openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-vpn/openvpn"
-
-ACCT_USER_ID=394
-ACCT_USER_GROUPS=( openvpn )
-
-acct-user_add_deps
diff --git a/acct-user/openvpn/openvpn-0-r2.ebuild b/acct-user/openvpn/openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..910756a921ad
--- /dev/null
+++ b/acct-user/openvpn/openvpn-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-vpn/openvpn"
+
+ACCT_USER_ID=394
+ACCT_USER_GROUPS=( openvpn )
+
+acct-user_add_deps
diff --git a/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild
deleted file mode 100644
index 29f970ce62a2..000000000000
--- a/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for openvpn_exporter"
-ACCT_USER_ID=355
-ACCT_USER_GROUPS=( openvpn_exporter )
-ACCT_USER_HOME=/var/lib/openvpn_exporter
-
-acct-user_add_deps
diff --git a/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..286c269ef79b
--- /dev/null
+++ b/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for openvpn_exporter"
+ACCT_USER_ID=355
+ACCT_USER_GROUPS=( openvpn_exporter )
+ACCT_USER_HOME=/var/lib/openvpn_exporter
+
+acct-user_add_deps
diff --git a/acct-user/opm/opm-0-r1.ebuild b/acct-user/opm/opm-0-r1.ebuild
deleted file mode 100644
index ed82e1d8a36c..000000000000
--- a/acct-user/opm/opm-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for an open proxy monitor"
-ACCT_USER_ID=127
-ACCT_USER_GROUPS=( opm )
-
-acct-user_add_deps
diff --git a/acct-user/opm/opm-0-r2.ebuild b/acct-user/opm/opm-0-r2.ebuild
new file mode 100644
index 000000000000..41599e175ed2
--- /dev/null
+++ b/acct-user/opm/opm-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for an open proxy monitor"
+ACCT_USER_ID=127
+ACCT_USER_GROUPS=( opm )
+
+acct-user_add_deps
diff --git a/acct-user/oprofile/oprofile-0-r1.ebuild b/acct-user/oprofile/oprofile-0-r1.ebuild
deleted file mode 100644
index 2a7a5bafe18d..000000000000
--- a/acct-user/oprofile/oprofile-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-util/oprofile JIT code processing"
-ACCT_USER_ID=492
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/oprofile/oprofile-0-r2.ebuild b/acct-user/oprofile/oprofile-0-r2.ebuild
new file mode 100644
index 000000000000..193a1f38d923
--- /dev/null
+++ b/acct-user/oprofile/oprofile-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-util/oprofile JIT code processing"
+ACCT_USER_ID=492
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/oragono/oragono-0-r1.ebuild b/acct-user/oragono/oragono-0-r1.ebuild
new file mode 100644
index 000000000000..94eddf9061c1
--- /dev/null
+++ b/acct-user/oragono/oragono-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Oragono IRC server"
+ACCT_USER_ID=324
+ACCT_USER_GROUPS=( oragono )
+
+acct-user_add_deps
diff --git a/acct-user/oragono/oragono-0.ebuild b/acct-user/oragono/oragono-0.ebuild
deleted file mode 100644
index 0c0040c559ca..000000000000
--- a/acct-user/oragono/oragono-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Oragono IRC server"
-ACCT_USER_ID=324
-ACCT_USER_GROUPS=( oragono )
-
-acct-user_add_deps
diff --git a/acct-user/ossec/ossec-0-r1.ebuild b/acct-user/ossec/ossec-0-r1.ebuild
deleted file mode 100644
index 875c3884f1f2..000000000000
--- a/acct-user/ossec/ossec-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=330
-ACCT_USER_GROUPS=( ossec )
-ACCT_USER_HOME=/var/ossec
-DESCRIPTION="net-analyzer/ossec-hids (agentlessd, analysisd, monitord)"
-
-acct-user_add_deps
diff --git a/acct-user/ossec/ossec-0-r2.ebuild b/acct-user/ossec/ossec-0-r2.ebuild
new file mode 100644
index 000000000000..a559074b51e8
--- /dev/null
+++ b/acct-user/ossec/ossec-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=330
+ACCT_USER_GROUPS=( ossec )
+ACCT_USER_HOME=/var/ossec
+DESCRIPTION="net-analyzer/ossec-hids (agentlessd, analysisd, monitord)"
+
+acct-user_add_deps
diff --git a/acct-user/ossecm/ossecm-0-r1.ebuild b/acct-user/ossecm/ossecm-0-r1.ebuild
deleted file mode 100644
index f180b5c65102..000000000000
--- a/acct-user/ossecm/ossecm-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=331
-ACCT_USER_GROUPS=( ossec )
-DESCRIPTION="net-analyzer/ossec-hids (csyslogd, maild)"
-
-acct-user_add_deps
diff --git a/acct-user/ossecm/ossecm-0-r2.ebuild b/acct-user/ossecm/ossecm-0-r2.ebuild
new file mode 100644
index 000000000000..6f0937bc3343
--- /dev/null
+++ b/acct-user/ossecm/ossecm-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=331
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (csyslogd, maild)"
+
+acct-user_add_deps
diff --git a/acct-user/ossecr/ossecr-0-r1.ebuild b/acct-user/ossecr/ossecr-0-r1.ebuild
deleted file mode 100644
index 09a1309ef995..000000000000
--- a/acct-user/ossecr/ossecr-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=332
-ACCT_USER_GROUPS=( ossec )
-DESCRIPTION="net-analyzer/ossec-hids (remoted)"
-
-acct-user_add_deps
diff --git a/acct-user/ossecr/ossecr-0-r2.ebuild b/acct-user/ossecr/ossecr-0-r2.ebuild
new file mode 100644
index 000000000000..4ad2a76704e8
--- /dev/null
+++ b/acct-user/ossecr/ossecr-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=332
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (remoted)"
+
+acct-user_add_deps
diff --git a/acct-user/owntracks/owntracks-0-r1.ebuild b/acct-user/owntracks/owntracks-0-r1.ebuild
new file mode 100644
index 000000000000..41f51bcfe485
--- /dev/null
+++ b/acct-user/owntracks/owntracks-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for sci-geosciences/owntracks-recorder"
+ACCT_USER_ID=524
+ACCT_USER_GROUPS=( owntracks )
+
+acct-user_add_deps
diff --git a/acct-user/owntracks/owntracks-0.ebuild b/acct-user/owntracks/owntracks-0.ebuild
deleted file mode 100644
index 6a429d1e7c3e..000000000000
--- a/acct-user/owntracks/owntracks-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for sci-geosciences/owntracks-recorder"
-ACCT_USER_ID=524
-ACCT_USER_GROUPS=( owntracks )
-
-acct-user_add_deps
diff --git a/acct-user/p2p/p2p-0-r1.ebuild b/acct-user/p2p/p2p-0-r1.ebuild
new file mode 100644
index 000000000000..c01f9700cdee
--- /dev/null
+++ b/acct-user/p2p/p2p-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mldonkey"
+ACCT_USER_ID=378
+ACCT_USER_GROUPS=( p2p )
+
+acct-user_add_deps
diff --git a/acct-user/p2p/p2p-0.ebuild b/acct-user/p2p/p2p-0.ebuild
deleted file mode 100644
index ec404415aeb4..000000000000
--- a/acct-user/p2p/p2p-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mldonkey"
-ACCT_USER_ID=378
-ACCT_USER_GROUPS=( p2p )
-
-acct-user_add_deps
diff --git a/acct-user/partimag/partimag-0-r1.ebuild b/acct-user/partimag/partimag-0-r1.ebuild
new file mode 100644
index 000000000000..ca2de473588c
--- /dev/null
+++ b/acct-user/partimag/partimag-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-block/partimag"
+
+ACCT_USER_HOME="/var/lib/partimage"
+ACCT_USER_ID="91"
+ACCT_USER_GROUPS=( "partimag" )
+
+acct-user_add_deps
diff --git a/acct-user/partimag/partimag-0.ebuild b/acct-user/partimag/partimag-0.ebuild
deleted file mode 100644
index 27434b6a4472..000000000000
--- a/acct-user/partimag/partimag-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-block/partimag"
-
-ACCT_USER_HOME="/var/lib/partimage"
-ACCT_USER_ID="91"
-ACCT_USER_GROUPS=( "partimag" )
-
-acct-user_add_deps
diff --git a/acct-user/pcap/pcap-0-r1.ebuild b/acct-user/pcap/pcap-0-r1.ebuild
new file mode 100644
index 000000000000..fcff027697a4
--- /dev/null
+++ b/acct-user/pcap/pcap-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for capturing network traffic"
+ACCT_USER_ID=377
+ACCT_USER_GROUPS=( pcap )
+
+acct-user_add_deps
diff --git a/acct-user/pcap/pcap-0.ebuild b/acct-user/pcap/pcap-0.ebuild
deleted file mode 100644
index 781fd3191925..000000000000
--- a/acct-user/pcap/pcap-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for capturing network traffic"
-ACCT_USER_ID=377
-ACCT_USER_GROUPS=( pcap )
-
-acct-user_add_deps
diff --git a/acct-user/pcscd/pcscd-0-r1.ebuild b/acct-user/pcscd/pcscd-0-r1.ebuild
deleted file mode 100644
index 8341bf973cab..000000000000
--- a/acct-user/pcscd/pcscd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for pcsc-lite"
-ACCT_USER_ID=47
-ACCT_USER_GROUPS=( pcscd openct usb )
-
-acct-user_add_deps
diff --git a/acct-user/pcscd/pcscd-0-r2.ebuild b/acct-user/pcscd/pcscd-0-r2.ebuild
new file mode 100644
index 000000000000..7da6a318dccb
--- /dev/null
+++ b/acct-user/pcscd/pcscd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for pcsc-lite"
+ACCT_USER_ID=47
+ACCT_USER_GROUPS=( pcscd openct usb )
+
+acct-user_add_deps
diff --git a/acct-user/pdns/pdns-0-r1.ebuild b/acct-user/pdns/pdns-0-r1.ebuild
deleted file mode 100644
index 7e7272f48a8c..000000000000
--- a/acct-user/pdns/pdns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=423
-ACCT_USER_GROUPS=( pdns )
-
-acct-user_add_deps
diff --git a/acct-user/pdns/pdns-0-r2.ebuild b/acct-user/pdns/pdns-0-r2.ebuild
new file mode 100644
index 000000000000..08cc83f39d72
--- /dev/null
+++ b/acct-user/pdns/pdns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=423
+ACCT_USER_GROUPS=( pdns )
+
+acct-user_add_deps
diff --git a/acct-user/pdnsd/pdnsd-0-r1.ebuild b/acct-user/pdnsd/pdnsd-0-r1.ebuild
deleted file mode 100644
index 1d7bf049ad29..000000000000
--- a/acct-user/pdnsd/pdnsd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for pdns daemon"
-ACCT_USER_ID=184
-ACCT_USER_HOME=/var/lib/pdnsd
-ACCT_USER_HOME_OWNER=pdnsd:root
-ACCT_USER_GROUPS=( pdnsd )
-
-acct-user_add_deps
diff --git a/acct-user/pdnsd/pdnsd-0-r2.ebuild b/acct-user/pdnsd/pdnsd-0-r2.ebuild
new file mode 100644
index 000000000000..3b3ff7fe51f7
--- /dev/null
+++ b/acct-user/pdnsd/pdnsd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for pdns daemon"
+ACCT_USER_ID=184
+ACCT_USER_HOME=/var/lib/pdnsd
+ACCT_USER_HOME_OWNER=pdnsd:root
+ACCT_USER_GROUPS=( pdnsd )
+
+acct-user_add_deps
diff --git a/acct-user/pgagent/pgagent-0-r1.ebuild b/acct-user/pgagent/pgagent-0-r1.ebuild
new file mode 100644
index 000000000000..9bda2e510d21
--- /dev/null
+++ b/acct-user/pgagent/pgagent-0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="pgagent program user"
+ACCT_USER_ID=135
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_HOME=/var/lib/pgagent
+ACCT_USER_GROUPS=( pgagent )
+acct-user_add_deps
+SLOT="0"
+
+pkg_postinst() {
+ ewarn "The home directory has changed for pgagent."
+ ewarn "You should move files, especially .pgpass, from:"
+ ewarn " /home/pgagent"
+ ewarn "To:"
+ ewarn " ${ACCT_USER_HOME}"
+}
diff --git a/acct-user/pgagent/pgagent-0.ebuild b/acct-user/pgagent/pgagent-0.ebuild
deleted file mode 100644
index da03477a46a1..000000000000
--- a/acct-user/pgagent/pgagent-0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="pgagent program user"
-ACCT_USER_ID=135
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_HOME=/var/lib/pgagent
-ACCT_USER_GROUPS=( pgagent )
-acct-user_add_deps
-SLOT="0"
-
-pkg_postinst() {
- ewarn "The home directory has changed for pgagent."
- ewarn "You should move files, especially .pgpass, from:"
- ewarn " /home/pgagent"
- ewarn "To:"
- ewarn " ${ACCT_USER_HOME}"
-}
diff --git a/acct-user/pgbouncer/pgbouncer-0-r1.ebuild b/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
new file mode 100644
index 000000000000..5903c2bb5c40
--- /dev/null
+++ b/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="PgBouncer program user"
+ACCT_USER_ID=463
+ACCT_USER_GROUPS=( postgres )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/pgbouncer/pgbouncer-0.ebuild b/acct-user/pgbouncer/pgbouncer-0.ebuild
deleted file mode 100644
index 91bdbd6630ff..000000000000
--- a/acct-user/pgbouncer/pgbouncer-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="PgBouncer program user"
-ACCT_USER_ID=463
-ACCT_USER_GROUPS=( postgres )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/pgpool/pgpool-0-r1.ebuild b/acct-user/pgpool/pgpool-0-r1.ebuild
new file mode 100644
index 000000000000..9d5ee1d3cda7
--- /dev/null
+++ b/acct-user/pgpool/pgpool-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/pgpool2"
+
+ACCT_USER_GROUPS=( "postgres" )
+ACCT_USER_ID="106"
+
+acct-user_add_deps
diff --git a/acct-user/pgpool/pgpool-0.ebuild b/acct-user/pgpool/pgpool-0.ebuild
deleted file mode 100644
index 209a4ee7605e..000000000000
--- a/acct-user/pgpool/pgpool-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/pgpool2"
-
-ACCT_USER_GROUPS=( "postgres" )
-ACCT_USER_ID="106"
-
-acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-0-r1.ebuild b/acct-user/pipewire/pipewire-0-r1.ebuild
new file mode 100644
index 000000000000..75bfc8650b44
--- /dev/null
+++ b/acct-user/pipewire/pipewire-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running PipeWire as a system-wide instance"
+ACCT_USER_ID=509
+ACCT_USER_GROUPS=( pipewire audio )
+ACCT_USER_HOME=/var/run/pipewire
+
+acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-0.ebuild b/acct-user/pipewire/pipewire-0.ebuild
deleted file mode 100644
index 7d3ea52b7d16..000000000000
--- a/acct-user/pipewire/pipewire-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running PipeWire as a system-wide instance"
-ACCT_USER_ID=509
-ACCT_USER_GROUPS=( pipewire audio )
-ACCT_USER_HOME=/var/run/pipewire
-
-acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-1.ebuild b/acct-user/pipewire/pipewire-1-r1.ebuild
index 0492f9ffcc2e..0492f9ffcc2e 100644
--- a/acct-user/pipewire/pipewire-1.ebuild
+++ b/acct-user/pipewire/pipewire-1-r1.ebuild
diff --git a/acct-user/placement/metadata.xml b/acct-user/placement/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-user/placement/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/placement/placement-0-r1.ebuild b/acct-user/placement/placement-0-r1.ebuild
deleted file mode 100644
index 33bddfb4a00e..000000000000
--- a/acct-user/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the placement openstack service"
-ACCT_USER_ID=448
-ACCT_USER_HOME=/var/lib/placement
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( placement )
-
-acct-user_add_deps
diff --git a/acct-user/plex/plex-0-r1.ebuild b/acct-user/plex/plex-0-r1.ebuild
deleted file mode 100644
index d5e798054bd7..000000000000
--- a/acct-user/plex/plex-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Plex Media Server user"
-ACCT_USER_ID=103
-ACCT_USER_HOME=/var/lib/plexmediaserver
-ACCT_USER_GROUPS=( plex video )
-
-acct-user_add_deps
diff --git a/acct-user/plex/plex-0-r2.ebuild b/acct-user/plex/plex-0-r2.ebuild
new file mode 100644
index 000000000000..10782ef24f9b
--- /dev/null
+++ b/acct-user/plex/plex-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Plex Media Server user"
+ACCT_USER_ID=103
+ACCT_USER_HOME=/var/lib/plexmediaserver
+ACCT_USER_GROUPS=( plex video )
+
+acct-user_add_deps
diff --git a/acct-user/polkitd/polkitd-0-r1.ebuild b/acct-user/polkitd/polkitd-0-r1.ebuild
deleted file mode 100644
index 2d441cd42616..000000000000
--- a/acct-user/polkitd/polkitd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=102
-ACCT_USER_GROUPS=( polkitd )
-ACCT_USER_HOME=/var/lib/polkit-1
-
-acct-user_add_deps
diff --git a/acct-user/polkitd/polkitd-0-r2.ebuild b/acct-user/polkitd/polkitd-0-r2.ebuild
new file mode 100644
index 000000000000..2546ca918d7b
--- /dev/null
+++ b/acct-user/polkitd/polkitd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=102
+ACCT_USER_GROUPS=( polkitd )
+ACCT_USER_HOME=/var/lib/polkit-1
+
+acct-user_add_deps
diff --git a/acct-user/polw/polw-0-r1.ebuild b/acct-user/polw/polw-0-r1.ebuild
new file mode 100644
index 000000000000..7d25130c691c
--- /dev/null
+++ b/acct-user/polw/polw-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/policyd-weight"
+
+ACCT_USER_GROUPS=( "polw" )
+ACCT_USER_ID="263"
+
+acct-user_add_deps
diff --git a/acct-user/polw/polw-0.ebuild b/acct-user/polw/polw-0.ebuild
deleted file mode 100644
index 9a86e4848d40..000000000000
--- a/acct-user/polw/polw-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/policyd-weight"
-
-ACCT_USER_GROUPS=( "polw" )
-ACCT_USER_ID="263"
-
-acct-user_add_deps
diff --git a/acct-user/popa3d/popa3d-0-r1.ebuild b/acct-user/popa3d/popa3d-0-r1.ebuild
new file mode 100644
index 000000000000..dc83868e0236
--- /dev/null
+++ b/acct-user/popa3d/popa3d-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/popa3d"
+ACCT_USER_ID=375
+ACCT_USER_GROUPS=( popa3d )
+
+acct-user_add_deps
diff --git a/acct-user/popa3d/popa3d-0.ebuild b/acct-user/popa3d/popa3d-0.ebuild
deleted file mode 100644
index 7d9064ca0001..000000000000
--- a/acct-user/popa3d/popa3d-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/popa3d"
-ACCT_USER_ID=375
-ACCT_USER_GROUPS=( popa3d )
-
-acct-user_add_deps
diff --git a/acct-user/portage/portage-0-r2.ebuild b/acct-user/portage/portage-0-r2.ebuild
new file mode 100644
index 000000000000..5d8cc4b82ab3
--- /dev/null
+++ b/acct-user/portage/portage-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=250
+ACCT_USER_HOME="/var/lib/portage/home"
+ACCT_USER_GROUPS=( portage )
+
+acct-user_add_deps
diff --git a/acct-user/portage/portage-0.ebuild b/acct-user/portage/portage-0.ebuild
deleted file mode 100644
index 505c3f3b85f4..000000000000
--- a/acct-user/portage/portage-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=250
-ACCT_USER_HOME="/var/lib/portage/home"
-ACCT_USER_GROUPS=( portage )
-
-acct-user_add_deps
diff --git a/acct-user/postfix/postfix-0-r1.ebuild b/acct-user/postfix/postfix-0-r1.ebuild
deleted file mode 100644
index 227740ec875a..000000000000
--- a/acct-user/postfix/postfix-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postfix daemon"
-ACCT_USER_ID=207
-ACCT_USER_GROUPS=( postfix mail )
-
-acct-user_add_deps
diff --git a/acct-user/postfix/postfix-0-r2.ebuild b/acct-user/postfix/postfix-0-r2.ebuild
new file mode 100644
index 000000000000..7543f3afb66e
--- /dev/null
+++ b/acct-user/postfix/postfix-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix daemon"
+ACCT_USER_ID=207
+ACCT_USER_GROUPS=( postfix mail )
+
+acct-user_add_deps
diff --git a/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild
deleted file mode 100644
index b5b31e9b49d2..000000000000
--- a/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postfix_exporter"
-ACCT_USER_ID=356
-ACCT_USER_GROUPS=( postfix_exporter )
-ACCT_USER_HOME=/var/lib/postfix_exporter
-
-acct-user_add_deps
diff --git a/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..eec25c5cbfa1
--- /dev/null
+++ b/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix_exporter"
+ACCT_USER_ID=356
+ACCT_USER_GROUPS=( postfix_exporter )
+ACCT_USER_HOME=/var/lib/postfix_exporter
+
+acct-user_add_deps
diff --git a/acct-user/postfwd/postfwd-0-r1.ebuild b/acct-user/postfwd/postfwd-0-r1.ebuild
new file mode 100644
index 000000000000..a9f9bb00ff8d
--- /dev/null
+++ b/acct-user/postfwd/postfwd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/postfwd"
+
+ACCT_USER_GROUPS=( "postfwd" )
+ACCT_USER_ID="189"
+
+acct-user_add_deps
diff --git a/acct-user/postfwd/postfwd-0.ebuild b/acct-user/postfwd/postfwd-0.ebuild
deleted file mode 100644
index ba5ad6136dfa..000000000000
--- a/acct-user/postfwd/postfwd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for mail-filter/postfwd"
-
-ACCT_USER_GROUPS=( "postfwd" )
-ACCT_USER_ID="189"
-
-acct-user_add_deps
diff --git a/acct-user/postgres/postgres-0-r1.ebuild b/acct-user/postgres/postgres-0-r1.ebuild
deleted file mode 100644
index e420798667c5..000000000000
--- a/acct-user/postgres/postgres-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="PostgreSQL program user"
-ACCT_USER_ID=70
-ACCT_USER_GROUPS=( postgres )
-ACCT_USER_HOME=/var/lib/postgresql
-ACCT_USER_HOME_PERMS=0700
-ACCT_USER_SHELL=/bin/sh
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/postgres/postgres-0-r2.ebuild b/acct-user/postgres/postgres-0-r2.ebuild
new file mode 100644
index 000000000000..4bc70595c4de
--- /dev/null
+++ b/acct-user/postgres/postgres-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="PostgreSQL program user"
+ACCT_USER_ID=70
+ACCT_USER_GROUPS=( postgres )
+ACCT_USER_HOME=/var/lib/postgresql
+ACCT_USER_HOME_PERMS=0700
+ACCT_USER_SHELL=/bin/sh
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild b/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..f451c6f3ed15
--- /dev/null
+++ b/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postgres_exporter"
+ACCT_USER_ID=233
+ACCT_USER_GROUPS=( postgres_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/postgres_exporter/postgres_exporter-0.ebuild b/acct-user/postgres_exporter/postgres_exporter-0.ebuild
deleted file mode 100644
index 4e6d3dd388ba..000000000000
--- a/acct-user/postgres_exporter/postgres_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postgres_exporter"
-ACCT_USER_ID=233
-ACCT_USER_GROUPS=( postgres_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/postgrey/postgrey-0-r1.ebuild b/acct-user/postgrey/postgrey-0-r1.ebuild
new file mode 100644
index 000000000000..11f06cdca018
--- /dev/null
+++ b/acct-user/postgrey/postgrey-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the postgrey mail daemon"
+ACCT_USER_ID=360
+ACCT_USER_GROUPS=( postgrey )
+
+acct-user_add_deps
diff --git a/acct-user/postgrey/postgrey-0.ebuild b/acct-user/postgrey/postgrey-0.ebuild
deleted file mode 100644
index 71d344b37917..000000000000
--- a/acct-user/postgrey/postgrey-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the postgrey mail daemon"
-ACCT_USER_ID=360
-ACCT_USER_GROUPS=( postgrey )
-
-acct-user_add_deps
diff --git a/acct-user/postmaster/postmaster-0-r1.ebuild b/acct-user/postmaster/postmaster-0-r1.ebuild
deleted file mode 100644
index cbf6a9f00c19..000000000000
--- a/acct-user/postmaster/postmaster-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Postmaster user"
-ACCT_USER_ID=14
-ACCT_USER_HOME=/var/spool/mail
-ACCT_USER_HOME_OWNER=root:mail
-ACCT_USER_HOME_PERMS=03775
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/postmaster/postmaster-0-r2.ebuild b/acct-user/postmaster/postmaster-0-r2.ebuild
new file mode 100644
index 000000000000..f2ec25973733
--- /dev/null
+++ b/acct-user/postmaster/postmaster-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Postmaster user"
+ACCT_USER_ID=14
+ACCT_USER_HOME=/var/spool/mail
+ACCT_USER_HOME_OWNER=root:mail
+ACCT_USER_HOME_PERMS=03775
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/privoxy/privoxy-0-r1.ebuild b/acct-user/privoxy/privoxy-0-r1.ebuild
deleted file mode 100644
index 9a3113c42296..000000000000
--- a/acct-user/privoxy/privoxy-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A privoxy: privacy oriented web proxy user"
-ACCT_USER_ID=392
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/privoxy/privoxy-0-r2.ebuild b/acct-user/privoxy/privoxy-0-r2.ebuild
new file mode 100644
index 000000000000..2afb11613a43
--- /dev/null
+++ b/acct-user/privoxy/privoxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A privoxy: privacy oriented web proxy user"
+ACCT_USER_ID=392
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/prometheus/prometheus-0-r1.ebuild b/acct-user/prometheus/prometheus-0-r1.ebuild
deleted file mode 100644
index df0a3191d93d..000000000000
--- a/acct-user/prometheus/prometheus-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for prometheus"
-ACCT_USER_ID=430
-ACCT_USER_GROUPS=( prometheus )
-ACCT_USER_HOME=/var/lib/prometheus
-
-acct-user_add_deps
diff --git a/acct-user/prometheus/prometheus-0-r2.ebuild b/acct-user/prometheus/prometheus-0-r2.ebuild
new file mode 100644
index 000000000000..048869dfe9b9
--- /dev/null
+++ b/acct-user/prometheus/prometheus-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for prometheus"
+ACCT_USER_ID=430
+ACCT_USER_GROUPS=( prometheus )
+ACCT_USER_HOME=/var/lib/prometheus
+
+acct-user_add_deps
diff --git a/acct-user/prosody/prosody-0-r1.ebuild b/acct-user/prosody/prosody-0-r1.ebuild
new file mode 100644
index 000000000000..9d228c8218a7
--- /dev/null
+++ b/acct-user/prosody/prosody-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/prosody"
+
+ACCT_USER_GROUPS=( "prosody" )
+ACCT_USER_ID="115"
+
+acct-user_add_deps
diff --git a/acct-user/prosody/prosody-0.ebuild b/acct-user/prosody/prosody-0.ebuild
deleted file mode 100644
index 223aa45c40f1..000000000000
--- a/acct-user/prosody/prosody-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-im/prosody"
-
-ACCT_USER_GROUPS=( "prosody" )
-ACCT_USER_ID="115"
-
-acct-user_add_deps
diff --git a/acct-user/prowlarr/prowlarr-0-r1.ebuild b/acct-user/prowlarr/prowlarr-0-r1.ebuild
new file mode 100644
index 000000000000..8780c5f0fed3
--- /dev/null
+++ b/acct-user/prowlarr/prowlarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for prowlarr"
+ACCT_USER_HOME=/var/lib/prowlarr
+ACCT_USER_ID=517
+ACCT_USER_GROUPS=( prowlarr )
+
+acct-user_add_deps
diff --git a/acct-user/prowlarr/prowlarr-0.ebuild b/acct-user/prowlarr/prowlarr-0.ebuild
deleted file mode 100644
index be6de1d3e940..000000000000
--- a/acct-user/prowlarr/prowlarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for prowlarr"
-ACCT_USER_HOME=/var/lib/prowlarr
-ACCT_USER_ID=517
-ACCT_USER_GROUPS=( prowlarr )
-
-acct-user_add_deps
diff --git a/acct-user/psybnc/psybnc-0-r1.ebuild b/acct-user/psybnc/psybnc-0-r1.ebuild
new file mode 100644
index 000000000000..5d2635b896c5
--- /dev/null
+++ b/acct-user/psybnc/psybnc-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-irc/psybnc"
+
+ACCT_USER_GROUPS=( "psybnc" )
+ACCT_USER_HOME="/var/lib/psybnc"
+ACCT_USER_ID="259"
+
+acct-user_add_deps
diff --git a/acct-user/psybnc/psybnc-0.ebuild b/acct-user/psybnc/psybnc-0.ebuild
deleted file mode 100644
index 854b5bf822a9..000000000000
--- a/acct-user/psybnc/psybnc-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-irc/psybnc"
-
-ACCT_USER_GROUPS=( "psybnc" )
-ACCT_USER_HOME="/var/lib/psybnc"
-ACCT_USER_ID="259"
-
-acct-user_add_deps
diff --git a/acct-user/pulse/pulse-0-r1.ebuild b/acct-user/pulse/pulse-0-r1.ebuild
new file mode 100644
index 000000000000..88465175512a
--- /dev/null
+++ b/acct-user/pulse/pulse-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the PulseAudio daemon as a system-wide instance"
+ACCT_USER_ID=171
+ACCT_USER_GROUPS=( pulse audio )
+ACCT_USER_HOME=/var/run/pulse
+
+acct-user_add_deps
diff --git a/acct-user/pulse/pulse-0.ebuild b/acct-user/pulse/pulse-0.ebuild
deleted file mode 100644
index 4e885b688f7b..000000000000
--- a/acct-user/pulse/pulse-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the PulseAudio daemon as a system-wide instance"
-ACCT_USER_ID=171
-ACCT_USER_GROUPS=( pulse audio )
-ACCT_USER_HOME=/var/run/pulse
-
-acct-user_add_deps
diff --git a/acct-user/puppet/puppet-0-r1.ebuild b/acct-user/puppet/puppet-0-r1.ebuild
deleted file mode 100644
index 61230a8a6a60..000000000000
--- a/acct-user/puppet/puppet-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for puppet services"
-ACCT_USER_ID=455
-ACCT_USER_HOME=/var/lib/puppet
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( puppet )
-
-acct-user_add_deps
diff --git a/acct-user/puppet/puppet-0-r2.ebuild b/acct-user/puppet/puppet-0-r2.ebuild
new file mode 100644
index 000000000000..4e634ff27bf3
--- /dev/null
+++ b/acct-user/puppet/puppet-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for puppet services"
+ACCT_USER_ID=455
+ACCT_USER_HOME=/var/lib/puppet
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( puppet )
+
+acct-user_add_deps
diff --git a/acct-user/puppetdb/puppetdb-0-r1.ebuild b/acct-user/puppetdb/puppetdb-0-r1.ebuild
deleted file mode 100644
index 7f70113f6559..000000000000
--- a/acct-user/puppetdb/puppetdb-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the puppetdb service"
-ACCT_USER_ID=456
-ACCT_USER_HOME=/opt/puppetlabs/server/data/puppetserver
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( puppetdb )
-
-acct-user_add_deps
diff --git a/acct-user/puppetdb/puppetdb-0-r2.ebuild b/acct-user/puppetdb/puppetdb-0-r2.ebuild
new file mode 100644
index 000000000000..c509fa9a158c
--- /dev/null
+++ b/acct-user/puppetdb/puppetdb-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the puppetdb service"
+ACCT_USER_ID=456
+ACCT_USER_HOME=/opt/puppetlabs/server/data/puppetserver
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( puppetdb )
+
+acct-user_add_deps
diff --git a/acct-user/pushgateway/pushgateway-0-r1.ebuild b/acct-user/pushgateway/pushgateway-0-r1.ebuild
new file mode 100644
index 000000000000..a7a92c4456f9
--- /dev/null
+++ b/acct-user/pushgateway/pushgateway-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/pushgateway"
+
+ACCT_USER_GROUPS=( "pushgateway" )
+ACCT_USER_ID="288"
+
+acct-user_add_deps
diff --git a/acct-user/pushgateway/pushgateway-0.ebuild b/acct-user/pushgateway/pushgateway-0.ebuild
deleted file mode 100644
index dfd5dad5e837..000000000000
--- a/acct-user/pushgateway/pushgateway-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/pushgateway"
-
-ACCT_USER_GROUPS=( "pushgateway" )
-ACCT_USER_ID="288"
-
-acct-user_add_deps
diff --git a/acct-user/pvpgn/pvpgn-0-r1.ebuild b/acct-user/pvpgn/pvpgn-0-r1.ebuild
new file mode 100644
index 000000000000..ddabd61a188e
--- /dev/null
+++ b/acct-user/pvpgn/pvpgn-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for pvpgn (gaming server for Battle.Net compatible clients)"
+ACCT_USER_ID=285
+ACCT_USER_GROUPS=( pvpgn )
+
+acct-user_add_deps
diff --git a/acct-user/pvpgn/pvpgn-0.ebuild b/acct-user/pvpgn/pvpgn-0.ebuild
deleted file mode 100644
index 42d6b6c54788..000000000000
--- a/acct-user/pvpgn/pvpgn-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for pvpgn (gaming server for Battle.Net compatible clients)"
-ACCT_USER_ID=285
-ACCT_USER_GROUPS=( pvpgn )
-
-acct-user_add_deps
diff --git a/acct-user/qemu/qemu-0-r1.ebuild b/acct-user/qemu/qemu-0-r1.ebuild
deleted file mode 100644
index b2c94705fe97..000000000000
--- a/acct-user/qemu/qemu-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=77
-ACCT_USER_GROUPS=( qemu kvm )
-
-acct-user_add_deps
diff --git a/acct-user/qemu/qemu-0-r2.ebuild b/acct-user/qemu/qemu-0-r2.ebuild
new file mode 100644
index 000000000000..ca7ef414b25c
--- /dev/null
+++ b/acct-user/qemu/qemu-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=77
+ACCT_USER_GROUPS=( qemu kvm )
+
+acct-user_add_deps
diff --git a/acct-user/qmaild/qmaild-0-r1.ebuild b/acct-user/qmaild/qmaild-0-r1.ebuild
deleted file mode 100644
index 01104fd99156..000000000000
--- a/acct-user/qmaild/qmaild-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-smtpd"
-ACCT_USER_ID=201
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmaild/qmaild-0-r2.ebuild b/acct-user/qmaild/qmaild-0-r2.ebuild
new file mode 100644
index 000000000000..c5d19a59cf46
--- /dev/null
+++ b/acct-user/qmaild/qmaild-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-smtpd"
+ACCT_USER_ID=201
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmaill/qmaill-0-r1.ebuild b/acct-user/qmaill/qmaill-0-r1.ebuild
deleted file mode 100644
index 52d00df5c450..000000000000
--- a/acct-user/qmaill/qmaill-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail logging"
-ACCT_USER_ID=202
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmaill/qmaill-0-r2.ebuild b/acct-user/qmaill/qmaill-0-r2.ebuild
new file mode 100644
index 000000000000..58863dc7fa00
--- /dev/null
+++ b/acct-user/qmaill/qmaill-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail logging"
+ACCT_USER_ID=202
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmailp/qmailp-0-r1.ebuild b/acct-user/qmailp/qmailp-0-r1.ebuild
deleted file mode 100644
index cce7a11a4dee..000000000000
--- a/acct-user/qmailp/qmailp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-getpw"
-ACCT_USER_ID=203
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmailp/qmailp-0-r2.ebuild b/acct-user/qmailp/qmailp-0-r2.ebuild
new file mode 100644
index 000000000000..cd06f3ce8ccd
--- /dev/null
+++ b/acct-user/qmailp/qmailp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-getpw"
+ACCT_USER_ID=203
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmailq/qmailq-0-r1.ebuild b/acct-user/qmailq/qmailq-0-r1.ebuild
deleted file mode 100644
index f01b4dbb6a5f..000000000000
--- a/acct-user/qmailq/qmailq-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail queue"
-ACCT_USER_ID=204
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmailq/qmailq-0-r2.ebuild b/acct-user/qmailq/qmailq-0-r2.ebuild
new file mode 100644
index 000000000000..3f48c735c70c
--- /dev/null
+++ b/acct-user/qmailq/qmailq-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail queue"
+ACCT_USER_ID=204
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/qmailr/qmailr-0-r1.ebuild b/acct-user/qmailr/qmailr-0-r1.ebuild
deleted file mode 100644
index acc355174d63..000000000000
--- a/acct-user/qmailr/qmailr-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-rspawn and qmail-remote"
-ACCT_USER_ID=205
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmailr/qmailr-0-r2.ebuild b/acct-user/qmailr/qmailr-0-r2.ebuild
new file mode 100644
index 000000000000..dabc73bfed6c
--- /dev/null
+++ b/acct-user/qmailr/qmailr-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-rspawn and qmail-remote"
+ACCT_USER_ID=205
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/qmails/qmails-0-r1.ebuild b/acct-user/qmails/qmails-0-r1.ebuild
deleted file mode 100644
index 67ada5606b16..000000000000
--- a/acct-user/qmails/qmails-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-smtpd"
-ACCT_USER_ID=206
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmails/qmails-0-r2.ebuild b/acct-user/qmails/qmails-0-r2.ebuild
new file mode 100644
index 000000000000..7f26ec2f89b3
--- /dev/null
+++ b/acct-user/qmails/qmails-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-smtpd"
+ACCT_USER_ID=206
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/quagga/metadata.xml b/acct-user/quagga/metadata.xml
deleted file mode 100644
index b3726e9bf59e..000000000000
--- a/acct-user/quagga/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/quagga/quagga-0-r1.ebuild b/acct-user/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index d40e6dace3fe..000000000000
--- a/acct-user/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=424
-ACCT_USER_GROUPS=( quagga )
-
-acct-user_add_deps
diff --git a/acct-user/quassel/quassel-0-r1.ebuild b/acct-user/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index 402d7a01cfca..000000000000
--- a/acct-user/quassel/quassel-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=472
-ACCT_USER_HOME=/var/lib/quassel
-ACCT_USER_GROUPS=( quassel )
-
-acct-user_add_deps
diff --git a/acct-user/quassel/quassel-0-r2.ebuild b/acct-user/quassel/quassel-0-r2.ebuild
new file mode 100644
index 000000000000..4f783f9a351f
--- /dev/null
+++ b/acct-user/quassel/quassel-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=472
+ACCT_USER_HOME=/var/lib/quassel
+ACCT_USER_GROUPS=( quassel )
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq/rabbitmq-0-r1.ebuild b/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
new file mode 100644
index 000000000000..ec27b7545b5b
--- /dev/null
+++ b/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/rabbitmq-server"
+
+ACCT_USER_GROUPS=( "rabbitmq" )
+ACCT_USER_HOME="/var/lib/rabbitmq"
+ACCT_USER_HOME_PERMS="0750"
+ACCT_USER_ID="121"
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq/rabbitmq-0.ebuild b/acct-user/rabbitmq/rabbitmq-0.ebuild
deleted file mode 100644
index 23f7f618a8fc..000000000000
--- a/acct-user/rabbitmq/rabbitmq-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/rabbitmq-server"
-
-ACCT_USER_GROUPS=( "rabbitmq" )
-ACCT_USER_HOME="/var/lib/rabbitmq"
-ACCT_USER_HOME_PERMS="0750"
-ACCT_USER_ID="121"
-
-acct-user_add_deps
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..78248a6b75ff
--- /dev/null
+++ b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/rabbitmq_exporter"
+
+ACCT_USER_ID=107
+ACCT_USER_GROUPS=( rabbitmq_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
deleted file mode 100644
index 89db38665fb8..000000000000
--- a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/rabbitmq_exporter"
-
-ACCT_USER_ID=107
-ACCT_USER_GROUPS=( rabbitmq_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/radarr/radarr-0-r1.ebuild b/acct-user/radarr/radarr-0-r1.ebuild
new file mode 100644
index 000000000000..419aa4591317
--- /dev/null
+++ b/acct-user/radarr/radarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for radarr"
+ACCT_USER_HOME=/var/lib/radarr
+ACCT_USER_ID=516
+ACCT_USER_GROUPS=( radarr )
+
+acct-user_add_deps
diff --git a/acct-user/radarr/radarr-0.ebuild b/acct-user/radarr/radarr-0.ebuild
deleted file mode 100644
index c910ab4636ce..000000000000
--- a/acct-user/radarr/radarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for radarr"
-ACCT_USER_HOME=/var/lib/radarr
-ACCT_USER_ID=516
-ACCT_USER_GROUPS=( radarr )
-
-acct-user_add_deps
diff --git a/acct-user/radicale/radicale-0-r2.ebuild b/acct-user/radicale/radicale-0-r2.ebuild
deleted file mode 100644
index 221d3fb16490..000000000000
--- a/acct-user/radicale/radicale-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/radicale"
-ACCT_USER_ID=327
-ACCT_USER_GROUPS=( radicale )
-ACCT_USER_HOME=/var/lib/radicale
-
-acct-user_add_deps
diff --git a/acct-user/radicale/radicale-0-r3.ebuild b/acct-user/radicale/radicale-0-r3.ebuild
new file mode 100644
index 000000000000..75d00441a126
--- /dev/null
+++ b/acct-user/radicale/radicale-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/radicale"
+ACCT_USER_ID=327
+ACCT_USER_GROUPS=( radicale )
+ACCT_USER_HOME=/var/lib/radicale
+
+acct-user_add_deps
diff --git a/acct-user/radius/radius-0-r1.ebuild b/acct-user/radius/radius-0-r1.ebuild
deleted file mode 100644
index 811870d8e2d6..000000000000
--- a/acct-user/radius/radius-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="FreeRadius program user"
-ACCT_USER_ID=95
-ACCT_USER_GROUPS=( radius )
-acct-user_add_deps
diff --git a/acct-user/radius/radius-0-r2.ebuild b/acct-user/radius/radius-0-r2.ebuild
new file mode 100644
index 000000000000..2611f8b3352a
--- /dev/null
+++ b/acct-user/radius/radius-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="FreeRadius program user"
+ACCT_USER_ID=95
+ACCT_USER_GROUPS=( radius )
+acct-user_add_deps
diff --git a/acct-user/radvd/radvd-0-r1.ebuild b/acct-user/radvd/radvd-0-r1.ebuild
new file mode 100644
index 000000000000..d74fe7916643
--- /dev/null
+++ b/acct-user/radvd/radvd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Router Advertisement Daemon"
+
+ACCT_USER_GROUPS=( "radvd" )
+ACCT_USER_ID="215"
+
+acct-user_add_deps
diff --git a/acct-user/radvd/radvd-0.ebuild b/acct-user/radvd/radvd-0.ebuild
deleted file mode 100644
index 3b51448d28b9..000000000000
--- a/acct-user/radvd/radvd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Router Advertisement Daemon"
-
-ACCT_USER_GROUPS=( "radvd" )
-ACCT_USER_ID="215"
-
-acct-user_add_deps
diff --git a/acct-user/rbldns/rbldns-0-r1.ebuild b/acct-user/rbldns/rbldns-0-r1.ebuild
deleted file mode 100644
index f9ec0841095b..000000000000
--- a/acct-user/rbldns/rbldns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=153
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/rbldns/rbldns-0-r2.ebuild b/acct-user/rbldns/rbldns-0-r2.ebuild
new file mode 100644
index 000000000000..43929c1fad55
--- /dev/null
+++ b/acct-user/rbldns/rbldns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=153
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/rbot/rbot-0-r1.ebuild b/acct-user/rbot/rbot-0-r1.ebuild
new file mode 100644
index 000000000000..bf0c7c145e88
--- /dev/null
+++ b/acct-user/rbot/rbot-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-irc/rbot"
+
+ACCT_USER_GROUPS=( "rbot" )
+ACCT_USER_HOME="/var/lib/rbot"
+ACCT_USER_ID="129"
+
+acct-user_add_deps
diff --git a/acct-user/rbot/rbot-0.ebuild b/acct-user/rbot/rbot-0.ebuild
deleted file mode 100644
index c4e767ac30a0..000000000000
--- a/acct-user/rbot/rbot-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-irc/rbot"
-
-ACCT_USER_GROUPS=( "rbot" )
-ACCT_USER_HOME="/var/lib/rbot"
-ACCT_USER_ID="129"
-
-acct-user_add_deps
diff --git a/acct-user/readarr/readarr-0-r1.ebuild b/acct-user/readarr/readarr-0-r1.ebuild
new file mode 100644
index 000000000000..d782879aa061
--- /dev/null
+++ b/acct-user/readarr/readarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for readarr"
+ACCT_USER_HOME=/var/lib/readarr
+ACCT_USER_ID=521
+ACCT_USER_GROUPS=( readarr )
+
+acct-user_add_deps
diff --git a/acct-user/readarr/readarr-0.ebuild b/acct-user/readarr/readarr-0.ebuild
deleted file mode 100644
index 9998e137f4ad..000000000000
--- a/acct-user/readarr/readarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for readarr"
-ACCT_USER_HOME=/var/lib/readarr
-ACCT_USER_ID=521
-ACCT_USER_GROUPS=( readarr )
-
-acct-user_add_deps
diff --git a/acct-user/redis/redis-0-r1.ebuild b/acct-user/redis/redis-0-r1.ebuild
deleted file mode 100644
index b685af71488c..000000000000
--- a/acct-user/redis/redis-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="Redis program user"
-ACCT_USER_ID=75
-ACCT_USER_GROUPS=( redis )
-acct-user_add_deps
diff --git a/acct-user/redis/redis-0-r2.ebuild b/acct-user/redis/redis-0-r2.ebuild
new file mode 100644
index 000000000000..a9cebb2a7108
--- /dev/null
+++ b/acct-user/redis/redis-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Redis program user"
+ACCT_USER_ID=75
+ACCT_USER_GROUPS=( redis )
+acct-user_add_deps
diff --git a/acct-user/redis_exporter/redis_exporter-0-r1.ebuild b/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..9dc7b65510f4
--- /dev/null
+++ b/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/redis_exporter"
+
+ACCT_USER_HOME=/var/lib/redis_exporter
+ACCT_USER_GROUPS=( "redis_exporter" )
+ACCT_USER_ID="298"
+
+acct-user_add_deps
diff --git a/acct-user/redis_exporter/redis_exporter-0.ebuild b/acct-user/redis_exporter/redis_exporter-0.ebuild
deleted file mode 100644
index 9096283d34a1..000000000000
--- a/acct-user/redis_exporter/redis_exporter-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/redis_exporter"
-
-ACCT_USER_HOME=/var/lib/redis_exporter
-ACCT_USER_GROUPS=( "redis_exporter" )
-ACCT_USER_ID="298"
-
-acct-user_add_deps
diff --git a/acct-user/redmine/redmine-0-r1.ebuild b/acct-user/redmine/redmine-0-r1.ebuild
deleted file mode 100644
index 2c309ee4b3d1..000000000000
--- a/acct-user/redmine/redmine-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Redmine application user"
-ACCT_USER_ID=451
-ACCT_USER_GROUPS=( redmine )
-acct-user_add_deps
diff --git a/acct-user/redmine/redmine-0-r2.ebuild b/acct-user/redmine/redmine-0-r2.ebuild
new file mode 100644
index 000000000000..c46f454cb5c8
--- /dev/null
+++ b/acct-user/redmine/redmine-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Redmine application user"
+ACCT_USER_ID=451
+ACCT_USER_GROUPS=( redmine )
+acct-user_add_deps
diff --git a/acct-user/redsocks/redsocks-0-r1.ebuild b/acct-user/redsocks/redsocks-0-r1.ebuild
deleted file mode 100644
index b59a8084d4d4..000000000000
--- a/acct-user/redsocks/redsocks-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-proxy/redsocks"
-
-ACCT_USER_GROUPS=( "redsocks" )
-ACCT_USER_ID="154"
-
-acct-user_add_deps
diff --git a/acct-user/redsocks/redsocks-0-r2.ebuild b/acct-user/redsocks/redsocks-0-r2.ebuild
new file mode 100644
index 000000000000..bcaa7b06c23d
--- /dev/null
+++ b/acct-user/redsocks/redsocks-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-proxy/redsocks"
+
+ACCT_USER_GROUPS=( "redsocks" )
+ACCT_USER_ID="154"
+
+acct-user_add_deps
diff --git a/acct-user/reg/reg-0-r1.ebuild b/acct-user/reg/reg-0-r1.ebuild
deleted file mode 100644
index 57bb9a6ed18f..000000000000
--- a/acct-user/reg/reg-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-containers/reg"
-
-ACCT_USER_ID=503
-ACCT_USER_GROUPS=( reg )
-ACCT_USER_HOME=/var/lib/reg
-
-acct-user_add_deps
diff --git a/acct-user/reg/reg-0-r2.ebuild b/acct-user/reg/reg-0-r2.ebuild
new file mode 100644
index 000000000000..908843687070
--- /dev/null
+++ b/acct-user/reg/reg-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-containers/reg"
+
+ACCT_USER_ID=503
+ACCT_USER_GROUPS=( reg )
+ACCT_USER_HOME=/var/lib/reg
+
+acct-user_add_deps
diff --git a/acct-user/registry/registry-0-r1.ebuild b/acct-user/registry/registry-0-r1.ebuild
new file mode 100644
index 000000000000..0542f5c6e243
--- /dev/null
+++ b/acct-user/registry/registry-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-containers/docker-registry"
+
+ACCT_USER_GROUPS=( "registry" )
+ACCT_USER_ID="295"
+
+acct-user_add_deps
diff --git a/acct-user/registry/registry-0.ebuild b/acct-user/registry/registry-0.ebuild
deleted file mode 100644
index 5994a8162973..000000000000
--- a/acct-user/registry/registry-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-containers/docker-registry"
-
-ACCT_USER_GROUPS=( "registry" )
-ACCT_USER_ID="295"
-
-acct-user_add_deps
diff --git a/acct-user/root/root-0-r1.ebuild b/acct-user/root/root-0-r1.ebuild
deleted file mode 100644
index ea2e82dfcf29..000000000000
--- a/acct-user/root/root-0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=0
-ACCT_USER_ENFORCE_ID=yes
-ACCT_USER_SHELL="/bin/bash"
-ACCT_USER_HOME="/root"
-ACCT_USER_HOME_PERMS=0700
-ACCT_USER_GROUPS=( root )
-
-# Avoid reverting changes by the sysadmin.
-# https://bugs.gentoo.org/827813
-ACCT_USER_NO_MODIFY=1
-
-acct-user_add_deps
-
-pkg_prerm() {
- # Don't lock out the superuser
- :
-}
diff --git a/acct-user/root/root-0-r2.ebuild b/acct-user/root/root-0-r2.ebuild
new file mode 100644
index 000000000000..886f46d01e36
--- /dev/null
+++ b/acct-user/root/root-0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=0
+ACCT_USER_ENFORCE_ID=yes
+ACCT_USER_SHELL="/bin/bash"
+ACCT_USER_HOME="/root"
+ACCT_USER_HOME_PERMS=0700
+ACCT_USER_GROUPS=( root )
+
+# Avoid reverting changes by the sysadmin.
+# https://bugs.gentoo.org/827813
+ACCT_USER_NO_MODIFY=1
+
+acct-user_add_deps
+
+pkg_prerm() {
+ # Don't lock out the superuser
+ :
+}
diff --git a/acct-user/rplayd/metadata.xml b/acct-user/rplayd/metadata.xml
deleted file mode 100644
index 93423219a5bc..000000000000
--- a/acct-user/rplayd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sound@gentoo.org</email>
- <name>Gentoo Sound project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/rplayd/rplayd-0.ebuild b/acct-user/rplayd/rplayd-0.ebuild
deleted file mode 100644
index d0f4a9ffa47e..000000000000
--- a/acct-user/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/rplay"
-
-ACCT_USER_GROUPS=( "rplayd" )
-ACCT_USER_ID="161"
-
-acct-user_add_deps
diff --git a/acct-user/rrdcached/rrdcached-0-r1.ebuild b/acct-user/rrdcached/rrdcached-0-r1.ebuild
new file mode 100644
index 000000000000..254b5384bb3f
--- /dev/null
+++ b/acct-user/rrdcached/rrdcached-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/rrdtool"
+
+ACCT_USER_HOME="/var/lib/rrdcached"
+ACCT_USER_ID="511"
+ACCT_USER_GROUPS=( "rrdcached" )
+
+acct-user_add_deps
diff --git a/acct-user/rrdcached/rrdcached-0.ebuild b/acct-user/rrdcached/rrdcached-0.ebuild
deleted file mode 100644
index 1ce6ab3ef294..000000000000
--- a/acct-user/rrdcached/rrdcached-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/rrdtool"
-
-ACCT_USER_HOME="/var/lib/rrdcached"
-ACCT_USER_ID="511"
-ACCT_USER_GROUPS=( "rrdcached" )
-
-acct-user_add_deps
diff --git a/acct-user/rslsync/rslsync-0-r1.ebuild b/acct-user/rslsync/rslsync-0-r1.ebuild
new file mode 100644
index 000000000000..58907429b95f
--- /dev/null
+++ b/acct-user/rslsync/rslsync-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-p2p/resilio-sync"
+
+ACCT_USER_GROUPS=( "rslsync" )
+ACCT_USER_HOME="/var/lib/resilio-sync"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="175"
+
+acct-user_add_deps
diff --git a/acct-user/rslsync/rslsync-0.ebuild b/acct-user/rslsync/rslsync-0.ebuild
deleted file mode 100644
index c0b018b0637e..000000000000
--- a/acct-user/rslsync/rslsync-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-p2p/resilio-sync"
-
-ACCT_USER_GROUPS=( "rslsync" )
-ACCT_USER_HOME="/var/lib/resilio-sync"
-ACCT_USER_HOME_PERMS="0700"
-ACCT_USER_ID="175"
-
-acct-user_add_deps
diff --git a/acct-user/rspamd/rspamd-0-r1.ebuild b/acct-user/rspamd/rspamd-0-r1.ebuild
deleted file mode 100644
index 6c9d403c5892..000000000000
--- a/acct-user/rspamd/rspamd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for rspamd - Rapid spam filtering system"
-ACCT_USER_ID=237
-ACCT_USER_GROUPS=( rspamd )
-
-acct-user_add_deps
diff --git a/acct-user/rspamd/rspamd-0-r2.ebuild b/acct-user/rspamd/rspamd-0-r2.ebuild
new file mode 100644
index 000000000000..445b38c43475
--- /dev/null
+++ b/acct-user/rspamd/rspamd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for rspamd - Rapid spam filtering system"
+ACCT_USER_ID=237
+ACCT_USER_GROUPS=( rspamd )
+
+acct-user_add_deps
diff --git a/acct-user/rstudio-server/metadata.xml b/acct-user/rstudio-server/metadata.xml
deleted file mode 100644
index 0aa68b1689b9..000000000000
--- a/acct-user/rstudio-server/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>gienah@gentoo.org</email>
- <name>Mark Wright</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild b/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index a77f8b72ddee..000000000000
--- a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sci-mathematics/rstudio"
-ACCT_USER_ID=466
-ACCT_USER_GROUPS=( rstudio-server )
-
-acct-user_add_deps
diff --git a/acct-user/rt/rt-0-r1.ebuild b/acct-user/rt/rt-0-r1.ebuild
new file mode 100644
index 000000000000..ebc3c57938be
--- /dev/null
+++ b/acct-user/rt/rt-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/rt"
+
+ACCT_USER_GROUPS=( "rt" )
+ACCT_USER_ID="126"
+
+acct-user_add_deps
diff --git a/acct-user/rt/rt-0.ebuild b/acct-user/rt/rt-0.ebuild
deleted file mode 100644
index 0cb1f523ec0b..000000000000
--- a/acct-user/rt/rt-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/rt"
-
-ACCT_USER_GROUPS=( "rt" )
-ACCT_USER_ID="126"
-
-acct-user_add_deps
diff --git a/acct-user/rtkit/rtkit-0-r1.ebuild b/acct-user/rtkit/rtkit-0-r1.ebuild
deleted file mode 100644
index 49a940185f8c..000000000000
--- a/acct-user/rtkit/rtkit-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Realtime Policy and Watchdog Daemon"
-ACCT_USER_ID=133
-ACCT_USER_GROUPS=( rtkit )
-
-acct-user_add_deps
diff --git a/acct-user/rtkit/rtkit-0-r2.ebuild b/acct-user/rtkit/rtkit-0-r2.ebuild
new file mode 100644
index 000000000000..e37c9fff14f8
--- /dev/null
+++ b/acct-user/rtkit/rtkit-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the Realtime Policy and Watchdog Daemon"
+ACCT_USER_ID=133
+ACCT_USER_GROUPS=( rtkit )
+
+acct-user_add_deps
diff --git a/acct-user/rundeck/metadata.xml b/acct-user/rundeck/metadata.xml
deleted file mode 100644
index db463f3eeb66..000000000000
--- a/acct-user/rundeck/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>williamh@gentoo.org</email>
- <name>William Hubbs</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/rundeck/rundeck-0.ebuild b/acct-user/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9c34344b34ff..000000000000
--- a/acct-user/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/rundeck-bin"
-
-ACCT_USER_ID=109
-ACCT_USER_HOME=/var/lib/rundeck
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_GROUPS=( rundeck )
-
-acct-user_add_deps
diff --git a/acct-user/rwhoisd/rwhoisd-0-r1.ebuild b/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
new file mode 100644
index 000000000000..7bb46f1728e4
--- /dev/null
+++ b/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/rwhoisd"
+
+ACCT_USER_GROUPS=( "rwhoisd" )
+ACCT_USER_HOME="/var/rwhoisd"
+ACCT_USER_ID="258"
+
+acct-user_add_deps
diff --git a/acct-user/rwhoisd/rwhoisd-0.ebuild b/acct-user/rwhoisd/rwhoisd-0.ebuild
deleted file mode 100644
index b7b112a8db4a..000000000000
--- a/acct-user/rwhoisd/rwhoisd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/rwhoisd"
-
-ACCT_USER_GROUPS=( "rwhoisd" )
-ACCT_USER_HOME="/var/rwhoisd"
-ACCT_USER_ID="258"
-
-acct-user_add_deps
diff --git a/acct-user/sabnzbd/sabnzbd-0-r1.ebuild b/acct-user/sabnzbd/sabnzbd-0-r1.ebuild
deleted file mode 100644
index ee5b6e7c09f5..000000000000
--- a/acct-user/sabnzbd/sabnzbd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="SABnzbd program user"
-
-ACCT_USER_ID=397
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( sabnzbd )
-
-acct-user_add_deps
diff --git a/acct-user/sabnzbd/sabnzbd-0-r2.ebuild b/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
new file mode 100644
index 000000000000..271ae1c22ae7
--- /dev/null
+++ b/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="SABnzbd program user"
+
+ACCT_USER_ID=397
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( sabnzbd )
+
+acct-user_add_deps
diff --git a/acct-user/sagan/sagan-0-r1.ebuild b/acct-user/sagan/sagan-0-r1.ebuild
deleted file mode 100644
index 9ad8931530f3..000000000000
--- a/acct-user/sagan/sagan-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Sagan log monitoring system"
-ACCT_USER_ID=317
-ACCT_USER_GROUPS=( sagan )
-
-acct-user_add_deps
diff --git a/acct-user/sagan/sagan-0-r2.ebuild b/acct-user/sagan/sagan-0-r2.ebuild
new file mode 100644
index 000000000000..4f81071a3b94
--- /dev/null
+++ b/acct-user/sagan/sagan-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the Sagan log monitoring system"
+ACCT_USER_ID=317
+ACCT_USER_GROUPS=( sagan )
+
+acct-user_add_deps
diff --git a/acct-user/samplicator/samplicator-0-r1.ebuild b/acct-user/samplicator/samplicator-0-r1.ebuild
new file mode 100644
index 000000000000..7b60d91482a0
--- /dev/null
+++ b/acct-user/samplicator/samplicator-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/samplicator"
+
+ACCT_USER_GROUPS=( "samplicator" )
+ACCT_USER_HOME="/etc/samplicator"
+ACCT_USER_ID="179"
+
+acct-user_add_deps
diff --git a/acct-user/samplicator/samplicator-0.ebuild b/acct-user/samplicator/samplicator-0.ebuild
deleted file mode 100644
index cbdb6485cf39..000000000000
--- a/acct-user/samplicator/samplicator-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/samplicator"
-
-ACCT_USER_GROUPS=( "samplicator" )
-ACCT_USER_HOME="/etc/samplicator"
-ACCT_USER_ID="179"
-
-acct-user_add_deps
diff --git a/acct-user/sancp/sancp-0-r1.ebuild b/acct-user/sancp/sancp-0-r1.ebuild
new file mode 100644
index 000000000000..012908badf47
--- /dev/null
+++ b/acct-user/sancp/sancp-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/sancp"
+ACCT_USER_ID=382
+ACCT_USER_GROUPS=( sancp )
+
+acct-user_add_deps
diff --git a/acct-user/sancp/sancp-0.ebuild b/acct-user/sancp/sancp-0.ebuild
deleted file mode 100644
index 804e4057270e..000000000000
--- a/acct-user/sancp/sancp-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/sancp"
-ACCT_USER_ID=382
-ACCT_USER_GROUPS=( sancp )
-
-acct-user_add_deps
diff --git a/acct-user/saned/saned-0-r1.ebuild b/acct-user/saned/saned-0-r1.ebuild
new file mode 100644
index 000000000000..43a593335a48
--- /dev/null
+++ b/acct-user/saned/saned-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for media-gfx/sane-backends"
+
+ACCT_USER_GROUPS=( "scanner" )
+ACCT_USER_ID="409"
+
+acct-user_add_deps
diff --git a/acct-user/saned/saned-0.ebuild b/acct-user/saned/saned-0.ebuild
deleted file mode 100644
index cf6954c61297..000000000000
--- a/acct-user/saned/saned-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for media-gfx/sane-backends"
-
-ACCT_USER_GROUPS=( "scanner" )
-ACCT_USER_ID="409"
-
-acct-user_add_deps
diff --git a/acct-user/sanlock/sanlock-0-r1.ebuild b/acct-user/sanlock/sanlock-0-r1.ebuild
deleted file mode 100644
index 839e34bd9bc5..000000000000
--- a/acct-user/sanlock/sanlock-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="shared storage lock manager"
-ACCT_USER_ID=340
-ACCT_USER_HOME=/dev/null
-ACCT_USER_GROUPS=( ${PN} disk )
-
-acct-user_add_deps
diff --git a/acct-user/sanlock/sanlock-0-r2.ebuild b/acct-user/sanlock/sanlock-0-r2.ebuild
new file mode 100644
index 000000000000..8a98a7cacb31
--- /dev/null
+++ b/acct-user/sanlock/sanlock-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="shared storage lock manager"
+ACCT_USER_ID=340
+ACCT_USER_HOME=/dev/null
+ACCT_USER_GROUPS=( ${PN} disk )
+
+acct-user_add_deps
diff --git a/acct-user/sauerbraten/sauerbraten-0-r1.ebuild b/acct-user/sauerbraten/sauerbraten-0-r1.ebuild
deleted file mode 100644
index 1e35c084b798..000000000000
--- a/acct-user/sauerbraten/sauerbraten-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
-ACCT_USER_ID=286
-ACCT_USER_GROUPS=( sauerbraten )
-
-acct-user_add_deps
diff --git a/acct-user/sauerbraten/sauerbraten-0-r2.ebuild b/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
new file mode 100644
index 000000000000..657f44fd672f
--- /dev/null
+++ b/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
+ACCT_USER_ID=286
+ACCT_USER_GROUPS=( sauerbraten )
+
+acct-user_add_deps
diff --git a/acct-user/scanlogd/scanlogd-0-r1.ebuild b/acct-user/scanlogd/scanlogd-0-r1.ebuild
new file mode 100644
index 000000000000..9e823b440fbc
--- /dev/null
+++ b/acct-user/scanlogd/scanlogd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/scanlogd"
+
+ACCT_USER_GROUPS=( "scanlogd" )
+ACCT_USER_ID="166"
+
+acct-user_add_deps
diff --git a/acct-user/scanlogd/scanlogd-0.ebuild b/acct-user/scanlogd/scanlogd-0.ebuild
deleted file mode 100644
index 21ec18b7a255..000000000000
--- a/acct-user/scanlogd/scanlogd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/scanlogd"
-
-ACCT_USER_GROUPS=( "scanlogd" )
-ACCT_USER_ID="166"
-
-acct-user_add_deps
diff --git a/acct-user/scponly/scponly-0-r1.ebuild b/acct-user/scponly/scponly-0-r1.ebuild
deleted file mode 100644
index 329ccf735996..000000000000
--- a/acct-user/scponly/scponly-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for chrooted scponly"
-ACCT_USER_ID=239
-ACCT_USER_GROUPS=( scponly )
-# Not a typo. scponly uses the trailing // to identify the chroot dir.
-ACCT_USER_HOME=/var/chroot/scponly//
-ACCT_USER_HOME_OWNER=root:root
-
-acct-user_add_deps
diff --git a/acct-user/scponly/scponly-0-r2.ebuild b/acct-user/scponly/scponly-0-r2.ebuild
new file mode 100644
index 000000000000..ed12f0b4e2c6
--- /dev/null
+++ b/acct-user/scponly/scponly-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for chrooted scponly"
+ACCT_USER_ID=239
+ACCT_USER_GROUPS=( scponly )
+# Not a typo. scponly uses the trailing // to identify the chroot dir.
+ACCT_USER_HOME=/var/chroot/scponly//
+ACCT_USER_HOME_OWNER=root:root
+
+acct-user_add_deps
diff --git a/acct-user/sddm/sddm-0-r1.ebuild b/acct-user/sddm/sddm-0-r1.ebuild
new file mode 100644
index 000000000000..ee5313288ddd
--- /dev/null
+++ b/acct-user/sddm/sddm-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/sddm"
+
+ACCT_USER_GROUPS=( "sddm" "video" )
+ACCT_USER_HOME="/var/lib/sddm"
+ACCT_USER_ID="219"
+
+acct-user_add_deps
diff --git a/acct-user/sddm/sddm-0.ebuild b/acct-user/sddm/sddm-0.ebuild
deleted file mode 100644
index dbfdeb4679ec..000000000000
--- a/acct-user/sddm/sddm-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for x11-misc/sddm"
-
-ACCT_USER_GROUPS=( "sddm" "video" )
-ACCT_USER_HOME="/var/lib/sddm"
-ACCT_USER_ID="219"
-
-acct-user_add_deps
diff --git a/acct-user/sendpage/sendpage-0-r1.ebuild b/acct-user/sendpage/sendpage-0-r1.ebuild
new file mode 100644
index 000000000000..b0fc5897e520
--- /dev/null
+++ b/acct-user/sendpage/sendpage-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dialup/sendpage"
+
+ACCT_USER_GROUPS=( "sms" )
+ACCT_USER_ID="406"
+
+acct-user_add_deps
diff --git a/acct-user/sendpage/sendpage-0.ebuild b/acct-user/sendpage/sendpage-0.ebuild
deleted file mode 100644
index 02b16c3ad728..000000000000
--- a/acct-user/sendpage/sendpage-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dialup/sendpage"
-
-ACCT_USER_GROUPS=( "sms" )
-ACCT_USER_ID="406"
-
-acct-user_add_deps
diff --git a/acct-user/serf/serf-0-r1.ebuild b/acct-user/serf/serf-0-r1.ebuild
new file mode 100644
index 000000000000..08b4db34860a
--- /dev/null
+++ b/acct-user/serf/serf-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/serf"
+
+ACCT_USER_HOME=/var/lib/serf
+ACCT_USER_GROUPS=( "serf" )
+ACCT_USER_ID="314"
+
+acct-user_add_deps
diff --git a/acct-user/serf/serf-0.ebuild b/acct-user/serf/serf-0.ebuild
deleted file mode 100644
index 69ba27af0770..000000000000
--- a/acct-user/serf/serf-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/serf"
-
-ACCT_USER_HOME=/var/lib/serf
-ACCT_USER_GROUPS=( "serf" )
-ACCT_USER_ID="314"
-
-acct-user_add_deps
diff --git a/acct-user/sguil/metadata.xml b/acct-user/sguil/metadata.xml
deleted file mode 100644
index d5af4bcfaf13..000000000000
--- a/acct-user/sguil/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/sguil/sguil-0.ebuild b/acct-user/sguil/sguil-0.ebuild
deleted file mode 100644
index 01910dcc0edd..000000000000
--- a/acct-user/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/sguil-sensor"
-
-ACCT_USER_GROUPS=( "sguil" )
-ACCT_USER_HOME="/var/lib/sguil"
-ACCT_USER_ID="165"
-
-acct-user_add_deps
diff --git a/acct-user/shellinaboxd/metadata.xml b/acct-user/shellinaboxd/metadata.xml
deleted file mode 100644
index 65be4a236db7..000000000000
--- a/acct-user/shellinaboxd/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@