summaryrefslogtreecommitdiff
path: root/acct-user
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-07-09 22:25:44 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-07-09 22:25:44 +0100
commit796e724b5ace96ff70d918765662edf62f1d8c85 (patch)
treeb09742996db0de2a2414587542b1b91d4ae5c522 /acct-user
parentcd7ab3ad114e9777d85ced67abdd5b25d0bd4efe (diff)
gentoo auto-resync : 09:07:2023 - 22:25:43
Diffstat (limited to 'acct-user')
-rw-r--r--acct-user/Manifest.gzbin70859 -> 70799 bytes
-rw-r--r--acct-user/_cron-failure/Manifest2
-rw-r--r--acct-user/_cron-failure/_cron-failure-0-r1.ebuild12
-rw-r--r--acct-user/_cron-failure/_cron-failure-0.ebuild12
-rw-r--r--acct-user/aerospike-amc/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild12
-rw-r--r--acct-user/argus/Manifest2
-rw-r--r--acct-user/argus/argus-0-r1.ebuild13
-rw-r--r--acct-user/argus/argus-0.ebuild13
-rw-r--r--acct-user/arpwatch/Manifest2
-rw-r--r--acct-user/arpwatch/arpwatch-0-r1.ebuild13
-rw-r--r--acct-user/arpwatch/arpwatch-0.ebuild13
-rw-r--r--acct-user/artifactory/Manifest2
-rw-r--r--acct-user/artifactory/artifactory-0-r1.ebuild14
-rw-r--r--acct-user/artifactory/artifactory-0.ebuild14
-rw-r--r--acct-user/aspnet/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/cinder/cinder-0-r1.ebuild14
-rw-r--r--acct-user/cinder/cinder-0-r2.ebuild14
-rw-r--r--acct-user/clair/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/croc/croc-0-r1.ebuild12
-rw-r--r--acct-user/croc/croc-0.ebuild12
-rw-r--r--acct-user/cron/Manifest2
-rw-r--r--acct-user/cron/cron-0-r1.ebuild14
-rw-r--r--acct-user/cron/cron-0.ebuild14
-rw-r--r--acct-user/cvmfs/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/deluge/deluge-0-r2.ebuild (renamed from acct-user/deluge/deluge-0-r1.ebuild)0
-rw-r--r--acct-user/dhcp/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/duende/duende-0-r1.ebuild14
-rw-r--r--acct-user/duende/duende-0-r2.ebuild14
-rw-r--r--acct-user/ejabberd/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/freenet/freenet-0-r1.ebuild14
-rw-r--r--acct-user/freenet/freenet-0.ebuild14
-rw-r--r--acct-user/fritzbox_smarthome_exporter/Manifest2
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild13
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild13
-rw-r--r--acct-user/frr/Manifest2
-rw-r--r--acct-user/frr/frr-0-r1.ebuild11
-rw-r--r--acct-user/frr/frr-0.ebuild11
-rw-r--r--acct-user/ftp/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/glance/glance-0-r1.ebuild14
-rw-r--r--acct-user/glance/glance-0-r2.ebuild14
-rw-r--r--acct-user/gluster/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild13
-rw-r--r--acct-user/goaccess/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/havp/havp-0-r2.ebuild (renamed from acct-user/havp/havp-0-r1.ebuild)0
-rw-r--r--acct-user/headscale/Manifest2
-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/Manifest2
-rw-r--r--acct-user/heat/heat-0-r1.ebuild14
-rw-r--r--acct-user/heat/heat-0-r2.ebuild14
-rw-r--r--acct-user/hsqldb/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/inadyn/inadyn-0-r1.ebuild (renamed from acct-user/inadyn/inadyn-0.ebuild)0
-rw-r--r--acct-user/influxdb/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/iroffer/iroffer-0-r1.ebuild11
-rw-r--r--acct-user/iroffer/iroffer-0.ebuild11
-rw-r--r--acct-user/jellyfin/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/keystone/keystone-0-r1.ebuild14
-rw-r--r--acct-user/keystone/keystone-0-r2.ebuild14
-rw-r--r--acct-user/kibana/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/libreoffice/libreoffice-0-r1.ebuild14
-rw-r--r--acct-user/libreoffice/libreoffice-0.ebuild14
-rw-r--r--acct-user/lightdm/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/litecoin/litecoin-0-r1.ebuild14
-rw-r--r--acct-user/litecoin/litecoin-0.ebuild14
-rw-r--r--acct-user/lldpd/Manifest2
-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/Manifest2
-rw-r--r--acct-user/logcheck/logcheck-0-r1.ebuild13
-rw-r--r--acct-user/logcheck/logcheck-0.ebuild13
-rw-r--r--acct-user/logstash/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/maradns/maradns-0-r1.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r2.ebuild11
-rw-r--r--acct-user/memcached/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/minbif/minbif-0-r1.ebuild14
-rw-r--r--acct-user/minbif/minbif-0.ebuild14
-rw-r--r--acct-user/minecraft/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/minio/minio-0-r1.ebuild13
-rw-r--r--acct-user/minio/minio-0.ebuild13
-rw-r--r--acct-user/mogile/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/netbox/netbox-0-r1.ebuild13
-rw-r--r--acct-user/netbox/netbox-0-r2.ebuild13
-rw-r--r--acct-user/netdata/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/neutron/neutron-0-r1.ebuild14
-rw-r--r--acct-user/neutron/neutron-0-r2.ebuild14
-rw-r--r--acct-user/nginx-unit/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/nova/nova-0-r1.ebuild14
-rw-r--r--acct-user/nova/nova-0-r2.ebuild14
-rw-r--r--acct-user/nsd/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest4
-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/Manifest2
-rw-r--r--acct-user/placement/placement-0-r1.ebuild14
-rw-r--r--acct-user/placement/placement-0-r2.ebuild14
-rw-r--r--acct-user/plex/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/portage/portage-0-r2.ebuild (renamed from acct-user/portage/portage-0-r1.ebuild)0
-rw-r--r--acct-user/postfix/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/quagga/quagga-0-r1.ebuild11
-rw-r--r--acct-user/quagga/quagga-0-r2.ebuild11
-rw-r--r--acct-user/quassel/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/rplayd/rplayd-0-r1.ebuild13
-rw-r--r--acct-user/rplayd/rplayd-0.ebuild13
-rw-r--r--acct-user/rrdcached/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r1.ebuild12
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r2.ebuild12
-rw-r--r--acct-user/rt/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/rundeck/rundeck-0-r1.ebuild14
-rw-r--r--acct-user/rundeck/rundeck-0.ebuild14
-rw-r--r--acct-user/rwhoisd/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/sguil/sguil-0-r1.ebuild14
-rw-r--r--acct-user/sguil/sguil-0.ebuild14
-rw-r--r--acct-user/sigh/Manifest2
-rw-r--r--acct-user/sigh/sigh-0-r1.ebuild11
-rw-r--r--acct-user/sigh/sigh-0.ebuild11
-rw-r--r--acct-user/sks/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/smokeping/smokeping-0-r1.ebuild14
-rw-r--r--acct-user/smokeping/smokeping-0.ebuild14
-rw-r--r--acct-user/smsd/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/sobby/sobby-0-r1.ebuild14
-rw-r--r--acct-user/sobby/sobby-0.ebuild14
-rw-r--r--acct-user/sobexsrv/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/spread/spread-0-r1.ebuild13
-rw-r--r--acct-user/spread/spread-0.ebuild13
-rw-r--r--acct-user/sqlgrey/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/stg/stg-0-r1.ebuild13
-rw-r--r--acct-user/stg/stg-0.ebuild13
-rw-r--r--acct-user/strelaysrv/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/swift/swift-0-r1.ebuild12
-rw-r--r--acct-user/swift/swift-0-r2.ebuild12
-rw-r--r--acct-user/synapse/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/thttpd/thttpd-0-r1.ebuild13
-rw-r--r--acct-user/thttpd/thttpd-0.ebuild13
-rw-r--r--acct-user/timidity/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild (renamed from acct-user/yubihsm-connector/yubihsm-connector-0.ebuild)0
-rw-r--r--acct-user/zabbix/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-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/Manifest2
-rw-r--r--acct-user/zookeeper/zookeeper-0-r1.ebuild14
-rw-r--r--acct-user/zookeeper/zookeeper-0.ebuild14
1294 files changed, 5967 insertions, 5967 deletions
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 1b609b21b508..2236c563c744 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
Binary files differ
diff --git a/acct-user/_cron-failure/Manifest b/acct-user/_cron-failure/Manifest
index 2203ae226109..0d16b605d16a 100644
--- a/acct-user/_cron-failure/Manifest
+++ b/acct-user/_cron-failure/Manifest
@@ -1,2 +1,2 @@
-EBUILD _cron-failure-0.ebuild 266 BLAKE2B 3f61b95a651927ba4b697d32235a082ee665ef54db582e52f8629896560fa425c3e6c4caeae0f485cba8f117c4aa815027da081d618bbd1f5ec9b98d0d8bd043 SHA512 136bf1ccb93a45957af54d9fe33d57eeddd785821ca3945a4f241cd2a4fad346f4c81a628e8916aab1b9fcbfcb07c7ef92adf65bfae24da8dd5d1f3d786c9248
+EBUILD _cron-failure-0-r1.ebuild 271 BLAKE2B fe850bfcb26b9671d2051268f9b77c276b77107c286f85f4fbcffb4c0a956e859de5a384c4be47914d9c2158777fc5879a80955bb5d1a4b078fe9a300293ac54 SHA512 9aa532759a5ec0d6a2a15613de86f17bb2e8dd2f9fbb9e0915d7fd60815b92480ad15e8fc1ecc0293958b4d8a2f60deb4f4e2328f0a8d2d2eeb57640c8a5ad63
MISC metadata.xml 248 BLAKE2B a5a7d9bcd542fe55d50fed508ef21f6a820aee11993d27e8ffb967f55cf3f8a02846c96499f1112e1b58f4a93b8b6fce596589e653fe161bb94c1b5868bd6dd5 SHA512 a45b735f6fec1b6bbce0a559869d9ac99c13b2dceb0d2b23f6fdd32fb7b6d44a2b199f47d89418784243fafafeea56094e0e0c7a90b67cad5cefcc94bf1423d4
diff --git a/acct-user/_cron-failure/_cron-failure-0-r1.ebuild b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..d521c8d59f17
--- /dev/null
+++ b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/systemd-cron failure emails"
+ACCT_USER_ID="520"
+ACCT_USER_GROUPS=( _cron-failure )
+
+acct-user_add_deps
diff --git a/acct-user/_cron-failure/_cron-failure-0.ebuild b/acct-user/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index bf25d6b1fc4d..000000000000
--- a/acct-user/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/systemd-cron failure emails"
-ACCT_USER_ID="520"
-ACCT_USER_GROUPS=( _cron-failure )
-
-acct-user_add_deps
diff --git a/acct-user/aerospike-amc/Manifest b/acct-user/aerospike-amc/Manifest
index af38f17f0473..3358693b1d6a 100644
--- a/acct-user/aerospike-amc/Manifest
+++ b/acct-user/aerospike-amc/Manifest
@@ -1,2 +1,2 @@
-EBUILD aerospike-amc-0.ebuild 268 BLAKE2B ca0e788ebe36eda690049805b4d87a8105791bc6b6d87fabc882e764b5e8417eca41a296005e72a78a7c4a04daaf60a9a4f8bd9dcde94f35fc9bd3dbdd74f26e SHA512 e5a6ebddf697cfb22798adf58325bcfdeae6b952d54bff4811f390ce5517985e8e04ba62cf16dc2f066392cd102bc01a539457cd75655c92d82126ce126fb459
+EBUILD aerospike-amc-0-r1.ebuild 268 BLAKE2B 409c3a1f1bf640c28fac4b9a6c26cf375e2e48b57f52e1a7475d9034435164321d9394db51a497967c3a62cf84898741c8eb71925d20ff66dce50b270846d842 SHA512 3e6365e074e283cbcbf4eb4bba526aa9fa85377af371fd5ff22bba625d95daad7e388ac5d3404ebf637d1023b975c1aef06d3ce72ef715584b998009325c739d
MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild b/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
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/Manifest b/acct-user/airdcppd/Manifest
index f29177dd3a42..b4eee8c6a11c 100644
--- a/acct-user/airdcppd/Manifest
+++ b/acct-user/airdcppd/Manifest
@@ -1,2 +1,2 @@
-EBUILD airdcppd-0-r1.ebuild 373 BLAKE2B 3e8176c48fb5ef3b74044b042dafb0ac34c7dd1ef147211403bda0d51628e70d205b795f624e8bdaf790e016b61ae63adab218037476a91c21fb428c3f35a96f SHA512 b88627d827f7946be26e6ea002a94c89c82f8c559c04d5cd674277b6675a5620f01bbaac6f9505c48a3b9df4808043bcb639f48ae060f6a4d489137985eaea88
+EBUILD airdcppd-0-r2.ebuild 373 BLAKE2B 4c1fe97226c7600f3aa5540ac3888980b407968eb778eb0b7a0c1a3c4d3e23bb528357f10f40dee3261de9fc21c634092a1506324fe9210e1e6755e93dbd469e SHA512 35d5c5b8ea61a09c95188acfb471651be3f026b2cfef515bf25bcbd14dfed4ec69393ceaf5bad316dd48532523f6b2b038778f958ec32f6f7d1ac304101f3c71
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-user/alertmanager/Manifest
index 3fcf52c1084d..5ea13e8240fe 100644
--- a/acct-user/alertmanager/Manifest
+++ b/acct-user/alertmanager/Manifest
@@ -1,2 +1,2 @@
-EBUILD alertmanager-0.ebuild 241 BLAKE2B 2d1c52ab94f8a6e8833e46c20196a577d74a5f7c6ad8b5b257173ce4bfeec192f99de02ad1a4dc6967be8eca08d902104d7f47fdf687a9468b2b07bc6547f3e2 SHA512 2b2db6ff72a9bb6970179e76eb90a2689148a85bf81caa74de37b4696d6c670718ab221e896b878da71b919679b32a93b3cf96b30f568ebfff5fa865bfb5576c
+EBUILD alertmanager-0-r1.ebuild 241 BLAKE2B a1e258d0e2115433c30fd5e27c8d6b210bdc7a7ed145c98acd13d342fe0c18efc32a92ace2ebbb877dde88fbc652666307264a1a5515424481011de37714ea10 SHA512 28ff636cb39ceb2d226d02ea4bb6d29b5f771a5b44197ec3ac339314fe3e7524012d2469e0ee36dfbb8e8e3142aba56a4cd280fcff53e9f7b0843dc4264a4bfe
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/alertmanager/alertmanager-0-r1.ebuild b/acct-user/alertmanager/alertmanager-0-r1.ebuild
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/Manifest b/acct-user/alias/Manifest
index a1e43d0c90a2..14aa9c73fef5 100644
--- a/acct-user/alias/Manifest
+++ b/acct-user/alias/Manifest
@@ -1,2 +1,2 @@
-EBUILD alias-0-r1.ebuild 399 BLAKE2B 861b236e499e82e0cddb70529f22d622137a010fb6508b47b8094e636654748ed9b4770b1c43e7575c3b08d09eddd1e6fe030f75d22f3df88512a040122c7f34 SHA512 aff4a8a0eee73d2276277123aae6e0e0fe20366e777aa98f6a0caf13e591408deef1eb4c48a16ee30aa68ff51cec4a89c4eb1f2cd50a6e286a66b743f91b7dec
+EBUILD alias-0-r2.ebuild 399 BLAKE2B 5773219de629f8f1830666d1433effa0a7bc79103dde0b9dc189136fa6ae3474ec1ddceb76fea08bd552539c7851d9ee33289e3db6e0922e0e9920a6407cef7c SHA512 94ad82ca56891c3e64c4f8968f3c2282d11e028448251ca8ac61b0d6587a875d4ffb553c2c0bffa628915e2afc518015c87618e41dfc53f96a0982997f783db8
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/amanda/Manifest
index 4b89de58814f..5ec87100211e 100644
--- a/acct-user/amanda/Manifest
+++ b/acct-user/amanda/Manifest
@@ -1,2 +1,2 @@
-EBUILD amanda-0.ebuild 231 BLAKE2B b4c12a48da158fb0e2e739525d4e11bc7ee17d166a76c984231cbaf2fb1483fd19033c15f4e5b6da8bc7c9f261bd7a5c493a3894d41c694b72b6e2f606d77554 SHA512 a335b75236e6471d744e6d853bd4303217f81c24a1420058bfd289c51ae2b1d1824e69f60b91cad17f897b3f0bf2186d58c720c9cc07f0d1dc303adce52931ba
+EBUILD amanda-0-r1.ebuild 231 BLAKE2B bebf7a6053e2619e15f6d149ba6b8546b78da6d7bc6fbf8f58c0f579831495c65516f6ed9ef216d35bfbc512b351bd5ed18d3318c330c6a156344dc97e38210e SHA512 5aa86bc791980cf44b1c2b60519f118b2eae6b3bf1a5242f1d3cc5951f10d57fc80bbd923be6ebdddcc265ed0a1120c5fecb22260cc09c8261dba711e44666f9
MISC metadata.xml 568 BLAKE2B 27da958a42770d386d7204ee1a18b189210253e4ca7bbf150efc7f947d089bf273fa1536ef3fa7525a94c753cac43cc784f5989dc348d9a9363e38e508d495e8 SHA512 ec050ac6eafed72aff2323a015cc5a40011c7803650f26907b2787a3a53fd3943a126d7f70ac1f673dff89bbc088968fd7ae92105625abb7058d159bd9cdabc3
diff --git a/acct-user/amanda/amanda-0-r1.ebuild b/acct-user/amanda/amanda-0-r1.ebuild
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/Manifest b/acct-user/amavis/Manifest
index 11d363857dc5..427dcc3f4582 100644
--- a/acct-user/amavis/Manifest
+++ b/acct-user/amavis/Manifest
@@ -1,2 +1,2 @@
-EBUILD amavis-0-r1.ebuild 274 BLAKE2B e119e1c483488368ffa0ec0f5166d0843242777767c186793cd0eb7e4d6df3057db8dfa5613e3e60c921cf45be2b917fec3c8eab83df58b8504ce9f683276978 SHA512 366133f008e1d270d35ed0437183b927798ac0e8c0c5f522546f350d3cf66b3dc2dd530390282a80db138520d3c8aebba512fff3f8db8995be055267890f6359
+EBUILD amavis-0-r2.ebuild 279 BLAKE2B 5db9c52f3fcbf2db90246c02e40cd3ffd93416c9162aea082bdf8233e2ede955c5e7fdd569d5fe8f75315468dcd660ddc3e098c88122135240061a26d8fdad60 SHA512 b34df0cc8fd7c5334cd030f67ea6a34a6cdb898ce4dba9c35bf30719c30019ccc5524968dad15f3dd99805d76d5af5e2cfa295a5d7734d0306ce831d3b364d65
MISC metadata.xml 262 BLAKE2B bdf88a65e34409c3f65204337925e14be06c13ab53571f864dc58309b72d50a9968dacf93110bd97acc5ae729f55207718d4ffd6ce321210e220bc6d57fc61a7 SHA512 9836f7da275ae8424e0494ee38313d62f90a180ed9fcbf7ff6391b3a5b4c3679f566668f0acd82ad0fe5f036e70a0e0a33b95df87475e4cbf8aafe1ae6974774
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/Manifest b/acct-user/amule/Manifest
index 5798d9af6fe2..e4890d70cead 100644
--- a/acct-user/amule/Manifest
+++ b/acct-user/amule/Manifest
@@ -1,2 +1,2 @@
-EBUILD amule-0-r2.ebuild 270 BLAKE2B 4478c146afce117ef961bea8f3c4edbfe3d5773cb4956e13544c2ed5dee6ed2ecfc238071a6b2a548e199d1682baafe57e472403ba4e0a4103119a502ce588f6 SHA512 8a1eecc151a395002c359c4b9f8279f73fac3a9780117c540937ea69f2ee0a97a2c412d9db23dde33026362560dfb13aed285d0b57064135240509647226a0d7
+EBUILD amule-0-r3.ebuild 270 BLAKE2B 8283d4a89059d53e62ed1f3e857ba23b4fd6219d80f5c1472f8ae7844f6f2f82030f119270c75616070d311fda1c38a0366fefd2403338a6fe70aadb8fb36b56 SHA512 3546bd1d55330e273775517666208d295ea7e4bae8599e5394c3f6b2ed7c40ba6da5876a8ff35a513220a3b80c1986c993a809bcbfe62873f4e3e22ca86e9591
MISC metadata.xml 395 BLAKE2B 676ceaef4b63cc5fd7c0ad8b28065738adf013fa4f85cb2fa70bd1cafa8ea6b76fc6ca81e36e91c839bcc55c55a8bf24b4a325e44b0830f653adc89ee09dbfc4 SHA512 30eec216eef39513374c06cc1b0be994f53deb7054f7241a55b1ccc73d58ab0b578b92096eb56daef0e7f8d1377480a00a6bbb6e0bcbffb19d53a48f081170f3
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/Manifest b/acct-user/anope/Manifest
index f92bb0cd900f..f905945b2716 100644
--- a/acct-user/anope/Manifest
+++ b/acct-user/anope/Manifest
@@ -1,2 +1,2 @@
-EBUILD anope-0-r1.ebuild 233 BLAKE2B d081f128df708df4c8da0474db4fb92c22c2fd5147a1a762f1dfa110fa3fcb18948659e08aba39514842569b7eb45853bfb466244566d2d0739b3465b91d64bf SHA512 0ef1d9eff725ae071c492c961df5ee5553d5bce9c8b5140224e96bed4d17b755865416ca0fddc2aca9a01b333f832f3b755cbc143daaf14f4b7662bb3261ca1c
+EBUILD anope-0-r2.ebuild 238 BLAKE2B 461b1665e3fd09772f90c2003c9303a0cb1a3ccd06b2d70189376b45055de48fba0c598aa7281af1171810a90a6158cabe3d8e7ddd5c3d50fd4ed11193fa0b43 SHA512 3e745767ff53fcbf57f0ee17bab3077a850d1991572b195925be8d576e916f792f3040e7195548a4b9ef78ba267ee38ad73593080ac2235c8c4e6dc319290012
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/apache/Manifest
index af41610e44e6..4ed6a1e7e5a1 100644
--- a/acct-user/apache/Manifest
+++ b/acct-user/apache/Manifest
@@ -1,2 +1,2 @@
-EBUILD apache-0-r2.ebuild 226 BLAKE2B e7b667c8344edb8c18026f4375254738d82f57c5ab577ba4ce9da5aeeeea1020a2664b1a27a440c23b0f8c06d1e67837685112695ce9dd794f329255752895fb SHA512 26b053d6fb3e6f1719625679c0ea6e4ca15f3af539278335cf0bca1356a9252a3a54141063c5dfe31703bdfe1059ff0087ab517096d62d5ca40245ca6a571672
+EBUILD apache-0-r3.ebuild 226 BLAKE2B 6ac2eab5f1cb2c83772d72c9feb4ba0a6894fa2c3a4e9198460e9a3fdbadac4fb8ab56c657ed0a7dd90232cd088316ab3c298142a1e9e0ef671941aa29dae376 SHA512 673894f8ca9dacabb7d6764a919e8c56279fabd9f19371b1f902a28addf708b06bca8039422f2c8feafb66dc9922bbaec0367eb452863dd9ee863cd2439a843b
MISC metadata.xml 254 BLAKE2B 309bda95de24ec4bc4d565251f6b87ce5adc08e96bcd062c6b0cb77daf48729a08b84bbd9cf20f17e917bec6636c47c51a780dff452e45946df34088a7b80da0 SHA512 4c6b588732cb314b2a0c82d476516cb1c226f737a74934831232be6b9828e8c4636589beb8872c3df0931f6dbf37e78a47309376d3480dce7683d3ead5a63e61
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/Manifest b/acct-user/apt-cacher-ng/Manifest
index 67dd97884eb4..f91853619c14 100644
--- a/acct-user/apt-cacher-ng/Manifest
+++ b/acct-user/apt-cacher-ng/Manifest
@@ -1,2 +1,2 @@
-EBUILD apt-cacher-ng-0.ebuild 236 BLAKE2B b0c8a73f67a8295bdc89b737ec6f4fcad30f0481cbda085f14383c05d7d0e5db12706ae65ccaf936f7ea2da7ee165c0df9ecf39f500ab6e03d63b590d6830195 SHA512 439f4be9a951698348f5b408234d57db45e2173062fd9a596c0daf06566fe420e8fcb1d16f82eec2142314556595bd2690a18acb5543a7c04857240ea09b9a46
+EBUILD apt-cacher-ng-0-r1.ebuild 241 BLAKE2B 33036cc27dc1d6b4bbae54bf66d47d5b41c46f0c98ea1814a63f3b22d2291e20ef66e5d39caf24c80f7799dd8fe06543b605ac34501b9b99a588568461fc4e2a SHA512 428e409cda8f2e7cad1c34540aa412a92c63ea66a9f2abc7ddbbf32e86b8c75c1e45a9cdcbf7a6dd7581644cb7a50b317298408ccfe2fcb042c480f365b022d8
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
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/Manifest b/acct-user/argus/Manifest
index 14d4ef1598a5..954c24135b24 100644
--- a/acct-user/argus/Manifest
+++ b/acct-user/argus/Manifest
@@ -1,2 +1,2 @@
-EBUILD argus-0.ebuild 262 BLAKE2B e80c6c0e86db15cec848abde2fb7e6d6c0330e17a460acc8c763d35df37bbea5dfe44e852615801930b3e6c2799d6201c0ae1bbb105f8bf5cafa7794da44a164 SHA512 87ca7579154d773545b1f8e1a6af1e17a4ae3cb411be2b641278d55e85dfef2e5dd77b65ffaa08ec1f4b8af44316551848e294017406bc7eef62b7b0cd39549e
+EBUILD argus-0-r1.ebuild 267 BLAKE2B 3435d446de84e1291a0cb967a9c9297fc0cab1066f152a6500c61f62815549c82b5b8fb732f660fb9e30450ae8324cd0d2f56865ab3f4de65255991000091bb1 SHA512 211bbb995e83ef8801acdc9ebe0d5d16578dbe9e07390e70a2c600196d7ca0e8727bc2feddf78d5d7f5211da611fbb5102c12271b215c7c3e29f7b53160fe5a7
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/argus/argus-0-r1.ebuild b/acct-user/argus/argus-0-r1.ebuild
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/Manifest b/acct-user/arpwatch/Manifest
index 03a380df4cd6..5894e9960f64 100644
--- a/acct-user/arpwatch/Manifest
+++ b/acct-user/arpwatch/Manifest
@@ -1,2 +1,2 @@
-EBUILD arpwatch-0.ebuild 251 BLAKE2B e60481baae233c93b88306b2fa140f6f0a59dba30c8d8e2261d9badf36503da50becf803649d8f2d3f29e7b0494fdf926ef2544af7dddfb19e7a58f970d7eca1 SHA512 90a8826b5368bd7610c37cf9a15d4ffefb0c8a9d76681fd770ca938d245e3d0fc2efe6ec795c08108c8969486af1e3b474804fc611d7afe346a366c5995921e1
+EBUILD arpwatch-0-r1.ebuild 251 BLAKE2B e44d696a212216d809a12cde634b920e5ab43bda3ff77e113758cf0c3023e9a066d6e183eaa1809ef3b1e65e816afac26ca126d86b693d24c360f797bbcefd48 SHA512 4f5af4432e8eb647ecaaca81d44673fea2857eafe6a46f08a5ba0f7bc1c2afa6f2cf2e0b57a1f6742f5d0786d29dc69b2835a0c57aff6dc316950a3730d10821
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/arpwatch/arpwatch-0-r1.ebuild b/acct-user/arpwatch/arpwatch-0-r1.ebuild
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/Manifest b/acct-user/artifactory/Manifest
index e5155b35d0bf..fe4f7aad74a0 100644
--- a/acct-user/artifactory/Manifest
+++ b/acct-user/artifactory/Manifest
@@ -1,2 +1,2 @@
-EBUILD artifactory-0.ebuild 281 BLAKE2B 6197cf8e725e7f66a3ebbfb605fef6f1d3aa6a99aa1a518b0477e1845ca735a6f4ab79e9592814569cb0e7a3c92a57063a0ad8b10d0b8758de298320ae5c1752 SHA512 156ba68140b5f4e2f2614862cbf38acdce78b373ffb356694806755f337a64c53c1bea67ad864b5bd75ec7c4b630d62ca6fd58ff288c114dbddfb13def47f231
+EBUILD artifactory-0-r1.ebuild 281 BLAKE2B dd722693923d9a748ce81cf7965df397ed6063dc24548575cf754e8f063fff41bdbc024ba0a1b3e326f5d8adc1c4efefd58de8dc7e5bc675c7049e383b528f94 SHA512 105adcd5966eea80004dbdad0906777be43bff45115f9c285e9147503f8bcc30a9811f400fd0db39dc17c54ab05f37750730912fb6c79b3f0d40529001fb9521
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/artifactory/artifactory-0-r1.ebuild b/acct-user/artifactory/artifactory-0-r1.ebuild
new file mode 100644
index 000000000000..22ebc4531a7a
--- /dev/null
+++ b/acct-user/artifactory/artifactory-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for dev-util/artifactory-bin"
+
+ACCT_USER_GROUPS=( "artifactory" )
+ACCT_USER_ID="264"
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
diff --git a/acct-user/artifactory/artifactory-0.ebuild b/acct-user/artifactory/artifactory-0.ebuild
deleted file mode 100644
index f1132d14b63c..000000000000
--- a/acct-user/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-util/artifactory-bin"
-
-ACCT_USER_GROUPS=( "artifactory" )
-ACCT_USER_ID="264"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/aspnet/Manifest b/acct-user/aspnet/Manifest
index bf169ff4350c..904c3100a671 100644
--- a/acct-user/aspnet/Manifest
+++ b/acct-user/aspnet/Manifest
@@ -1,2 +1,2 @@
-EBUILD aspnet-0.ebuild 255 BLAKE2B 37a8e5c9240a597557b6426c5d1604faa7878f5d86ea818b56e0650430056d79a8b8fd5011ff369ff3588ae7514ee62e99a20d12e1a2dcce33d763bf088380e9 SHA512 4c136039726e9498c26658de4ac2a51eaf4649a054bd1a1a89a585ee86c94ab97a267af6b1601d3f4aaf3dc21f1b487eb16111395e54a901287fb772293f637a
+EBUILD aspnet-0-r1.ebuild 255 BLAKE2B b7b58dc7693a4ce0e18bf48efdf5de54ba1fc6bb458b910fde45aa7ab5f98d093f77437efdd1f73ab49cc448104b528c303ca3a222882c0924e05902fa868317 SHA512 10d25b8a83108ccc80cfed85cb513514218b27e24fd1291ea4c4e8b6ac983ef07cbedd4789d93420191e9221a614382c78fd7e0739212323d492e84cc28acecf
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/aspnet/aspnet-0-r1.ebuild b/acct-user/aspnet/aspnet-0-r1.ebuild
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/Manifest b/acct-user/asterisk/Manifest
index 16981268c3b8..970e83fdf0c0 100644
--- a/acct-user/asterisk/Manifest
+++ b/acct-user/asterisk/Manifest
@@ -1,2 +1,2 @@
-EBUILD asterisk-0-r1.ebuild 239 BLAKE2B d1f0cf845ac2dbbf5b3ee41c62548ea64ad7aad68b4bac28a1dcc558271ac3effab50537d90fe596a90401b1e1117aa5b0eabc60a72d18c57663eec2a88a9ff7 SHA512 3f29d21c7a9d0506de137eef91de34dce3e85ca790dd1fdf495ac340aa8ef4fe471b0e44b1a864a9020038520632bc2e2caeec32f877582897355460c7099358
+EBUILD asterisk-0-r2.ebuild 239 BLAKE2B 16ff6ce6438b72cff3fdceb2af9982a2c47bb2f3bbcb3b008282a4b37d9ec2bfc568412c5404fb6014e329dabfc3c5a34ed23e92a1e9535461a7922bcefa32e2 SHA512 6cf9100cf7358f77761fb9acecbcf6d2d645eb5b6f65b07680406431a0c99220bfad447e1b572f0112d33a841918c3d291aa33e5201170cd01c8a78204044a11
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
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/Manifest b/acct-user/at/Manifest
index c821a5207f0c..2e68213afe10 100644
--- a/acct-user/at/Manifest
+++ b/acct-user/at/Manifest
@@ -1,2 +1,2 @@
-EBUILD at-0.ebuild 226 BLAKE2B cc1802cefcbe11fc06c31add5c59c444f15af0686349abee3c2090ceca86be24f273116c643a883877c7864fb80e014666b78acf5dfccf83fdba1e247fc2c3cc SHA512 a3dcd58b18451df5bf5b2c6fd0fd632711c196d471c83922d7eaee58a973ff3760682642ed398e9143097cd0af16f94b404f37f05b143ffe0e8c44cf22553dec
+EBUILD at-0-r1.ebuild 226 BLAKE2B e6f3f561bb4d5de906428f31679f2706fabb9484e8e530ca2c87eb3e1806ba5fb2a9a3b57ca5b6275186e217241fc964090a41eb7f665a658e8464e5d9d9bdcc SHA512 173fb4251a80ca206010b2d2e466818df05eaad6645ed350de8678dc1175cc50e0594a4318bff2ce44bf257c0d20147d6d7204fa78e4d3cda74ce00db55642fc
MISC metadata.xml 398 BLAKE2B 037f58ef9b9d372a1137066db288badda6f884013296b4ea879816f539a91b5f484148ecd3c874561d24a9a3b4e336f6a73b332b30fc666f19f213b6bb37245d SHA512 c4d6086c77a47321b33e8ecfc827b51dad5f79558f1cb8845d495326d1f002e7fc5289165735fb26d1a1020e55d85f22358d313be11f5ddfb05b6580db027833
diff --git a/acct-user/at/at-0-r1.ebuild b/acct-user/at/at-0-r1.ebuild
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/Manifest b/acct-user/atheme-services/Manifest
index 84a6acb75812..56abcb3cdc70 100644
--- a/acct-user/atheme-services/Manifest
+++ b/acct-user/atheme-services/Manifest
@@ -1,2 +1,2 @@
-EBUILD atheme-services-0-r1.ebuild 234 BLAKE2B 42fa49814fa5af6f6b03de5d0779321b38527f2c46ca55ea87657b855ead19c841f384f9d375cfd7473daca49a448bb3e5e0f0dc343558504e8703bef0f8295a SHA512 9cc19f82a9c6303174065d4784c993a10562e593c10b186f6319ee995ddb8c719fa02d0d36385944bce8b79d2bf79c19ed86d4774bb07b0dfdbb5f0b875647a1
+EBUILD atheme-services-0-r2.ebuild 239 BLAKE2B 3f45cfd09f6b26edca4ca1dec69ff6bc6fb7589e20041e985e4c61bff31345c2fb9d67199cb926f5fd2540ae2d0c08508054dcf14bec7bd6bcd4fd20c99573a9 SHA512 851d80df563f9a323b6ab3860148a68f18bed8cb1521ccbde0ea52ada0c0c853ff875cf5726a4889ddde35527cf9b5940713bc7dd6cce48dad3abee32538554b
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
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/Manifest b/acct-user/automatic/Manifest
index 7ee23618e379..7be4ecb6d4df 100644
--- a/acct-user/automatic/Manifest
+++ b/acct-user/automatic/Manifest
@@ -1,2 +1,2 @@
-EBUILD automatic-0.ebuild 236 BLAKE2B 05c81c7d98b6063259cc40fdf5dd209acbb26be1b0f912f45fc2fa73f0b7cd844e1675d20ad225d06df1762ee4f63e0943ec8be80d5f04cfd4ef1a6bc634bc4d SHA512 6c6ef4c25b039bdb145fc51e2d4fc3b990a196b594abe0cf63070afe346a7d36b6c6552cc64592a2fd8014d8815491cf40161e6ce3c477ecfa3b1b5a8e7a31b0
+EBUILD automatic-0-r1.ebuild 236 BLAKE2B 05c81c7d98b6063259cc40fdf5dd209acbb26be1b0f912f45fc2fa73f0b7cd844e1675d20ad225d06df1762ee4f63e0943ec8be80d5f04cfd4ef1a6bc634bc4d SHA512 6c6ef4c25b039bdb145fc51e2d4fc3b990a196b594abe0cf63070afe346a7d36b6c6552cc64592a2fd8014d8815491cf40161e6ce3c477ecfa3b1b5a8e7a31b0
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-user/automx2/Manifest
index f928fea3ecf4..224ad50cc204 100644
--- a/acct-user/automx2/Manifest
+++ b/acct-user/automx2/Manifest
@@ -1,2 +1,2 @@
-EBUILD automx2-0-r1.ebuild 273 BLAKE2B 75c1bae39d36caf84265fb5d5ffb3f8cb9f5a9987aeca75308880b4ee1353bef4c9c2e00d718031459d91a806e6f4f4bcb6b689770f8cb405e97a2bd398f378a SHA512 c2ad681ce1e57e1f8fd3cb2cf659c98028cb5289707c3843eab3e3a54e095b6aef72dc2c63b13c57d9985e1ea48f47b05cb74d74471cfb297ea9bc3fd203e481
+EBUILD automx2-0-r2.ebuild 273 BLAKE2B bbb370903703717ad9bc6009f338586748d58cd235b06ac560e02b1307bb12e9f9fbe5a808a72e0108d3bfa2a0d696f90ce0534380055400ebb0730dfcc205ff SHA512 9237bf2926a3f5137c980a449f9f8ac7a591fd7ef2280021ee51fe69693673c56b2591923e77acf2d29b6a1ccc47fb56d591fe51b3d8cbcd3a8506928aba1769
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/avahi-autoipd/Manifest
index 42262fea0ea7..cea354550c91 100644
--- a/acct-user/avahi-autoipd/Manifest
+++ b/acct-user/avahi-autoipd/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-autoipd-0-r1.ebuild 240 BLAKE2B 2ec18a7716dc10bcbb7551654ec55e1eb428f41cbbd271583cce0413b2c41632b7ac257368717bdd930f435a4a749543eafb4763778a9df45e1dd097e48e7998 SHA512 4c322c7c3633f605b87ccabcda2728168e65a6ec44899629d537575df0300ca117ba775af9da3a2f0d26916baf49a4892a39d2ec584819a0454807d221cc9ee4
+EBUILD avahi-autoipd-0-r2.ebuild 240 BLAKE2B 6d4eefce8642b4d4b66a2c2fa9b8628259f8bd312ba12d3a59a21f86563db697edbcc15e120a1c89714ac37e25fcaaee56be014b472a9337ac74502177bc1e04 SHA512 59462015e8cb9d103ef2f1282c19bc3cea90cb583916ba70190aafcc4d4d83dbaf146565358addfb67bd6f07bbb8f3fa107d928f603bab2904a602c9f1f76271
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/avahi/Manifest
index dcd50adadf67..3eb6007d9ebb 100644
--- a/acct-user/avahi/Manifest
+++ b/acct-user/avahi/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-0-r1.ebuild 224 BLAKE2B c96e6780e6c2b7fa40b5777820d7a21dc1e210beb7dd136ea40672481fd00acd553a0c2cf064bbdaf1142415ba4675b775af508a36a9f1b07bd5c72cc99d4081 SHA512 91d489d5a7c531252489776d19ae44b753a394ed719b96b29e22ee430253f35f78aa3428fe0bed3dbc740c4f5c988b92175c6a78eeab26e13c719a28d4912790
+EBUILD avahi-0-r2.ebuild 224 BLAKE2B ff2162870498a62c79ad9c42643829850069d23b0fce842226ba5fb085f3d75b60dcbcd70a3a299ddca080911f701401e54c7ca24e174bb1874f99a619a83e1a SHA512 0972c2e0e957eda3bbc9d1d97f74021bc4875fd0d0764b1f13b3911c05284fc8ecf8a238d69c956811bb73cb30a8cc31c3346f0ce607d2498bbfe933c2ec4efa
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/axtls/Manifest
index f1888a1838a9..37976ab2c8dc 100644
--- a/acct-user/axtls/Manifest
+++ b/acct-user/axtls/Manifest
@@ -1,2 +1,2 @@
-EBUILD axtls-0.ebuild 241 BLAKE2B e47fdd0d85f9cbe95dac87da2c96b763d30c7fdf2ff688cbbf0b6926fe2345af5aaa515ec13b369ad3719aa7457ff438f81f08192daded8b811f2b45fef1cb3a SHA512 071889146eaf37f3f369e51beac236f17c25691f9be6b2382b12e940b070d1d18c7691cc8b19af34e1de3a7ce95c56c25b519a011118aa7570abac204a24ed30
+EBUILD axtls-0-r1.ebuild 241 BLAKE2B e77b2483b4e25fca65e4bd05a3711862c4c0504e1e012f0fed0c85910886caae911d50fdbcdf71cb7115cc6bb0ac604be26792dbb89dab45c3ecfab74bedbfbe SHA512 d259a8f22e8d0ddf106e63a9fc92a4f9abb886fd8fbc70f80d15e470ef06d3c16a45a8a261ed05ba08abb93dd57dbad071235ad82b31c984cc68ccc482f75bba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/axtls/axtls-0-r1.ebuild b/acct-user/axtls/axtls-0-r1.ebuild
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/Manifest b/acct-user/backuppc/Manifest
index e66dc0034813..4155eb47d044 100644
--- a/acct-user/backuppc/Manifest
+++ b/acct-user/backuppc/Manifest
@@ -1,2 +1,2 @@
-EBUILD backuppc-0.ebuild 310 BLAKE2B 3a32fb20f92c07aced3981e95a39b4d0910fde970511d50bf313144269777f98c51a7003d78e38a65141ba2df70031253a24eb7ac760a9b167a0794a05573801 SHA512 9cfc3ab4bd227600d06842e0fda8e119fc0fa5e35dedad04605bb65e8ab1797aef127f5a049baa5a09e04dd2f9daa573f7bab3dae411eb4235177eb1399b12a6
+EBUILD backuppc-0-r1.ebuild 310 BLAKE2B cc2520f496781482bfe988e6e1fa9efaa919727ee2fcd8119466fc4e5ed9ac1665506ba63453370af29bb461c324983df47a322f97719ba0f2ae374af98af48d SHA512 178ff63d1fc06010ebc6976c8267e2ea4e493e149a3b55e6aa039b1be201f2f311de87a3224e8b2fc2888d25c9dee86901c134d9f36de6b17e2568883cc2fea3
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/backuppc/backuppc-0-r1.ebuild b/acct-user/backuppc/backuppc-0-r1.ebuild
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/Manifest b/acct-user/bacula/Manifest
index 8edb5c6cf92a..7e8e544b53ac 100644
--- a/acct-user/bacula/Manifest
+++ b/acct-user/bacula/Manifest
@@ -1,2 +1,2 @@
-EBUILD bacula-0-r1.ebuild 295 BLAKE2B e59a6c41008a1708ca23b69e94534ba4698e67e6901b93bad05ae839df4619aa4b2dc298e384e6f4e1bfbd36e6012c1846479132606f5959de3637f0fad29d16 SHA512 226dd4e8dc809880d1ff6055223be6f188bb753fb7bfb785486be0fe776121c53f48f3ceaf9bb80854ce75923b0937843d5b08042daf5c4487da1636dd74392a
+EBUILD bacula-0-r2.ebuild 295 BLAKE2B 901d056a5afb0c2c7f13cce381b9de0f98a9dcd059080cc0689761fcfb73944ef071ae3b170559525b903cb33d9ce97fc4f3b1e088a60b9c2b26da76bf8c8e6d SHA512 63ef67688f3328efdff6b51e6d11a6077e8bd8a474ebfe7003a0f3dd0d1d615b5b08975c652907636e5e550641b3f4c2d8df14b4bbd6ef19212ba222c3cbd663
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
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/Manifest b/acct-user/bareos/Manifest
index a7713a8cf4b2..e49433193a9c 100644
--- a/acct-user/bareos/Manifest
+++ b/acct-user/bareos/Manifest
@@ -1,2 +1,2 @@
-EBUILD bareos-0-r1.ebuild 292 BLAKE2B db77a8caca84348f69918c1bcbb3d9c69a1b2906cddfbaf95286dc7f44659b89afac163abc5964b5899556c4a06adcce2132346090146137f1b0afcc695b58a7 SHA512 0db636442dc7f7e6d5b6137347ed5bda43a01502e563e4ed332ad03a7e983e3cfac3bfe522d0c0d70afbd095b6fd1288bea5a04039c72e5af37aa743b3b4ce5c
+EBUILD bareos-0-r2.ebuild 297 BLAKE2B d59bace020c8c76e2b7d76cd3783c3f282b8ad356764913c2f06a8a0e90f13501ce84098720f0d20794fc15ebce19eafb1ce8fc0fb2914ff6c672ffa63a767f4 SHA512 d68be10638c368765c1b0b67da06d37dd3dcef54dece234b6b7c29d36cda1c49ec5675ef1cb23d66dc46f6356e1232eaae1ffb95b0838d30ee9dc45c5b0eac16
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/beanstalk/Manifest
index 03f99f59ee40..ba12db4663aa 100644
--- a/acct-user/beanstalk/Manifest
+++ b/acct-user/beanstalk/Manifest
@@ -1,2 +1,2 @@
-EBUILD beanstalk-0.ebuild 287 BLAKE2B eaea570b667375d0042bca642de7cd9332e37c2ad9a53709101b23de080f321f5ee13924c174622a741d55d98a7e245e2d9c66b43787b3562d92704c0f61cc19 SHA512 3c54a024500abe620f3e388be9e8ca4ad49af888fcba2e7278da187eefa9619321ed5c514e8f24f50606cbb921f4b8e3c54390644f798f069b1821ba1f7177af
+EBUILD beanstalk-0-r1.ebuild 287 BLAKE2B a0d428189c5eb30b704db646d48d5cf68ad0732139e2cf4d3c2e4bc86d9173758b0b66c3b133e77fb6dc170b5a19e81952a0de6e5b0dacbbca9268bb3d117e99 SHA512 d31b24fd8f2f8e3b63adf32ca7a8bd869f328a0d9b029258a0c48e3a2188468625f2dbc78e590f0eefe456d4e5f34d2560c51b946252cabf9b698b85e32f3189
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/beanstalk/beanstalk-0-r1.ebuild b/acct-user/beanstalk/beanstalk-0-r1.ebuild
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/Manifest b/acct-user/bedrock/Manifest
index dbc8e755af94..c21db147a54b 100644
--- a/acct-user/bedrock/Manifest
+++ b/acct-user/bedrock/Manifest
@@ -1,2 +1,2 @@
-EBUILD bedrock-0-r1.ebuild 257 BLAKE2B 87d763ae11de52de85c42ce6c8706d3a87509074d533859c39336657f70489035690dfbc5b9de8ecb5d7dcab369e952a59d2f2ff45a9932240b444094031bdb8 SHA512 4873ba63ca18f2e41a118df9ca083b51e136e55630d7b0652c60f20ca8f46c911b75d175799bf43293f1ad834da88403b9e0229ca522ff950ca60979b23a3d76
+EBUILD bedrock-0-r2.ebuild 257 BLAKE2B 73fccb05968b0b40cae7a171b646bec253c47a61afa884b23f53d8f8069592587784428eeeefdbdf8e4aa5b36d51f9aa4cd9a0a9dc8fa887a37c6a51fb0e1355 SHA512 2470f6767380a250912eda1e96baba67cee09d1b1f7eb6a1084e689e14ba336ea17ae3e289685d6277327c602b37ae368fde823f6847732bf6bda0bcf6ecb680
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/biboumi/Manifest
index a8a79a5ee4d8..662f8ed71f10 100644
--- a/acct-user/biboumi/Manifest
+++ b/acct-user/biboumi/Manifest
@@ -1,2 +1,2 @@
-EBUILD biboumi-0.ebuild 236 BLAKE2B 458acccd702c6fb762a779433f18399bb572d17b6194b85f28bf545e2cc558662ac2d56ac8de2797ed64519498e7a08f128cf6c2702226d5998a038eca8f04f0 SHA512 51124a78e9fd83ba3df510a74b14a6055ac15c61a40b71e8e52fa2a5cd56f7d08fff08e4268609256d294c17f22f2167bb41bc5b7adb47cfdc212628b320f972
+EBUILD biboumi-0-r1.ebuild 236 BLAKE2B d61722177af8368197c9ea1b42d9ac2c88df029d365b79731a624a3d4f04658cbd43a944521b3fa6e340dd6cc31ad6e3627373217886c7afebe12936f5f2f934 SHA512 df0f7cc9f816447b1af70cf71ed3d2fcf6de344e4f9ba80135d92aabc0dfd64cfbcaabb6809beaa7a8b18288741386ef6d610b95deaa2aca3e5be6fe106fc301
MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
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/Manifest b/acct-user/bind_exporter/Manifest
index 6254ba8ba98a..c99c3e6f0de0 100644
--- a/acct-user/bind_exporter/Manifest
+++ b/acct-user/bind_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD bind_exporter-0-r1.ebuild 236 BLAKE2B ab443d4d3a77b0b6855728b881c17eb0e054e384c8920c5a98d93835405e40df7cd3ee04406041a80bcd0aab1a99d9d51807c90b2f70ca17ce2162b4d15de32b SHA512 f1dd3c91a1e0163c05c1fc30a2fdf7f573767c67f8b1ab60b828474f5dd4169d0507859663503423e3038f9e47b53d66a0f7aa3f1e640d07d18df6c456e5d077
+EBUILD bind_exporter-0-r2.ebuild 241 BLAKE2B 3b3a129b4ea853bed61d935fe6fee2f5e4e4080124b17bf45eac2e1ceef5d9743e93f2f5cb6e18c0140b794673dc3b8b8e3cb8102939ea8d908738953220cc6c SHA512 4dfb630c67997b68cf51efd21040f2a88c745a33cf2421c95b591e72ff3313a556008ce9fd4cd6cc729a82325c43ca5e6853668863a083a364899125074e499d
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/bird/Manifest
index 4dd83af3cbd5..55eae8d659f4 100644
--- a/acct-user/bird/Manifest
+++ b/acct-user/bird/Manifest
@@ -1,2 +1,2 @@
-EBUILD bird-0.ebuild 283 BLAKE2B 6a03848a72077eec7e107fa08cae235666e301d69f73ad8844ab3b4a662904dc04f7be3747fd929c5bcc795bd671c05501ce7e13d1801a0f523447d864d3ee99 SHA512 8ac4298d849a19280a7d294460fbdb2c702566847df82668c37c7c84c76b4f22bf933d503d6e0145e7c632583715fe1eacd0588971fc0ee73bee5b0b25381cc3
+EBUILD bird-0-r1.ebuild 283 BLAKE2B 0af4f2467cf792292f423cda9b11923f78a09cc794770278a3589a0afd0e7ab2310d66e00d72a6d5816a35005e0d966e0d4ad3bbe8f5109c5d71c465e6d60be4 SHA512 a6baaba913725d87a3a25ff3e03ef9d4db4377a206214bdc21a1f9a9eedf1bfe7cb662a2bd6666a23d1ebfc713ec5c2a7347f812bdc42419981c932f9e8a7af4
MISC metadata.xml 383 BLAKE2B 080fdb7b781289c93a68e25e99430c9abe12915f7567be25c3d37a7c7d8903efa0eba320b1655e77ae8d06bb22aa86ea64cef3d85190729f21bc9018cbf3b1da SHA512 52461aeddda68ed1585802d7d831c95574cce5c9ddefd16ca28c71eb50a2ed3abb5b36e5e018392f184f07ad133aa2dd6b7054f7845b27ee1cc97b3bf80ab836
diff --git a/acct-user/bird/bird-0-r1.ebuild b/acct-user/bird/bird-0-r1.ebuild
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/Manifest b/acct-user/bitcoin/Manifest
index b9ac6c92c143..f60c6d6ab02d 100644
--- a/acct-user/bitcoin/Manifest
+++ b/acct-user/bitcoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-0-r1.ebuild 246 BLAKE2B 6b573c1424e6043130cb9d8feda9f27be052de6507fa150242813d56ed535322fb1852fd7fbf9983907257d796a05b751316c7f2188388b855a6e34e81db3686 SHA512 1a38f8c22929f6d43abfbf58a855359c906c9566653f728e92425a75edb7ab021820b6f5ceb30fac565bd4188186c130360934a8a8e047e323bb27aad57eab1e
+EBUILD bitcoin-0-r2.ebuild 246 BLAKE2B a72e59e340b154f1612c6959827d6c565e4e5593ad28951438a4e052b6b84d1f1d03bc6ef1d10b0f8d4f1aa5c1381aeb14491fd6356399d3979635a28709feef SHA512 564b8ecbd26f0cb370f7955454580aaab7c5cf6710609426f4a2fe9312af4663d5217dae12749308be9505a7e17671d43d29338b1ab1973a3a0cb65c3fcc750b
MISC metadata.xml 405 BLAKE2B 3eb2845f129f9c7ece1f374a0bef8eeba29614c94e714afa75d9193c5238539d48de1c761de7568eb7a1e3497fc8afc0e876be8339292e7e020d14531b963a59 SHA512 2ef8d9eb38092901821728d198e438c169f57cb38772267e62dc352ec7e35586a578802492682705fcd1d387ef9987344ef7d501d254d2743a35c9f0692d3f75
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/Manifest b/acct-user/bitflu/Manifest
index 0e83322f1c71..51f3cbb94146 100644
--- a/acct-user/bitflu/Manifest
+++ b/acct-user/bitflu/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitflu-0.ebuild 275 BLAKE2B 45daee39f14de027bacee36ce1f5ab92616a45d650cfeab10fae52edae276759886d19dceaf8921041f330bd4da5303ba14960ae7c3352a7ef8ef06631c809b7 SHA512 23bec2ee900585a68e08b357f0aba2555fc6e9e23a21f88ece12b0741589f6e8a36e47bc5a2cc1385949aa547b663fa5870491c5d43c398524e6ad278c75622f
+EBUILD bitflu-0-r1.ebuild 275 BLAKE2B fe459f0f4b60c81cf2adf3bae2998b70907c907c6d27a5d479c8afa539196f795c8e8ae6579e4d520069b700c68dfa5392f7a83c874370f0397b0a518193a7d7 SHA512 98372ebce121fb91f5bd0957fa9677d99be013961186e457a2acaa914d927aebbdbc59325bb2a8eddd98c13c778750acc2212bdc179d74f259f30b2429c76228
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/bitflu/bitflu-0-r1.ebuild b/acct-user/bitflu/bitflu-0-r1.ebuild
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/Manifest b/acct-user/bitlbee/Manifest
index 286116676ee7..574913834cb3 100644
--- a/acct-user/bitlbee/Manifest
+++ b/acct-user/bitlbee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitlbee-0-r1.ebuild 224 BLAKE2B 944019bdf450429d1bf5b9dd6a59e254f2052405ca9e2edbf2c775c65c539987dfa305212c57af57c67093f9ab97199e305ffa9180bf49c43103197f68009d16 SHA512 b79c708a7f517ff96dfda5624c5059acc64fb0fe5e5e2283d451110cf16772702b77d7e39c1bfbc3ab7d5ff0aedcedda4421999943c0a3dda13cdecd6bdbfb8d
+EBUILD bitlbee-0-r2.ebuild 229 BLAKE2B 72b159be9a00e774fea8350d608710571836c4474f214cd17028a1e6c7311dcd7c7a66dfb95a51c0715a5c0abc01592eab3c67ff0b794804dd7517bef29564c7 SHA512 4165e0296eef6d2345d8bcd159a7dcaa95036d956db3564abb37f5c91d0165a717a2c2c4ed7136d27cf8f92e6d3c3dcc1c8badd5eb20bdf26717a0f4db6808fe
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-user/blackbox_exporter/Manifest
index 52b8230132ce..dbd21e96747f 100644
--- a/acct-user/blackbox_exporter/Manifest
+++ b/acct-user/blackbox_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD blackbox_exporter-0.ebuild 251 BLAKE2B 29c4a423cafffd56c67d0d28bcb740380d595e4e5cf64afc1954d7c20fe70d7b59e39611e708e53eda8c43719beea54ce65524d63eae46c3a1d1d4e9e010776d SHA512 4469af136978c081e5a33bc3a7175c16291598792dd11dfe18ed44f3b9f9ab8c2b7d78ad5ce297ec99c250ea37f35cfe5822d451213bd8f0d2ece4984017e196
+EBUILD blackbox_exporter-0-r1.ebuild 251 BLAKE2B 5b515ca8425aea745e83bf20929fa5280d8f2a675d39be197b46087d78d5194a9eeef76d2b26a048efab31c0edea9155cf550a13e114a3792f042509bd071bbb SHA512 c7099232d5cfedfbdd4539d0e9b802d46c14ea7488eb8659ae748a072929d6a8d5e30255c6cca1a1d719d133892bb8b73fb826533dcb15f17dfac93738da92dc
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
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/Manifest b/acct-user/boinc/Manifest
index 823490e7ef80..6b33eb34a11c 100644
--- a/acct-user/boinc/Manifest
+++ b/acct-user/boinc/Manifest
@@ -1,2 +1,2 @@
-EBUILD boinc-0.ebuild 291 BLAKE2B 982e184dd3be58e2fc5045e05e574223e23e5445a938c32d1329d38234124b098f0cbcfc6279aececf56c9fc4f65711f3535f2f212f24a48ef6e7fa6e9f9faab SHA512 cc736e27a523776653d1e3080ad500c796be422becb242fd6a66ddac494b855b0135cffe07f78310e2db5e21cf18c8181ebc2dff8df610d3ac8aef938891a305
+EBUILD boinc-0-r1.ebuild 296 BLAKE2B e9c0dcee6b89f8a607e12385d89f18316757a8c32337efad1475a2684aaf85e0511179aed57ebf9c47586dbf8fc3c1d7376886f524af3e9ed94c3b5b02dafbc3 SHA512 61d690938af6bb9081cac559b72fb2447f84d2e87dd8ffdb09a77c804ccab89358ea9a46914d2a7a25e8d948e0f2331af16a261e9697d9a8365c220db0940dad
MISC metadata.xml 510 BLAKE2B 80b772647185a13d46c2e56c90a473ce0752d55a9bd1aacb0847383ff73e4e4d56c5eb48554c86eabce217191ed36fa411c05fbe27edadee551808cc97aefe6a SHA512 d5d44bd410fe44f111a327b50b9f583589b749b7ff0a8ee66ec5fe54e70d6c18734e53803e2f3cfb761bb48a6d1082ee9c108d64d230a02fdaf5ffb737b7037e
diff --git a/acct-user/boinc/boinc-0-r1.ebuild b/acct-user/boinc/boinc-0-r1.ebuild
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/Manifest b/acct-user/brltty/Manifest
index 7fa08afe953f..a15f42a43213 100644
--- a/acct-user/brltty/Manifest
+++ b/acct-user/brltty/Manifest
@@ -1,2 +1,2 @@
-EBUILD brltty-0.ebuild 307 BLAKE2B 761db8d612620961344e691b5775edd9519420da3e6c1860151fba1f2f91c6f27f4b7b1c060a9d40e1880d2e5ee6abd85c365b1e153d5c1205224bc40b946076 SHA512 ee7bda650a9162aead512b7791ab58dd43d40bf5fa54ea60b09ca6a1a90e98a0fdf6b539207549410e458ca7a2b2f8d015b2db6094af96a173ce8948ebc3f080
+EBUILD brltty-0-r1.ebuild 307 BLAKE2B 1a7b98d1e8a4cd6295ac977c7f4a06a74b0f5d05ff705b642f9818a007ed6aedc8aa38bf4945facf08de7d7d5f0fbf5624a9489b13262fddaa060f7d7f31872f SHA512 eec326ac476c0e420c9afd0b3d03e6c6df7567c89f1a0434ea119678439e03bc130c09c9260765f6e9311736511690c35dc5801876e5db057ae76a6384c441c5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/brltty/brltty-0-r1.ebuild b/acct-user/brltty/brltty-0-r1.ebuild
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/Manifest b/acct-user/buildbot/Manifest
index 27f33762996b..6fc83d1d48fa 100644
--- a/acct-user/buildbot/Manifest
+++ b/acct-user/buildbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD buildbot-0-r1.ebuild 243 BLAKE2B af2fc2da53d9cbf85ae6c9d4decb576a98e47a909c09b318e7d8be9ea71ed6264513856a028c143a291888af8c526948ab72e1ad05e474986137a7559836564f SHA512 71255b9ca60ad95bcee4f3cb5e4ffd16ccb36b3b2cfb9b8ab70642a7fe416ba3960e50505edf7601b604db1b4b60c775a5b0e719f3b5e9e51cfa6add8694cf8c
+EBUILD buildbot-0-r2.ebuild 243 BLAKE2B d472f563118354a2dfd412730b242010691e56da5ca103ce08ea2e9a2ab377f5a0bdde7a0892cae0ab5a8b103a4b8685cb98132564e5d639601693ca506a742c SHA512 a08863d678c3eceace1bc8df737ca9eefa36d163d7d770fac7198e5571d710bc20bdeb4b24b91c19de4a65e14335cbcbcecf2b9b2c9096a762c5fe8002ced1e4
MISC metadata.xml 252 BLAKE2B a7ff81694559e4649beaf5821bf5c155420d0170fec450c215147b27928cf668494a61f850c49c5b5fc2f2185eb5c33b283766bd3824969c6e84e8327c340c94 SHA512 dc07337dc5c47477164914f740f97763d2dfbed7a82c3b69f34ca12c5e0d290d26e4e15d126ded66d525e98567e86814cf4ec7ae42a3ebbcfca0bf723a23d31a
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/Manifest b/acct-user/burp/Manifest
index 1d8d6d032f2d..6b2f129ece12 100644
--- a/acct-user/burp/Manifest
+++ b/acct-user/burp/Manifest
@@ -1,2 +1,2 @@
-EBUILD burp-0-r1.ebuild 245 BLAKE2B 4259b1106a7eacc08715bc16ec2ad9bea0ab78e4e0cad8f4bb3998aa595a35c2c3c7f8cc065412a5cfa642d636544d47e40e14510c37c196f31b254410e5cac6 SHA512 ac8c0f887ad5ca4303d3fbd89690c39c3b3f21dd0c48a325597742e69a829ed02e4b23ef938af2d15fd995d2e6677e043310c76fd6d4666f5d8ae02ef7ddb9a4
+EBUILD burp-0-r2.ebuild 245 BLAKE2B e07331e4975a684a86700dddc2997326c7e6c895c56b06340332a37ab08b191055c00647f81b431dbd056c15d5b3717941f37c1668b99fbfb8094c617cef6f4b SHA512 5e09a914d8705a3bada323b4d9b957797f419c3acec310285a2d28d6760eaa51171ff8ac1e7ab2d70d036aa32af14b908511a5221026f352b1672a82d560d02d
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/burrow_exporter/Manifest
index 612e4d91b892..ee0a648c6c05 100644
--- a/acct-user/burrow_exporter/Manifest
+++ b/acct-user/burrow_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD burrow_exporter-0-r1.ebuild 259 BLAKE2B b611011d872d850103034ce7f824c53bfa81661d42be10078b69822d08beabcc5f02ac1b677dadcf9b98e3ea644ba33553812889e19098d1fce1f273182ebf12 SHA512 7de120189ab70673f6badaee19852d9794b87d4394c6222fbf753e12ee17ea67498d3bad744461609b9de543cf436607ff24e770ccc332036ce9b68ca1b7d892
+EBUILD burrow_exporter-0-r2.ebuild 259 BLAKE2B aa7e14b0bd0ab64d8488bd52e41d804e7a3e3beea7feefbfa607fe0bb6ea15fe05eb1902ac20f5c327649e1e40da0a725c60db23a318e80c5c5b07f3fbf49bba SHA512 278fa1eb0be53f6232b61884bc0b556cef41d57f3127e9caf5b79a08ba065a8f0a4cbb5d495fed3ddcd8a1d046e65f942169aa531b37d6740623fb0547a70b96
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/cadvisor/Manifest
index 5d9d81d1b553..1839ed8464cf 100644
--- a/acct-user/cadvisor/Manifest
+++ b/acct-user/cadvisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD cadvisor-0-r1.ebuild 226 BLAKE2B 0e96d76620c940ce3c1a66e5ba75301118d050e6ecf4817cfc3e29925efccf4965d764dd47ef307322a92f4277605ca38cb1e528d5a3608207ae282735b0b4f9 SHA512 1a7ce77d73ffba22c8321989a83993dac30335e617c08047178c8ee56de00750e5c7e9392b19d5a230b9181183cfc3bc8debad703958554826b95ec8f5d03e25
+EBUILD cadvisor-0-r2.ebuild 231 BLAKE2B 909213ea3500ec2adeec3bccaec0de0f358bef7af5c4f15fb2fec187c78404ed29f63aa4bdefc005e49b487f0e72704b50a269a1e79d8f9465daaf8951de7ebf SHA512 a4962b54fb574b05f446fea733e525947dbb474f8cfe4f55d73db9ef0381d76be7597ec2fe0d94c32a63e3cfe50158e9883dd88108e90ac214ee95cb8c1069e8
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/cancd/Manifest
index dde7ad189c52..b0d212d33413 100644
--- a/acct-user/cancd/Manifest
+++ b/acct-user/cancd/Manifest
@@ -1,2 +1,2 @@
-EBUILD cancd-0-r1.ebuild 251 BLAKE2B 22761b4b976f15b32a2ee10a7ae4d62c0a9c16878094a5d9ee634c50a5e481eba3880b4a9ea54018510d79027a53cea8681db4b09d0503df9609f7ffb58c5995 SHA512 653a83a106ee76b6c2ca5c711978d5c3694569497e35327af0872942a6c8063880b5ba100efe31395dec55c04cba2c18185e861754c021df0b65d10b2ad0d05d
+EBUILD cancd-0-r2.ebuild 251 BLAKE2B e103122428a0aabb79292bf54604319adc59921e084c4ea53ed051e9ae9e2479e71841e7ba0419b294d0674648fa56134f74309dba3b451bc01ae136f6e5330e SHA512 988778d5b60a607b878aac3452fea2321e63a15df853f3c6beba9e2b825b1f6a46f359fe5015c3e0bd74946a4ab652cd3275f116f205538fe786c53d2962b4e6
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-user/carbon/Manifest
index b02d6fcf47dd..29e1bf6bcbe5 100644
--- a/acct-user/carbon/Manifest
+++ b/acct-user/carbon/Manifest
@@ -1,2 +1,2 @@
-EBUILD carbon-0-r1.ebuild 237 BLAKE2B 9ebde2ea0048a790036acd2ad536b841853fcbd6f30f22079d235ced492519e705aa9da5377377058ef3387f21c5ad200b71f3107c37f91cf0130dc943555eb7 SHA512 b3808040be051dbec0e37d4a23f78f0938fc5bebb5b43206ca29fec120db454a579011545dde888e5275e51ee962b0de463a713236cc10d5b0bc79829afbdb65
+EBUILD carbon-0-r2.ebuild 242 BLAKE2B 06d9d88bc1c90a67c53119d317f94d94225322865358e482cc24609a98116b6f641412438db874ffa412536d5b2032bb15808a6a330f2d1847d7e0e19cf72645 SHA512 687d5ed988728e662f8a78fa1651412a2ec91f552c9ceea3f72644a0dc86bda1f8ebaaf81449bb639a712157619157bbb95372a71047cc2f85c7c5bf4d635169
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
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/Manifest b/acct-user/ceph/Manifest
index 71cb5768a685..567638d14874 100644
--- a/acct-user/ceph/Manifest
+++ b/acct-user/ceph/Manifest
@@ -1,2 +1,2 @@
-EBUILD ceph-0-r1.ebuild 253 BLAKE2B ff583dc61d2da7c33b829ea708680f88c867f216af7e5ad243538a6a2dde8cbd78c7f5dbe895cb2f5eab5f41b4e22e0e52d0f91c766820ddc046e7d7620647f6 SHA512 e54c83fe130736888c4a24ab3b31045ffe2c5c5e7fd04f3d9df359e9c04cfc0b936c1b3330ded3949e60c21b974e030a0b58bde9603a31613e0b92441ec87e73
+EBUILD ceph-0-r2.ebuild 253 BLAKE2B ff583dc61d2da7c33b829ea708680f88c867f216af7e5ad243538a6a2dde8cbd78c7f5dbe895cb2f5eab5f41b4e22e0e52d0f91c766820ddc046e7d7620647f6 SHA512 e54c83fe130736888c4a24ab3b31045ffe2c5c5e7fd04f3d9df359e9c04cfc0b936c1b3330ded3949e60c21b974e030a0b58bde9603a31613e0b92441ec87e73
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/cgit/Manifest
index edac28d85ca0..e9e57b6fd462 100644
--- a/acct-user/cgit/Manifest
+++ b/acct-user/cgit/Manifest
@@ -1,2 +1,2 @@
-EBUILD cgit-0.ebuild 247 BLAKE2B e18c6bec79054cd8a436a14a5b0fbdf83547a493e6beb26de8c730288aeb7d8c038b727bd947506fbc7ce66a835379a767bcaea64767d7d26a338080cc0894b0 SHA512 b2178e09ff70af379ef4cf4ec02f4e26e823630e35d81875506df3a408234217a4c4bae309fb61da0e3c71214d1175fa38b0e331b8b85cb81bc9bbdcd9c522c2
+EBUILD cgit-0-r1.ebuild 252 BLAKE2B 063656fc6110180fb3f1c7cf3b734c5c16859cf2b6aa3f760a5f48553e8d01d9080056991817f95d44e40dd966edcb370eceb92a2b21f988ad951249d1b63899 SHA512 43449043a699d441e4ef448e3888242c02f2cae7e411e784c06764ff158bbf4077d3cd9db01cb3a914685b9cf463d4842cf84bd076a31afc5c16582afb14b96e
MISC metadata.xml 251 BLAKE2B f41d5969712506f1083eeb23748860a267a5cb5a66dd8b6e765f057c4ef6549bd8e314aad6f6081eacd3f11274963a46093d37a4beb95ae442fba32fe6fe5b2d SHA512 3d0c951bc2e14c38f4b3e8cf2da3fcc69e7077d4bcca59a3a48e9c69b2de759a7aca10ab736ed3d2fa96fe8254a6519f62f3f584418f0b8073281f4bdf874e3d
diff --git a/acct-user/cgit/cgit-0-r1.ebuild b/acct-user/cgit/cgit-0-r1.ebuild
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/Manifest b/acct-user/chronograf/Manifest
index 95a73169f035..00a56e4b1876 100644
--- a/acct-user/chronograf/Manifest
+++ b/acct-user/chronograf/Manifest
@@ -1,2 +1,2 @@
-EBUILD chronograf-0-r1.ebuild 265 BLAKE2B ba6f2da9041990f248a609e86cb6dc34ee914ae07b2d959e8320614ed6b7ebd62a68abcc794b8f17491a936a006d771d22acced7c8c73cd99831d8e30ef0fa06 SHA512 7f8ab5e95c06ff24a53d7e684696f33dfd21a57489e81ebd845cb14caa3000b53b2f9f69e84b14f86be4adb4830d5e8fb2bb5af6b3c97393f630a8a50cad82f1
+EBUILD chronograf-0-r2.ebuild 270 BLAKE2B 5ac9d2bc3a77534bfa271b9171a2d7e2c2c571c40ff129cad3d86394cc6c33c3d2259f841ba51cfb630a251afceec9e47d0c288f9443a04f66a771654d72a61d SHA512 3a6617833da974722167872627436a6a076ea50b369f2aecc254b05ec88af43a3e5d24d1603d07c56dd8a82550002a43e3d7f8e1597302e17e0f6b34f4b30528
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/cinder/Manifest
index 4d86712810e8..a38d873b083a 100644
--- a/acct-user/cinder/Manifest
+++ b/acct-user/cinder/Manifest
@@ -1,2 +1,2 @@
-EBUILD cinder-0-r1.ebuild 301 BLAKE2B cfd982181a84fc3e453a269a0551b7a5f0406c1547fa2b8b5339ecd409cd0087d9721e18b8c9a35bafe22caa3f4e6d37bfc5bba20f0e45103b435a1c76896cdf SHA512 1875c4a0f26a0d820ac802da3741e64984e8e31d9542b93252d41d7aba510cdc515f7b7742081aca03a2ba41f646fe2dff0442490aac0253d2bab02ab5f425f7
+EBUILD cinder-0-r2.ebuild 306 BLAKE2B 80c8a17d3a3eab209a6595bfbdd8762ead2ace66fb13a33a278900e17622c250ec2df3aa8c0d4b3c0868ba62764d9ecc629f257558eff33a2a6ea26877bb566c SHA512 7ea1ffce1b3d6d46474d63ffb53eb03c636627d740979cbc17828885b7c6c40044369b25ef95bc219f03942ca64607479acdcbc79dc5c100d9a61d565268e10a
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/cinder/cinder-0-r1.ebuild b/acct-user/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index 3576a06cec02..000000000000
--- a/acct-user/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack cinder service"
-ACCT_USER_ID=442
-ACCT_USER_HOME=/var/lib/cinder
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( cinder )
-
-acct-user_add_deps
diff --git a/acct-user/cinder/cinder-0-r2.ebuild b/acct-user/cinder/cinder-0-r2.ebuild
new file mode 100644
index 000000000000..ef4ee18dbf85
--- /dev/null
+++ b/acct-user/cinder/cinder-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack cinder service"
+ACCT_USER_ID=442
+ACCT_USER_HOME=/var/lib/cinder
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( cinder )
+
+acct-user_add_deps
diff --git a/acct-user/clair/Manifest b/acct-user/clair/Manifest
index 6a678771d0aa..605b5209cc51 100644
--- a/acct-user/clair/Manifest
+++ b/acct-user/clair/Manifest
@@ -1,2 +1,2 @@
-EBUILD clair-0-r1.ebuild 220 BLAKE2B 782100f976c7d33fa44dfd4dcacdfcb46eb635d445a815cfb6733f196f2c2dd3a2613cdb02f9e42d473c193af3095c6d6acd318e59dad55e09d0bbba10d04a3a SHA512 63b2b39259a1eaee7899f778707bf6ac98ad96003335734bd1cbe08218ee8fc3687ab162159009b5297cd3385781aa480d5583161d1f0e86a42b806b5b0b0513
+EBUILD clair-0-r2.ebuild 225 BLAKE2B b56a855acfaae1e1f08d0ff9b55aa9676c0dfd7d47dc32d2cfad356fd8fe9e083d30c1e840a3314e84a7d57d993b94e9ea37323123584bc96c636ba1f106c095 SHA512 744a29d5b10adf2fb18d3eff5a7133c8636515dd74b53e42971087bd930c04f76e0f902e10eecc67c1091d219ce360b30cffd4663d3e47b1e845441cc19bb68a
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/clamav/Manifest
index 42ad75cd32f1..22b32ea9da61 100644
--- a/acct-user/clamav/Manifest
+++ b/acct-user/clamav/Manifest
@@ -1,2 +1,2 @@
-EBUILD clamav-0-r1.ebuild 198 BLAKE2B 33ff963e08ea8eaaf8dc8c77a41ab5e65dfb82f1057125ffbda51c524b26cf50d66f3f88b6a0ff2829cd27ddd24b7fae51ae22c7aba6b2c072f04f5c9dfce5db SHA512 e5046e36a74e609b22c29a9a366185f7bf8cb4714ff064e8abcc70153840f438a86ab01f4e20185cfabe376863689e55be70b3c34c38f4dfca7774a32385b04b
+EBUILD clamav-0-r2.ebuild 198 BLAKE2B f81b80438f73f4fc07338b83a7aae9d14af8406c971de57fa782a2f0097cbb6fa12abd01e55585df54ed2bc86596bf76036419089f884ee403b1fc8ca0e81139 SHA512 a887c59940534dffa3101adf5d792a721888ae7ae85269fbff305b97e3d7bebeec50a124e27e77c2fdcf373d074c04929aeda400b5bc68a7948a7af3bd105c7f
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/cntlm/Manifest
index e72053c7caa6..35d7d0fd0353 100644
--- a/acct-user/cntlm/Manifest
+++ b/acct-user/cntlm/Manifest
@@ -1,2 +1,2 @@
-EBUILD cntlm-0.ebuild 240 BLAKE2B 86501257402b0beb79b26233c1515541c33b9e1a8c331b0df659491d9643eebb299254ded545e491b27f0a3ea8a304344e7ea3a908408fa62e75565437451fa5 SHA512 e9b1e7021186dcdcba4e31f2f9ee2f11dfa9c152051aa7680333ac2a84646b7870cbcaccedeec9a42c139549f119c2a1ff561a78decd67d1ecba3e59b71a37ff
+EBUILD cntlm-0-r1.ebuild 240 BLAKE2B 28185570eb694987477cf4de3368b8da00b5f7e4d53275bbd80063f1d237cacffab69d3fab76be30b3a498df0796f836ebff8489576aba16911dfcdc7cdec74f SHA512 c1f2a7a57b5edcf8d4759d4d7b7a56943164cff0b71fa438d56926a7c3370200f61908a2bded868c296520c656cef50520cf65c41a466a973081a804727d51ce
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/cntlm/cntlm-0-r1.ebuild b/acct-user/cntlm/cntlm-0-r1.ebuild
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/Manifest b/acct-user/cockroach/Manifest
index d9591e72e827..b63ce4f5823e 100644
--- a/acct-user/cockroach/Manifest
+++ b/acct-user/cockroach/Manifest
@@ -1,2 +1,2 @@
-EBUILD cockroach-0.ebuild 301 BLAKE2B 00ab9807fb374aaf6399a6c4fa5a6ec676e1d92377be5ab10801fe80043ad37db8f9e61a1ff78f67811bf67392b09a60513c575d7a05de3bdde39fd0d8293b8d SHA512 db25c3844dfc33549c411da2cb1c5a222e51a9eb613d6e96ad3ee9d3fb66c93498fef01f96301b72fe6a2c52892208d5e002be84f78424c8942cda926da3e351
+EBUILD cockroach-0-r1.ebuild 301 BLAKE2B 2a6e272be31089d0c33792b94181f77e27b0cefd840d938ca95f9add840e0cd8c6c30ef6c94b8852402baa2f0faf1627a18a223347f555e694b6e9b95dbe68ea SHA512 318c09aafba47ec575426ef1808b87dad29b27a866b0d2527a9f35424ade18db4c89bc7f9d46f53973f765f0fac83c30673cf479dc1151f47ae8c3cc8c4835e1
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/cockroach/cockroach-0-r1.ebuild b/acct-user/cockroach/cockroach-0-r1.ebuild
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/Manifest b/acct-user/collectd/Manifest
index 9c16c3afc6a1..f6b84e7ec747 100644
--- a/acct-user/collectd/Manifest
+++ b/acct-user/collectd/Manifest
@@ -1,2 +1,2 @@
-EBUILD collectd-0.ebuild 260 BLAKE2B 84d607a18913303061ddaf9e52170d5c2d1e135c08074309a5491a4a0447e320362889b9a1f8bdd59f12b60ba5917655bbd88517e6533062e0ea569917026fd6 SHA512 382350949b6e3cf36c1d1f278b39238391fb2d13afdc940fbd277007e433f17d0ab41c0b759c4b8c134533534347c20ce530deefc62002935f415f9b97ee7ea1
+EBUILD collectd-0-r1.ebuild 265 BLAKE2B 6de2810a3158297b89751f773c55217ec1b1b22209b2c19b53e4cca1f03933b21c71d0a113e525ac4652a7a05405e4f6b55cfc0e46da4c7d5b83967650650351 SHA512 86d7d8bfa73326987766b3382bced8888da8ae9941dbce5488e178eddcc8d6b907be02b67da26dc6a1188b93ed58cfe559493c25654f441f866a3361018965fe
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/collectd/collectd-0-r1.ebuild b/acct-user/collectd/collectd-0-r1.ebuild
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/Manifest b/acct-user/colord/Manifest
index 166f94677d6c..8a2695a15028 100644
--- a/acct-user/colord/Manifest
+++ b/acct-user/colord/Manifest
@@ -1,2 +1,2 @@
-EBUILD colord-0.ebuild 278 BLAKE2B 88b28dabb9fc7cfe116154e3a44ab4a19dcb59f1ff7b7d483dc2e30d27773ee10c3a82053dc7ade2b9bcf5d59f6fce418696541974e6fbaa7de3c0cab8c16348 SHA512 17ab09869356fa1aae526e25e7eb7524ee4fda867ea61d349ebea6f8f70b99abd56fa2b8bcc9bd2016b5269c6eae056043a71035c5f78e51c5585f4a72d0a981
+EBUILD colord-0-r1.ebuild 278 BLAKE2B 4c9b8f90585e05b72f3fa08c382fb37ef9817ce8cb999719a7fb2c512a07d6af83944d6d996b4743b6b9959ab504e61e34408d331addc82492624476c6748e17 SHA512 0db9fabb714a91ab60cc0c54e36aef9836e28f347f53f35e35992dee5d9c30279e68dd2612a79d74282673ea4b77fbd4fc817b489b551152379079bf9a9a0d29
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-user/colord/colord-0-r1.ebuild b/acct-user/colord/colord-0-r1.ebuild
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/Manifest b/acct-user/consul-template/Manifest
index 93794927a456..13f5cdbe3191 100644
--- a/acct-user/consul-template/Manifest
+++ b/acct-user/consul-template/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-template-0-r1.ebuild 240 BLAKE2B a39b614efde513f1aedcc62038c03275c18650760f85403517717eb57e315860c2431cbf7886fd3befb1a62263a451ab0b3387e05bfd11cf1e2edfe415ad9321 SHA512 d5ab081a6db79c27f81022502450098aa4a41d82362d6f0bb65ba09fbac07f8986fcdf8ec5d7ad2eb65a499ebff296412cee0fbe5809645779881806f9f79dec
+EBUILD consul-template-0-r2.ebuild 245 BLAKE2B adb54afa76d7c4e2313579b3ee3049fd3bbbfe7c4b0c541ed3b59b7f5512cb74178c99f07dcf4f2fec62f28e2c1e2a3d4481147c788e611d421ba2ba2a1a0efe SHA512 ba681d663dfc207ffde2a1080ac9f997aef42470a6104e0ddc414f8b71311bb23c237525b04e60e40d179141edb966e4a24260ebfcb89b14f68836f6efe53f4f
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-user/consul/Manifest
index 1f16aa715a54..1e4ac3f55b35 100644
--- a/acct-user/consul/Manifest
+++ b/acct-user/consul/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-0-r1.ebuild 253 BLAKE2B b4cc7bd07ff34e1ceb7a1b48c57b2cb23b042d84fb30049e3c501412a3cd946e80b4596cfb8d5dc208edd56e0e47d02ba39e4cad024a7c0e5ae2631e28e58b57 SHA512 a3a3be5138c0baf1aa87e216ec458fa8ca9f05cd1f1a3e1ce366e56a3ca33e4c637d762348a4a9a6fbaf8e52dfe745ef8addbad49c990a0b663c1221cf25b701
+EBUILD consul-0-r2.ebuild 258 BLAKE2B 2ad6b4c7ba6d192593276f22c74367fbd5eda43c1e30fd8446fd42702e9c9c5ed9ff6611d44285360bad916c4864144b90716c7ec8f1d335d608add2fce5f123 SHA512 c3b6d910f25ae255cb926e818dca3bc4c9122eda2a047fe28fd8afbf4b19684cf0e945e711b677cb58be6aa8164ff59b5558cc8b08800ca67153c3b6e1bd1312
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-user/consul_exporter/Manifest
index 2892a505156d..4e51a05bbd38 100644
--- a/acct-user/consul_exporter/Manifest
+++ b/acct-user/consul_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul_exporter-0.ebuild 240 BLAKE2B a965f0595740eea6b35a93f9b43c5a526000a1c7fcbbc0e096847353ff537918a089c55ec1b23efd62939c497f39f6a1da75c2f54c9e87a9f41e23ca6c451eb2 SHA512 8999088068e7bf014b7fe9bd5a9d699b71f9ee79ead1bf35318a345a803ec0e7facd032aad43f99c79fc4305f6823a7b26a64477ea5285bbe2d0ebdb9ddafae4
+EBUILD consul_exporter-0-r1.ebuild 245 BLAKE2B e68e0fab260c0692211afc1f57db7b110d6781f5a9cf8f9c740dcf81b1688eb5adc236b29bfd6ce5f1e38c959357829047c36148da924555b61d19f788ff6baf SHA512 3a93c94c5361714507a41e51a75b38dcfe4bb7bd57b563807b646f0f91c1167abead1815ed79d7d9141d7edb33f1fc85486a5183ef194dbe3e0d37c942b9a741
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/consul_exporter/consul_exporter-0-r1.ebuild b/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
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/Manifest b/acct-user/coredns/Manifest
index 2167518752a6..0d4020f68c94 100644
--- a/acct-user/coredns/Manifest
+++ b/acct-user/coredns/Manifest
@@ -1,2 +1,2 @@
-EBUILD coredns-0.ebuild 271 BLAKE2B f8d2fc76c8b70e965fa23e9b29cd7c619313f1af38cf413e18ca7f22481e2fcbbc47fd80ce552c592179ec4def5f592690b9750ca27233c0a0fcb60fbe01d19c SHA512 85b1d22c426bc448d9330c8bedb26d50c03d90411e64fcf848180c0a7d1d39c507644bead17d4b8136f2e8b875a06d4062efc4ff09251e86093dfb8cd2b13011
+EBUILD coredns-0-r1.ebuild 276 BLAKE2B 48f3c5e4145e34ea0b01585375d87a5802202bc306dcbafd8e662d0a85c486347182f985661094ccca9e8e71024b16df222ab0b1f0004728c858adf7923f4ab0 SHA512 7168782643aa9f427bb5f27fdd37843159fbd672759a65135641cc5aa0790010bd54d45c4714fae9d776b82d99fa598187b3faabdb9f2f9feb52e1b8f48dd24c
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/coredns/coredns-0-r1.ebuild b/acct-user/coredns/coredns-0-r1.ebuild
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/Manifest b/acct-user/croc/Manifest
index 94d92ce161e3..5fa1edf95341 100644
--- a/acct-user/croc/Manifest
+++ b/acct-user/croc/Manifest
@@ -1,2 +1,2 @@
-EBUILD croc-0.ebuild 233 BLAKE2B ce05cca9ab4804b667229e5b244fe33737a4a3225bf90d50cb42a7178e12d4c8bc20679e8b2fe8a6b23fde063234f52ac949522152dab7471d631ae27fe5812b SHA512 a7b939944d26c64cd04121602504a11d04787d9ad1cfe0830f2747fa923ea91141277bdc59ee5bd88eda2de8cee7e1fdc747a25780020e8d0816a079f90816ae
+EBUILD croc-0-r1.ebuild 233 BLAKE2B 19f8700f38cca4206630aa269a93c638571e6215aa864c2057e7b5e73366d1927f4d7944bae72408b2ccff19533dc3a243b81ddf810064cf1eba025396e97ddf SHA512 f5016f1a1c4b2b56048bde40062ebab3a5167614d5f8c973647da810b0d39806acd698cb23114af3c09f6a00197c8537503909b9966be3e507934b4eab9e6283
MISC metadata.xml 250 BLAKE2B e1b3331ad38b6a21cc4a5b15c11669fab651b37d69c6259fda26509a6c52422d87965ef5e60207db0f42b6e2b52e2f98e87c289f57f758eb886faa271606b67f SHA512 d7cd0a9d76d9b5d2f3c9a73da396e760fffea65055ae5b083b8f4616cb6f0620443f387a2f726c841f2d7982516dc2d87c60bd1e5cfa9625800015ad85b97c26
diff --git a/acct-user/croc/croc-0-r1.ebuild b/acct-user/croc/croc-0-r1.ebuild
new file mode 100644
index 000000000000..ec221b097a29
--- /dev/null
+++ b/acct-user/croc/croc-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/croc"
+ACCT_USER_ID=310
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/croc/croc-0.ebuild b/acct-user/croc/croc-0.ebuild
deleted file mode 100644
index 84f75f78aac4..000000000000
--- a/acct-user/croc/croc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/croc"
-ACCT_USER_ID=310
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/cron/Manifest b/acct-user/cron/Manifest
index 17c28d6c7683..18c9d49ad39e 100644
--- a/acct-user/cron/Manifest
+++ b/acct-user/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0.ebuild 278 BLAKE2B bd0a67bf0888b6496cf504d77631bd326da673cbc42ddd1f317e32f873682bb95a5eb49eaf4becbfd23208ef4a7a3db01b929bff42dbb0d3043c9c881d666f71 SHA512 d34b4c070a53484b36f1fe73060a1779c1ab981c54b223de75d5226abba14ae1ad608a077c7457f1d1e3dbd22cb54b4cd461a5db82182d7bb3d6c2f078937edb
+EBUILD cron-0-r1.ebuild 278 BLAKE2B feaee0177cea9f5f71cca9248629c90842961408a46d7f7e8728b39e2981793ff208e94b9a0b0a917215a8febac25c872eaeddfa7f3c5817d3f94e1f52041aee SHA512 d63cffc6a3ff5efcbca3ce5ae547460beafc8eb38f6fb33b3faaffee529c67fb1ee7eb1118acdea68e7915005974f79b17eec0d8449f0371cb00170a64371b86
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/cron/cron-0-r1.ebuild b/acct-user/cron/cron-0-r1.ebuild
new file mode 100644
index 000000000000..cae4953127b9
--- /dev/null
+++ b/acct-user/cron/cron-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/cronbase"
+
+ACCT_USER_GROUPS=( "cron" )
+ACCT_USER_HOME="/var/spool/cron"
+ACCT_USER_ID="16"
+
+acct-user_add_deps
diff --git a/acct-user/cron/cron-0.ebuild b/acct-user/cron/cron-0.ebuild
deleted file mode 100644
index 7ec64484762e..000000000000
--- a/acct-user/cron/cron-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/cronbase"
-
-ACCT_USER_GROUPS=( "cron" )
-ACCT_USER_HOME="/var/spool/cron"
-ACCT_USER_ID="16"
-
-acct-user_add_deps
diff --git a/acct-user/cvmfs/Manifest b/acct-user/cvmfs/Manifest
index 7457e64909ce..632f71dcb8e6 100644
--- a/acct-user/cvmfs/Manifest
+++ b/acct-user/cvmfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD cvmfs-0-r1.ebuild 250 BLAKE2B ba841c70e8dd9122f1fdab67947ce63bf57d88664ea651bf129e0cec10e76e388a858cde426f53bed31a9bff1c42db7834a61e32eab82878d1751c2c15ffe9aa SHA512 e0f74313654fc958ecac2da409e39cc098d4caa863a043d169fe7749143ab1f041a55f4a8448770b96b5ad767f84957c24a072b4be99ecc127c51f00613ff0f8
+EBUILD cvmfs-0-r2.ebuild 255 BLAKE2B 2c8ddab9cbe3cd353031e1fa2c61831aee2646d2ded1e4a913c0b3ac075cea1b5a46a73d65f6316670acd18048849b1d5ac8cb5b44062530a3fd2dd7ffcb91a1 SHA512 48f7d5a14f57ec02cc3fae749869193d41dd33f75dba0bfbbf9bd7348e98f7409141693b8c8dc7744bfb261f1c1ffeb89ac44478efbecad532fbb4ed52dd3049
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
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/Manifest b/acct-user/cyrus/Manifest
index e6df9e25a0f0..e4093ce7a9a8 100644
--- a/acct-user/cyrus/Manifest
+++ b/acct-user/cyrus/Manifest
@@ -1,2 +1,2 @@
-EBUILD cyrus-0-r2.ebuild 232 BLAKE2B eb3653f5f4c0c8151808e73e91b2fc417e4bce8cf81e75602f141b68c686bf9f9207653eaa26a5e8b47f9faf13c76c51a9abaf973e29bf32d0111e7262f7eebb SHA512 453e047266d27abe0fea196aa789799008b97a72b7bb41ecbd33e06bb927c7bd3b610fb478c84913ba6c8b9d7734b4d8f0b29ebdee3db2bc86b4e325f56c6e56
+EBUILD cyrus-0-r3.ebuild 237 BLAKE2B 3f24837dea38630c8053872e0f7a597133ee6ec3d101efe6e52d1164e5ed305d9ac22d01ce841a1f17a7e4d03b78fa5a20ad338cf30b98931da84b8c0d27b87e SHA512 5866d8110598ceac43df3fa902c2c31d1f769433c774eb0946830ebd5e0d413f99423695a13c8c083ad212dfc3ac4bcc8b45977d575974d0002a725ad6bc47d6
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/darkstat/Manifest
index 8923f5c7babb..fab949f40c5c 100644
--- a/acct-user/darkstat/Manifest
+++ b/acct-user/darkstat/Manifest
@@ -1,2 +1,2 @@
-EBUILD darkstat-0.ebuild 237 BLAKE2B 98d07d85a4477c72c1d279136e8e620ec6bec74bc296e66e3811d64bee36c24e9b8a9b058eec8e214fa1372b904e44e9bccd85a330d2cf469115708be35410d3 SHA512 a247a5565630fa3d0f27a708075fa0d5cc63489b77d8f85948e3ca0bbd0597f62d9a6bb686981e9b4815b0ed39b118c6f62ea4868e9060b6326acd5d0c87e5de
+EBUILD darkstat-0-r1.ebuild 242 BLAKE2B cd2686931e8f09808de74f5ac1fc54426c2eea254d112c3d84c621a3450365ce5ca8a045b91f5d36e3b14461a9bb88b5cdfa8b097da880121dde32150c0c0103 SHA512 fa447a2da3dc866783dcc51ed37c6ea36558db8beccc9e17624c30db6518734f0c825d5e73443d7f67425870638dd68b286fcc7160e8d4cbfb879b7f526984ba
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/darkstat/darkstat-0-r1.ebuild b/acct-user/darkstat/darkstat-0-r1.ebuild
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/Manifest b/acct-user/davfs2/Manifest
index f4a8f1b385ad..4459f232aa73 100644
--- a/acct-user/davfs2/Manifest
+++ b/acct-user/davfs2/Manifest
@@ -1,2 +1,2 @@
-EBUILD davfs2-0-r1.ebuild 192 BLAKE2B f54e375a7105b91849c52ce2299ed50da407c268a5068c5ebed567b0d25cfbef1af5e5d6d0ff5c6569c69a88fd6c6ce34378253ab3c5e29ca1b63e4bcc98cbbc SHA512 341f730e6e1b685cf37e47725063af79577beb64aaa09b3132bcf44d7621f1888928d76c5facdc347ccfc6aac998c4eb2d37b991ccfcdace675ca82391792960
+EBUILD davfs2-0-r2.ebuild 197 BLAKE2B 2ba3774305c3c36b5d801a0f84250df45e089000480d3ca3baa5b099764af4fec74a3e2f2f974a63305fa93b9ea3cf456bc8ab193b551b609574720a5718f78c SHA512 a4a778cc12a06539a1927cc242b04cd7b81739ff37a52c25b87605f636a98eddb80da687effcf90f7112afe9dee8176ddc734b38bc0695a93fc3f6bce45812b5
MISC metadata.xml 219 BLAKE2B c0192fc2c685f564929ff304a18b20facdcc8638726bfb8711803a633a109780747e98c42b14cd3e8dd674a92a7ed783a40d56e617e414b6cbc3d4fb18a63caa SHA512 f702a981fd2afe5f23c2814fdf91a540e6335e50e3cd85003e28ec2130739001ecfcfd824cfa91780c6b1d5999cdcfbb06857dada1c53b4f9580675a5491eb46
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/Manifest b/acct-user/dbmail/Manifest
index 005afc6c29c6..efd254b77ab8 100644
--- a/acct-user/dbmail/Manifest
+++ b/acct-user/dbmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbmail-0.ebuild 198 BLAKE2B cf2aae761a05449758e9bf1ed85adbbdd1892c780851f018a28713a92c0459b23e2d2a37cf75ed3fb7ca0baa3b00dafecda47672633a46ee1ad70578ca2ae71a SHA512 fce38395283685c0430ea83ad8f83991eed1ed116d77d44476f79dc211e0b2b1976d09cc7f510dbbef6e109ba3ec616969dadd00e68bc42342347c3400542f50
+EBUILD dbmail-0-r1.ebuild 198 BLAKE2B 83be3994f39a547cbc397750ccce419062207568a587ce47f759f8ae4f4c1a2ea8a41f00e163fdb023fed441a93a888fce777c4fe9b2aefbbd857c60f84f368f SHA512 dc868064e20a1701094379b82b24534cc554a42fff4dcec20b455507ea05821784c183c0a9bc5b8a11bcc04b43103fa03f45497adc22262871dac2a76b8cb28b
MISC metadata.xml 259 BLAKE2B 3d6e2c71a67eb6eec74e229e746e4ca8c32878d251276044aeacfc21afb48be29752d2257e41ab4ffefbd061fb05929b17237905dd4fd01c65c24e61e464a681 SHA512 ceb54d3784d2abce86137f25059dba4f90ebba03e31dae56d2b8acbc515d9c0d7ed909f46c569a73e929cbe9dac2caef440e9c52b0518d37c081e03be471fa4c
diff --git a/acct-user/dbmail/dbmail-0-r1.ebuild b/acct-user/dbmail/dbmail-0-r1.ebuild
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/Manifest b/acct-user/dbskkd/Manifest
index 2632f583b852..e1fcadb3196b 100644
--- a/acct-user/dbskkd/Manifest
+++ b/acct-user/dbskkd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbskkd-0.ebuild 247 BLAKE2B 380cb585f14520f3c37a00c85010e0f67ff6f0d7f02e0ebcb6f09f1ad4e2f3f35c9d8860a48516d364f1fd936c8d62701d9325c2d24766c9d2e9423ce570d65f SHA512 25899e2b8fdba85b33e7584e41d16605df724f6e8756ea1b4256e87920a2a6392fc02723f00bf62b66a5fdb2b720091d2b649080a99046e0ee41d71fa11202dd
+EBUILD dbskkd-0-r1.ebuild 247 BLAKE2B 148bcccd5b04f7388556db0cfe51e81d217773583913665ee0046cb53d22d7a2bbdccec3b9491a28673507b8446895c3ce365fbfcb87595e844f01dcccd75449 SHA512 480fac7b4ca01d36170e8fd9482139068d5850463f8cc5f889266de3e5874dac559c4f5870fbc9434f70e3c63eb3009c4330d0beb25dce16952e656c3a2729fe
MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/acct-user/dbskkd/dbskkd-0-r1.ebuild b/acct-user/dbskkd/dbskkd-0-r1.ebuild
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/Manifest b/acct-user/ddclient/Manifest
index adeb86deea3d..54d2b514b36c 100644
--- a/acct-user/ddclient/Manifest
+++ b/acct-user/ddclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD ddclient-0-r1.ebuild 252 BLAKE2B 7cddab7b167c015be70b3dd2edc77a08e5ec5909995e3bf3c46459fabbd7b9666eebac7a398b750073de364fbcaa93aed4390b42b3f46d2d7a6890de8691a6c5 SHA512 1faee7f73e7c5fa4c5e7ece2b1586b03641ac49790aadc4184dc79e16ccde11137ff986710c1630c0e5ec5c5214e449b2724b7ea5bf8d0e8e7f89770421b72c9
+EBUILD ddclient-0-r2.ebuild 252 BLAKE2B f70b65d99fdc90f10cd1addeec14171c924e1dd3b4500e3196da5f62d3e89334c8d9ea664624c9b34693e0a4ecd03e1b806da737f05e14e7ead9e06572a031e8 SHA512 90d25a804be2173144e74f09c641ce2a075b263af1c99b3334658067926973fb3f1004363670715d1136814b8548ff0669c4f16d5a99bd030dfeadf87a6a7ea5
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/defang/Manifest
index 2efcbdfba098..35d46e526790 100644
--- a/acct-user/defang/Manifest
+++ b/acct-user/defang/Manifest
@@ -1,2 +1,2 @@
-EBUILD defang-0.ebuild 250 BLAKE2B d4545ba16e44f706bd9311122e26939c97639b5b216d41dd7d58641b3f269ce3edd4acdcf25044de3f47539081ff9fcdb79657058dd44bcf424f66fdd79500ca SHA512 e8a3519612417a30461bc399b73273e0503973dbb61b653aec192ad56a2074915dffa4e9d9b238c4113180bdf949962be92fd38157832cb0279a5d47396f2c66
+EBUILD defang-0-r1.ebuild 250 BLAKE2B ec111240eb6f5837eca4b2b7557a51a4d9ece7d5526db7fda8c82ebacd5101af9807638d7cdd5bc7d86360135af6df00ddac2ee57671edf68ae313e18310bfd8 SHA512 b762e43b12ce112b807fb8fefdad6cc64347e95189c704f99e8d8b26e9efc8b52b7f40ba7852e27a4385231567eb4b54ca848d671e274ba28175b99563bf6fb2
MISC metadata.xml 397 BLAKE2B ea8573a9aa18ceef29be88a477c5fdec0a5ce15904a80395a73eb9947df371f257b285249576d1ac69158c1d6bced11f16b742c52e63715ed275d43cf960b5b9 SHA512 0af40b5fc5e6d00c9be7afdb6d2d124aa13de899b035c7f61e98c82c37e74377b10ce09f909d5f52bba93cfae069cd17bb8cf8e705155a2d221ccda184ffd343
diff --git a/acct-user/defang/defang-0-r1.ebuild b/acct-user/defang/defang-0-r1.ebuild
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/Manifest b/acct-user/dehydrated/Manifest
index 9d718f89573f..8bbe8e94d71d 100644
--- a/acct-user/dehydrated/Manifest
+++ b/acct-user/dehydrated/Manifest
@@ -1,2 +1,2 @@
-EBUILD dehydrated-0.ebuild 260 BLAKE2B c53c4c0dbe46d2b5f8770f8bf7bf09f58899c0e46dcca83e4ecdcca8bb7b55b8e346081262d7f4178880ccd36464d08d67f17c437767c73e10b4688d29ceff75 SHA512 30938b6c4957fb99e82727331755f8c3edbd05502e4eaf4f24359d26d589dce0bbcbe7e6f12761fb5ee3505d5c4365b4ff8acc62235136cb0e15a27ddc0d52cc
+EBUILD dehydrated-0-r1.ebuild 265 BLAKE2B 905819585e2b1139109d519387ba573ba701cedb1218b091d8b61d95d9dec532d1bba888cde3241c93181183484a3705d26089aab556ad0789960a431bdb66c8 SHA512 b21ea04d0b37faf4920e027d4557fa2bf6a3a99dd84abf7ff79e574f3efcb9eae2b81c7816c6f6cb0cc5fea725e7aa182a5160e673a5f44668c18870cde312a7
MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/acct-user/dehydrated/dehydrated-0-r1.ebuild b/acct-user/dehydrated/dehydrated-0-r1.ebuild
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/Manifest b/acct-user/deluge/Manifest
index 8a284138f938..082b85a9e7bd 100644
--- a/acct-user/deluge/Manifest
+++ b/acct-user/deluge/Manifest
@@ -1,2 +1,2 @@
-EBUILD deluge-0-r1.ebuild 258 BLAKE2B 7822697aab1c4daad787e7c42d41263e5811668a5bad80a175bf0dd38d90a033fa4ef72dde639d70cd0199c4d816ca103d7508c4b9ca6154203f2ce0e34e2822 SHA512 a8e6f801efc0bc60180b5fc260f6b1ca1618ee37148cc47e424c51ca7870429aecd4576c15d081073fb35edd323da07bcea9119297bee529eca8d62931f54630
+EBUILD deluge-0-r2.ebuild 258 BLAKE2B 7822697aab1c4daad787e7c42d41263e5811668a5bad80a175bf0dd38d90a033fa4ef72dde639d70cd0199c4d816ca103d7508c4b9ca6154203f2ce0e34e2822 SHA512 a8e6f801efc0bc60180b5fc260f6b1ca1618ee37148cc47e424c51ca7870429aecd4576c15d081073fb35edd323da07bcea9119297bee529eca8d62931f54630
MISC metadata.xml 521 BLAKE2B e4adb92b824153ea2e9d79164c2111a1e49049286cbe9e1662ff0ee8300031092d65b3ca97c3cf449ca7a57bcdb78f86c9988154244686879194686f0bf3048c SHA512 d37d8f08b7b7d5a5a00d1c0ecbcf27d42610df9c4a1e68dbb2f17272cbc73fe000bba406f0f9ca40aba22f081ef2de097029886af6938d1b64e63a6d25fc8bba
diff --git a/acct-user/deluge/deluge-0-r1.ebuild b/acct-user/deluge/deluge-0-r2.ebuild
index 328da7731618..328da7731618 100644
--- a/acct-user/deluge/deluge-0-r1.ebuild
+++ b/acct-user/deluge/deluge-0-r2.ebuild
diff --git a/acct-user/dhcp/Manifest b/acct-user/dhcp/Manifest
index 508c38b8a7ff..e07b232be041 100644
--- a/acct-user/dhcp/Manifest
+++ b/acct-user/dhcp/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcp-0-r1.ebuild 230 BLAKE2B 1f192d8a05b241666e93bb6b9d0f0ea5e9ff2994f23e2930a89b818da122b2e75bd6a459e2a1be2f30794fbea4d03072dc7b1c0e2f9ec4330f285f1408f7ce15 SHA512 59e6e85fbcb0f99f5092dc65fd0ee3767e322225ae67bc17971f0ca4f9da263521f3e162f4eb955cb639f3092de14377661b1321fbcecdfa4440c38edc8bff5f
+EBUILD dhcp-0-r2.ebuild 230 BLAKE2B 5e16482a0c8cf27691e1cf6fb89aee054eac48833c1275788515b4f8a5da6d5dc7c9d64f42b18d6f3737f14cd3474251bca1a9d502228e106c452eb71fc80498 SHA512 1af187e33a649671d1fffca92169b0052c18ef26b8e2a98756f9a11ce6a0c5363fc599dba39fb12d5ade497ab98d813639d46d9a65263d84cee0a186cc835213
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-user/dhcpcd/Manifest
index 9127ad5ce7db..7926187bc3da 100644
--- a/acct-user/dhcpcd/Manifest
+++ b/acct-user/dhcpcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcpcd-0-r1.ebuild 270 BLAKE2B 12e28cb8ea4a65830b124f73add3ab07cad1a98e7551ab3657b24ecca2f750c973126b5d1671ac892daab20cfb4dfd8126a98f9d208949aac4a2fdb0376b108c SHA512 d8c2461213f1b8cecc48001b537384aa238bd3b3ee919e179f8c142db421b85a6f4b6587ce089dd2efd3392633011c57a726f02477a048b3c080409a48dc7163
+EBUILD dhcpcd-0-r2.ebuild 270 BLAKE2B 476ef4f27d2f176cd08dd08548a896f582578a9867e03b4dc1544660aa795449124f98166c1a5b97b72d09b40990bb1282f4eae75a41b4828121437767aedc02 SHA512 3c6693917cfad9041334122af0768fc3320f3429bbf76ac9e196511878fe153dba0f0f70f37d9736e31878a2b397d8521d011542362d537024ba9c5ea3b044f1
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-user/dictd/Manifest
index 0f882420f315..fbc3357a3d74 100644
--- a/acct-user/dictd/Manifest
+++ b/acct-user/dictd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dictd-0.ebuild 228 BLAKE2B 370fa42c192b87777292ee13a41e12d29ba3818ab5c270f49791f79a261e572804086271662fb111df7506834e20357f2d47168df8f8c67db30cf1cb00c332be SHA512 25421ee8909c997b4ed5cf624eb492c5a7ad36e60262adf8708a1d167552e16220dce9a2dc33aaca599535ec88f794879113a0d8a85cb6a8090bbe4d462edd3a
+EBUILD dictd-0-r1.ebuild 233 BLAKE2B 7daafda5d14821d45751a4fe0e68a599d2af8c963284f981b387e8486b5e8e8731dd1abcee9f7d7ef988c30a4822c2778522d80d9818c4f745bc452cdefffe62 SHA512 46e931f939111d3931c8477f0b2afec67cec40bfcce0300a0bf1fff2452a487672babdef83c358913229403d92657e96c61bee3b19e460decb8b29295096421c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/dictd/dictd-0-r1.ebuild b/acct-user/dictd/dictd-0-r1.ebuild
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/Manifest b/acct-user/dirsrv/Manifest
index 51c6abe6e8b2..b70b69ffb454 100644
--- a/acct-user/dirsrv/Manifest
+++ b/acct-user/dirsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD dirsrv-0.ebuild 235 BLAKE2B 7a01da0560f3f958aa5a0f9d4d47a5eb3a8c97f22371322306f4c3192e7afca619cb7a81fc24b7219c0ed4c06a07238bf9c9d39b9e1fddef281d3b19555ee6fa SHA512 25e5666f13f0fce7209533aab077dc59e9d0f66d7a8e156407cd2b8a470360c5b343bdfe5ad8c84cfd6289a36782e2aa48f18bac20230df7153068c87e071d5e
+EBUILD dirsrv-0-r1.ebuild 240 BLAKE2B 82fa9c61d7f43009e600e2a835d41583ef0a7a1663932b94deb801f2c8b627c91484aac64421cc2bf80ac826577b5cc2f4f082093aa51c5dc35fd92414097d0b SHA512 36af0fd90f924e0e51a9af685cdfdb05408f96529bb1c266352294cc6fad1b901de62f8dc72d467c100345f0617a0f384e27d8dc46a46858948825d3dbeda076
MISC metadata.xml 531 BLAKE2B 9b3cdbe8aa6b5513b7b2fa5c16b4f3a3809e369420d156c9a84dbcef3b6630ab328732a81e0cd88d06004e208a3156346bc5bbadeb549ffa2adebdea758ac45c SHA512 0744c746cf418423c03e41753c82d3ff22cffcb26c763f16fd449d86ec22dd1a927ac38d8f8f062983c75962a62b1556181a8bfc1835fb7a11c60e8dffef8cc9
diff --git a/acct-user/dirsrv/dirsrv-0-r1.ebuild b/acct-user/dirsrv/dirsrv-0-r1.ebuild
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/Manifest b/acct-user/distcc/Manifest
index f4523903473e..a584d184ebe5 100644
--- a/acct-user/distcc/Manifest
+++ b/acct-user/distcc/Manifest
@@ -1,2 +1,2 @@
-EBUILD distcc-1.ebuild 237 BLAKE2B 7b390eecec70767c3f778d2b2c55d0d6b7ab111acdc514ab4154103518d1c745f3759e5e7e4560462ee7b48ffec1dbda41ef8ab35ddc95d44b41c3f69d57ad6c SHA512 4b8fcf7c4570e3ae199615c61a8fedae39200834acaaa66259d24c424c70006fde4356cdde43a3bda2fa6b146677be6d812c806c4bc06ade9ea53d855a043990
+EBUILD distcc-1-r1.ebuild 242 BLAKE2B 210b907f4cc77b114e5454a564d7be59cbe0fedfec4b596cc5c9769764b9aad9b3fc9933bc0c89687a9838778567e79df64c28de6d65833bfeda47b143d46008 SHA512 68f38aec2d3f7707a92bcfcb35c897ffeb24f02703fa17c5ac21f27fb7eacdcacc38b5195f3e1cd6274a001459fe8542d1423b3f3b6ec87f47cb0bc7fe2ffd8e
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-user/distcc/distcc-1-r1.ebuild b/acct-user/distcc/distcc-1-r1.ebuild
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/Manifest b/acct-user/dnrd/Manifest
index 678518f1df98..3f62a08f53ec 100644
--- a/acct-user/dnrd/Manifest
+++ b/acct-user/dnrd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnrd-0.ebuild 236 BLAKE2B c0c265d904b6f1b01d3b713292989e96c189fbceffe820c6e2e62b7c33857b13f8d8abf7c85af7650a468f2169c27c5581f7612a5f12ef36e15a2cbe1118c8a0 SHA512 81162bc26bf6e3991af9c9a5a81773fd3300061a297e10c156519285255d032d732ddd36c1fa19e3a3a347ae84d2f79b9b2491a48eb6502e46042280e389faaf
+EBUILD dnrd-0-r1.ebuild 236 BLAKE2B 1ee697aa9eee2c0463c1f780bbc823d9a577d9c5b376f527bb515d28b6ae64e0d26df0235e23db343f528e3a203bbd1a1fe4d34d451cb224c57004b7b499e81c SHA512 08cba9860e63d34a5b020d26d9dc3b5e70a675a84a4a0d9f69e38bfd2dd6ab825f76aaf3639efcc3a1ee7af2a2690454c81ba5a54b062efdfbd2ee6b7d2386dd
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/dnrd/dnrd-0-r1.ebuild b/acct-user/dnrd/dnrd-0-r1.ebuild
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/Manifest b/acct-user/dnscache/Manifest
index e152ec2672ba..67b3bd2fcba4 100644
--- a/acct-user/dnscache/Manifest
+++ b/acct-user/dnscache/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnscache-0.ebuild 198 BLAKE2B a687b9097a7e4137d489ea27d96a575f01e6608ae43f06d49501920fe6533780d0474aaa2e1043966d2739c9a92c8c746b8ecf7b84cfdc7d6d716fd7a3fc103b SHA512 dfe11955fa7c34b8b9e544a20a2919b0e44d166a66e9c43ecca4f5c2cf68e58cd60477d1aab689060c3e9a60340b4e764c9aeb744838e689266e6ecc73c5848c
+EBUILD dnscache-0-r1.ebuild 198 BLAKE2B bc68077935cb8e5449e427cc93b9cd12e8c2f0a0e5ff2d919ec7c7a04ed5e101f0b5bc9619d5256099cbab164d02bf6c71ba69fbd10652621c173859974bc053 SHA512 5161558a85c6bfc264c5c702070cd8ac454fbbce983315718fdcdbaf8d9169c285a8178d17a2c3ef5a8450065279d0b39d038a6726ead03726c366c629f5f534
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-user/dnscache/dnscache-0-r1.ebuild b/acct-user/dnscache/dnscache-0-r1.ebuild
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/Manifest b/acct-user/dnscrypt-proxy/Manifest
index 68388655f0a6..8eb02271250c 100644
--- a/acct-user/dnscrypt-proxy/Manifest
+++ b/acct-user/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnscrypt-proxy-0-r1.ebuild 251 BLAKE2B f14fbe1638b29b2ae554e8064f11f231690c1831e905c34738a1953f2da09e51068eff11b05521f30f816d0274c0fcc2a8f66bb3e87166c4d1674990f93c95e0 SHA512 4002dcee748a549024e98f5d54f818163b3fa7f7122eb0525bed282a7ec421cf31f1db368300842b56cf7b110c2c7c2bb7eede79972ad56f38c36baf1567c008
+EBUILD dnscrypt-proxy-0-r2.ebuild 251 BLAKE2B f412b460a3de14c12dd647ed8699f04d41228b2b095b5ea7f91d25b9035c0332ac2ca935e6a3ba28ed2d75f8d47d4e587d031a1977ce9b8e0c05709d7c183221 SHA512 6151792c40af254988ccce39a948b859e980333568a0b7eabea92830d4157a72ddc6256bf2d3381ac47a77f4d360ea2e5c609f99faf08c9883627485b9bef554
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/dnsdist/Manifest
index 204cebfcffd5..ae6b3653acfe 100644
--- a/acct-user/dnsdist/Manifest
+++ b/acct-user/dnsdist/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsdist-0-r1.ebuild 239 BLAKE2B b99df7daa5cefe11370cb3205877a846494595dab8103929235379ea0e9c30201c87fa26beed8b057e9c0aaef63e30d2e5e0d589a7b5f4358a49ad97b4ec6365 SHA512 29cbc4e322f1e123720906f7bf27aaf53474eef0b69bda8ed97ff3716c1a283c95b004638aa7997035e690a4217245821acc8315acb639fea6cb67953885d29e
+EBUILD dnsdist-0-r2.ebuild 244 BLAKE2B 87844e2a6163549d52e2c0904951bc6ddb005a43f08f3894227a973c10061a0aee1469be5329839463e8ff21905e59ec28afa1599456a115e1a8f76105e3355e SHA512 266812df1ccedf343fb7081260df27cc7964637e82837073d6d4fec8e89e57bee0b8854f7506c854e118a8fb8c2daa39ac5abd391c4c783bc688e747711c6483
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
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/Manifest b/acct-user/dnslog/Manifest
index bad347634b42..acbbdc48defe 100644
--- a/acct-user/dnslog/Manifest
+++ b/acct-user/dnslog/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnslog-0.ebuild 198 BLAKE2B 06642d5e526a1c74fddce8cffe02bf090527eb4f0b7e1059e30872384e01c5e76733616339877c92773eba3a888c81446d54552f4509dec40ecd5e428ab4f57b SHA512 2646ab941e25e77570ed2f3467044a8c2a0143d7bd228a514c8011d095d6b50b1bd6511e74d5251c3cd8bb98a50105df04f7e23741e35cb683e57d417e4810ef
+EBUILD dnslog-0-r1.ebuild 198 BLAKE2B 59a55ea3323e902d1fe99575e741d62e5168a972276026e6011e871dfdc060bf121c18297fac4ceb65de0d12ddb4886f9f0cb77cc64b27ea9203a9584db7623c SHA512 573fe6655a4a30c5503a0cef9e04b1a163a4d286775863548e72675a2d703e6880c867dc21eef1507371cc7abe2f0ea0c5c7ed8b8e0e78eeef029225b15e2fd1
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-user/dnslog/dnslog-0-r1.ebuild b/acct-user/dnslog/dnslog-0-r1.ebuild
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/Manifest b/acct-user/dnsmasq/Manifest
index 1998b49a5c7c..9906488d1159 100644
--- a/acct-user/dnsmasq/Manifest
+++ b/acct-user/dnsmasq/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq-0-r1.ebuild 238 BLAKE2B 3d9dcf836df4c13d8d5ba90719f73fa1747efa004fcef1b9682c4516d10ba31f3285a3651b31b5c5e66534df32170537d366720eaa7ae32222e84b5e01b45f79 SHA512 7aa2f58e0037546b7cc3ca36fb62dce294914899aa231b6dc891d055ee4d05dd7a96938cb5983b65217bf42a72339c47fb365817b95341acb397d79753165bf6
+EBUILD dnsmasq-0-r2.ebuild 238 BLAKE2B 6ef5b6c7aa1390ccad84ceb9435037a016fd38932d0787fc15008223fd50d064a198876da014118a033ec797ad83d33ae87622861409619fb481155669054fe9 SHA512 f5595a3c079b141da96972b14a38240adcb585f1b98188b11bf9c8c4469ae3be14a2dcd15c1f7b7845dab76eaaebb8252aa3cc265aee03282728b65b37ae57a0
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/dnsmasq_exporter/Manifest
index 0436c050045a..5bf9f84a8af2 100644
--- a/acct-user/dnsmasq_exporter/Manifest
+++ b/acct-user/dnsmasq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq_exporter-0-r1.ebuild 247 BLAKE2B df6383e1b543cd477ea6b61e0c3451a8932c594e6f69379f4e0cdd35dddf3047fc44ed737393fa979e0814e840519b27cdebc32c88b0286cee6bafbecbb5a622 SHA512 6c116919c44986a4297a2890b5526db5ca7c219b56e61b5bb01baedd9c5f5f48b52b44c07d8b04dc6b2dc777c69d56930f152bd223855f23249f301570011ade
+EBUILD dnsmasq_exporter-0-r2.ebuild 247 BLAKE2B b24232206f28ad79a1f8cea7afb97e44ca8ad95f73f408d5b062bdc13f55ffb28869168c96dbd739c3ff35c8dcf7a7f9582adf4af4da4af147524ecdb459d8e8 SHA512 fc0c67a87a55d50acd7a7016f635e500c1fa127bad1128c4c6a7d44240399afc96b3f264c702f52e1a4d88ca48c7ab77d0df6a594d9d6b044352d243573dd014
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/docker_auth/Manifest
index 493085fe7c91..2ccda4ddbb21 100644
--- a/acct-user/docker_auth/Manifest
+++ b/acct-user/docker_auth/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker_auth-0-r1.ebuild 232 BLAKE2B d37a5c3a253edc0f1574b22a4a28c99404b0219f052befc5dc04faf136f7fd72927e3ca3b94895dcdbc5b704086e37d521693ed98f2add9cbadd6e009f78fdcf SHA512 f6d4869aeda8b14f4f9dc536bdaf8844c4cfe99bb5223e09624acc48c4f315840495d2f37d1fe630827c2ebd2a6391edbb91b77176c6be2781c6567dedde6038
+EBUILD docker_auth-0-r2.ebuild 237 BLAKE2B 0730bf539e7704f54a321dddccd15d34dfcd9811d0ba2cae2d2ee0071611a67e7e758f77c80c8d97b3a4e5ce11f21561eefbad3125ee1e007332b8bb5a5f1905 SHA512 32ccb1e7ad9cdb5a1d76cb06c7e8dedbb1cbb571ff9b6bbc152368632125c9d0a936169109e776d5df397d0bce326d72f3efa13694f3bfba73b3241de67d79e3
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/dovecot/Manifest
index f204814b54aa..ff5e15d725cd 100644
--- a/acct-user/dovecot/Manifest
+++ b/acct-user/dovecot/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovecot-0-r1.ebuild 235 BLAKE2B 60ada3b644854e97e55095fdc6b87c95552f63a9aafc2a06f30b1bab5a820b6aa7a7ccfe17f87973363da1bb9a4e97d5e831833a6ad2cfa433c6f9c8ab498f4c SHA512 b678e57dfd87068b415c2caeb997fbec30cf29a5f358f86c3155b9c16ad1a4f67a4ca99c53d58b6492baf01dfb0fc8e3066c2725f38ac1f79b2686975c14b7d9
+EBUILD dovecot-0-r2.ebuild 235 BLAKE2B 6b21357401d5a2a18aa28563713b5c57cfbcbcd61db2fb12748bbc198e97a1b96e718c6456bedc0b163714bd9db11c0b2ff6a45316e5dc7edf6548e23b20b830 SHA512 2b1f355ca84e41e3475076f621c5a1b2afea59d8f06309445f772caffd1636035dc7b8b4030252f290e8c068a43ce627ec688d45bfc52e451a95c98fc00a174f
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/dovenull/Manifest
index c005ddad25f5..c153498b9865 100644
--- a/acct-user/dovenull/Manifest
+++ b/acct-user/dovenull/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovenull-0-r1.ebuild 236 BLAKE2B a38fe9ab57129596996aac85e5dced70159b9a9d37970f89a8c0f80b8f9a9703fbdcee421caa243a8013f14e36348ae8cca3e0095e585b7891fab71857c7c4b7 SHA512 e546f8aa5a64a687e101bfa50dbdf6c977be81d3d0343b8201921290f0194491515c73aca2f5958f5c52cb4ce7067ccff80e093b017d3e210e8b718d63867889
+EBUILD dovenull-0-r2.ebuild 236 BLAKE2B 8707ce0bb796ef7759544f4e65d51365b3bf02b9a18955671c752335d513b6c0ab8cbd11ddee08587f0989886852efb74169669e13a7d3cf98e4aca7762d983a SHA512 2f54c879d9133ce8e3d3bc73f24c9e5fe8a72c876d2ca7e7e628956438354340be30637c1088729412b46bc79facd693107f4c66034557e8244b8be2bb18bcce
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/drone/Manifest
index ae22663e4fd4..f8ae5302921d 100644
--- a/acct-user/drone/Manifest
+++ b/acct-user/drone/Manifest
@@ -1,2 +1,2 @@
-EBUILD drone-0.ebuild 267 BLAKE2B f6502e1a43cf2216342f496ff2911458ae0d331b66ad0902fa608d556492a5441aa5e953ae534c95697019ec069831ace05e6ec85fc644cc79a7cb6c18823212 SHA512 46413482c49640d350f86929da0eb549cecd30ad39672704d84b49cb6d3c5ed8aa3a91d818040c46dae6fe1dd5a6e091c53ac72b34f44dab4607a65b3231bb5f
+EBUILD drone-0-r1.ebuild 267 BLAKE2B b857fbc2488d021a7cf8a155e60827c8ca584ca6af03a60def4d65859b97d9c4cbba067f4cec812b90bee73fed89d98e3608fe34a50140c856161a31f9c17102 SHA512 4ba2bb4bdc47a80b6880a7eb2601fa4b6ea31845e22efba187ee210d405c4838f4085a2aaf2bf55d176968014604838a719d0168af04bc2a704815edceb221dd
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/drone/drone-0-r1.ebuild b/acct-user/drone/drone-0-r1.ebuild
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/Manifest b/acct-user/duende/Manifest
index 8f6f4b24cc5f..366e2b54c484 100644
--- a/acct-user/duende/Manifest
+++ b/acct-user/duende/Manifest
@@ -1,2 +1,2 @@
-EBUILD duende-0-r1.ebuild 263 BLAKE2B 4a3b9b4aeb7f2b3f9d4261ee3a42a78e2f566370ae45a7a419b74aaab4a648e66fd4d9e2c758c1998f35bcba4761f8f2e68466b2b518c102b0004f00f371d928 SHA512 d3f05b84bfe7a84bae17abea5bcdcce91d780c9442c94c00f3a7c08cb3f9d15daf40ad07e693193a65b67592d3e315b9940610ca42b2ddae8fb597fffa545788
+EBUILD duende-0-r2.ebuild 263 BLAKE2B ad79ed0ac020b629823d211ae748cf8873aafe97366627582f57d053751f1a28030b780883baf0ecb259ceacd9b687bac9d3b5005939b943538d883c8c4458b7 SHA512 468d2d47d3894979651a09be49423eab9773a63648d20011e44672ffc008ea39e85d5af2251776f718c9d00694a479bd22a6f188f21cd5a82a619157cb40206e
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/acct-user/duende/duende-0-r1.ebuild b/acct-user/duende/duende-0-r1.ebuild
deleted file mode 100644
index b7ad1e5a6dbf..000000000000
--- a/acct-user/duende/duende-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=66
-ACCT_USER_GROUPS=( "maradns" )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/maradns "
-RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/duende/duende-0-r2.ebuild b/acct-user/duende/duende-0-r2.ebuild
new file mode 100644
index 000000000000..9606fcf3d80c
--- /dev/null
+++ b/acct-user/duende/duende-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=66
+ACCT_USER_GROUPS=( "maradns" )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/maradns "
+RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/ejabberd/Manifest b/acct-user/ejabberd/Manifest
index 5584b3b4e343..87961bd21d63 100644
--- a/acct-user/ejabberd/Manifest
+++ b/acct-user/ejabberd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ejabberd-2.ebuild 370 BLAKE2B d10747e8f6facd772e09246ed7ad1e3f78c276f947b8b530b575a600b85de0e6e7f06784a773f60a46bb2dc811cc2da72f15eeb8fcd214691f24d7ffeddfda42 SHA512 2679237b58c3bcc00a1ef19871b88f0656d522e3b8ee5141f291dcf6e24e5dddc2f5035d4f4baaf99845f85d799c4ccd576c5995073efd1d5ff4cf99cffb3b39
+EBUILD ejabberd-2-r1.ebuild 370 BLAKE2B da820d73597f60bb42147465e1acbf3cad31e2883a2666aaa4757acbf06f723be8e8db798b75b18278ed211e5cd4d5a552579bc9f43b36ef7011d885ee23b5cf SHA512 efd5fb729ad682d1935e6e6202357ad8fe6d47602ae0f4447065821cbafc32da4d2a1512f7db3ef4aa8f6d732d2998cd9cd212b24979d56c52ea0638054c44da
MISC metadata.xml 328 BLAKE2B f5091b52d611b1b5316381dc2a1bbdb6f4bfbbcd6bb92f6e0aeb9dff2e8cc080665eed36c14e0abbe593c8d7f4074cd19df1089915441a75f57f3317d2c8b5c7 SHA512 64e578aadb702803be2ad5d4bc629c91e72cb5d6446e9c77a46198cce513e4de1ab582d527c69da62e3f86749f2a1eaec9ba0e0764627562283c29c2ba223811
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/Manifest b/acct-user/elasticsearch/Manifest
index f6587a57d3c9..8bac0f13e2b2 100644
--- a/acct-user/elasticsearch/Manifest
+++ b/acct-user/elasticsearch/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch-0-r1.ebuild 310 BLAKE2B 0f96c0cb753183440ad7148b7c515d8f9ab6f183c486e54cb249747b1bf16e16911170d3f0e17ec2f2dcb92b9c623a9da36241ae7cd524d54da742ad641167d7 SHA512 54d4356742d329f1f3343601ee42c183c01fc9f6a7da84bd3fdb1460445aea04b355769892605f7775b8a25d2a70ed074eecc0e9ca98b2843f149eea796b5dcc
+EBUILD elasticsearch-0-r2.ebuild 310 BLAKE2B cd8ec5ce55bfb0aee467d9355049cb8472def58521ea670dc13964ad9707bc67cad791e4b7b5a1cb30cd34a5c83457648eff8acfbfc458b994c12222518bdd64 SHA512 f7666742a579a3bd3fea3df5bbc599f41ba2d85cfa985af856977e64d5c83872cc1ddb472e17e7fd261ac89447e29b329061c34b6eb3fdc18146571e66a4eaaf
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-user/elasticsearch_exporter/Manifest
index ccf3651da5dd..8cedd0239ae6 100644
--- a/acct-user/elasticsearch_exporter/Manifest
+++ b/acct-user/elasticsearch_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch_exporter-0-r1.ebuild 273 BLAKE2B 5bae90d0bb86304c796a2a28e0a4dc3592c506c1fc0d00622a8569c0031b141f7b87dfac83cf7319d071c93d98d49c353567fd6f4c0a8d88c55b247fae907cdc SHA512 6b4527d2fac7adb6e1991e0c9accf22169a52e25858f27b8a487c3f0ff349c173fe542fc044f5ca57e5b68a07505a406f3de8e5f673dee9f44e5581b7a2b8539
+EBUILD elasticsearch_exporter-0-r2.ebuild 273 BLAKE2B c3b9c17d2a93a3ac41e16a37d5ea749e657b3c79b63e418cb8e6f0f7577bbe9ae28c5568314c7bac727b15645ffb456664b9c8eac2cb9a52d66ba7d5e9f458e4 SHA512 d0603e09e0722b95f1240f4ec0fd198007cffb46b9cc81ba399b8035de4be2b3c46e6819d8c80cf8571b4abb11dd38c0b205aa72d9695a14f26eede1df08b720
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/energi3/Manifest
index d34854cbaecf..80b5a1806626 100644
--- a/acct-user/energi3/Manifest
+++ b/acct-user/energi3/Manifest
@@ -1,2 +1,2 @@
-EBUILD energi3-0.ebuild 237 BLAKE2B f5a77117c1db6c771bbd03108d0d5e2481133091f3ea53962349d728854fcf76168f57c0200448124a3fd443ab164a36bed511d49cc01133de58b42bab4f9235 SHA512 7fec6355e9f09b2a7ab8daa376991370ef826bd9b6a42ef8f61f32e370833a015ff1321a941c5e2df0707be5e7224f85c3bb340d36888e42f5a62140d9f2d284
+EBUILD energi3-0-r1.ebuild 237 BLAKE2B a7e50f3ca84a9dcf30ed94ded8aaba7d8bbb90a6e3c65bb5b219c1e7b618b0729858d9e64af889b47e6c99336c1fac8eac8220673601308f669cb83e3014572b SHA512 7cc39038c9a152a609e1aafd961804f7e839e3bf5fac34955e891e55b1c6cf095045d49fcd9406515296f7efcc646dc63ad303d5e30a4e3c7e854f54b56156fd
MISC metadata.xml 245 BLAKE2B f1fab6ac89edb8c7e0d5c3582eef178767c9e0a28ad1a59741d043cbc57c2cb9a14508be1e9ef31c9db4b74c8b265c38efca55d8b64cd30a128447862bc4550d SHA512 049bf946fa98e28b0e4b016ac2ccb4c10cb132b2b2103e1483ba0fc7351a0cbdaab6cbae460c6d9c2781a21cd1587449469516d5b23dea33418485ba5f4df8e0
diff --git a/acct-user/energi3/energi3-0-r1.ebuild b/acct-user/energi3/energi3-0-r1.ebuild
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/Manifest b/acct-user/epmd/Manifest
index 53bf4a5cb460..125e142495ac 100644
--- a/acct-user/epmd/Manifest
+++ b/acct-user/epmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD epmd-0-r1.ebuild 243 BLAKE2B b3e3a9017c4f13270152e28d36e0cbee4ac8e23acd92db2f2d24b30d48de55674784e375989a24c512d945abaefb3a3c56cc90d5a9cf1b5c62c30e890029a9e8 SHA512 6b081a1414029a714eab8a4a09d109126ad57362a0e37992b31b75705c2a81018ed5c211b86fba9e5acd006b3609cb96a3218df2bc3cca7c8143b804772a4351
+EBUILD epmd-0-r2.ebuild 243 BLAKE2B ff1a954f6472fd9490ab0b6d0b75c69f10e57480085bb2d1097758fc5eec72a7f30e87b4744192dfdc4ae9e9e8d8c53ea966f0ea0c4f14496aa457898309bbfa SHA512 dc35bfe19233ecc5f7226e9a3631597756725079356c21bcfc072a22852b480a13e46d148ae2e5695a97734f5116fdb452d5bf2d70e37ecb9d3d9ffdca42fd70
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-user/err/Manifest
index b545cd366c2b..3303c8594a12 100644
--- a/acct-user/err/Manifest
+++ b/acct-user/err/Manifest
@@ -1,2 +1,2 @@
-EBUILD err-0.ebuild 193 BLAKE2B 9b072cf84646b787072a12bfc5173638365bea3d72d37d18c957d8663fcff6358bedce5a04bae570630666a1b61f9066aa762116ef8d988f97508c1226c7c883 SHA512 09f76a677189b8c6005a51d59b0e1d7a226c19524c297ecb276f4a4ae3ec0d302b0fd6a4f65773ab91720b40da5277944faf47e56f20b0dd60fbae7709eef082
+EBUILD err-0-r1.ebuild 198 BLAKE2B cd7e4399f27cd3a5641fd60ac0f75642dd03bb09179fba744548faad10b5454dfcbdac4676e17219cd1e79533eaec2b53f73c5d69330a1174a065669650d36e5 SHA512 0d85c55be681249f9da06e95a9493627c460c6d429d232150ba558f33899c1ac5499e13ace3cfe6cff710325879047c313027a1e3dae728575a0443f14aa5176
MISC metadata.xml 387 BLAKE2B dc4c71051208fdba10dfbb38deb731492f03310bbe6a90d46ef696f7549a851f0933f51d158f598fea4211e55232c15f757d3b436bce0d1b8ff0516c85964118 SHA512 d9a689e19f684bb65ad0b38ad3050ac6aa247b45f7321deaf49111d4153a841bf2ae97b59a21472308c79668de3b96f60e8b50738d5998908c359cd1be0b1de7
diff --git a/acct-user/err/err-0-r1.ebuild b/acct-user/err/err-0-r1.ebuild
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/Manifest b/acct-user/etcd/Manifest
index 62a512a75596..f0262a174b38 100644
--- a/acct-user/etcd/Manifest
+++ b/acct-user/etcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD etcd-0-r1.ebuild 272 BLAKE2B a8473818ec6fd4685aa6ed6f5cab05c2fd0af7285df4482bc458e5a80046988b6a3672b932b29eb56e39da9fdb7f995b27e7b712eef78f59fc00b2197ba01170 SHA512 22a9d9b239c3411823623e6cd73704d9f68270e03a24677e86713ec6e64cc3abdd46cd3177ef5c59ccf20855367a8c224d03fc1df75d2437112abda176c30c15
+EBUILD etcd-0-r2.ebuild 277 BLAKE2B eb14a0a73393f11fc52c4c7231e858356888fc8c51be93237a8b62f907d34882d288148ee0cb4c1016901475ccf38b35f73a3ea1733623f335df05a4b9b20389 SHA512 bb8997ad41e81cfad423db4af6bb81d35289a7a39e03cad33ab39966e7797ed7b7d7a3c8bc17ff9e3118cdb062f65d959b93ad5710a7bad4c703966d2eb6fa60
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/exabgp/Manifest
index 6abd4c0eafad..8dfbe9b5e7d0 100644
--- a/acct-user/exabgp/Manifest
+++ b/acct-user/exabgp/Manifest
@@ -1,2 +1,2 @@
-EBUILD exabgp-0-r1.ebuild 237 BLAKE2B 1f5a160bcdacf3ac911a7206952d6dedd7cc9f62da3aca570d9ef66c4d9ca8473fe9806549d3e24717df8c12b78634ba57be1a3124d7bc5586a6d6484032e528 SHA512 270d7e7e0bdcce2a1d739134fbf590ad748aa9ed3d8832eab32426465f3850ec052cb3b69331a7aa64b46dde36f253b60d8ea2fef2c01bb16cc230162bc17951
+EBUILD exabgp-0-r2.ebuild 237 BLAKE2B 7e0c06afad541f11b485215cd02ceddabe6a243df82942ba82d549fc3c1fe314d8c9fb67d69df09f9d56a267ace8e596375c611974b8e331df64d65b0fdda901 SHA512 b3ed485ed36dec4dc7b9c459738d56bdf40503f3e1c265a9a059f60b01c3562da00af21df6d1619d22aec36dba32535d4fc4dbbb30a5f634f79650c6349984c4
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/ez-ipupd/Manifest
index 928a52637e1b..cf68b96e4a60 100644
--- a/acct-user/ez-ipupd/Manifest
+++ b/acct-user/ez-ipupd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ez-ipupd-0.ebuild 287 BLAKE2B af7015b130423ecf84fefb4934ff7587dcfd34366cf3c979abfe13a54fa11f8b1d62cc10fc2629d6f8cd1fce54079a96824fdf7ea75909c98b4a34a7e34e22a3 SHA512 aecf8199a27599cb36c8cb5b65b1af30c0e8028f62dea2e4d9f42e04ca7c62295259049165614cd73f2a3d16d2e443a489d239aa18aaf94237d7e36597931bec
+EBUILD ez-ipupd-0-r1.ebuild 287 BLAKE2B 95910e63e3becdc1870c4665dc69cc92ec6d02100af7f46e76762803fd44fc4cacf6276a0d55601df501f8be6ccadd07deb5c4d225e3592fef8b3e82b6a42779 SHA512 ce5e2540e61a88ab6c642b90efbebde9a35388b818d22525c619ca5b2fdb5a5199f020f939d165019a165931dc79bc623f96d5c1e5aabdaf4d0a13850d328d37
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild b/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
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/Manifest b/acct-user/fax/Manifest
index 18c304994cb0..a3342575c7e9 100644
--- a/acct-user/fax/Manifest
+++ b/acct-user/fax/Manifest
@@ -1,2 +1,2 @@
-EBUILD fax-0.ebuild 242 BLAKE2B 933110f0c0de4a6e2650b6efc8ce9d4c6906b419f6b3bdf80b7e9e863e0cdc77af8c10504d4ee65692ad289ceb9f1f824c824b0c0196d5f1df33f1df542b76f6 SHA512 38e3855f14d5a595e7955c03c225ea4ed322daa954d0b22dc775661db8cb5c3ace419119625c6f1216e30c51bdd65206e751c0389f831fce5b90e34a2c9bde43
+EBUILD fax-0-r1.ebuild 242 BLAKE2B 75827baf0ad342023b79bacad655c2748a17a6f59d83ab0db09c37d13f51b98f97225f49ea3466610fc771ecdd89b2eb02a94c838a94dbffea29a1575b549b03 SHA512 a9aa64c7e6794447e75e0af18176778ada37786e3571ac548dfb67e1ce67f552256d838a80aaa24635edfd8f3ef435985864bbdc18a2f40293663ce2f4875904
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/fax/fax-0-r1.ebuild b/acct-user/fax/fax-0-r1.ebuild
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/Manifest b/acct-user/fcron/Manifest
index 580372f981fc..4371b6e05c36 100644
--- a/acct-user/fcron/Manifest
+++ b/acct-user/fcron/Manifest
@@ -1,2 +1,2 @@
-EBUILD fcron-0.ebuild 244 BLAKE2B e052d56cc913f14ea565234c61ba8802da78c3a3c1afd64399abd97e22a4ad9b6e525aea0bb85b63bf5f8dd056dcab7473f746408b05594f461722936974588b SHA512 4530971666a480beac9df22a759e50d76e7c82d586e083076ad010c6da5faf4ea863c4ce3e8907f8eed7583142872cec2b57780cafb1d28588c481ff91619dfb
+EBUILD fcron-0-r1.ebuild 244 BLAKE2B 7701edcedf9255e3331d5d71bee4d073a1f3fb0ca736ce276ed8fc7d7d8847bb1bea35870f96f8881b00af1b620450cacad8444d941c396085ee8a7a5fd39aa8 SHA512 ff834080ad8f10b88c6601eaf2942cd8c2a9b62b99ac16dbdf1adbf3f94c86d6d2e8f9aba0822ad83eaf14b62d2d50019ba4cdffa638e6661d847496cae0c345
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/fcron/fcron-0-r1.ebuild b/acct-user/fcron/fcron-0-r1.ebuild
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/Manifest b/acct-user/fdm/Manifest
index 5f4e7a451d0d..9a9a4c1ea962 100644
--- a/acct-user/fdm/Manifest
+++ b/acct-user/fdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD fdm-0.ebuild 235 BLAKE2B 7d053279e941218eae6b57d8f1f1c6d5263f7c101181001f6eaed7d08e8203dff1b7460f3e1438760d713a9e6039c02cb5456da40a131dfb521d91d6ad7f9ee0 SHA512 c1301b62c4c73fa2e9fdf3f971333c79418fdba7241f3f9e55c26bf2b32a8935365dedec6de1914a916997ed8404aec45b047f927a56c0c3c3054888b3cb9360
+EBUILD fdm-0-r1.ebuild 235 BLAKE2B 55c3afdbe9526a8f25ad191d641b221040c2890c76acc54412aa617b43e8381c3c219a76076751711eca8c530948dcb921118a93502ac12722d3f451a127f1b8 SHA512 28595f193f3b05778eca8edd4bd8d12e2659dbb48e50fe839dcc69d06d09281761e95de7b96afbe415717e1dc0f97765db8ada5465422007a21afa57ec50ec09
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/fdm/fdm-0-r1.ebuild b/acct-user/fdm/fdm-0-r1.ebuild
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/Manifest b/acct-user/fetchmail/Manifest
index f98597f4dd9b..418edddb55ae 100644
--- a/acct-user/fetchmail/Manifest
+++ b/acct-user/fetchmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetchmail-0-r1.ebuild 299 BLAKE2B 7dda94866ad9d62b4a4fe10dec063a7d9742aab57cdec43eb74d87614120d5be10da2e1ab108b5391089f3f80723e88db9cbd60c3a153912ac74fd40a04769d9 SHA512 bcf1e9f2a72db92848db54a203b01d2bcd641748c3ed5874a41e2d897a434eaaf38685bcbef7d3c6e67fa532d9bc4d27e9806e7d5a567e05e8263ae0b712e3b3
+EBUILD fetchmail-0-r2.ebuild 304 BLAKE2B dc6eefb048b6111d98c9363b9840c1eb7d5d0f45cc4f7150c41ce0cedfd53a57ef4707bad908f07f99416926cdb6ee62aee17419b2d00b810c6fd6e8bcecbbed SHA512 d3d8fccae985d60001b4223196e88d94b98ceb818dae2e30768953154e755c39703f645637940e58c591b7a58cea305f66ba1f790646f915b88a659510c39ee6
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
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/Manifest b/acct-user/fhem/Manifest
index 9e910f77c0f6..0a1efb4ec7ce 100644
--- a/acct-user/fhem/Manifest
+++ b/acct-user/fhem/Manifest
@@ -1,2 +1,2 @@
-EBUILD fhem-0-r1.ebuild 294 BLAKE2B ee501342b24f46c1f3436c27e5e24dcd074ab76d055ca5306994ce8d9790c7469c156b40c4b1f3378a43437f6723eb70c74bbbfe84721665820466a53e8a48cc SHA512 0098b902472436e49de5948d3eb591952ab7ad5559b94f65c1594e9749ce611c66763d5ef3e1b531462020fa792f3d21b7ed32ef0f86faf2e561fbdf37265f25
+EBUILD fhem-0-r2.ebuild 294 BLAKE2B 618bafd26638dd2078ba703334f34758648f74d3b60ab7b211d2cd06833f216e40c554a15ee21f375736097b6392c84155ae7a77c938ce004f0f1a0bb29e8ea9 SHA512 a7f9eb5e69dd44b6e61c55be87b7843d0de483482cf9c05730cba7d49e72fbbe99132340361c51580cda63835f11e337824ab7d141bf158b8c0f315d6dccab00
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/firebird/Manifest
index bb6240a30256..6bc95cf8de46 100644
--- a/acct-user/firebird/Manifest
+++ b/acct-user/firebird/Manifest
@@ -1,2 +1,2 @@
-EBUILD firebird-0-r2.ebuild 334 BLAKE2B 3fbae4d4fd057416bd2cdfc86188c89aa9f323385f643c265e541c02f61ab1a4e4049520732e81aa6ca857dbb180a77f7cf86fdbd7f2a9a8de3c64364cf70193 SHA512 38b2d474be130550cb220757400b41373010343bd104e237b464b590d668ed5843eede53d6f12305668faf4eb63b52315d2b9fcbe6e1bc1064377eec08506145
+EBUILD firebird-0-r3.ebuild 334 BLAKE2B f13d6f6beba52e30698306afa9af30c18f46de93cd463dc2f20915196edaf0358a024207a305e8267993be581ab55e7fabc301cc764a716c403a4e713ffc381e SHA512 959fdbc8f384f28a2b7946216372b35afd8847e4e4ce016aa3fba17ae5bb254ca576a623b6abe503ee67484ee35ab2e48ad5dab0d400feb3fca588531c43a89e
MISC metadata.xml 219 BLAKE2B 5b3c48d040de522ffbcb035a9704f5b71799a5a2e45172b39ea97049733842723503ff69869946c69808c965b7ef9eb40cbf1f2a5277815c4bb2e4b7ac978001 SHA512 176cc78690ba2800973fc6fa926e7bcbf3e18e8f45e925491f2349ff8619ef5df4b4a0f01b0a33f9fabbd2218c09581ff028f56379daa85494eaca9387a745e0
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/Manifest b/acct-user/flatpak/Manifest
index 6115dbac2da3..4541e9197bda 100644
--- a/acct-user/flatpak/Manifest
+++ b/acct-user/flatpak/Manifest
@@ -1,2 +1,2 @@
-EBUILD flatpak-0.ebuild 192 BLAKE2B 1b15f788552eec6a1a6c399b213dbf35fc0a129975b14f2d64266f2ab0c49189ce090c193a6478a2cd8dde1d660f827f0e4256ec12ecd46de56742cbb9cb78a2 SHA512 7840eb711528447e7b52df777dae91a0531dc9cfd222e0e68ca6fc68b92c07015e8107fec3da8fdd22af61ff710ffcb26747549e133fe1543f919197c16e655b
+EBUILD flatpak-0-r1.ebuild 197 BLAKE2B 4db4bdee6d5f58efa61c8959ee1be612dead8a0f9bb4154c3f61ecf5b540e4fbca06a39b032cc67a3999e8c3512e03792cb1b79b1715a6ee2be919fc926eda8a SHA512 70d5fc3c92c30ab0825327e86d3985357c0cb44fcd1cb8434ae518f94c249512533c0f1d7560b1acf70aa6c060afb6fa213329fec8e68c392f6790aa62675796
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/flatpak/flatpak-0-r1.ebuild b/acct-user/flatpak/flatpak-0-r1.ebuild
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/Manifest b/acct-user/flows/Manifest
index f9bdba7c99b5..a31513598115 100644
--- a/acct-user/flows/Manifest
+++ b/acct-user/flows/Manifest
@@ -1,2 +1,2 @@
-EBUILD flows-0.ebuild 267 BLAKE2B ad4a975688786ee51afafe7134df57cc1b8f1f12f17748c8e1db4baf12c988fbc9d7fc648491bd089f6716fef241138be8d4a86fcada81c970a59bc3993a5270 SHA512 ffe20da7cf763d00863af891780296593850f118dc7111147f451de04838b19eaf2b4debb27408dbe128ca7f02c971bf0b4b14fbe3f1ac9fb8e64701b942b8bf
+EBUILD flows-0-r1.ebuild 272 BLAKE2B acb02ee35915e0b39222014445c41cd7ecde81836d41f5642e2b903eaef1f40cdd48ef4e62d59b896ceb62a205c4bebbedc29b9aeb3b73c6657abd1902555db5 SHA512 9db41c46dd1628b6e59a605fe5d7374af043216a222398c707924dfe229c25501490c90fb88923323d94a0e121d0e491e2ef032f1c71199c94e267f5a8867e71
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/flows/flows-0-r1.ebuild b/acct-user/flows/flows-0-r1.ebuild
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/Manifest b/acct-user/fluentd/Manifest
index 4a742d2db658..c7d3eee15d58 100644
--- a/acct-user/fluentd/Manifest
+++ b/acct-user/fluentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD fluentd-0-r1.ebuild 241 BLAKE2B 26e8a0cb4bcda2bfabcc69fd6491bdfed7f70d6a111a2a6971f462345476e6d3834abd683fe83804213443bb0f6fa4cc2127f8ed55a9a08d0f85948b64f3759e SHA512 0bd3e02b535aedc96fa865a0cbc2a2d7a674d2547e6344c020e8f5e98633a60e271dffcde943484f988c428c4d9aedc91b939a2f1d989747fba5dc4dc69bea00
+EBUILD fluentd-0-r2.ebuild 241 BLAKE2B 64c5abc3407434ad0794f744afc7bafdae0aa0c47c300e621bb7470011e4817f50735427a7909713a3499b96a41bce5ff5ef6be5e9158cf95ff9b796060a4b58 SHA512 d3bc7e0f2402bf8c5b3d7712a26f817923969fa2fa98ea0c999e6b63a42901301d621660a80502dddee02d0cd53fb4aa52d66a9b30637cc2c6f5e1a7b48cda42
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/fnord/Manifest
index 905e13abf0d2..3951c596ff08 100644
--- a/acct-user/fnord/Manifest
+++ b/acct-user/fnord/Manifest
@@ -1,2 +1,2 @@
-EBUILD fnord-0.ebuild 272 BLAKE2B afa5789768275dbf59573e4ee9e070a78e0a9b851893f0f545495fed67da52b459000b1f53d8b5123ebfbe5588cfd401e6ac3dd563cc895dd089ff2b8997eb3f SHA512 8d58a13f6a3351e56603aca01262488d3cb9a5b3f83b48edec0aedbc9472ff7ed72c159949cf9fc6d343a623a4d01f994212de253c35c2273e69e1f84ec83330
+EBUILD fnord-0-r1.ebuild 272 BLAKE2B 8d8635a4a76be67613817666f51b17bedc6260dad3e827f49c90cf2a349a68d8ffc4160f6a78d69540fb31ef53e6f9e9e0d062e379b59ff6cbb654a87c5e8bab SHA512 1476ee402764162012eae0c42dfc335cd8d9d37b336560466a23fa74bea48138f53783ce533ca201e55f681707b219673713509a4745d40de59d8b4edbead720
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/fnord/fnord-0-r1.ebuild b/acct-user/fnord/fnord-0-r1.ebuild
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/Manifest b/acct-user/fnordlog/Manifest
index ec2006e847cc..4ed65d890ac7 100644
--- a/acct-user/fnordlog/Manifest
+++ b/acct-user/fnordlog/Manifest
@@ -1,2 +1,2 @@
-EBUILD fnordlog-0.ebuild 272 BLAKE2B d40701a5d2ae2c054efd4d60e0d4ce0d865e3b283344dfea12334658a48fafafb95f675d8213635f426d4f21e22b442e71078830c47f0dfb6a251755292a938c SHA512 9491f3896a259be3c1f7d39393a9c92de5ede123da98d5c20f2badd1b4e28ac2558e3b4a92622628856380a2548146b432c8b131de1ad86b4e7e91cce406e153
+EBUILD fnordlog-0-r1.ebuild 272 BLAKE2B 5ed8504dbcde289594c65c7b30cb1e31d4658c18c3eb981afd44afcd3ce4e0b41ce111baa7d86089a02c666b6fede8adff936f88ee1de4da830cb8acdfc89741 SHA512 b58ecc34548f5bf7532e567b7a368a720527df8f091cc1fd084818a83f99f9c93f1d3346706442cf4e762b35553ca917b0b69d12ac01ac9f15c2b7588584d034
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/fnordlog/fnordlog-0-r1.ebuild b/acct-user/fnordlog/fnordlog-0-r1.ebuild
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/Manifest b/acct-user/foldingathome/Manifest
index ac16b67badaa..9e3537997395 100644
--- a/acct-user/foldingathome/Manifest
+++ b/acct-user/foldingathome/Manifest
@@ -1,2 +1,2 @@
-EBUILD foldingathome-0.ebuild 304 BLAKE2B 277939ab7f0c4c702bf3d0e02d763e227bc30ca90fc21693a74c4df98a02085f4cf6f6659a0d9a9bcd1d86f37c3b7cd2c183628808d9edda4ac4d7ca98dacad6 SHA512 f42f202c2d9e04ca1c30278e65b3aac591632a25bf9697c182f6af0a1205aa291642410d2c93e8b83adbd95ae6b24a0b1df7926e9322fa02670b7008e71b9ab7
+EBUILD foldingathome-0-r1.ebuild 304 BLAKE2B 38d165e7431f516909d5fa1447834a53d22449c544a5dd0378bbe942bf8d81057c001f85abe94849247f3cf4e83a451a41d9bd0a63bdf4051b616c53622de3d6 SHA512 f51dc00042088355adb4df709d5435cec37cc6d024425e581d6f177c5922480f6083ae53fadbf999b2a3b125184567e74774727a75d744866f6dcae99b1c8956
MISC metadata.xml 262 BLAKE2B adaacf2ac22ce09f8b1b68f538773c1e2101156181ff302eca2ce1280ee5d45db4eb302a8eee1bbead5e55942443dd16ef924cfbfdc95a1658dc6a9f460468a2 SHA512 ac924b6b530d96645f173d40f7a2bf0e3abbf49048ebf7fadcea3dd553cd25504f0e68a103395de1fb59a2e5e11497dcead601be01cc6f0295ccbc4155f67e3f
diff --git a/acct-user/foldingathome/foldingathome-0-r1.ebuild b/acct-user/foldingathome/foldingathome-0-r1.ebuild
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/Manifest b/acct-user/fp-multiuser/Manifest
index 2df2b11a167e..b3c662631c52 100644
--- a/acct-user/fp-multiuser/Manifest
+++ b/acct-user/fp-multiuser/Manifest
@@ -1,2 +1,2 @@
-EBUILD fp-multiuser-0.ebuild 286 BLAKE2B 62eb59f3eabeca42600a78930205e53b84693ba3b115713ff700215028ca521ba08015815079f8fa9b3f28bfb446bf5f53c2e12035d3cb53c6f2b11f5ecf0f42 SHA512 70e11cbfbf635a6e5f215430c8502303ee1c071c380840c4f8c68cfcd38b145e9a18fe96931e638a25ed1f59459b213fa22e4cb4e4fb1aea515de8f7f6879b27
+EBUILD fp-multiuser-0-r1.ebuild 291 BLAKE2B 77cbe28c47bf11e00a8baf4477ff589fa8aea6f74a08aa8dd6a3879b24cc3f8e0d68507540dce6b50b6e5e55cda9a4077fb7f466e8f691adf774169730ffe7c4 SHA512 3c4f4c281cc4575fd6c28bffb4b7ba68b7d58f4c167302aa8924f07aa3fc54479d17ffe873db981ef1e91a8a183d44874f7030e8a0ba8e0250b1d2f42e09e4a9
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild b/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
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/Manifest b/acct-user/freenet/Manifest
index 2171ba6e475f..0324dd36f093 100644
--- a/acct-user/freenet/Manifest
+++ b/acct-user/freenet/Manifest
@@ -1,2 +1,2 @@
-EBUILD freenet-0.ebuild 289 BLAKE2B 2f436b33719460b5c8166dee021bafc502fb10638d22963e3b596947c27c47dd02441c5dbd907afcb7039639b9a689d1d0d766237f2b183ba98fb281ee2b048d SHA512 81db114bdf3f07952ec7742e01d010ace97334fc786d0435803592b0788194b83a5ea859abf89eaaa6fe800d75a49d4b1c438dd8b4c53801e839d31bdb27e31b
+EBUILD freenet-0-r1.ebuild 289 BLAKE2B 713cd8e27080a409e3a1f0b8e9f8dd0326970d9a40c89b559149c1f78c8afa794da6c05b35062e78a8959bd6eefb8acda7142e49102f9d965ed6424705f07810 SHA512 500eb41f676ac17ca23f7c292d2bf7326c3f01eb982d11c98469d3df7d50f50feaddc43418bad7a977d965372fcbc8b78ab8bbf653c82ee33d4599f44e5a6bba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/freenet/freenet-0-r1.ebuild b/acct-user/freenet/freenet-0-r1.ebuild
new file mode 100644
index 000000000000..c03cfb616ecc
--- /dev/null
+++ b/acct-user/freenet/freenet-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/freenet"
+ACCT_USER_ID=105
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/freenet
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0.ebuild b/acct-user/freenet/freenet-0.ebuild
deleted file mode 100644
index 3f624fa01977..000000000000
--- a/acct-user/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/freenet"
-ACCT_USER_ID=105
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/freenet
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/fritzbox_smarthome_exporter/Manifest b/acct-user/fritzbox_smarthome_exporter/Manifest
index 05b19537db89..1109a74bbbf5 100644
--- a/acct-user/fritzbox_smarthome_exporter/Manifest
+++ b/acct-user/fritzbox_smarthome_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD fritzbox_smarthome_exporter-0.ebuild 241 BLAKE2B dc4de9c0025a4b95a16240e558891ddffa8fbc2d08bfe41ba2cea57eb371df3d5622ac904a5dc6830f90bc0c7ac2b18ebc439ee18b0023ed9da2157397a91283 SHA512 d913116ab0345b94d3cc6111e2dba066ba5e535c3ddb076060d4db384da537ad81bf2a494903cbf65483c773b917ced70abe8a4fd035dd74de35888ad51f850d
+EBUILD fritzbox_smarthome_exporter-0-r1.ebuild 246 BLAKE2B 6df6d768581d9d9ccaaa8dd72b99ef768b1b87ce478162a2cb432f75a9d53f3b7e8e4f8e33cc2e34ec6ec16640219068baee1ec76b60a08114bd3af9db7d9919 SHA512 f8aefa4857d5668f716190b05e54347e355ca579e8869dcc2a7fd22a2f3318c804e4d0207afda7e14def533a7146a02c01753cbd7bf5761f39bc642bd36c3358
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
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/Manifest b/acct-user/frr/Manifest
index 68e0d37f85ea..3cd03440ea4f 100644
--- a/acct-user/frr/Manifest
+++ b/acct-user/frr/Manifest
@@ -1,2 +1,2 @@
-EBUILD frr-0.ebuild 189 BLAKE2B b8fe6ba343a800458a6fe2fcdbe2c9392abbfc71505a0103f1b99969a9317ea7f4a6f03e6a0ada98d43ac20b76fd51a7a4c97a7f34487835ea82b6da5ba949d8 SHA512 a126acd028c3b83081ab1a9f3e7f6ca65ee9bcba9eefefffa37a02d09e2be491681cbb0764e27b6beeec3af4e9ebdf7abbf26a2e33ffca57f32b602f9cd07a79
+EBUILD frr-0-r1.ebuild 194 BLAKE2B 5b78e17f9726254ccc8b474e7ebe8f24441e126bf9b053a7225804f32773be98a7bb58c1beacd13c604fe236ac011069d041ae476d0dcc560c110490a99713d6 SHA512 39dece8db644a270633251a4fddf6d6d27cfbb9d712447afac15ccb1f3f98a219a0839c5dc86d8964fbb70aebddd8583280d9e6b4547f17276798ede5c6302c9
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/acct-user/frr/frr-0-r1.ebuild b/acct-user/frr/frr-0-r1.ebuild
new file mode 100644
index 000000000000..8a2f7caed68f
--- /dev/null
+++ b/acct-user/frr/frr-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=371
+ACCT_USER_GROUPS=( frr )
+
+acct-user_add_deps
diff --git a/acct-user/frr/frr-0.ebuild b/acct-user/frr/frr-0.ebuild
deleted file mode 100644
index ec7cc1f8d314..000000000000
--- a/acct-user/frr/frr-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=371
-ACCT_USER_GROUPS=( frr )
-
-acct-user_add_deps
diff --git a/acct-user/ftp/Manifest b/acct-user/ftp/Manifest
index 7b579e100d16..d254eb81f615 100644
--- a/acct-user/ftp/Manifest
+++ b/acct-user/ftp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftp-0-r3.ebuild 315 BLAKE2B 5361237ad500b752cc8c71a772864e204de93267b5919c7077fa94bf32aa34311a72b0f4eca764febdb336d4c0228bba4a119bf44aeee97f9e3a7d5e90550658 SHA512 6f682d246f945b36449daaae8e04b7edf58f36e9b33ba181934bdc70ac5a8e027c3c5c8d147e4f947a7878e49790a101359725af088ede8e08b9dbccd6bf89df
+EBUILD ftp-0-r4.ebuild 315 BLAKE2B ad82d67af9687a340d4044167055a57c877c0fb1f1f33b9c0fc35d76ea0c9822ebe1b92217e78600ba79c12acf214b7529ee1f9afaa70079e16b0b43dc1e5a80 SHA512 db91412e294738fd4b1ff63d27625b46fa9d2ba7c9be66c0ef3f802f28df88078137d802b998d95cfd823a7fe274487748386af88093579e0d51079222a7dddf
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
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/Manifest b/acct-user/ftpproxy/Manifest
index 63c6531c7f24..3c95fd977769 100644
--- a/acct-user/ftpproxy/Manifest
+++ b/acct-user/ftpproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftpproxy-0.ebuild 302 BLAKE2B eecdf448e319f6dd19ad56db601f9d273ca6ec4753347020d46b2217baaaae7657ad41f38b50bb44806cfcf2407272d01430c206d623f348dd5fc4732d5ea42d SHA512 108002fb6d5fb82f6ed42d08703e4a40219d0492c8f68513a0ab1306e717cb9b19ac830e7bcf929080eb6c6adbf78e3836e4eef893f2157513ef28b504d8d105
+EBUILD ftpproxy-0-r1.ebuild 302 BLAKE2B 1ff209461f587cce5987ede99268e2d8c80ecd953bf6323d660c45c5088251ee2901a83128959513cb27ac0584ffb779b5fc92b8179f2071b7bad4da5e7ba1e8 SHA512 dfc0b1afaff6ba07a84bb0a15a81c72e87a0093cf84c634205ef438d1c7d1f1cb6c6fe62e6e100a0740b3c5100b6159161988555d6e812e306480985d84a315d
MISC metadata.xml 392 BLAKE2B fc1f7d674fbe3dfea4c499c4595eaa01bf618ac2cf99dcc75e021d238fa9bcb09708645a67d2c65c4da7ada77e4f338345793455efbdc6ccd4601fd2e25e36b3 SHA512 02230e8e4aea057d502f6a2ffadc349514d6da1f1eb9346741767d1a893dc0fcd050691fb3294dce34fdd50cd8170a084482fa863fbab2da36ad7da441f74a21
diff --git a/acct-user/ftpproxy/ftpproxy-0-r1.ebuild b/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
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/Manifest b/acct-user/gatling/Manifest
index 4a5e56b8efa5..4ad7cb6f50e9 100644
--- a/acct-user/gatling/Manifest
+++ b/acct-user/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0-r1.ebuild 262 BLAKE2B 17fee8322babc572c3bc7175237b7397ad25922492b6814657c823ad8543fdea26c47408deb115ae522494f7a2c4c7ba410931018fe94e507f2c79f021c451bf SHA512 a68a764a03961c3b56398a9d8eef1e9c371b4534ac9274e57c5ae6aa8b64007335a7dafa875a907803446d57338da16eff590e26238a90e77488d2d585e97606
+EBUILD gatling-0-r2.ebuild 262 BLAKE2B 96c021408b29d1b462f664c9dd2ae8222238ef84e1d5805b78a15803537ad6858656aa7dc346fcd148a1d935e8ab912fb86970cc4abefa74cf9aa4335b0ee5c2 SHA512 65ed1a94fe49ed7d14f0d14b9d9162d6be2e553d550c7b17ea495c6a30a6d8728f99b750e5c8ba27d95bf3f71d0cced7f9fb6b6af4fa2577e0af5ec6126160d7
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
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/Manifest b/acct-user/gauth/Manifest
index 6fddb12e9b6c..e9d6f438ede0 100644
--- a/acct-user/gauth/Manifest
+++ b/acct-user/gauth/Manifest
@@ -1,2 +1,2 @@
-EBUILD gauth-0.ebuild 265 BLAKE2B 31e996d6834ac1cde40a25cfd702d816d74385df3a5cbc1f3b5d819e342f0e456d60ea14357108d84f5bb2ffddb964d0c6cabd61bd70ef3b3a4df25f2d22ff5b SHA512 fb7856d8798e71462cf1157c1f621c26dffcaba73012b4986e2245d4a97a8823f23ce286437f8ff033cefb025bd7ada1de1aa7ad1deaae8b714bea07ace767f0
+EBUILD gauth-0-r1.ebuild 265 BLAKE2B 13f86fa4301cd432e8491841a030e173054569a274ba4dc1e03ef579087273b48122853aafe9657a5d451621dae372754032b42a8ea223ae43228d661dd1c78c SHA512 c85df099c2da8e81d6aa1d3ef2cd8af5e874e5d2960374382aab7e5815ab5d0950691bfc8295aba39789a6beff6477d5d2344ddf2dbdaeab609324755f9a4de4
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-user/gauth/gauth-0-r1.ebuild b/acct-user/gauth/gauth-0-r1.ebuild
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/Manifest b/acct-user/gdm/Manifest
index 60df5e292cbe..2dbd217b9606 100644
--- a/acct-user/gdm/Manifest
+++ b/acct-user/gdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gdm-0.ebuild 262 BLAKE2B df60f339d858c37f7356d3ab6d3facb4616b0cca3ca418cee6a6cc4871ce0f3eda10cf309551d0a7c0a4ae8472c1e131c540da95401c7f99c6bb0e14876adc58 SHA512 44ec68d59ca508c849859f85a644dc2bc6e72a1e15c6a36f501ec4c10e2f9f3f47bc71b1eebdf35ad2bb36e436939218bf1f768dc3bcbb3ca4a59bf8d52411e5
+EBUILD gdm-0-r1.ebuild 262 BLAKE2B e0bf23660cfacd667d3e14006984d37f5d550adfea1b45bcd5a64cbf0737cab69f65c91f372b4cb55c34ff286fbbe1e04047d43e5fa7eb856e8b6bb757ac0b84 SHA512 3732fd204b5e6ad008426c90bbd1b544e9b7b35072eedb834dcd60c581dfa929161a557268b78d0f252d548aaad48f36a35c8298f158091b2d788c5024c1dd68
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-user/gdm/gdm-0-r1.ebuild b/acct-user/gdm/gdm-0-r1.ebuild
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/Manifest b/acct-user/geneweb/Manifest
index e5e2237f0fb2..fc10b38dc3ca 100644
--- a/acct-user/geneweb/Manifest
+++ b/acct-user/geneweb/Manifest
@@ -1,2 +1,2 @@
-EBUILD geneweb-0-r1.ebuild 267 BLAKE2B 01e24219ac3493f34d706841939faf8dedb7850af6555f26e3cf1edb0b4f0bd04de3c4afa59bd3f004406843ad268bfb4ea5f777c7592d1d3a7711b9aef226bb SHA512 550c099fcca2d668b32a1eba252f6516eb363c511d9acb754a1bf087177368780c039b9d1465a5733f310c01096ff09d7bc841b5205f487f7d42a3ad49a4bcdf
+EBUILD geneweb-0-r2.ebuild 272 BLAKE2B 908f2bd98262d1e24d8e7c51dbb4c9cfa40c71fff5a9cd4e95a6c57ef98604af70f6a60d4bbbdeb1d89c07c23777cb702928d1bce9423c0858dccc745596fb7c SHA512 955613c775cdcf1dd05bd4c28217b16c628c89939a07c5a3a38fe854c6e3b5feb4690a90ca8de252bd1f1ee16e8787d511c2db0093b91b1325f97428ea39942e
MISC metadata.xml 254 BLAKE2B ff7f6eeb2a166b29a60b0a13ded8c4f0ab8bc5413b0fc42062bf6550b0fa637426c491a01ff118c9d7d58cc5f0566a6112ced6a24a2d0b2be28ab5c027829b7a SHA512 1d9910e0013ab41b3e5511242b90fa8fcf444bba4623074cd75fd09f8ac0be98635a1d38cfd96974fc830c17c73db9e7f23d105a811fe629032cf3762ce197bf
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/Manifest b/acct-user/geoclue/Manifest
index 5df8343458d9..d412fe68d049 100644
--- a/acct-user/geoclue/Manifest
+++ b/acct-user/geoclue/Manifest
@@ -1,2 +1,2 @@
-EBUILD geoclue-0.ebuild 294 BLAKE2B 11aa9f37c0df56956fef11715ecf7884ff0f5069f978e9df46ae48399c91ed16fdfca6208c17f35514d838678a415fbfba6341e09c9f167ed857cc2914a72315 SHA512 420cbeb863cb23f357f2e9f5f9c10240a34d73586989c25c60b3e3ab819de328ce79a99aa74a3329e92958f86df931bb3ca03f8f85297cb83d8a5d698b325931
+EBUILD geoclue-0-r1.ebuild 299 BLAKE2B fcb7793a069de4ea9528068b18fae8e003763856f6c3fc7de47070489f0e1f6dcec391e372f1a4d9de5cc2576d6cde089241ced5db87b220366f8d88992c3393 SHA512 14091c5be40cb17a2aa073e54b0eaf36b131c15a00e291490bd4a67ecdbfd1a6154147b6e81b6c53b37af70581d674533a276f2f23342db53f5d768e80bb90fe
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-user/geoclue/geoclue-0-r1.ebuild b/acct-user/geoclue/geoclue-0-r1.ebuild
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/Manifest b/acct-user/gerbera/Manifest
index ffc2564a4d56..08d7d630c844 100644
--- a/acct-user/gerbera/Manifest
+++ b/acct-user/gerbera/Manifest
@@ -1,2 +1,2 @@
-EBUILD gerbera-0-r1.ebuild 276 BLAKE2B 5c613b2015ec89ec15facfdac4e541baf86f87b15c0d3f587d00bc0a4609cef952a9ff8ed7db4569ac63572ac7fd89cc98c3f86d8c2d13ec88b756aab55793bd SHA512 11f48b299593a11250ceeb1bc7a9a1bb6dc75606a5adf070d3e88f15d3fd5ef221b15236cbf14ef554c01bb6e23ba9dbfe51e7fe9b5da87a1bdd6c8be798e34c
+EBUILD gerbera-0-r2.ebuild 281 BLAKE2B 6ca1046e4a02d8a51a54a987bf6416d02dff81d9f02c41e39254ff9676a48e1d6ca7541d9241c017169d98de4ff251e743d80c8a4b2aa7c82deeca3748fcd91f SHA512 520c3192761f448f0d7c1d3e01db6aa468b8721a07c19b24d7d60b0c44a4bd2e922eec35f577ed56402e389028314ba533f9a4cf6eac4e3cdbb465a4767977ca
MISC metadata.xml 406 BLAKE2B 6be52a743657b969bb47047966f9220e0c095142868dbe3560aa2e55e16c6a078658a2c54b990f907e5fa0b24f15d3aab7901cfccd78b39aa00393f44e1ea841 SHA512 4a2559a1cae4a2779e48114bcb08ce6d2f1c2b5587d0296f20172a24c7bcffd54f93bcd67fbf0529ec01ff05384e26c194d25d333c63f5318ee0cadd06b7944c
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/Manifest b/acct-user/git/Manifest
index f64b94199813..c9b8ae02f9ed 100644
--- a/acct-user/git/Manifest
+++ b/acct-user/git/Manifest
@@ -1,2 +1,2 @@
-EBUILD git-0-r2.ebuild 582 BLAKE2B 3a8397ddbb3e204e0726f238f09a1b56cc12c7d9891c6cfa2988020896a14f90c05b8d02a6a942199950fd7ed4d24232130e2872b6b1c313fc0f521fdf49a6f8 SHA512 6ef944bfa5886a3a401ed47603e113ccaa43b6caf165580203366d3c7514d21fae39be9b71e18b637b2201490700bbde3c540c9e1c42d274abffd0e5fcc9560b
+EBUILD git-0-r3.ebuild 582 BLAKE2B 3a8397ddbb3e204e0726f238f09a1b56cc12c7d9891c6cfa2988020896a14f90c05b8d02a6a942199950fd7ed4d24232130e2872b6b1c313fc0f521fdf49a6f8 SHA512 6ef944bfa5886a3a401ed47603e113ccaa43b6caf165580203366d3c7514d21fae39be9b71e18b637b2201490700bbde3c540c9e1c42d274abffd0e5fcc9560b
MISC metadata.xml 503 BLAKE2B 14f108a60c2bc75a258da37336def1f1e76140c1027d8d544f51141dc59311e0073c63c8a15f1cfcffb36c1254a44ef19165d7a28888545d14a75330b5964b9e SHA512 6016d84743fd15b8592a79c6c67537e57108e1d4a419575acd1e90e7b50644385935dcc106871483b616d7fa88434f53bb40e1b5118187fe4b1d9d6284cb0e13
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/Manifest b/acct-user/github-exporter/Manifest
index 9c85b27c0c75..705c889fa00b 100644
--- a/acct-user/github-exporter/Manifest
+++ b/acct-user/github-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD github-exporter-0.ebuild 240 BLAKE2B bcb82f35b470a13fe65c6092a7fbf7756056801da11b8c8ca483f8f138ebad6983ddddebd83ae17e33f62a74e3a34fd26c043b2502801e60764a4c64d35d45b7 SHA512 8dffc40a6f6ff52b2efdd1eca4ba7718b04f460be3f9f54efa4c654e67c3855fe9db1af3a7ec24e162947c5484ea627c154ae5245128eabebfa02da512c6bc85
+EBUILD github-exporter-0-r1.ebuild 245 BLAKE2B 68e69bbd3000bb6826232beef064756a0f52b3aa9b28e612b005001c8f55dc323a3674692e9c81940fb83e1c5f50259f152d24f1966a566360a002b30a89695d SHA512 a60a5efd84ddb032344697125bbf4aa15af72b7f478388f47631cc264f585b8697cf5e11ee7b7e850c9c9ff61c48c3d82effcc5e7d8c9d8fb8c7f03f3277b817
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/github-exporter/github-exporter-0-r1.ebuild b/acct-user/github-exporter/github-exporter-0-r1.ebuild
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/Manifest b/acct-user/gitlab-runner/Manifest
index d1bd2e80b4ad..b229ee4500f3 100644
--- a/acct-user/gitlab-runner/Manifest
+++ b/acct-user/gitlab-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD gitlab-runner-1.ebuild 312 BLAKE2B 0b91df00506dd521e9a66472643ae56de19dcf1feb46bbc7f3ac9427b9eba3380a915fc9ed632da2b472e5c9c9e00b0af0b490720a8003c6231efd2831dc4560 SHA512 ac81a2750760c851d8b1405f3a4a83a3e9e55a08e397a2f402a79cfb255a8b8c26a1a5de62871824e91fa85f642319135aacbb009e9629dc90b096f8a35e93d4
+EBUILD gitlab-runner-1-r1.ebuild 317 BLAKE2B 55ea0596213160a5621b9c1d65a4b25b56119303b23fa7c36f10a6ffd3104f3ba3254194f73e1bb96cfbbaa07151df180e79115b34337dd4238f40aa3779dad0 SHA512 5027a6a4668c311e63b051da4439b51f6842fc0403e4aee25a9e9fdc7d4716ee14f6d49877d6850e66c4db1f1ab61b6b7101165528bce4c781acbfaeda826fbd
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild b/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
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/Manifest b/acct-user/gkrellmd/Manifest
index 14deb120dfa1..7d452b8348e7 100644
--- a/acct-user/gkrellmd/Manifest
+++ b/acct-user/gkrellmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellmd-0-r1.ebuild 237 BLAKE2B 9d500334891a892f1938560f638900fab2ad167ed8f8153dc980a8ff5867ea683758c5e059c94521325bfdba44001dcbe6a77ef9ceb6cb563492a1510a5215fc SHA512 ef6e61d74dd7694935900f622d1a8f24ef3371e5c919c1e38d4a88495ff06671f2e55eef558c0bf633044ef20db02b0e61974df85564e3e1c95425d0d0db3b9c
+EBUILD gkrellmd-0-r2.ebuild 237 BLAKE2B 3be6ead806de42d4104f0ffbc686cdec3eba96acf6075e92bced1aeb2f77dc98cf4ef5d22f67f4d42ea65eed312e215efc6d8eec39cb790e32fb95501245f4f4 SHA512 df0c74d3705df0e84cb18ba9ce2fdfb4ba2735457ee80e4467a5d8e0cefa02a011ea491c3949c50d012203eba708b67d5402a1ca393f7f8b2a23616eaf0c317a
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/glance/Manifest
index 7e28a21b4a94..94e2e25d33a0 100644
--- a/acct-user/glance/Manifest
+++ b/acct-user/glance/Manifest
@@ -1,2 +1,2 @@
-EBUILD glance-0-r1.ebuild 301 BLAKE2B e308b883a7051cef24e45750150c3d348ace8ad666f79fc92787de2ca907b002e345f3f2c7f9ff09a9e41241ec9342843b9eb2bdacfecd9fa5939c16267a9cc9 SHA512 a625238857cbfe43e7551dcf926224c6a34d783021b407f0763618289cd438fd8f2cb9072e81ef6d6213d475b24fbc736705a5602e4a5d87d186c96aec08fd83
+EBUILD glance-0-r2.ebuild 306 BLAKE2B 4941c50467076ecb6530581c026008ef07ba4ab2c606dbcbe61ec4dbb59d08c8545d5cf6639e361cc837dfeb46431795ce0ac7d1bb9ffe062534148f2cfc9111 SHA512 9b61004651acd10a750658099e3be55765103410c4289b2a5bb35c9c1b06a62ee6798986081bdd1e2e60bbb398e575c0476b4b28bbcb5d10ebab10ffa29d0665
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/glance/glance-0-r1.ebuild b/acct-user/glance/glance-0-r1.ebuild
deleted file mode 100644
index bf1992f35860..000000000000
--- a/acct-user/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the glance openstack service"
-ACCT_USER_ID=443
-ACCT_USER_HOME=/var/lib/glance
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( glance )
-
-acct-user_add_deps
diff --git a/acct-user/glance/glance-0-r2.ebuild b/acct-user/glance/glance-0-r2.ebuild
new file mode 100644
index 000000000000..da592367b662
--- /dev/null
+++ b/acct-user/glance/glance-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the glance openstack service"
+ACCT_USER_ID=443
+ACCT_USER_HOME=/var/lib/glance
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( glance )
+
+acct-user_add_deps
diff --git a/acct-user/gluster/Manifest b/acct-user/gluster/Manifest
index 3bea1ce7778e..23b4d74cd834 100644
--- a/acct-user/gluster/Manifest
+++ b/acct-user/gluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD gluster-0-r1.ebuild 310 BLAKE2B 1e45815549e57081bcf4bb184deb98f2800d29fc098e260c446bc037fcabc6871920ccaf12212fb2a9a99cf4d86e814a70100ae0140e29338a21c420378ff79c SHA512 81831e5e44382f253a9ed1d948308b4684024ecdf9d877fbfc0cafe62e2a44b6e156c4b93fac2dedbbc0d49eda76e3b68b7157929327bac3ece329c05e7373b4
+EBUILD gluster-0-r2.ebuild 310 BLAKE2B 5fb526131f206e11647ff4ee45d36be6f74291ca7ecd4eee00486bf47c2a8471c383a4c207da73863cf493adb080f224f1cbb101318875650b540339ba644d9d SHA512 1e73469fcdc7709b35464c2104e826e505b6131cd8642c4604a871afdea7efbb0035ecd3a8aed664128df8befda7e5d01ca660f9a31f81b1258352c7d92b18cd
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-user/gns3/Manifest
index 35908d4cdf5f..75ef68e942f7 100644
--- a/acct-user/gns3/Manifest
+++ b/acct-user/gns3/Manifest
@@ -1,2 +1,2 @@
-EBUILD gns3-0.ebuild 232 BLAKE2B 20ec0fa83b63d956e2bfaf4a803e775b9d10f927e56b764d2d4269b50e0b3b21a6252ce7932bfad37328b84604d7bfc396808efb7df81749c39d11166aacc795 SHA512 531eb5a96963a58305b1e1f6f8d73eb176e15269d66849f4dc4e31ecb40804cd2fabfa79a9ac3cffdcee4b330b594a169eb069f5278c0a1067e249036e299033
+EBUILD gns3-0-r1.ebuild 232 BLAKE2B 6d5666d87fbc8172fe52f27d3f2b2807dd068124b6906c193b1bdd94370abe8b4b70a14ed943009a98b875ff48d641c631f3139f6c0a552acc871ceed4055521 SHA512 bce774a6f868eb1ee726fba6ff299ca7da8e49efe118b525ae7e044f9d696b84e47058f67ed04febba0cee83b92daa15c96b6636d4c4d1fcfc1d56f0dda6d7a5
MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
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/Manifest b/acct-user/gnump3d/Manifest
index d56f9b32d969..8ac18483ded4 100644
--- a/acct-user/gnump3d/Manifest
+++ b/acct-user/gnump3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnump3d-0.ebuild 248 BLAKE2B 75238ff7e3b99f72a975759c0b4918b86c3c76718db502d2349df4c00c1057cffe2926a9dfba2d4a15f8dfd804fd622a8a7e688f2d68b8b3f8b9132285ec5bf8 SHA512 7c2c1cf691282d0af2d8fd912fcfe1b843b4fa8ad3bc53c9426765e442061db11a2623e3528fec25bc9daddfdb5fe0038c0517916a756f81708d4d3e15b7003e
+EBUILD gnump3d-0-r1.ebuild 248 BLAKE2B d6221bd60e314001cc6be01c7f031c2428d1b3a92eb2b475346238669329748e5739c8585a817644e01d7bee6ca4691a1510c14ee4b8d3e086aa88784b2fd06c SHA512 51548e6202576b4e871337d13c73a6f84fc0ac30cb6793dcb31659401fa3c4bc9e9cfd12b3e2f455b08512c34b108d21a84f89d3927a3c23120bb6f6373dd4a0
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-user/gnump3d/gnump3d-0-r1.ebuild b/acct-user/gnump3d/gnump3d-0-r1.ebuild
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/Manifest b/acct-user/gnupg-pkcs11-scd-proxy/Manifest
index a512b9e9f631..1da6ba5a7c78 100644
--- a/acct-user/gnupg-pkcs11-scd-proxy/Manifest
+++ b/acct-user/gnupg-pkcs11-scd-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnupg-pkcs11-scd-proxy-0.ebuild 283 BLAKE2B 42ea5901fb893bc59524c8de52b32f9ceabd5081a83cae92b6ec4cd6075d06c11281d8baf3a653f7d0dff0a0fb51a1fd20055bdb5d8982a1c925c0f99422b7e5 SHA512 6b3187ad8be474ce2a15e0b70cbee0dbe79c0386bb0a667cae9e6c262d895be838c473a9181b2a0655ca353a10714f60ace447115136035dd38971fcca7e0767
+EBUILD gnupg-pkcs11-scd-proxy-0-r1.ebuild 283 BLAKE2B 9f07949f925ff4e0c6cf5c1624e0db36f536211d36fdf3b43410cf43b2894603f599b511a7bb7bcc3fd3aa0387c4ad2d823839e1d6b51c59d53656cb6ea07a29 SHA512 4210da65d43a8f27373939d2b164a412f0eb23f5310f1516a29fb452c3cf8620a03081a916f534994602ba2a669de3094476c30684853361ff1e67765ae3b68b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
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/Manifest b/acct-user/goaccess/Manifest
index 3e4df5f3f69c..2821db54b048 100644
--- a/acct-user/goaccess/Manifest
+++ b/acct-user/goaccess/Manifest
@@ -1,2 +1,2 @@
-EBUILD goaccess-0.ebuild 260 BLAKE2B d5d0435007463691da21097639515ef0e3ca8ee1fd678cb8b81ede6a902f280233f67d42de8c05edcd0fcabea0c2a57d9c370c7363e9adafa0c80cfbf44d5ec7 SHA512 407e997aa80076cd69fb31b76cd9b4815b29f9e4588ee6aa38329b8b6c2c7cf86df7fb67aab636f30deb0f4049b01d6d3aabb0187bca63a03c388c20b2d5a155
+EBUILD goaccess-0-r1.ebuild 260 BLAKE2B d5d0435007463691da21097639515ef0e3ca8ee1fd678cb8b81ede6a902f280233f67d42de8c05edcd0fcabea0c2a57d9c370c7363e9adafa0c80cfbf44d5ec7 SHA512 407e997aa80076cd69fb31b76cd9b4815b29f9e4588ee6aa38329b8b6c2c7cf86df7fb67aab636f30deb0f4049b01d6d3aabb0187bca63a03c388c20b2d5a155
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-user/gopher/Manifest
index 9b5ae802fa83..7cb27d4ead13 100644
--- a/acct-user/gopher/Manifest
+++ b/acct-user/gopher/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopher-0.ebuild 227 BLAKE2B 64a69b84e41a22af7eb32a904c734223fcea3446a1b4099ea4da626c31b5e98b1b2670cb44723a574f19f13d5a370dbf22e64a404719c8826843ee562ba95615 SHA512 15d3b9dc6bacd693a1c24a1a556e5e9d5a65c84fe8571207a4484b2033f44e7ba3d9c158c94878da241027deaef61e9bc454ac3864bb9d73ae8fb2cbb0599b6b
+EBUILD gopher-0-r1.ebuild 227 BLAKE2B 9f16a9c8949369dc2c513dd8af9040cde37d5a73a4f5c0a64395dcb7904b852c3b6215e3f249295773398553a6fed5b66dda845446120372306f7b50d4e1cc7c SHA512 0c702b7a503107d042d54d9087959a0c0f7af63f0d3951e371463cfa7bd94f1cbb752c12a1923ce91a8d19057800e566ab77e7ffcfd2ceeb391a889ad38ab09d
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/acct-user/gopher/gopher-0-r1.ebuild b/acct-user/gopher/gopher-0-r1.ebuild
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/Manifest b/acct-user/gopherd/Manifest
index 1cdd07491277..99ff813e3f22 100644
--- a/acct-user/gopherd/Manifest
+++ b/acct-user/gopherd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopherd-0.ebuild 276 BLAKE2B 6a223e50bc59ce6e9c804b3a9bdad43da7608e6ff127ee45b32304d5943de1d322bafb6664f804279780bbcf67de1591a4016504ab175b65a722fabb5bbfa148 SHA512 ba112e01d723978f42d1b408c4e75fd06e00af52f7cd32af74209c4d6efe98e7e1c488404c228d5c064da423684a6a1c5878ec2a98bc4ccd4e2d62a7dbe59c73
+EBUILD gopherd-0-r1.ebuild 276 BLAKE2B 948f40b6fccb2807b79f82e5a76c9d4cb5426f0886a0ffa027a18f27637942c5fa0336b9fec5c8dc93447fd5f3c166ce0a160dfc874779a3a18f927be66849db SHA512 9d3ad91b6429fedb289ef135c1aaa08f3e497c83dc8a7bb4f8b2596422230bea3e4a7eb9aac069caa13039eadb19480a2c1c3419f7eb48c1176c9e2fb1fc9521
MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/acct-user/gopherd/gopherd-0-r1.ebuild b/acct-user/gopherd/gopherd-0-r1.ebuild
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/Manifest b/acct-user/gpsd/Manifest
index 5ac63e8fcced..4bda56d2a4fc 100644
--- a/acct-user/gpsd/Manifest
+++ b/acct-user/gpsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpsd-0-r2.ebuild 245 BLAKE2B 19ad403816f58a3c5337d74236576a2afb7ed275a16371a63e3a51d30e92d38272d58b1c538a9cecfaec5fb765b7711b00817386d047e64b8d8c1b4bcfcf0298 SHA512 f408a969cb5d2323f12383aa7ace687e8bd40015586ded3ce861441f55cf9afadbb95c787296a1adac1c254174fe89ab47715a59dbf1c118893be28b327e687e
+EBUILD gpsd-0-r3.ebuild 245 BLAKE2B baeca11f2c5eb7decbe326d582902dff30602ecb4ee967837e3bf2953ba014f0295e4e43e21c9f39675c15bf4ad53a71cb1850ce5b0b8bcc73dca7d26b4cc8a3 SHA512 889ab72d1d8d65a439218993bb753a2f783ce08c12e36bbc89466db05efe24ac2532dedfc616085eae411e28aee69fc393acf2f7a702d0a0f657dc07a6332cab
MISC metadata.xml 276 BLAKE2B 51ed91dbe57f48aa4af2c9fa6fc16fa70996a95e31096505ec3e9288f04182aaf09feb0cd3e2e1c45e37dcffc528c788995ee4c89ea73b3c736dd9ec6172788c SHA512 b0a243998a4962647e6e5bbf04f9d92837c969c5a2f44d1c752a032cf3f0308d0ad82dcab968781b8edb88aa49748e27da617e7c3587647d4637db0912a4cb95
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/Manifest b/acct-user/grafana/Manifest
index 526512f6a1f4..85ca34c8f43e 100644
--- a/acct-user/grafana/Manifest
+++ b/acct-user/grafana/Manifest
@@ -1,2 +1,2 @@
-EBUILD grafana-0-r1.ebuild 227 BLAKE2B 4cc93e0dd1ca0a19779890cf0aeda971b94f33cc31689a3b73ecfc94c4ead92b51a10ae3857637179f5ee66ae7c8c3cfb666e97e4bf19d4d4729e0998e4e1894 SHA512 898cdfe135ce35131b8554160494ebb53cf3c3f7cf1ca367751fa1cb4c7561c0cd3d3f6ed5b7a998c650243732edec70165fb261e8d6bac3bf9753da4e49ac66
+EBUILD grafana-0-r2.ebuild 232 BLAKE2B e1fd7a330a3ccc103e0544c649a28c7cc20b9e4916a975c8574c12ed45c7a41f234a3e80f588a1921c6e894f82ff75078200ab856a4d282dddedfc57db77b30d SHA512 fe42757173c135bde8d3d117eaae184f6c914013ed7542bde0d7ec0313a4d95edac51aa30f40f2e3727a63c15ac37a82f6b156e374f016300bcd426092eb8306
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
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/Manifest b/acct-user/graylog/Manifest
index 39515c913ea6..2e2f748133f6 100644
--- a/acct-user/graylog/Manifest
+++ b/acct-user/graylog/Manifest
@@ -1,2 +1,2 @@
-EBUILD graylog-0-r1.ebuild 232 BLAKE2B 9ab8206f7f5247a8736c6e5ed848648c4f965b88e77ed1991330447c783c8098bff5165a0df64d4e1b3ae279ae517104cd5cb5e598dec6538e84097b7b6a9df6 SHA512 1690e03bdd40cfad8e59bd92272964c040ba841776fc9ae35bf5bf92cff528363a12bc4ce508250cfe7c26a4ddf2125769d29902815bf98bd3c159f1f1cf98b5
+EBUILD graylog-0-r2.ebuild 232 BLAKE2B 209a0f58d773326cab999819ba5bc867f980e0e03c6f866fe8f6d45d75b95bbd026f55a81beacbb826ea023f12bd84531152278ce079b33b60a7b9a12cee8b88 SHA512 44d76c7c58eeae248a95cb65263ade93b809ba301edd2e4a821932d67c5d4a940cbcca520d5eb37d9c7829f98133898d60b725de90371275a5eb51c113cf299e
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
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/Manifest b/acct-user/greetd/Manifest
index 887b17f48071..5713b85ed5ce 100644
--- a/acct-user/greetd/Manifest
+++ b/acct-user/greetd/Manifest
@@ -1,2 +1,2 @@
-EBUILD greetd-0-r1.ebuild 237 BLAKE2B 2772ef9a59ffdee577ad2dac61aa0c4ba859143f803d2d1f51ce42c42999224b83e8c9ed22e884fd5485dfb73cd2d39af01d6cb4498322a4c2d165c00a256fa9 SHA512 43e09dfb2f6c5297c56ed19ab4c3ee0ba236f05fc81e4e9f3935288a6df7f363b975aff3bfce1614ad3b6f4fe7f1305f6af2ae9dc3c286e752455e941e8d7b24
+EBUILD greetd-0-r2.ebuild 242 BLAKE2B b32701199e49f2b69084e26baf48d643c55b9ebd8dacdbec62b5434b1b34b4b6ea6228af2617c036d6b24a06c38b7b2d20e2f475de0a90f37cdf6076c764d685 SHA512 ebcff12be5d323c1c08a63ea596c35deaa07a0df60757ccd587540ab0098cd20e7276cd667ecddbc655be460e62f13a02f25c52604c2ba388a21041da876f0de
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
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/Manifest b/acct-user/grok_exporter/Manifest
index c246234d6229..b86ddeebdece 100644
--- a/acct-user/grok_exporter/Manifest
+++ b/acct-user/grok_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD grok_exporter-0.ebuild 255 BLAKE2B 31069c2ac77954eabd35cf8e33ddfcb6652cbcfccf8da5d592355ef296ff66958c97df5bd347986f476d8de36409149e3f8ea484c920015d7aa9b2a5dd9593fb SHA512 55937de55bd412846a4698c892403ecee1905921b6370fd7727b128ebe45b38af09c97962187f6d6050ab5142a5292a2479b1ddeca0a6fdd1c9d1bbace91505c
+EBUILD grok_exporter-0-r1.ebuild 255 BLAKE2B 5e464c5e40c650fd4e678dd7bec051c68273c6b28ec5a4fe31d9861622422896b2e2f4ebc66ab497a623ab6056d1b50c535ec5c5400edf174bd972ac354555ab SHA512 75907cef380ec3aae1f8193bae3f34b505d95ccc9f319169e0fb3f07fb1aa94f1e3177dc34cc5d5873fe67a1b4b1f0a05efb0b0067702fd82b9f10eff7c667b4
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/grok_exporter/grok_exporter-0-r1.ebuild b/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
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/Manifest b/acct-user/groonga/Manifest
index 24e890357dea..982cf7c1f549 100644
--- a/acct-user/groonga/Manifest
+++ b/acct-user/groonga/Manifest
@@ -1,2 +1,2 @@
-EBUILD groonga-0.ebuild 243 BLAKE2B 16297ee81bca4812b3c8490d2cf77835c04b2fa1f23aff3298dd27c9ddfb5e1276f4073fdea5e4301f5d229255ed5d769e86c527037504231a74b590178bb845 SHA512 b1313325d3118e89286d1cfa8becb04f1d968c79bb47801b0914bd595a628feaf19319fa97f43f17fe770e9baf821ec7bafa6e1b01c261abed1c2073e158c2dd
+EBUILD groonga-0-r1.ebuild 243 BLAKE2B 42be96b0b4a6cfb70a6e84e865c36f1255282f32d10f61e0ff783b5e412f3abd51250c667e0892d3203a942955188ae52a48c7adc6907bda6a73f66937f76aac SHA512 e125df0750783041ad297e9e1d6926beddde03c03be6560952c7559c10cd364e450b425c756b2db8c42f71bf98ee0635c1f77c2416d4c9f0058b0cd562d86a60
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/groonga/groonga-0-r1.ebuild b/acct-user/groonga/groonga-0-r1.ebuild
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/Manifest b/acct-user/gvm/Manifest
index 47577465b401..bc21805086bf 100644
--- a/acct-user/gvm/Manifest
+++ b/acct-user/gvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gvm-0-r1.ebuild 284 BLAKE2B 2f31118a18a69e3717520bb9597e3b56b76bb2c35b9d577b132fffc63b31d75de83266c0b3f035f34fb7c64cbd4cf7cbdc5f4899228ca9267e7c55ed15975be7 SHA512 f46413c09d6857aa61b127f5c078ab20e299f1373ad8c0d6157fbf6cf4f24c35da16b0fa868ae67271dba8709485b559acea54be30559c83acda1d60f54fed49
+EBUILD gvm-0-r2.ebuild 284 BLAKE2B 7856856a55994f90efef0080dfc64bcc68c18b0ad11f31bce4875e7abb23d29319076a8b86c9c5cf5cb7be78ca41cac67cbd4e56ee15eb2c884d7cfb4deba6a6 SHA512 7c6d8820449075a854ea216aab76af47787416fd18165b63337d1ed8d605784f76a50cb94396a383fb93fc48db21068912a263ae020611232a661f437712dba3
MISC metadata.xml 480 BLAKE2B f044167fa448b019fb56009a38d0d1d84d7ec1df0281d65e4e5719458e154a7def87ac71decbf0cdc3843bcd8b56e44e89a896db2fc62d951ed102f7908897be SHA512 4ff3c81f201beff84473ebf82a9820b761bf30dad40e7702bf72d9053b64291300f98c0b45c50d5970ea1ab407e717dd6c1172df99cdb2636dd09100d630546d
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/Manifest b/acct-user/h2o/Manifest
index 9458d1b0fc6d..e88fc1d928c0 100644
--- a/acct-user/h2o/Manifest
+++ b/acct-user/h2o/Manifest
@@ -1,2 +1,2 @@
-EBUILD h2o-0.ebuild 240 BLAKE2B 1fec3cbc69c51a521455776426cd3e672eb84e43a2a1feae998702558425b2f85a5d5c8a3e7948a76298ff7da082fd838fbbd696970f5d55932ad64396f972de SHA512 9f9db91d65ff1707372dd5470a4d4a4b6ba9991d1567cf0c0e82f9886c0b8b87612c75839e6668ab5bff295afb7e7fc6427295ac80a8de61eeca2e7c322ab566
+EBUILD h2o-0-r1.ebuild 240 BLAKE2B 84a1fb19cd03aa52b363c92f9584689aaeb96917d4fc261ebabc59466c6f4137910a8030ae0c78a7c8d872c2ff3a0a456e6c115426c4c74ad8471ebada52ac36 SHA512 0b42ad953a294bed5ed34051faa0c6f5055dbb100cc2c2cc96839452289ac2f71d96303004bd2905dc6a58ef585005263013e2b9e8eaed2341285e947107a115
MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/acct-user/h2o/h2o-0-r1.ebuild b/acct-user/h2o/h2o-0-r1.ebuild
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/Manifest b/acct-user/hacluster/Manifest
index e893c889774a..a52b33307dad 100644
--- a/acct-user/hacluster/Manifest
+++ b/acct-user/hacluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD hacluster-0.ebuild 290 BLAKE2B f7a2214a320f111d7b47cee7796eb955961cf79fe86f65f2ccc36d85c6ed6d041f475712d5b16393a1e5be0a1f9b55264eac176119787ee6443a063ed3f1f6dd SHA512 9aa8700f061a9229c0e3179cf8403321d62aa8bb1bc02f076db2f21fb9cfec40cfc50a9b469d5762a0057da53717be306468bd5fd1a02a1da52eae5665d21284
+EBUILD hacluster-0-r1.ebuild 290 BLAKE2B f30238430a6f808a2e247ceda7637ce5e531dcd197ae04a1e2863d0a321f7eeab3b0b7609c8fea37ba278759c032d74fc6b71d765cf8088dd8d1ba2b0e632449 SHA512 0f4497b2a07b4f62af4a08fe4546a1c9ac0366a5ebdd4753cb158ba2c4be1ae6410b88188d44e10f05610098113f15dc6dacd174b888e477db1747909e151e3f
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-user/hacluster/hacluster-0-r1.ebuild b/acct-user/hacluster/hacluster-0-r1.ebuild
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/Manifest b/acct-user/haproxy/Manifest
index d17ee65175e6..0400f76bc5c7 100644
--- a/acct-user/haproxy/Manifest
+++ b/acct-user/haproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD haproxy-0-r1.ebuild 198 BLAKE2B 6974ae3794190e1b954c59c41f5b63138fe972c91009f6383c5ba77d6ab0c8de4900cdb546dd82d1a2f04a9333a76c64e95e5ad3a239474def89ab39ce9a0b6b SHA512 fb9d667b2e516a8552702a00b744a475b4b0f530c432afe16c4e616afbbc818cb84f179afe96fa170b25c08dd6fac9dfce026e2a3768685d31c8f81ccb10c352
+EBUILD haproxy-0-r2.ebuild 198 BLAKE2B 461005f8d344ef6b9ea0c2225fd2bda39bf788791b9753715fc800bb394c8b111e2d74cf2725e2ff20a1dbbed3d9742eb98bcdf29a310ad1283d3607c782deac SHA512 5882f16e82fac763fb9af542388ff9e8e2cb60e7f1ce18d2da5a81e30bb492e118abdb95b15de3a0074a8bd5b9f891224f0b35feccaf47910d84cd4b9c9f5edd
MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5
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/Manifest b/acct-user/havp/Manifest
index aa601c86f5ef..ac394db67e25 100644
--- a/acct-user/havp/Manifest
+++ b/acct-user/havp/Manifest
@@ -1,2 +1,2 @@
-EBUILD havp-0-r1.ebuild 238 BLAKE2B acbd9dee458770fca1da0361f5484f3b4521e39bec163069d6cf791a3e800b058779fc0875107296f1fe69a7fda669552d7c085e566ad071974fd0a8594f50cd SHA512 7dc3392021f9f002c4e6fbc4135568b8ff3670e4410953c2cee120c10f489f3392fb0c760e1f6ce2b533ad97d9a0ef2348fa73d714540209b89277684ff740e9
+EBUILD havp-0-r2.ebuild 238 BLAKE2B acbd9dee458770fca1da0361f5484f3b4521e39bec163069d6cf791a3e800b058779fc0875107296f1fe69a7fda669552d7c085e566ad071974fd0a8594f50cd SHA512 7dc3392021f9f002c4e6fbc4135568b8ff3670e4410953c2cee120c10f489f3392fb0c760e1f6ce2b533ad97d9a0ef2348fa73d714540209b89277684ff740e9
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/havp/havp-0-r1.ebuild b/acct-user/havp/havp-0-r2.ebuild
index 9b8f3542221f..9b8f3542221f 100644
--- a/acct-user/havp/havp-0-r1.ebuild
+++ b/acct-user/havp/havp-0-r2.ebuild
diff --git a/acct-user/headscale/Manifest b/acct-user/headscale/Manifest
index 5d6202557e85..34947f39a002 100644
--- a/acct-user/headscale/Manifest
+++ b/acct-user/headscale/Manifest
@@ -1,2 +1,2 @@
-EBUILD headscale-0.ebuild 304 BLAKE2B 8b1175d9b9791c2d369f463dad3fa103b68ec9528026c716459e1cd3c6b30bf57a24f90fbd7930a8b2b5a0db08da2f4d1b48b58a43bb682bcd4d9c90087f5723 SHA512 a0492bb398edbfad57caee21b9e2beaf8f9f58471cbbedcd74008ea1ec7fc2c147859e7e894a7b5ca292010751f12f409287550ac89323d3df223d73e629d97b
+EBUILD headscale-0-r1.ebuild 304 BLAKE2B 8b1175d9b9791c2d369f463dad3fa103b68ec9528026c716459e1cd3c6b30bf57a24f90fbd7930a8b2b5a0db08da2f4d1b48b58a43bb682bcd4d9c90087f5723 SHA512 a0492bb398edbfad57caee21b9e2beaf8f9f58471cbbedcd74008ea1ec7fc2c147859e7e894a7b5ca292010751f12f409287550ac89323d3df223d73e629d97b
MISC metadata.xml 500 BLAKE2B 7dc95b76985ac9cb40ac5f12de2739f6e8f9f4f4a68a0bb397968c7419900c52c6233df1ce7eefa369de0a66cfa07ce8ec71624a6111d72e8c91553012169228 SHA512 d5b77a9da9eba9bdf9ba2ce675f92ca058f145f5bebc3546ad7acbff8140c16915afdf153bba8aacd2ce5130d7427cdaedef64efcb368546da91cbac8b5495e1
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/Manifest b/acct-user/heat/Manifest
index e68a45215a23..1cb348686fdc 100644
--- a/acct-user/heat/Manifest
+++ b/acct-user/heat/Manifest
@@ -1,2 +1,2 @@
-EBUILD heat-0-r1.ebuild 295 BLAKE2B 1e3561a469c98f002b4a6bd8359a8d4606678a5e1aaac25d3a37f453789d42601319dda36dc17a5c2a74d2b072cbbe5fd04b3f23ef40fa7dd2a3139314f96cbc SHA512 5662d13c11c13d990f0eff28902fd6ea2602ba9f68b6fea73d93f0d530ee9fd5c72fcbecbf88dbe17d937d9c5d3fb84eb217b4cfe5da5bba7df8433d6be1a3b2
+EBUILD heat-0-r2.ebuild 300 BLAKE2B 71eb6b89957cd31d25507b049fc1eafdb4fcfe369eaeed0b5b1d6f92edcc97717400a8ea55cca5656e187b9cff5bed8c5c02e99b64e4625087c0b248fa633c15 SHA512 584a020f9fb8f830707d56dc36ed653d95113d43620188dd59069865cb0462f208ac3c02d7d053ab480adbf373602672e5ef395d935acd7344b544129545d47e
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/heat/heat-0-r1.ebuild b/acct-user/heat/heat-0-r1.ebuild
deleted file mode 100644
index d721c2e9d042..000000000000
--- a/acct-user/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the heat openstack service"
-ACCT_USER_ID=444
-ACCT_USER_HOME=/var/lib/heat
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( heat )
-
-acct-user_add_deps
diff --git a/acct-user/heat/heat-0-r2.ebuild b/acct-user/heat/heat-0-r2.ebuild
new file mode 100644
index 000000000000..eb03e5de5de4
--- /dev/null
+++ b/acct-user/heat/heat-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the heat openstack service"
+ACCT_USER_ID=444
+ACCT_USER_HOME=/var/lib/heat
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( heat )
+
+acct-user_add_deps
diff --git a/acct-user/hsqldb/Manifest b/acct-user/hsqldb/Manifest
index f8366816d326..77c46d685002 100644
--- a/acct-user/hsqldb/Manifest
+++ b/acct-user/hsqldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD hsqldb-0.ebuild 222 BLAKE2B 67982e0f80c08fab1af2b12acd4f40abd1e034b634921660da0a9ba05f4de7cd31a0a3501567c14e0bcc172b91c5d2ff1e397b90ecabf70f3f268cc377426bcb SHA512 f95d9b0d79da5c68a89f6897b0e6944e7b784bf59b90273e13e86b212470b5498e990256c6e971136e165bc4a9399034f4a811e3aa265e072e9ff5558b3b150c
+EBUILD hsqldb-0-r1.ebuild 227 BLAKE2B af9bec82b5f401384086e38005ff91a6067c4c7e30508d08e496b64788f14672703238228ecd3f1107801da34e96d492c71ea284488efca4af5a30c6ead9f328 SHA512 b87302c714b5471a86366c1cbf99968b6acc548ed808b2083df886890a3f825f4c2bd5d9da685f3a5566b79aa06a3bff68ece1d4218003b9aa5e4dd51970770b
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/acct-user/hsqldb/hsqldb-0-r1.ebuild b/acct-user/hsqldb/hsqldb-0-r1.ebuild
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/Manifest b/acct-user/http/Manifest
index 48c3a36e5f2f..c7777603fdd1 100644
--- a/acct-user/http/Manifest
+++ b/acct-user/http/Manifest
@@ -1,2 +1,2 @@
-EBUILD http-0.ebuild 267 BLAKE2B 5794d9ebd724dc92bbf64ba8f46e0599b11e3136d14cb01689e41f1fff86060e7a2f1ae6744abf4e700536e1da7285f466c55ce463012c0f1a6fda609a3eefa9 SHA512 739f658ae6304d566b2334de0750660bb5a61567c85ae1fa31ae10e02e03eaa57c744cb88d19ce017f27d700f6c6776332590fde3b91bb12afd0bc4d7dbe3709
+EBUILD http-0-r1.ebuild 272 BLAKE2B 19b22801fc209cd04116c20182a84bfe11cac0c186d0545cd9953e49a83febb73a5371ced5172e26e11600f38d7bc8c995eaf9ac545ec29acff7b11b88de9912 SHA512 05e7ce63753212abceae3faed2b49d2bc2edafe1173527d6196e5f6a51aab649ba2d0713df085f377e7e4adbbb8cce4d712f8891ed896f22eee8e6ce1a1bca0a
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/http/http-0-r1.ebuild b/acct-user/http/http-0-r1.ebuild
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/Manifest b/acct-user/i2p/Manifest
index 940d6afeb578..2f5763560b5a 100644
--- a/acct-user/i2p/Manifest
+++ b/acct-user/i2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2p-0-r1.ebuild 269 BLAKE2B 8ce388f120bfb9cd45b13859c5830fd5821b82d6c899013e5ca4f78c01adb1cbdb07627e425d2ef9da7f89cbe78b3bf912c697b5aa378327efa85db44153f3fa SHA512 2deaddf7b77521c111a6d10ebfb87737957353c40dfd3e6d0e77e0b9e0735445f7a5eab327cb532be2f19c097d64add6b778ffbfa7fc2b37c96a224a99c95b0b
+EBUILD i2p-0-r2.ebuild 269 BLAKE2B 64ed9cb226f5aabb45661065f730b54a3ac6b76ac13f1596a7ebdee0797133e67a29f78ecdc0813744e8d4ebede566c42dc3a6c10cf20a40365940a12b613de3 SHA512 316ddbc8494aacb70e19f2cc7f4d6e8d52d7973ac7d6e5be83d0ab58dd67c13a27f847a76abe69ac1cf3d4860a37f0d73b42cdfc9871353fe953674fc1c99ee5
MISC metadata.xml 483 BLAKE2B 6e2651a8813c1dd7ac7feef36431a6e08809d57b66381ded08d142088ee4f71d3fd2fed3e441cca0d87b1c22075acac5576528b84997743ad2b2b05144d66b98 SHA512 354e27f466ce32837109c395204282426ff5ca47f7f5e6c50679add744daf3b6507ed9f6e1e954db4ddebb98b9c9e556d8a0de0f58b9a0882905f83b46f69aef
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/Manifest b/acct-user/i2pd/Manifest
index 36bdf612149f..7596d336bbfc 100644
--- a/acct-user/i2pd/Manifest
+++ b/acct-user/i2pd/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2pd-0-r1.ebuild 309 BLAKE2B 37544474dd3890fd3583f41adcab24d3623b40ff8c0ba4a31b2a133e29bc90a15b2f3375fb968f0ed3e754b8683746ce8c834ecfc6029782ca533882c8189621 SHA512 417ea30122389c49b7c104d84068c0413040b6dc16b61e5f63f4227a22706f00f971d6b58c1aa76d45e50b35d54614892e0f9cc430ac2f870a396b1fcb3da5e1
+EBUILD i2pd-0-r2.ebuild 309 BLAKE2B 65ab685340e587acfbfe0e5c1b3fa03a9cb96170872b56461ae4ea078fb5973eff29afb46e610c6685789f47edd56bd2579c0c8b399763db17c62a08b98fdbee SHA512 138c84f14e0159807e8ad0b99897777f08f41869f1179eed2a45b6c023e40930da18d980fb1b09932a839e88cba078dd7af15108b3a89d0acb898d38e1f74084
MISC metadata.xml 399 BLAKE2B 85166ccc3c029d08bd993b4040ba89b287a14fe22bac1a96834686f074766a5545c64e6062766d0fe4162cf21e41772b8fedfac25c0d3f6f23bc38fc6feb1b6b SHA512 5add7dc4ce04ba1d51cc81d277ed0b7d50e16b678847aa00061fb7df1588f7080a911f54904ef36a3577dc199051189400cbcbb76b2c632cbbad72c2b8876da7
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/Manifest b/acct-user/icecast/Manifest
index cbf6aee68bd4..23c3c40769a7 100644
--- a/acct-user/icecast/Manifest
+++ b/acct-user/icecast/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecast-0.ebuild 245 BLAKE2B 8b430097e23b9528d17caa20148d04d8b084d1c07419c5f4c3a9dd845c11fb4b4fd2024fc639e0c0cc53430bf42d546c90fcf92a52dae44dab9ea254ab54afef SHA512 6e3b41e667d7b0b538ecd7a6ce77e8b696d7a87155f25c4c63e37470f54befc978d40f5dd4687d010f4d04da7b8541ad3a03e13528a0ae8321f7b23a26e119e3
+EBUILD icecast-0-r1.ebuild 245 BLAKE2B dcab43abc77f4943762b5da7754a4daf61d15734dd47487cd6128605c2d671759ac923a10cef776055fdd61c86d29cbf24d19ecb41512890a7974215e61cddf8 SHA512 801c18cf2e12144c2bdd2ac82b3f61bb0724d30beeb13447f8e553f37b4356a2aa800118aac463f67e5000756121ade2be86bab15d68085ceb9ed50399b35590
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/icecast/icecast-0-r1.ebuild b/acct-user/icecast/icecast-0-r1.ebuild
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/Manifest b/acct-user/icecream/Manifest
index 910ba682cd57..b81e055a6b76 100644
--- a/acct-user/icecream/Manifest
+++ b/acct-user/icecream/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecream-0.ebuild 285 BLAKE2B 19535fce6d34682586f64ec1998fbc85f7ae3b3eff8dced88a578a3da5120d9afc813415e65e1d06ed1965a0569bb0848c60345130a87bdaf0b4c23e023abecd SHA512 79a420440950c92c2c3e4f4a625c8f7ae899965dd513b21bc4678b9523990ff67226392efb75cde225c0b558d364252c9fdd3041055d675913ccbcfb187ef801
+EBUILD icecream-0-r1.ebuild 285 BLAKE2B 177a2df3049ae3a155a4bc1dcc4142ace9943225430a6f3f4e934dd6826a36bf2d4d0e1b9224e8d1fd779d580dd5f6a561fa599b69c11fe9c9950df75297c55a SHA512 a8c32e6750aeea9fe3158f7dbd63d324c43fa4cf0dd248b772ae513466dff68cf3c9abee5b29056f5a0934dbf3da97f472c1c741f807ed8dc71bc8b5bfd28a23
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-user/icecream/icecream-0-r1.ebuild b/acct-user/icecream/icecream-0-r1.ebuild
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/Manifest b/acct-user/ices/Manifest
index c721484a0ae9..01f7dc9c2c32 100644
--- a/acct-user/ices/Manifest
+++ b/acct-user/ices/Manifest
@@ -1,2 +1,2 @@
-EBUILD ices-0.ebuild 239 BLAKE2B 6e86c9440965d6054a0becf5fe6f41561fc1de03a7beb6983496881f938692f42d0c6ec0f8cb9c7ee026acec1c55d486535ee0748698472e8ff4a576990204ac SHA512 f4fd5573968347da2b1ff2cbfc3f077a31f97419e16f94dc8b43dd83d6168d3750cb114ca9f8820880cb90282a0b635a5c3a81bd575d6925f6f38c7f213ad72c
+EBUILD ices-0-r1.ebuild 239 BLAKE2B a982b747f13a7ec66377cd1bf86956b8a38b4795ce759d5b723a9658b922cfe79ebcfc007f9c9c1996bda202d05ba061b82cb0dafc6ddd949303026634c7953e SHA512 1ff3b080963f74f70e0263a13478945d25ffb9f548415d17a7991683a02ef04d6f34fa1391e19388b69a968fe407f64391b069034ec03c3680c48653aad6adb4
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-user/ices/ices-0-r1.ebuild b/acct-user/ices/ices-0-r1.ebuild
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/Manifest b/acct-user/icinga/Manifest
index e3987ee3adfa..44d82fc684cb 100644
--- a/acct-user/icinga/Manifest
+++ b/acct-user/icinga/Manifest
@@ -1,2 +1,2 @@
-EBUILD icinga-0-r1.ebuild 267 BLAKE2B eeaeb382a8f78b03c894f49ab8a3525a4643ca232a5d85064ee99b00323223bb36e1217fa225664a00d0577396a7de52acab5eb8d7d27c72076f45aab0a2f72d SHA512 b3f10417fdc4502b5f1af1306745112c1805115a6b73ac4b2bea2690ff0e48597573f799d8f8f9fc380b72cb11c5800b232f7013b2b9fad4e0f245e50e5b5a6f
+EBUILD icinga-0-r2.ebuild 272 BLAKE2B 349c36f74f7eb14f62567c50b9bfecef9bcd3e45fd52a0b69d6df5db0c6764d25d46f5396dc3551112ae9fe7e9c92a54d3d2383af2b65efd267b3b7b097ce643 SHA512 2b8efea203805e7cc972e6e8a80e9f0b4742daf42c06fc66d2478b852b7a9b941c4802b5f4b91174cfe42b9ba4783eefdab75a2c315d89e0361ffb9efce483db
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/icingadirector/Manifest
index ee71646ac6ae..ae35e38daf3c 100644
--- a/acct-user/icingadirector/Manifest
+++ b/acct-user/icingadirector/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingadirector-0.ebuild 275 BLAKE2B 655e229d89382674373f8aed936f58ea887bc48d8e472f150b1c2d17884e12fad53d56609143644acf7b3e4435d5afa18d523bc7984fa1678c599acbe87950a5 SHA512 fdd449560d718d2d6454e1260c137da6d9e6b9eba8d3fa8e3b22169557e2232da247cf812a383302ba39f71bd06e3d5def4fb583aafcd8a9bc66930feadbf6fd
+EBUILD icingadirector-0-r1.ebuild 275 BLAKE2B 71231c936fb2e49a1f2fdd378782f374cb80aa722f8ce24c720c387af3575aa62de652154ca707c42af4ee66431dc32581027cf68d00be55b325eb710a2727e6 SHA512 b252e556f152314f4549af0ec6f56d8fdfbbe7625319402c014f1b49c4d22188148b2b0ea6174ed660a382c58d82f5b6d1bf59e7b5f67b9a249dfb21dc52af1d
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/inadyn/Manifest
index 0d026aa75e7e..9ca05c1cc56f 100644
--- a/acct-user/inadyn/Manifest
+++ b/acct-user/inadyn/Manifest
@@ -1,2 +1,2 @@
-EBUILD inadyn-0.ebuild 275 BLAKE2B ddba2e31ed71ead7a897686ae83c7e72a182c46ea50ec0b273ac61f9c822081af94bb98e426581e4589d2e057778112d3e13388a1f2eca7e96f98372a5bfe549 SHA512 b29be44ed238d4f0db793d07dca6c686207f03f3c3569dc482c92d45d43a47b37cfb5c3f27f61599563c25d6e7651db11c4d2a0e421a93d99df4505812981721
+EBUILD inadyn-0-r1.ebuild 275 BLAKE2B ddba2e31ed71ead7a897686ae83c7e72a182c46ea50ec0b273ac61f9c822081af94bb98e426581e4589d2e057778112d3e13388a1f2eca7e96f98372a5bfe549 SHA512 b29be44ed238d4f0db793d07dca6c686207f03f3c3569dc482c92d45d43a47b37cfb5c3f27f61599563c25d6e7651db11c4d2a0e421a93d99df4505812981721
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/inadyn/inadyn-0.ebuild b/acct-user/inadyn/inadyn-0-r1.ebuild
index 62fcbf9f94b0..62fcbf9f94b0 100644
--- a/acct-user/inadyn/inadyn-0.ebuild
+++ b/acct-user/inadyn/inadyn-0-r1.ebuild
diff --git a/acct-user/influxdb/Manifest b/acct-user/influxdb/Manifest
index c59bdd641b06..1fe12cc95345 100644
--- a/acct-user/influxdb/Manifest
+++ b/acct-user/influxdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD influxdb-0-r1.ebuild 259 BLAKE2B 7048ca310193851e4a4239a35264c2a3e37d5aa2c3a615e1440c997dec0322d35cfe80aabdd072cfdf1a44bc31dc163d31cc6a3ad6b189dc00481701da7c683a SHA512 2733657d9d6e714691809e09f8041a331609e187977913c6135d204cb5c0a79fc1555e7651d629d2f537bcbb424c1c7ee68b76e21a0de83b0b303790752dd4bc
+EBUILD influxdb-0-r2.ebuild 264 BLAKE2B 040c213b779762e4e479b4f17e6a6f7ce389014becf5ffcc42d55ebbe15bc87e530fd9c171b2b17b88ea35131ad908cd9f8a4bd05e1bfb52f46a1ed037653d7e SHA512 6903fae59e6482b75d2ad23de83b33858e5de3a727f82361f233c3e05f1a2bd582434793d357eeda0b8fa8801ea09833e89ac16e9c3b0c945d2702ac4ba0553c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/inspircd/Manifest
index 4356050b54cf..b4ab3cdca209 100644
--- a/acct-user/inspircd/Manifest
+++ b/acct-user/inspircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD inspircd-0-r1.ebuild 245 BLAKE2B 6a4ab1cdfb63dcc976506b6911e162edcb948c55eaf2c02f96be92785d750335bd4174345cfa1e38fc0ff2c62d229dd9a707d7f10ad15421f87389e5a5509fdd SHA512 23c93b5172423dc98f935dfecd5c329f76d2d2c9bb64b4a321b64aa0b5f3c36f1803c1f1c86a6074e36bcb0c6cb22d256d60aa3836f6f2d46a1250feb650f15c
+EBUILD inspircd-0-r2.ebuild 245 BLAKE2B a59a620e629286b6cff4aa0d7bcc74be89c7cb4ba1808555c5f811355c2ca72d8b5e0ce328ac5c44777f114f4c68502e64b3f8e8f67b3bfba841c477a6d92a51 SHA512 694ad1474befa2d8ae628b71a570df7ae381aa3d4e3c201ecf911faad87ad207552c27585c1ebac94babed7661e65d146f82ff5ab6dd364f2d4a5d2870e9e1d8
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
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/Manifest b/acct-user/ipfs/Manifest
index 798fbf7be073..34e6e656df33 100644
--- a/acct-user/ipfs/Manifest
+++ b/acct-user/ipfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipfs-0-r1.ebuild 316 BLAKE2B 475d1c2e5f10a3087ad209f518a656c0a6c639b17df907e734dcc4ca5b74f9a44e30da164ab60a93554469a536fa4e6ee2703d3a23bc9dcda1633a9e64dd1fed SHA512 911065cdbd6d6858bacb0767cdfba720e5f1646475dbf72bc72bf27c6929c466594246143bcc032fb8e115fc441512d1f55db3b38896ac4b3cadbdcff11c9c79
+EBUILD ipfs-0-r2.ebuild 316 BLAKE2B 782202662bc8266d6ffa7ad5c0d107e45385e1b76b55bcb59ffde6b886834c1d7a6fa2b9715c39d9b358154862262a126041d6c3f9c86083b7801783c51e27ad SHA512 d9cba7581a34e2703782f7c6cfbadb298f0ffadfbd243e604de6bcd1a2627883d3f48f1e6c1df3f3a92f21fe1565a6b0a1d3567fffc14509b77d676cccd16975
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
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/Manifest b/acct-user/ippl/Manifest
index 638e928da086..c22cfa358af8 100644
--- a/acct-user/ippl/Manifest
+++ b/acct-user/ippl/Manifest
@@ -1,2 +1,2 @@
-EBUILD ippl-0-r1.ebuild 234 BLAKE2B af82622c0a2227f2ee21b57bbd067c02e5be2398e8c8a1317d15e0848f106b2c60ef7cc0a9148a0860c98126b3b396c7e64167065c9ef8cbb95e0494ca5fa422 SHA512 c7fc16e84c2529b0e09be81dd70eaa4ecbd349f2f63a1ec60568ed7f11c79c5a17839d4d22b0ff528cf716d414d8ab9b127ef9ca72467811e53eab78b56f4571
+EBUILD ippl-0-r2.ebuild 239 BLAKE2B b7f032f1538850a81129f812d074bec943ad39fb04c1ead5079131302147e2715788a7a8dfd2d1a539a9632d587fe8291a7f6e12c22949a2bd36476a5a8d1b26 SHA512 fd70091a981e52278864b2ad403d6684e7706490e765547631045bc3ba59f1a2e5162005dac344549af53ba87f2f87e1062c767cfaa9a11d13b941931fe6eded
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/ipsec/Manifest
index 9c724beef029..2f12b286edd5 100644
--- a/acct-user/ipsec/Manifest
+++ b/acct-user/ipsec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsec-0.ebuild 238 BLAKE2B 2ac85ca590cb258a1e85966205b09c3a7236fdffb646c83d6745f1369f6341e1429419e3226220ae46d3a50d8df880a1a8a8b950a42a90ba14c89bedbcdfe998 SHA512 c423b67d7fb20e999f503695b9e96034ad7b77a6ac73c0962362dc9ecfde7a984ca9329a924a01cfb9b64ab89d48cfacd17de00e79404736db1175098b4af5df
+EBUILD ipsec-0-r1.ebuild 243 BLAKE2B 6c3abe29e851a820a92f665527e38a053b0fcc2d86e576b610a7592c65a8d6ecbdaa82a1cb9953b0c08bce86e1271b3c23ef91d0195a48751a4984ddc546d1f2 SHA512 f2ef7d9e421ff8708e27df96d90a3ff7d37e8821164fe0b8832f9361e123b589970eb2d737fc2e7de79f6220352bf4a3fd8b3fa8a1f8bcb7bd0076ad943a5ccd
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/acct-user/ipsec/ipsec-0-r1.ebuild b/acct-user/ipsec/ipsec-0-r1.ebuild
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/Manifest b/acct-user/ipsentinel/Manifest
index 3c8eb9cfadda..09488ad19056 100644
--- a/acct-user/ipsentinel/Manifest
+++ b/acct-user/ipsentinel/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsentinel-0.ebuild 252 BLAKE2B c08fbd023b03aaf56f920408d10085e4287c1e3c296b27ac0e0d35ca76cac40e80707d3682c26b3e46668a11e0a67df4fd9235682cd32a8090d8ffad8ece347d SHA512 5f96ec48919d170a946273203eb10445fc7279a03c615572649f7139cd28f02992acc8474d73865ff5436b60c40351dc6cf0209f68eefcef7b8dddefdd697db9
+EBUILD ipsentinel-0-r1.ebuild 252 BLAKE2B b60265a87b07fd9959b9107dabd04e81570b6c71d2c369401fdb9d60e39f19ca2966b67839555d2c80f27c6d18611aa6ce0d770f60bf2d8874f4a441eeeafac2 SHA512 c22f5876dcf7a0029939fdf44349dae51ac3ce92549e1b199155512f6713f619d028fa2ca7db3584f3d9f11194f2a5734930da353e72d89645fa26d383902c78
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/ipsentinel/ipsentinel-0-r1.ebuild b/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
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/Manifest b/acct-user/iroffer/Manifest
index 794131905ffd..6b5f9f660014 100644
--- a/acct-user/iroffer/Manifest
+++ b/acct-user/iroffer/Manifest
@@ -1,2 +1,2 @@
-EBUILD iroffer-0.ebuild 193 BLAKE2B 1c86216a35e18b8abc44fdd070666909d7155edd4a16c471c20e4e7a7cc74b8749e9d4f81471a63c3218a8447bbc8e65d908c343c035f3228788b1b4f990e8f6 SHA512 7b43394e0d1b41d30b3ef33e3811ad87b2ea1e40f7118024ffa9ceb86a08274261a16f031786df547669141aa183d8c0f74984aef6015b169a8b5bf603e8c982
+EBUILD iroffer-0-r1.ebuild 198 BLAKE2B a2598dc6e89122c9c68cf3ea6c3f986a77d376201bdf96256fea30d04e260413b125a4e08b28e0a7ded8132fa9752f4a6532f1b801697a4948920dcd2667f871 SHA512 deaf723abf2f0262838f9b1e6da21f2ea2068e18736f7295fd598af0eaedb44d0f96fc575495c0ba6295ccf4ca793d13821752292b2177d0b4d8fca852922d3e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/iroffer/iroffer-0-r1.ebuild b/acct-user/iroffer/iroffer-0-r1.ebuild
new file mode 100644
index 000000000000..a44bed6da0d0
--- /dev/null
+++ b/acct-user/iroffer/iroffer-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=187
+ACCT_USER_GROUPS=( iroffer )
+
+acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0.ebuild b/acct-user/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 452a50f2f547..000000000000
--- a/acct-user/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=187
-ACCT_USER_GROUPS=( iroffer )
-
-acct-user_add_deps
diff --git a/acct-user/jellyfin/Manifest b/acct-user/jellyfin/Manifest
index 56a3dcc6091b..b997dd082d91 100644
--- a/acct-user/jellyfin/Manifest
+++ b/acct-user/jellyfin/Manifest
@@ -1,2 +1,2 @@
-EBUILD jellyfin-0-r1.ebuild 240 BLAKE2B 4bc54e0908950791e6bf884c952d56f1093d0805d5bca5eed567c27026e003224a6ac1ae03b8eed5f157ab7cb7c8cb4e98d1980485d1f99aac4970c16e48cc2e SHA512 c165d480418bf0f1d8cf4da190de7d8c06e0ff274a1495ecb207830802efbfa2743ec63bbb02caedf39ec96e7d71866ed1418263b5b5e5cd78b2afd340de25d4
+EBUILD jellyfin-0-r2.ebuild 245 BLAKE2B 23504290453021e01684f914fc1550feb380ebe0c76220abed42771ff98a3418f51f7f700fb8aefc9915251bbe5b2e48b2aac539f11c3e3c1f12dc131b757e91 SHA512 b725bfec0c318719dd429c476fff3333b3fb5ea8ca2f8518ed1cd7053288eea87af38a47f09a7e976482472665d9969d2bb89efe2491015e1f7964eeac577112
MISC metadata.xml 649 BLAKE2B 29ce34c89c1300d32c3ff30990ec92e49cfab21d74340d1cd6893650ffda87920348ac5feda5ee68feff3e8adbd8cd6e58548d73879025a206dc82756a99c383 SHA512 d8a36b27ee99f29cf9dfea5cc4a9735732bb11cc5931adb4bfe1d1942378d2477f63417b6a2a694e9691c217d20c5ce84bc8d46af5155c46b99b850c0f561315
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/Manifest b/acct-user/jenkins/Manifest
index 11c53bfd1472..a13d892dbe9c 100644
--- a/acct-user/jenkins/Manifest
+++ b/acct-user/jenkins/Manifest
@@ -1,2 +1,2 @@
-EBUILD jenkins-0.ebuild 259 BLAKE2B 5571a53bf546ef42ecfb3e4a70c759d83ec650e334be863bde8e2f6fe15c26a924f8672a89a5257156c1ba9e66ce82b1cb8a97ec59e32c00985a076977a0e1ab SHA512 b0079d52010269d53a2a05ea34f8d4b2c22b65e39477cd2315742d2e4dad0798146d18faf49410eade97197da80c0444d3eaece538587a548197fac4bd4666be
+EBUILD jenkins-0-r1.ebuild 264 BLAKE2B 86746d5ee458e47c03b7366c53589cfc616ffd9c5376325a02ae0d30830caec5b57865d063afba508e21f7008c69b4c187481e4edf4ae2c95b5280a3a5f24de9 SHA512 433cf3c0a1a3840b144206156020353c97d4e0ac37019bf28a5a219ec35d8fab0a68b0d49c214f8f5de9aad4f348daeb3cf9be34bb3e0af79551bcfbe859bdc1
MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/acct-user/jenkins/jenkins-0-r1.ebuild b/acct-user/jenkins/jenkins-0-r1.ebuild
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/Manifest b/acct-user/kafka/Manifest
index 2dc716ab8e8c..0a9d70ea3eab 100644
--- a/acct-user/kafka/Manifest
+++ b/acct-user/kafka/Manifest
@@ -1,2 +1,2 @@
-EBUILD kafka-0-r1.ebuild 275 BLAKE2B deac647a85d94e46582bf8714416121e3943b07f5ae2d3649b980c1d4ab74beac7ffe1d8dbe853345226ae0f65e2e65694928d584d9ca14d69f4b278b3d56a39 SHA512 61056ac945705bd596af484ccc6ee2afd1eb5605b04e6a12fc6e328af6b883ccdc7b004d018400dfae9e4ee587118f8f1d49cc0a9c6d180d2cfe7269d989985c
+EBUILD kafka-0-r2.ebuild 280 BLAKE2B 4cab6d8ae48f2f761d588f59e569cc5f9105c64c484bc18fd8ed743459882ffd60b402ebe0426464e26a31f536a507c598892a41e98253ad47aef53d40ae257b SHA512 3d3f1b039032ae547af211da1326a8bc21b07bb0e4f85c27926fb30872e480857b0dcb99d67df3d1d4cd2072e0e6e7f27a5c62760052f260ea1ee2b51db38893
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/kapacitor/Manifest
index 5d94a33da831..6326195c7d33 100644
--- a/acct-user/kapacitor/Manifest
+++ b/acct-user/kapacitor/Manifest
@@ -1,2 +1,2 @@
-EBUILD kapacitor-0-r1.ebuild 262 BLAKE2B 99cb2449ba72cd838f0be8aef09304e7b005a64629abcfa3a7ea6be755a8a613078aa0f26f4987d4413d0deb0221dfb2b3e6b228d2630a3b836a464b183c66f6 SHA512 abfdfd125896fad56fe542ba48c1a7cc47bb2d063129dbea5bcd51988e069237a2dd2f4c3d7e692172ee4d16960916326281550ab31cd56223c2367478da7c06
+EBUILD kapacitor-0-r2.ebuild 267 BLAKE2B 213ef3b1dda302d3b6ac6a4bf9655edc3b06c8e333642c59f76c95d185de0deb211b8e4c8d37cb626a8f0ab70ef7d7de179c8d7532c4e1dd276d94fb70c513d0 SHA512 3695fde0017d1f89fbcee3faf1dfa505756ea9787fada53d2e100657720c673eb6c3261dda7996e66088c72f07066ff2607d1d039f16e47fce2ded52191429bf
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/karma/Manifest
index 8bdb281877e7..e605b5612408 100644
--- a/acct-user/karma/Manifest
+++ b/acct-user/karma/Manifest
@@ -1,2 +1,2 @@
-EBUILD karma-0.ebuild 241 BLAKE2B e9e584e0a67b45f038070b5a926edcbe8471f3e2635fd35e663a3b2da5e444b42840bafab15f592891c6ff1dafca36d9cc075d27f05a4fe81fb408e99af7e9f5 SHA512 9dac2ef74f844bfab49775c078efd4556b1bde9ca32bf7197119555efb3ea8147732adcd8b434c7bd163c9b99240585d7fbe15f048f7ec81d60e7413683bf842
+EBUILD karma-0-r1.ebuild 241 BLAKE2B 8bf7dfd7870d3b8d3128200c3e1d09ae92e87dc6903e11833936a8168c0b9397b847ddee014059d134f4ad55973c237a69a9a5fbf2edcc251a590248f1036e0d SHA512 470ef27e8901b3c228ccc615fe4fa46d33205859f37456eeaefacef775ae9bfdd8d99442600fb26879ffe97f9a401d3320a419741ed41e82428e8faa042fcbe5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/karma/karma-0-r1.ebuild b/acct-user/karma/karma-0-r1.ebuild
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/Manifest b/acct-user/keystone/Manifest
index 62d61c210eb4..ab6f1ccbc352 100644
--- a/acct-user/keystone/Manifest
+++ b/acct-user/keystone/Manifest
@@ -1,2 +1,2 @@
-EBUILD keystone-0-r1.ebuild 307 BLAKE2B 224aebe94a3b55cac1407f4a02f940a8ace1432054bf681d3daf6d3c78d06764df4e2db93824e2293c4e5f497b0ddb9c758774b36d513d2dd9091b234ae849c1 SHA512 c855e2a15a39cc1f0b47c529ca0c556b1382d022634dd2d7f221e970b9594ef47f9704e3bb00e4821516055ce6beb3ccc45f96bd9e866fe8c074cf2c2770b3e0
+EBUILD keystone-0-r2.ebuild 312 BLAKE2B e0ec0ae979b33c369f9db0e3033b7a2f2bdfb549cf001aa27c08f2fb710ee70ad0c633c3b2531dfce7d104248c9ef5ebe7adadb02fdbc48657e54e2df4a24194 SHA512 643b84373b2894ec995026da1c455ca732e145c45a24508e854f7c735ddc47ea2171e07844813959df548e43cc6d432da91a00dc6307860ec782bb9d75ca9fd2
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/keystone/keystone-0-r1.ebuild b/acct-user/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 1519aa941e90..000000000000
--- a/acct-user/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the keystone openstack service"
-ACCT_USER_ID=445
-ACCT_USER_HOME=/var/lib/keystone
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( keystone )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/keystone-0-r2.ebuild b/acct-user/keystone/keystone-0-r2.ebuild
new file mode 100644
index 000000000000..873aea351054
--- /dev/null
+++ b/acct-user/keystone/keystone-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the keystone openstack service"
+ACCT_USER_ID=445
+ACCT_USER_HOME=/var/lib/keystone
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( keystone )
+
+acct-user_add_deps
diff --git a/acct-user/kibana/Manifest b/acct-user/kibana/Manifest
index b90ab59335e3..d0676e764a03 100644
--- a/acct-user/kibana/Manifest
+++ b/acct-user/kibana/Manifest
@@ -1,2 +1,2 @@
-EBUILD kibana-0-r1.ebuild 287 BLAKE2B 344cccf7bca13602e7a7c782bce7ab8f5bacc7fe2d80d9d8bff694aea470cda8449c8b394f25eb281875bbf510dae6f5ea0b14ce17154d97ea2fd91ef147ca21 SHA512 9ca7754ad2b47570349bfcdbdd9209553d42782d5ea897f892dba0c3b49e4da62db825de4ba88ab78793993e64e7cb38f3a538ff7702708380344c2b3475b0a5
+EBUILD kibana-0-r2.ebuild 287 BLAKE2B a1dfda4ffd757f31f616066b870507e32976086abc63f41a3832e7fc2ef7409798c4446a680c7ff0a5a6a343582e0b1a2abed6feaef25bb4c975af0574844446 SHA512 b273d3dfaba39e8f1295529379adb4fa9b1056ba431dac275c7fadaae12b5afc8b1a617aacbffa3b39a3849186e87f7ada7e37e47041e6476dabb96dd733b30c
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-user/kismet/Manifest
index 24da32a30202..952a5d86b942 100644
--- a/acct-user/kismet/Manifest
+++ b/acct-user/kismet/Manifest
@@ -1,2 +1,2 @@
-EBUILD kismet-0-r1.ebuild 290 BLAKE2B 82cccbab7fa18f299f0f95549259422ab6c6100aabad1a40b0eced0874e3b2c8997527ca349ca8dfce030d4a8e92a1b263aad2aeb277765e5930f5f77ccc866f SHA512 3b7f78bfd4380f285e4bea20577bd748858213ca24f33d78c11ca0f106528c21dc2177aa16f4aeda95b56160e5101b840cab5fbdce91f9921b7f9aab5bbb6152
+EBUILD kismet-0-r2.ebuild 295 BLAKE2B 5a3c672e88359b47956d9f622a4a4160d3ada260bbc1a4a0d0671eb839d94c8668baaddef0bcf3d25e9cac680bb003c14a3d889569d55e89bda60c32b13cf629 SHA512 385470a9605534aced01016db503b9b27837110ccc39697c56d2ac30fbff1b111e92c3e22679606f9e37a74126b9966cd23b9fbdf8957bd7048f7200ce4be71a
MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
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/Manifest b/acct-user/knot-resolver/Manifest
index 899e39109af5..fb085dc88ca2 100644
--- a/acct-user/knot-resolver/Manifest
+++ b/acct-user/knot-resolver/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-resolver-0.ebuild 237 BLAKE2B e60a70d83a1828ad40175fff0a51b719d288dd9bac02df222fe541b60ee173cfc1cdad29b04354262a091298ec095bc752e97a1b99e5ee71f041a55598cf8477 SHA512 eecd7010f800f810ace5a2d6541863f0fdb9cbef3e6c4f25b1b31582232446fe66ed8a91b2750932a417ae703b17d5fd1727388bdcad5f4bdf1dec43fb730981
+EBUILD knot-resolver-0-r1.ebuild 242 BLAKE2B c42dd09afa275a4693e4637b55e5779efdc057f9f3cf0ae81beb796efecb5140f6441de71b264050c737ca7da8ba032d1f7113b051d579c533cdc4b486368e03 SHA512 2703668552a6dc1e2ae937551537d9de62cb6a02532436a1b4ca7ca59656487356b3788e23705304ca0ef5bf8d5605b9b0847a9bb6f2fce3397be72026d3e514
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
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/Manifest b/acct-user/knot/Manifest
index 0f60417ae020..8175768976bb 100644
--- a/acct-user/knot/Manifest
+++ b/acct-user/knot/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-0-r1.ebuild 262 BLAKE2B ee66db55e0086ed6aebffc5aa160db5255bbb2a6dcc4b0dbb0cc8e8be31310d920b4fdef9da3c3f91d72713321b53a1f2947c47160c92a6a5fc7dfaf4b17f22b SHA512 5b78bb7d5b187964389db20269e25b14ebcb78913dedee7c642c031aa72b3965a44ef34bc5be886c5c00e436705588a65835bf62f6363741fb1fe2870a109885
+EBUILD knot-0-r2.ebuild 262 BLAKE2B 54638cee234e5c3373f485bd75eed56bbaf5c3a0fce9f1c25c987cb44ddc76fe64b0900f0b6a9c6216070a8baa4a57f4e61696b86c7ff0010e24b964d7f5593b SHA512 6d4641003e5dbd67939b5246b3269972e4f9e7e192c7b224f056de63bebffe43edf75206b211814fe20a6750abda47f01fe3b42c7ddc963bd32d4df5af3c12a7
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
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/Manifest b/acct-user/kube-apiserver/Manifest
index c01710cf96af..0715bf149bc6 100644
--- a/acct-user/kube-apiserver/Manifest
+++ b/acct-user/kube-apiserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-apiserver-0-r1.ebuild 243 BLAKE2B 5a876f94d5d4b4db4f315da69a494fbe998f91e3f4481e2e60a6d3b86cc83a240a9acb3f49315d663a4b325b04e834457f18064ef8b85bb9c4663b00840e3a60 SHA512 c91239aa8e8c9d70ffb0d97417175c9b6643ddd12d707e76d32782700b9bb8d222256c5684496b6c54756755c5a041fd5627ab6adebc043d04b4fe59f7369839
+EBUILD kube-apiserver-0-r2.ebuild 243 BLAKE2B 4471dbc459a725549ca311a5de9f89760b0b0322048be1e74881db8fc0671f470680d8ebec7f43f1df934011e04fb383184c1827dc0383b8f888fa99c7e82230 SHA512 17e04bc22ca54a1e5ad9041e65c31937571d723ee321df1c310a875c283b0d2138907849ac58d8d9e2a1638654002dcd5f365edf73852e84e5f2e0f3c2b156a5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/kube-controller-manager/Manifest
index 154cc69a5920..e473c61af6f0 100644
--- a/acct-user/kube-controller-manager/Manifest
+++ b/acct-user/kube-controller-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-controller-manager-0-r1.ebuild 261 BLAKE2B fbd37d8722a0930c225a7610b5b389ec17f5337c9239e09bb350ebd7bccec69dad1e554477b98ae2447005da36ce67d25252e76f2cc30d867d28b33709ad4ea9 SHA512 2ebfbcd6094163054e1ffcb2d5cb2c3f5f06d89bddf1947dc607456b75c345064db1236af0cf398eed56d667d58dbaf87c757bc2f0c15fa5107356fc1f84530d
+EBUILD kube-controller-manager-0-r2.ebuild 261 BLAKE2B 5c325219285889ac6f9b680fa8547fcdaddbdf059dcce2e128808bf1958fb5b13e90822a2fdabebb651d5e42430004cd225f03ed902e1433011afeacce1fa5f6 SHA512 5d8d502f15bea54bc34739a68164fe3a9bcb434d0caeeb24761d304f67f31692ec61c0bac1f5cea33ade73900536c5d897d88424ca260f46be90d2a56f3bd72f
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/kube-scheduler/Manifest
index 0e8054004668..4d5fa1e52a8b 100644
--- a/acct-user/kube-scheduler/Manifest
+++ b/acct-user/kube-scheduler/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-scheduler-0-r1.ebuild 243 BLAKE2B d230248748bec9252a71980f35a2089be0fa66b7c9bd05d0304864b41394a76507d29152bcae91327c64aa894456c0a91cfb90bbb94788440a1e9ca83cead275 SHA512 6b483c01289ca0ee22e8f5ecebd41a056729fe53ccf88088521e9b925fb2aea6f66597fc602fb600e88032ec71422d3eebdb99443f843a0a6294f0ccc5c5ceee
+EBUILD kube-scheduler-0-r2.ebuild 243 BLAKE2B 9ee1738b6a4a364f44c802a4ab719ea58810eea7475993fb8e7ea26304414e84ed16dff9f51f9eb9fdc0224d8bc726d1c57dcda7b6d7e4636b591e440beaa6ea SHA512 53269a79abb0a22717222fc1732995015ea7e974ec4fa55b933a85ca44fc88ea9bf75b5e7c935142b5b47d171a3974c6cfd2f1a494ce0128385a9ac575b8889e
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/ldap/Manifest
index 64a7ea8cab7a..c4b500ae00d3 100644
--- a/acct-user/ldap/Manifest
+++ b/acct-user/ldap/Manifest
@@ -1,2 +1,2 @@
-EBUILD ldap-0.ebuild 286 BLAKE2B ee98117dfca655fe09ab72326befb4a74f98e35d843251684653d788918de9db19e931aca9bdd2dcb28abc2a47f17e50d97eb86e86e7cd201e3ba65be9418261 SHA512 6d5e5587922488233d1b5fc6d47d966d66fef0a908a64de047f80f1fa6f5779ebaddcdcc28f3c042e4947364dec84718e8846a834ac53f7677c7284e210710f8
+EBUILD ldap-0-r1.ebuild 286 BLAKE2B a4891b3e24467f61415c0eec7261ac977909b02e92bc2b22c42b2c09346ab1264f37b799a0674ed63036c6a451cf4d3a99d41ddfc7ca5fa1d24f45785e13ad0c SHA512 98fdfa767a7ed9256ee629bffce944864dae89fa7ba71f1964f1eab2ce53e0aa8c672c66544f88e9b00c602880a96f60194485ad7808c3606a8980177e51210c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/ldap/ldap-0-r1.ebuild b/acct-user/ldap/ldap-0-r1.ebuild
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/Manifest b/acct-user/libreoffice/Manifest
index 640316f8ecdf..ed39ed889dcb 100644
--- a/acct-user/libreoffice/Manifest
+++ b/acct-user/libreoffice/Manifest
@@ -1,2 +1,2 @@
-EBUILD libreoffice-0.ebuild 302 BLAKE2B f24d238069c476b97ee0fb2ad2a37b80ab3363352b5010b419248aff81157342ed3d862cdba6312c82165bc96315de5c8408400afda30e07f91f39b03a3270dc SHA512 273211d2b1d7c67324a2f182053e8375826a5185fdb2d3db66be11999fa7ea8bad20a57fdf64507787a8b189c7bb669685d99477b68fc91fa1b58fd2aef633a0
+EBUILD libreoffice-0-r1.ebuild 302 BLAKE2B 2c762dbac41623485c2f6f4010554f9e7cc6179ba4203b2c331497de86beb71e0d3ed8529b112d44538c8f2f38219c1561c5b8ce617599faedc03397dd4499b6 SHA512 3504c4d752c93f5d31c42103b3cbf7e3ada3e7e4df857f4a1756ef3b4c3a665179faf11c59649137fba279ac4c90158be5cabc5e43a99554f813aff902c88a15
MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/acct-user/libreoffice/libreoffice-0-r1.ebuild b/acct-user/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..aa08fcfb70de
--- /dev/null
+++ b/acct-user/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for the headless LibreOffice server"
+
+ACCT_USER_GROUPS=( "libreoffice" )
+ACCT_USER_HOME="/var/lib/libreoffice"
+ACCT_USER_ID="512"
+
+acct-user_add_deps
diff --git a/acct-user/libreoffice/libreoffice-0.ebuild b/acct-user/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index 59f859ea5a19..000000000000
--- a/acct-user/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for the headless LibreOffice server"
-
-ACCT_USER_GROUPS=( "libreoffice" )
-ACCT_USER_HOME="/var/lib/libreoffice"
-ACCT_USER_ID="512"
-
-acct-user_add_deps
diff --git a/acct-user/lightdm/Manifest b/acct-user/lightdm/Manifest
index afcda54d5f83..8e8f373e2fe5 100644
--- a/acct-user/lightdm/Manifest
+++ b/acct-user/lightdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD lightdm-0.ebuild 287 BLAKE2B d86903678eb08e941612f7bfc2f6c898ab32c88e9390f7c6db6e57a9eeb51b6c9d0c9bc5cead400def341b8de5bb90d492a44ca17795acf97a8c091fbfd6f908 SHA512 c46f6173ff085da3698cd19e318146cb43d07386971a1d82732f8b3b2c95eb04ede308970976596124b00d4b07808c8871db2eadec27aeb5b2a0f266b9536c40
+EBUILD lightdm-0-r1.ebuild 287 BLAKE2B 65ded64b98893b0021b693229f82c2c24934f90c1cba8d59d4173342ec623543c02e001b7a662da9850f71a288a8f8689be20d0663841e14b4833c26681efd78 SHA512 746c4a2fb6377736941e5de69e44796a7182acd69b3649b89e8cce944c27423ddc54b6919ae4b0fd749c265865dc9cacdccbbb64fa81dacd470b2b28684d1a19
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/lighttpd/Manifest
index d5b703456750..86d4a3f1af2b 100644
--- a/acct-user/lighttpd/Manifest
+++ b/acct-user/lighttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lighttpd-0-r1.ebuild 233 BLAKE2B 5b1eb6e62b0912ec0ab14a2b71812b5563e9c4ee97a1bb495d52e99606ab4011e094cf7cb3c9eb6e96c99b1624979c66dd7f9b6e2d8b0cb4822def3c6e43e61e SHA512 84d72a4ee397c4a29a1d36930ae470eefd69e5c3ce742418265c8207c95834459b1f45bc664b54b12b43eba7082379a2c588d9d01fe60b61d57c5ca773eb326b
+EBUILD lighttpd-0-r2.ebuild 233 BLAKE2B f62af6f5ac51738b7b4e499bf4795e1be4619a80519d6d9acb545201a912ce0d3db44c3e77a6e223478e74832f7a78e0f65833f18f3207a55c472bc408755201 SHA512 87fdddbfae5d49d7a362794b297bbb870e51919d64a51e25b11bb77a6491caa566be34083d9430e36e40523b5770fa28c085006e2d83672fc245459ef4f46268
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/litecoin/Manifest
index 0702c42e4744..ab5480eaf266 100644
--- a/acct-user/litecoin/Manifest
+++ b/acct-user/litecoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD litecoin-0.ebuild 280 BLAKE2B afb8e8ffba9e93e820c9a0f72b20644966d60c277e0c58b51dfda5b1c5bb2cedc0ecd4c46d7d596b2d57510880c700a61929137d86e6a4bb709c4605c448cd43 SHA512 fe8361604261d9c530befc9a6687d1030002395858480cee2105b18666a462049ce3ae68376a83e95ecb89e2c1446ffc2bb03f82c6154a852643908de1918106
+EBUILD litecoin-0-r1.ebuild 280 BLAKE2B 6cc0ac450d981d4cae14b8632782bb735ed512de942b5edc79bb8587d6cb5a3a62368b1a182971dcd4f08fd80b46cf9106d21d0acd2b96302251f74e2a95174f SHA512 4c98bc63feccb773a056a4609d8dee8b27ac1b82e15e35c1e6adfa9a330e25f36d28cb95dd8d96d8337c4f94edbe24092cc5cd4999711016a759ba7bbf3ce0ae
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/litecoin/litecoin-0-r1.ebuild b/acct-user/litecoin/litecoin-0-r1.ebuild
new file mode 100644
index 000000000000..4f83d6e97e50
--- /dev/null
+++ b/acct-user/litecoin/litecoin-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/litecoind"
+
+ACCT_USER_GROUPS=( "litecoin" )
+ACCT_USER_HOME="/var/lib/litecoin"
+ACCT_USER_ID="256"
+
+acct-user_add_deps
diff --git a/acct-user/litecoin/litecoin-0.ebuild b/acct-user/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 2a9cad12ecb1..000000000000
--- a/acct-user/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/litecoind"
-
-ACCT_USER_GROUPS=( "litecoin" )
-ACCT_USER_HOME="/var/lib/litecoin"
-ACCT_USER_ID="256"
-
-acct-user_add_deps
diff --git a/acct-user/lldpd/Manifest b/acct-user/lldpd/Manifest
index 8865ebe1c510..b5784f581181 100644
--- a/acct-user/lldpd/Manifest
+++ b/acct-user/lldpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lldpd-0-r1.ebuild 235 BLAKE2B eafd1129a6602af56c58fdb7190305da56c704cff2816b2dac99fb1a805108bd11441b702ecc2a687a88f497ea0eac75394264e0df8fe346fe4d12cdeca3ef1a SHA512 64bc4309d729c2cd1d19e06f8f230e9e8b9c50cd7a66e877684cece7ae95b424c002ede86b6008055523454fd990c466b59df8b53283a79863b09c9c43212e98
+EBUILD lldpd-0-r2.ebuild 235 BLAKE2B 88be1fa5594479f70424210ed629f72c84092d5f3124b576eb38e7634ab634d8339c732d30169f442a97fb71b595f495aa0fc145ee2af3c4223bce9483b5fcd1 SHA512 2f8e188f5e9f97f74f42b53a4b7ed896c1af605c65e17d9e026174d76e97e984ea301462ec58854e4875979d65a2e9570832c398a17df703aa4fc4c1290f364b
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/logcheck/Manifest
index d30f6234347a..27d50c8f14d6 100644
--- a/acct-user/logcheck/Manifest
+++ b/acct-user/logcheck/Manifest
@@ -1,2 +1,2 @@
-EBUILD logcheck-0.ebuild 246 BLAKE2B 02bd84c095b8c90d937767d0a79127f960268ea1b19130d3af768d889b2470df72ef198c070e618562f83788dcc5afbb8258b282265386b04a2004f7272d701b SHA512 8a51dc29ec57bbd500cee6ab8846ddd2473e4e54022a531b3116e53191b2bb12f393b79f58bc971e65b8e83d989eb0120ae6ac5bca2d2f00d68fa6af9c21f289
+EBUILD logcheck-0-r1.ebuild 246 BLAKE2B c5558b50804374ca2de6befff985e05f6e94f2cb94b8384a36496aa19557779022ca3b122723f29ee15e6db574843b9fddd865d40040669f3a9fd13c48bf030c SHA512 4a92a64568f22e474e723c767069c60049f21316bef996897cfd7e91f41c7b47f94535db0626393c352652240ad733db9219d4f20018c6b5c285038bfb9047c8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/logcheck/logcheck-0-r1.ebuild b/acct-user/logcheck/logcheck-0-r1.ebuild
new file mode 100644
index 000000000000..f2635a5ebd27
--- /dev/null
+++ b/acct-user/logcheck/logcheck-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logcheck"
+
+ACCT_USER_GROUPS=( "logcheck" )
+ACCT_USER_ID="284"
+
+acct-user_add_deps
diff --git a/acct-user/logcheck/logcheck-0.ebuild b/acct-user/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 4dfb987a1636..000000000000
--- a/acct-user/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logcheck"
-
-ACCT_USER_GROUPS=( "logcheck" )
-ACCT_USER_ID="284"
-
-acct-user_add_deps
diff --git a/acct-user/logstash/Manifest b/acct-user/logstash/Manifest
index 6f3d012334f3..455b1683ecf7 100644
--- a/acct-user/logstash/Manifest
+++ b/acct-user/logstash/Manifest
@@ -1,2 +1,2 @@
-EBUILD logstash-0-r1.ebuild 293 BLAKE2B 09bbcf8c584c2b718581f7b8a5e6ee473dfc44af0cd1e62aa8530fb07d8099eeac21f569d6c9e6f43a1e5e8839dd8091002f18e4c33bc31e1f010127892b6c8f SHA512 dca82fd0a20d3dac218e9e662155ad55ea6cd63e32d79862e3af6b8659a60676992786db888aaa11df7590607214833d6962f61648f0c400431da7945045e79b
+EBUILD logstash-0-r2.ebuild 293 BLAKE2B d98b5240c549a808fc3e4bee7d8e67e056e6cbec0d38b23cfefb04bf886cacd1932690f27e50d60250512cad3ef24d3f730ba60e4dfbe6bb8ff9fefa9d0b14f2 SHA512 62b3b19461ad7d45b5f79be5793676670d74f8adc5f4920b6a86a85224c8506677b9f8e44aef4042324f2d12c394c7a459d1d5bf6720138e63b07f53deef0ed6
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-user/logsurfer/Manifest
index 60455d1591a2..eec98871be61 100644
--- a/acct-user/logsurfer/Manifest
+++ b/acct-user/logsurfer/Manifest
@@ -1,2 +1,2 @@
-EBUILD logsurfer-0.ebuild 248 BLAKE2B 5ad664de7e44e59446787cb5c25f6fdd252707d7be26e392409a9b71ab83afaac46786596ba2826cae33ea1fa4a7d54d651d395793d49db1e1d4c1492bebada8 SHA512 c9b41ec2cef9d24afd1389b21eaf0b7019da53c71b41e81d98c5bf0ead827d515eafdf4bf56abe5fb5da88d85e2a5e44d8e3ae97c68cbcb164eeba6ceb854afc
+EBUILD logsurfer-0-r1.ebuild 248 BLAKE2B 1fd5264778d20f13e41927655f7fb3df7da082edb9955bf29a29a2ad63f1b0303aa0559521d61c91130746007030901d412dbe2d18e970d0aa9ae17cacab640a SHA512 89590c55c98e6b2f86ec771374c587517ce42b2dadc5b4cb47384946b43d69376c27523e114f8d4bcb9cc77ac2cc11ca6ad8f6487b2524f1d9db9f535d69246c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/logsurfer/logsurfer-0-r1.ebuild b/acct-user/logsurfer/logsurfer-0-r1.ebuild
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/Manifest b/acct-user/lxc/Manifest
index 9e82121c7aad..71d634514feb 100644
--- a/acct-user/lxc/Manifest
+++ b/acct-user/lxc/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxc-0.ebuild 231 BLAKE2B 28c282a5600e0cdb01ed2f9d801a70781af66d97773c15ffba9f4c5c00b826d8890433589e75df9ac118df079a556c681f1731ebb50369c9e9baa2c72de6dd40 SHA512 5002765f63eea0fb5cadb4d79ab498a8599da84c652f09c83c2b3a47457bf18574824b62828aa22945f13b7ddfecc832b79e8c655e40a5cc41f6bbea2d71464f
+EBUILD lxc-0-r1.ebuild 236 BLAKE2B a61f8a9ba72524fe5b2b6c3e50040053668d554e7ec5765eaad42def8a9ceec2dcaf40240e41accb698dce66d5d5b9edf804931e2dc5d2d4d0d6f3d248ee3a1b SHA512 5cfb4bf28f4a20bd0868234d87cec1769bfcdf2f811255a1d08b9f33ff392f8c0e87a6e360ad4ec8aa93495e8f90451555df4582680a681ec4ac4a7a591dc9d6
MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
diff --git a/acct-user/lxc/lxc-0-r1.ebuild b/acct-user/lxc/lxc-0-r1.ebuild
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/Manifest b/acct-user/mail/Manifest
index 2b610791c92b..d10a7725bb86 100644
--- a/acct-user/mail/Manifest
+++ b/acct-user/mail/Manifest
@@ -1,2 +1,2 @@
-EBUILD mail-0-r1.ebuild 314 BLAKE2B c053f680b68219f88e137cbe4a7232589822bf2b93d761541991a7fad73d55bede7471b35022e3f51cc2ac9700221759f008e093f0ada132bf443b53ef0abd5f SHA512 d7a6df92a012278d4a324c92ceae2eb03c76c134c03a829f88b5b34ea36a07a4bd26e42b7d193f8b33f4d1cc9a3819038003da7044717ec0ec8bd817291024bc
+EBUILD mail-0-r2.ebuild 314 BLAKE2B 1d76d95ac1d8c4c9a0f46918c16a118c7504acb96fe9cef5c2caff7515995f8462e34288c0c426c5e953fead231d6670473b5dc63ac1c73a7df014a97ac18a78 SHA512 7d42a4ec0fec4ac9db1f4bed2030ce91daa79a485adb1d297f0c0a9a5f67ed63d55f4ed1e619835629f6894691a40c3dcc9f3f70e01ead3e1ccdbbcc161fe8e1
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/man/Manifest
index 71f7a51d9ba3..9b436ae5cd3f 100644
--- a/acct-user/man/Manifest
+++ b/acct-user/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-1-r1.ebuild 193 BLAKE2B cf86792ba5890257091605e7b8b558c923e5602c1998640878dc9d412790f1b9700db0afe5adcb9220746ae99b2ade1460b57805574bb936cf94da4a168e8e52 SHA512 584da8d06c3489d263c57eb14a63e6846ebf660c1fabbb7d36f1a844b0c837271bff554a2bf4f078d87333f39c27375dca84780705faca010c94e13e99b06359
+EBUILD man-1-r2.ebuild 193 BLAKE2B da384074752544f3a07c7a6d9400c7eb7dcceeb665a2d6513496ba08503aed519c4b520b622795be8fc46e924df33f66d429645f490ac8edba4f235f75a24743 SHA512 7a57c7134a1d2ab1f860118fa861523a0748fd94bddf02c3e13cbd25f4ccb0a287030fc357e007b37ba1a9eb5c9cb544bef644a6ace8e329a886fa2a2d7a384d
MISC metadata.xml 228 BLAKE2B f079847f571a8b1d3a795045c91b7c556e56a6c8ccbdb2104d4e0e5f976498fe3767a5b7d57edd46406b4e81861ad65b52de6b5d8d11d88409c91f158ceeccbf SHA512 982f1dd33d491d63e0a2f9bdf0fa9fe4778abbe7f38017387226101da3674eb242104ff57cbf5553923f35e6a8398b96b7cbd29da8033b7f70e128d67b366516
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/Manifest b/acct-user/maradns/Manifest
index 01f7c010c4a9..aed7db433bd1 100644
--- a/acct-user/maradns/Manifest
+++ b/acct-user/maradns/Manifest
@@ -1,2 +1,2 @@
-EBUILD maradns-0-r1.ebuild 197 BLAKE2B 13a500f10f5173c37759fbdc8011541a0b8df362cb16b1ff3d4539f6a17fad7f4f8de927c1e62efb24c88035cc9a0ae8b66cb8aa71bcbaea311f8e33b50aeb16 SHA512 1bf584d582cdcdab800f1b68c2b6c83f25e0291ed8ae76b76556b7ee1010b3eac670280bc93bef37f68df2e727c500b2399218cef1b7fb6a402566fa068675c1
+EBUILD maradns-0-r2.ebuild 197 BLAKE2B a9064f31cf4f036a8bbbff35968b6aee6e7e968ddf5538f818e336fc3bf548163107cbd7caa6f715fe847dd48e8d38137464a24149470becf38d96aa0e945795 SHA512 943afdd7a55e0b435eaa3bc0b76b6c115a5d91d9a98ee2aac518cc1c4304293f18e1c25fd7c4a7948467805212410af7406410baf3d728f0055acbe478d7498e
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/acct-user/maradns/maradns-0-r1.ebuild b/acct-user/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index c2a756d077b5..000000000000
--- a/acct-user/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=99
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/maradns/maradns-0-r2.ebuild b/acct-user/maradns/maradns-0-r2.ebuild
new file mode 100644
index 000000000000..7448e405ec94
--- /dev/null
+++ b/acct-user/maradns/maradns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=99
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/memcached/Manifest b/acct-user/memcached/Manifest
index 803e33af5322..54ea868b929d 100644
--- a/acct-user/memcached/Manifest
+++ b/acct-user/memcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached-0-r1.ebuild 240 BLAKE2B 54ff736f16e4fb9a9cfaeb6bd6371581b70362886969474d30e5b538b92fc0c92731dfe002b2c1e33e73d94af4414500baea44773946a6a8a6f151df64410f73 SHA512 6c093998424f1bbb1ff4f05447cb61769b5ec7128d00bac5152aab476ecab47aae4f59b67273612ebc20df46c500794e60ab2df5641c68f0a40b760b132abca3
+EBUILD memcached-0-r2.ebuild 245 BLAKE2B 3272490f1470d9330df301adb0267eef0064f551c24ee5d7faa55b4e6a9d940cb8294b8b9739bceec8ab4676b5c3802d3aafe14c4a5da59959bfbb4af1319526 SHA512 67ce619fd252394c43dfb4ddd5d5c854a45d32dbceaed153b1d2bb91042d4ad8116420e17fce9019287b9066168b9f2aea1a1a400f8a03a5403d6f67b986f0a3
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/memcached_exporter/Manifest
index 4d46d43af1ad..d2ed6a6b1397 100644
--- a/acct-user/memcached_exporter/Manifest
+++ b/acct-user/memcached_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached_exporter-0.ebuild 246 BLAKE2B 36b6a2b4ce6b41d06fdbc4cca5dcadff7cb516483f10a9557032c2e28055d5aa086111941df40937e5ce5c5c81bf482aaa056f7caf1a566e9da53744a3c3276f SHA512 d59a3f899eeac7afe04cbe00a9e3ef86407cf97df54bff2fdf1b999664f216b598ad933ca60cacf90b87aaf27cd04a3951276b375576dc62e195e54c70d45a30
+EBUILD memcached_exporter-0-r1.ebuild 251 BLAKE2B 2337a209c4d6f1f44064b917dade5f2d2b511041e3e2a86a2c4f257ee7c6588d644e545a1ec99bbf975cec95c78f03c5fe49d9c15ba08d773c253b73a2c4b6b3 SHA512 97d67933ddcfbe41cf15fc7278e961d4cd388e51a65aabf79d7ee28c4d1a05dad689ce250fdd3d0e43d0f352b8450d92893989064f5a0c83e4aee0566d44c1bb
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild b/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
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/Manifest b/acct-user/messagebus/Manifest
index cc96545abe4d..10be1f6ef3cc 100644
--- a/acct-user/messagebus/Manifest
+++ b/acct-user/messagebus/Manifest
@@ -1,2 +1,2 @@
-EBUILD messagebus-0-r1.ebuild 201 BLAKE2B 90acf8bb1a7bd2ebed17dccdc899a02e2ed9b5eac334f79bdba027d7d14faf2137f54f29dd23f27f25b0382a948ce9015300710dae9f5809bfd61792e8acac3a SHA512 d7db48c87a624d9850081e647d5a2a2f3b5e7d6717fe10d3d0b39740b22ce711a0e1bcd8cb786a93cd256930eaf97ace8b72378da27965324911e7c1b9bee4ec
+EBUILD messagebus-0-r2.ebuild 201 BLAKE2B e7fc8f178823a771166c5a613906e521a383c51e67ab52cc457d2a1a6e73812ada52f653082f03dbd2f901eccf1bdaa7adb352f48d9a16f12ecf1d03a4ea4a52 SHA512 a96a4062c83f9b3f33add68bc0acc07793edf1042de13af0c33520e2c76d9817cfa1431285e740dfa9b1bf0737147fcc00995378425d559183aeae512f52c775
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
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/Manifest b/acct-user/mgraph/Manifest
index 87b10df13346..3e8d05aa715a 100644
--- a/acct-user/mgraph/Manifest
+++ b/acct-user/mgraph/Manifest
@@ -1,2 +1,2 @@
-EBUILD mgraph-0.ebuild 304 BLAKE2B 726678467e20dc66c655c3a5e0538bdd2bb8642cf45858673e9ae73ecfa683848311fc16b343901571629f18998c27f35717431068571b8838670194e8188ee5 SHA512 ccd63bf8331592483f1912cf919eaffc241a50afaadd87ae67bcebc7e2e2594b2d21c482334fcea80965d71adf78280a295e887b1c052d9874d2f84fd3b4e1bc
+EBUILD mgraph-0-r1.ebuild 304 BLAKE2B b9380b35e78be0a2b6fbb45389d13893e22b532f1426fc6ce55433ead51d87c2e820dde589788023a6111a876cc74fcebcbfd695b8846f3b5ae5a18b5dfe6d98 SHA512 5b964bc862dc65584a6acd6845072e89f30ed5165dec362499ece114dffe57e72342af8c298122b3b79187ac5b4adcb046465a279db07556a1cf913a806f330e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/mgraph/mgraph-0-r1.ebuild b/acct-user/mgraph/mgraph-0-r1.ebuild
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/Manifest b/acct-user/milter-regex/Manifest
index cfed5cc98ecf..ccd161d0415c 100644
--- a/acct-user/milter-regex/Manifest
+++ b/acct-user/milter-regex/Manifest
@@ -1,2 +1,2 @@
-EBUILD milter-regex-0-r1.ebuild 252 BLAKE2B 7274e10222867b7f77e28c222d87d0041a3196783dc39ee04c4137e619697c386be910a735e343b2682265a0e5805a89ac0132186118a1014ad2898d7132cb4b SHA512 1960fc8a23f4f3a577421eef45f0ccaef697f576e157e96a3ad8331fe54cbde25268a038e72ee5f9b386bad24babcd7baefdf7580e3d110929a93aa727b674cd
+EBUILD milter-regex-0-r2.ebuild 252 BLAKE2B 33d0740883b3d1ba3cb50f8a9e562e64a81a575113c918013e79b656c72cdd980aa816441d26f9cfd7863ec69c4b6eeb657642a4fb5a83274810e928701d99cb SHA512 559ddad479360fa8d97c86da5956e9c75e1b98d859ddd634c2050451f12e7cc6b5d4a2df6ab90b4db1d2af1c9e6d24e0b40a491ee016a13cefafe66aca9b9d9e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/minbif/Manifest
index f6ebdae809a6..a41b7bf5706d 100644
--- a/acct-user/minbif/Manifest
+++ b/acct-user/minbif/Manifest
@@ -1,2 +1,2 @@
-EBUILD minbif-0.ebuild 272 BLAKE2B 29cd12588f212a078d7c0c197e13a123f1a68106e91d29f76b4428e5910ac47120d45117620f0cd61bdc9c4c97776c86f3df90302b22a22577dd9574c5fdf47b SHA512 f418f468163b2c86c2aba24ba7b4f5159fced08f2312d1a97c21328755a7405b98dfacc357bb3dd1831674d2b0f72fe095ffa81dbf3edc72488761f203d601a9
+EBUILD minbif-0-r1.ebuild 272 BLAKE2B 98598d5c84a6ab2866587ebb41617866977643a51f89432e7fe3eb80504379f7d13b5a33d2a392fad8a61105c0befc86296ccd2509869d130c94268857d43614 SHA512 62b9cc77bb476c240787e56d69ca6030f7dab024f54066e20c24a75e6a5b5bc082f9a6a3226f33730b1efb39f74d24fc4154752012ca6a8a21ec57cabe948f7e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/minbif/minbif-0-r1.ebuild b/acct-user/minbif/minbif-0-r1.ebuild
new file mode 100644
index 000000000000..8b2a8d2ffe3a
--- /dev/null
+++ b/acct-user/minbif/minbif-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/minbif"
+
+ACCT_USER_GROUPS=( "minbif" )
+ACCT_USER_HOME="/var/lib/minbif"
+ACCT_USER_ID="260"
+
+acct-user_add_deps
diff --git a/acct-user/minbif/minbif-0.ebuild b/acct-user/minbif/minbif-0.ebuild
deleted file mode 100644
index e93ddf7c984a..000000000000
--- a/acct-user/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/minbif"
-
-ACCT_USER_GROUPS=( "minbif" )
-ACCT_USER_HOME="/var/lib/minbif"
-ACCT_USER_ID="260"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/Manifest b/acct-user/minecraft/Manifest
index f8039e962eea..809b4b8bee71 100644
--- a/acct-user/minecraft/Manifest
+++ b/acct-user/minecraft/Manifest
@@ -1,2 +1,2 @@
-EBUILD minecraft-0-r1.ebuild 294 BLAKE2B 0f4c2b2327c625f1a07e7e10575f688d6accbeaf40a3b43f1f0eef4ed353828dafbeffbf86cd52801727807bca8885c5eb926ff8e92e9f9775856e47600cfd4e SHA512 5412c9006fd6737120bdd0bfb564a94ab315f892be845f39950dd08f0daacb096614802279eb2b65e80d5f878aeff52a46367bb548a144479c4f6a5dcf1cf579
+EBUILD minecraft-0-r2.ebuild 294 BLAKE2B 465b067d8885082466d839b30f63ac518e7d8dcba9c6b9b5e90f0267a7ee0abb83fec931b588abe27fd5007bbf6f6a15e42e23d4dfd1b2a7025b85449031e34b SHA512 850f0dd8dd92eefe229e6dcb24a74fa73a352339233d342bb3fd9f365f72dd2f8460fff8dbddc5e1792db12be716d23a9f9fe298d3c472d2718acda3f1de6eec
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/minetest/Manifest
index 3488b5272782..daad2ef5b77d 100644
--- a/acct-user/minetest/Manifest
+++ b/acct-user/minetest/Manifest
@@ -1,2 +1,2 @@
-EBUILD minetest-1-r1.ebuild 279 BLAKE2B 28b1814d4644e4c2eab068b1d1e59471c290981531a7d7ac4bc6e4bc25a3a900e502904f6b3f8b86809a7a63b523f011f53a0656a41ed9eb6896267378d94c6c SHA512 974c3eb1106438f42301d11289243995a4ae3cca1661e5fcb1267fbcd1b6725f98e6f5760588e1f5e6f1054542242aebbf91ec03a516a14631db5a2928e6ad58
+EBUILD minetest-1-r2.ebuild 284 BLAKE2B dce3bb1396d8c41cdcbf6acd866b53940ae8518b2f5c8db0c903112aefc808f882dd061ce8a442741416c1775e7c9aea8da2a8a3feba92e002140041cb4e5b64 SHA512 d7f7ee3cf4f7bec27a32cc9c6c5d12d2766eea13e1d2116c11c80b085b42ec4fdbc44bb73d5646d7cbdce827319be459b54cceb9bc6346b75a2a58519524995c
MISC metadata.xml 360 BLAKE2B 4867d8ae1f68605b01a06a446474bf19088f0cc57c5b381dd3af707e32bb7727c348b2c59b4ff654551be2ab78ac7ded05a0e258d0601740d27c058bbc08e863 SHA512 db7554cc1f206ef22ee9748d3102d40cb5b1085f5acf3f2cbd732ea11e122da26d20d2065d7184ea4a6b94105b4e53794af339c869f5432cc005e46b4b506545
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/Manifest b/acct-user/minidlna/Manifest
index 5933b16fa4c3..eeffb7354151 100644
--- a/acct-user/minidlna/Manifest
+++ b/acct-user/minidlna/Manifest
@@ -1,2 +1,2 @@
-EBUILD minidlna-0.ebuild 198 BLAKE2B 9dfa79b694cd9b23e2cb50b4eea091bbc533ea42d053208fc49bec8aff43acbc5b184a183a1014c37861249573ce4874a43c0921d03adc9c19b05840373b4604 SHA512 4c75e147c1a6b2cdd4be6f9558144f0e9902ebb5daa77b3b50e30cbb75bd3ed4f628e63adc8090c305f30becce068db60c99e4278bf6eda310a37226829e7298
+EBUILD minidlna-0-r1.ebuild 198 BLAKE2B f5bd83f3df77a07050d4a3c2bd4ea00914b1a712a677bdc0a44050141c05332167f67c3ce9cfd73c76b117d8968a6b7e4993d14bceb7e88d41d6c861bc0e0981 SHA512 7b8b7f545fe20dfd8ff26a7c83a0088e97e7e88751ecd8170659bb4f00071e9c8e7628c6241916c0eb25a8d9aca7111dbe5a21f758424543d4eba24badefe0c9
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/acct-user/minidlna/minidlna-0-r1.ebuild b/acct-user/minidlna/minidlna-0-r1.ebuild
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/Manifest b/acct-user/miniflux/Manifest
index 05d4a862a29d..551746a81364 100644
--- a/acct-user/miniflux/Manifest
+++ b/acct-user/miniflux/Manifest
@@ -1,2 +1,2 @@
-EBUILD miniflux-0.ebuild 238 BLAKE2B 01e2fe4fd3a95de3cb13234d89427968255e40372b2193d6a357ee6a587d5b8cc8bba968826e61a6c325c2da1ddc002adf0dc07c40353f3fdf14129541380b69 SHA512 02599dd8d9bf95f29087aec2c77b989654391b0d6fb68366b2d6c1e2f31f280758852aea2fae61ea601bd20b7949f22c2dfea77b0935a5aeb5b00103cbf1706e
+EBUILD miniflux-0-r1.ebuild 238 BLAKE2B 66f61c4f70fb9fd604c9e5bd2781b46fe043b4763d25273be13b7416fb16b8b07e92cb430829d634de58038b4736bb808445fd5925bc874d2ee2b8b5e23d5c8f SHA512 0560065e4708e2cd55b2f506dc127ae6d5773de433fd7204112819564deaff320dc0064fdf72f45203a864fa01988a406e11e2b6f26a0108c4aac05165a37898
MISC metadata.xml 253 BLAKE2B 894a7b03d1a84d9f92bf6ee4d3f48a672a8cc36c505763b02c63280a8b6655aebce347245da9505078457167c207380cd8d5a8dd4ce31a48cac2c1b7a1d31d8d SHA512 0ac515844f89835ebb3acc9b771e502be5cf81e9eee85f00da8a20d51ec2b92d6874ca1412421b46b11ce2387abccae3520a0ba0f56ce044b487e6c3d8eab4d9
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/Manifest b/acct-user/minio/Manifest
index 941d46771b7e..dce2a9bc7613 100644
--- a/acct-user/minio/Manifest
+++ b/acct-user/minio/Manifest
@@ -1,2 +1,2 @@
-EBUILD minio-0.ebuild 257 BLAKE2B 930d70f38781e2ebf6feab216d4b5913ea615e77bcae1702dcd9d23bdb81b7ee6ec4b2e3d63687c89f2ec9e93515566678dd0017ef3dd20e9eb7f564d99b5b9b SHA512 2c4b6a1f2c94a2d3a9575529ff66223c9c29aee5cfdfcb1af55648df25dc8b45d8b61a171d3bbc1c5861dd8f587be622799b194dc190b3e4021d52761e509476
+EBUILD minio-0-r1.ebuild 257 BLAKE2B a1af238c427ced933f7b70304c4a4fd63a4ac863579e1d5bdd44c3268c2738157c5e77d0b7d8e6d21c373e0ff1d2f8fc15e5616534021f5d503f501496df6562 SHA512 672ed14aa3a00c45c6e2b8b5809b3d58a8dbaff91489e879dabc17149f0c92ea662c181812f9064ea3566b08cf0374c1f954af2b2c85d1bf39481811c57b0b1f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/minio/minio-0-r1.ebuild b/acct-user/minio/minio-0-r1.ebuild
new file mode 100644
index 000000000000..4efb67950a9c
--- /dev/null
+++ b/acct-user/minio/minio-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for minio"
+ACCT_USER_ID=309
+ACCT_USER_HOME=/var/lib/minio
+ACCT_USER_GROUPS=( minio )
+
+acct-user_add_deps
diff --git a/acct-user/minio/minio-0.ebuild b/acct-user/minio/minio-0.ebuild
deleted file mode 100644
index 1c8765edb840..000000000000
--- a/acct-user/minio/minio-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for minio"
-ACCT_USER_ID=309
-ACCT_USER_HOME=/var/lib/minio
-ACCT_USER_GROUPS=( minio )
-
-acct-user_add_deps
diff --git a/acct-user/mogile/Manifest b/acct-user/mogile/Manifest
index c1c9f575bd2c..50b223d8ad11 100644
--- a/acct-user/mogile/Manifest
+++ b/acct-user/mogile/Manifest
@@ -1,2 +1,2 @@
-EBUILD mogile-0.ebuild 248 BLAKE2B 005e3c1ba7f949fe13237176655bb5f7a9a39cae5e9d5f28ce6c905eb59af0ca0e02e3f8c628df7e035166b06771d0dfe3020df5c042d2e2829643c82c06c90c SHA512 f5847b5e4527d3288e7c59760eebab26927f85fd2668e6b8a6438170f5752bfc0a4fd8a83edbca1d7cb0cede2a307322e22bc6a2fb0ae7c0a77ecd3e0f85ff57
+EBUILD mogile-0-r1.ebuild 248 BLAKE2B 10e86681e5c8ebdaf49d0a9db8b8a520e7abf6d4895d5d7a86a652ca0e89bcb8b6808f704180ac0c70be974f15382e0b6b890eaf7717f735f0df93a53741c762 SHA512 5b59ab186b31245c6305018c9ab3436bce4f646d7c1e2b7b793098f50af8408f31cc6eaee391841d56e3fc82d6ce22992e381a154a035728eeb469eb461bf7a0
MISC metadata.xml 296 BLAKE2B afccbded98b241e31d1d4810d0213d05e04f65e55d77540618e3508976acd9cb381c5ff54ffe36d0d88da75c22d66b0df4b785c33fc5b3f5a8c6695f1ce207ed SHA512 9ee502a57c0e4eb85ae2a1e8b0d6d2a3ba2d8e96d22610728441201d1ff4050b447a194f0da401e33c7e4ce91b5abf04b85f08e70c286e2c739edda5aa4dbec0
diff --git a/acct-user/mogile/mogile-0-r1.ebuild b/acct-user/mogile/mogile-0-r1.ebuild
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/Manifest b/acct-user/mongodb/Manifest
index d24d2e838684..3ad98659a15a 100644
--- a/acct-user/mongodb/Manifest
+++ b/acct-user/mongodb/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb-0-r1.ebuild 290 BLAKE2B cf28a1b81945753e527b376fb8e548269160ddce9e09d4f79644dfbf2d6ae61a904414ad4c80b2b817262f96f82efb3cab2807940443bfe3197989d1105ffe4d SHA512 8a9135c178eab42341fcd88e71a7965c1916e90ff37f5f8849bbe14cacf13bee322dff99efa7ec900982fecef7b7cd8acf85885ec5f72e4e3d905f8d76970998
+EBUILD mongodb-0-r2.ebuild 290 BLAKE2B abf5cf954ef476302a3d84d9fb41336180c7ecaa6f30c31ed95323df76cfbed3684dec957670e85732cbef5a9c82202fc1b1b33f76d512111d1adee0a4d88a89 SHA512 520905f907942f0723118bd5796f4d27cecd67c9366e9b30996322173b2fbad6398f60547a910867c8f38aabeee3c3e9b18b629247f1d35ade6751d78bfe2d93
MISC metadata.xml 506 BLAKE2B 914c508b2299ec351b57287f94ab25b016f8f6459a5de86da19b40850a9a90c364218a867589963d471becd19c93b73adb668787aa0134ffd2005b4d39fca7ee SHA512 d94bdd1e741af6d113f86aa60e837c3249ec74f11c6878a6932ecdf8c420968e2236a04bcca8e33ae77d7fd3029e7dbc78054167ef6feebfcab998ca527a677f
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/Manifest b/acct-user/mongodb_exporter/Manifest
index 00c9ecdd8d97..42bdb626f6b1 100644
--- a/acct-user/mongodb_exporter/Manifest
+++ b/acct-user/mongodb_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb_exporter-0.ebuild 242 BLAKE2B 7f44a0e6ee259bc39eb51b0d81ca6cb706c0c0b0d6902f25e09ab0645784ba29c48e1659efeec37281fc38f859664e71d80b6d2a49210d8a01500082203fd903 SHA512 df236caacf0c6c2cd867b9ab2fa4cfdaeaa10b921c83bb7923a5b8bae347fa022fc7310a084f55f5c56f9fa84dff3e630310e8eb300e3440bd5db3d478c74efe
+EBUILD mongodb_exporter-0-r1.ebuild 247 BLAKE2B 59e643c72d904de72a745c2a858512ce2365b40ae262e5d4a750e481488e1a28cdd0523b1cf1c4aed5fc8296cdc489d6634f01caa100474e01f83e7bc7cbb7f5 SHA512 d80bcbe9a96f524a89bbfc82ba0a777cf1669f81bbd294a277e2216bbcb59eaa0da93096940fb820b29ab8bc95b6488211d816ecf9b9563c966ebaeac7e51784
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
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/Manifest b/acct-user/monitorix/Manifest
index 88b6855fbfaf..4f9e29842eb0 100644
--- a/acct-user/monitorix/Manifest
+++ b/acct-user/monitorix/Manifest
@@ -1,2 +1,2 @@
-EBUILD monitorix-0-r1.ebuild 236 BLAKE2B 28a4e45994bdb4eeb08078aa6adc9b3eb9beb3051fce870ee5c47fefaf33d90cbc1c60ac047b7687d405e79cf821daf50a4fd45c857ae96b3bb26116202115bd SHA512 634e23889b5eaf9edb79285401a7ac2274a1524f882ce1c7bef21f83327d45dc8beccfc4f7184aaf6595a229d99a136d87064ca09322c8653549abc35da2805e
+EBUILD monitorix-0-r2.ebuild 241 BLAKE2B 42561489bee2492e1dbd40f773805737c01d60281393887d18dcc495f051b3e4afbd8602eba18f507da000f754d02cbdd6895cccd581342e985b29ea7e806dac SHA512 503b8dd6a4411f14b0589dabffd07b612a006c959087c9fb2cef537c52f511187bcb673efbf62a558d870f700b9c5c9051d5bbc1385b31aa6c0439868a30a95c
MISC metadata.xml 391 BLAKE2B 9ead41308785d3c5c7733cf997c688ae1ee8584c5eb379d8a03f14921a7597aa28951510c0bff8d5a0ec80df5b13864f34dd2b2ed962ddd870b3777187b0e09c SHA512 af160187c0209c791cfd8d497da9a9ff4b6fc3762300e309d5d75df2571fec2b52bdba990b2d13667d3fed5cf50e6d3938b70683e53d0937adb15e4897ca49d8
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/Manifest b/acct-user/monkeyd/Manifest
index 5389643697d7..3e55c99e0190 100644
--- a/acct-user/monkeyd/Manifest
+++ b/acct-user/monkeyd/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeyd-0.ebuild 310 BLAKE2B 3408231a1f46ad33dfae79549ba592efbd84044edd817d14d59f9d4b0f235dba36da046ff5e88c3b0676ca42decb0eb59f815c32f4ef30330300e7ec7dd89a65 SHA512 14493c8b57edf791d541d9ba854a9963b7df7c573b4b04c2668c55b4dc16ccb3f330494010bb6950caebf268aec29ed6d12487203507acd6b61ed843a6b86a7c
+EBUILD monkeyd-0-r1.ebuild 310 BLAKE2B 35942e5b491f5c2c15fd8bedf967a3d98c1acc362bed5086f42b735f655b8b4f4d82bfc23ad6bcc015cb807cc9e7452a2ba73634e64039a1bec28310cefb793a SHA512 8a6c5b1024ffeecbabbc27d5b5e8c8783970d02166d4eddeadc26997359c3f987c364278b5169741ab5633da112dedd7cc6288e12872a4c1e19bcf9aee054df1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/monkeyd/monkeyd-0-r1.ebuild b/acct-user/monkeyd/monkeyd-0-r1.ebuild
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/Manifest b/acct-user/monkeysphere/Manifest
index 1f121c5aec31..f6fb0a361be2 100644
--- a/acct-user/monkeysphere/Manifest
+++ b/acct-user/monkeysphere/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeysphere-0-r1.ebuild 324 BLAKE2B 6b77633672fbaeac3db76cefe36698cea9918f8e8a50a3c9cb69d1ce16482963421d962ce8d5db22f6ec107024342d9a4cad6874fdcd99126598a4bfd8c191fc SHA512 64a521fd9a4067827e479194b9fe8238749bc0f084dd7650b7123631a6b1b6137575e8da05396bd3c6bc75deac7d2257a5770670d2f7fc64773ac23663a71e1c
+EBUILD monkeysphere-0-r2.ebuild 329 BLAKE2B c3fb30a691bb0d2640cb1b066e87a0a820c37ec046dbca5c5322f244cbc929be422339afe1660204d81bd7ecfcd482387eac9f6cf1358b1a5f91929c57efc4c8 SHA512 ed34d58c9f6a852e06da1df991d164935546388dfb4fa683ca49c938576cb088c8cfa09d4f9497c4039f09babc67ce63ba43b4bcafca71c83b7d7b4d571c7499
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/mosquitto/Manifest
index bdc234550619..b865e9b74e24 100644
--- a/acct-user/mosquitto/Manifest
+++ b/acct-user/mosquitto/Manifest
@@ -1,2 +1,2 @@
-EBUILD mosquitto-0-r1.ebuild 251 BLAKE2B 0da801820587e7252c41e0e1880eed442e1a483e854790c12fac4e66999a68fc71923721bbc58630357f04e13ccbeedc797df26c39972dba8629adc22f5dcfda SHA512 c5f611058e18d9ed366156e19258e02eb9c46af2187f1430242e002da7420a0c1d9b82252f882c9f25de0f89315db95a27af5ee1c232496428ccde60d0bbf0a9
+EBUILD mosquitto-0-r2.ebuild 251 BLAKE2B a892230256421020d539c235a221b54033f0b5464d112596f5a6c801cb89b7067b365528fde2079cad3a9474424805de37cb22789e3022738e9efc82950d1858 SHA512 62fca076f93f8bf149ebe2a097e8c188e78cb1a75dae22ab0f8f1efccbbfb227fff9e9761c241904c9b95c5b4b170241ec8f9709ee59b5d2933d85063aaff537
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
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/Manifest b/acct-user/motion/Manifest
index c4e9d353d49c..83e24af9c2ca 100644
--- a/acct-user/motion/Manifest
+++ b/acct-user/motion/Manifest
@@ -1,2 +1,2 @@
-EBUILD motion-0-r1.ebuild 268 BLAKE2B 8f46b51f52ff016e8c91862eb708e05ae4697c88e60b71b3f32da32538ae1dc7d581a593c6203aec764a52e0e6e36e9c1d3d1ca47e78b288189cfecfc15ae33c SHA512 3db269c8739f01541a6b78124f45bb020ff77372f9f99d496fff22e99723955193d6f43e75fb0abcad41e831ea7d693ce7ee2fc227cbba537a6e57860a58e4d1
+EBUILD motion-0-r2.ebuild 273 BLAKE2B c73b67352db3b848d9544fbf8054a3799ef8ffd23eca291dbccf4ab7613afca4f9b10e6f0fea80999bed5b01dfdda56b18d471e720974061fe0c4f8b89a1ed3a SHA512 ed5aa548cc7c541dd9fc70b98290a0740aea74da718dffa38fcb35d02d3aa3e0e164b01eba0d73afd914e8fb7b114af59b5952003c5124bd15b52576dbad1ffa
MISC metadata.xml 396 BLAKE2B c23e0428f6d197596409734471aebdc88231ccdc6abf3b132414ac1c4a2aa933017b5d6368b018e8e91ca1c01f38c49933af23888f2a6eb3b9e333eee0677d81 SHA512 c5fbc86f53d46fda14e9268883cad59049f01e2f356185af9a0d0ab8d5e76de69923768027bfd0d3fe02af6af2c008adcfeed20f3d312a8bf458fa655376d19e
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/Manifest b/acct-user/mpd/Manifest
index 4897522f7629..5f5c92317697 100644
--- a/acct-user/mpd/Manifest
+++ b/acct-user/mpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD mpd-0-r1.ebuild 274 BLAKE2B ce5f2a0b9b442b3749bc8c25a213d58813ad809cc3853268358333f9efecc39f037beac7fe3709521e91f951538eb9c7b06a749ac7dccf5065f045858bb71e5b SHA512 2397cff726b2c9e173e30399efa6cd4160222fc403135052943204b4462e594a067c1f291281f69e757950706a160b6dc9e07e2a0e53c417aebeb8ab4724ceff
+EBUILD mpd-0-r2.ebuild 274 BLAKE2B 0482e6f5c1b4cc634ae18e54695af58052500e91fc5957f3e9360c635e820f12002084a3d10e01dea3b2fa0783f282479baed28e84c7ca41ef370f85b1a39f9f SHA512 77beb3f6b29d316cb66f82dc17fa8ad6acce79a155a980b7a408c45ff6c2f3701ac43a154191e5f4a3660ce67f65ed30cb287fc12cb9180ae32f5541c17f8595
MISC metadata.xml 371 BLAKE2B 1dc95f39908a3eaa277959b6434e6167edde97094d80c15895328586207abed46ab15e2aaf48751945f62888442279c9832fae1f5276c276522239afbee1c68f SHA512 79dba2ab8e6a18dbd7c10d95bdbb7a0b2bd8b639c98982e1cd325a5709b9984d713cb81c639165b4055a39d4993f44a746dba9db87f0f66acbc3b34d6f210103
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/Manifest b/acct-user/msmtpd/Manifest
index b7e1a12f927b..02b7db6e69a7 100644
--- a/acct-user/msmtpd/Manifest
+++ b/acct-user/msmtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD msmtpd-0-r1.ebuild 233 BLAKE2B 73058a412dcbc565df094705059329c3a37776909b5b1f9e0883283b71be17da92c9bbe8efb729f4e71a60ceca28474e55d0f4cda8ec6e6ffa5cd1a970996be0 SHA512 6372ffa6d1f65d3ce23d088a694569fa831001d56ba9095d28bf85ff0ecadfa72335ac5c0e87532642c1cf98e581524f1006d4d0fff023d06520914e107d3066
+EBUILD msmtpd-0-r2.ebuild 233 BLAKE2B 7004b36415ccf8c982104a4dbc66e27e6cf198d9e9dee662f134ff4405977aceae7f59739948fe14d19dca9e5158d30a287aad1e39a8049ee477565f0cc2f890 SHA512 e6e12ab2894b7baef6362b752419fa2e77ec728f9384927f98b1d84a4cc15991f7a2a41a4282d3f6959781e494d705c74d30ba50bf9aff78f53d5686edd530a5
MISC metadata.xml 228 BLAKE2B f079847f571a8b1d3a795045c91b7c556e56a6c8ccbdb2104d4e0e5f976498fe3767a5b7d57edd46406b4e81861ad65b52de6b5d8d11d88409c91f158ceeccbf SHA512 982f1dd33d491d63e0a2f9bdf0fa9fe4778abbe7f38017387226101da3674eb242104ff57cbf5553923f35e6a8398b96b7cbd29da8033b7f70e128d67b366516
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/Manifest b/acct-user/munge/Manifest
index de869fde4564..c291391c927a 100644
--- a/acct-user/munge/Manifest
+++ b/acct-user/munge/Manifest
@@ -1,2 +1,2 @@
-EBUILD munge-0.ebuild 273 BLAKE2B a0ef6e47b41a87865bcf3480c9543b84d0cabe79ce444e02e1cbabebe555db2fcf4a2854074f0f34b2d56e3055e009c812ee3342df4a531915a7ea6ac62b0cd6 SHA512 f69b6f4a45d2d851a04defa6191675a3eba9b1b088f08cd8b60af5cf1b9baa0a72c87448b523be6c5b5fe43d6792304ebbe2cd51058670d6db00b79aeb307e2a
+EBUILD munge-0-r1.ebuild 273 BLAKE2B 1ad56e71b145cf784e52d8fb7ffd00cf99d05083a871b1e9f69b51912137a71b1b245b6949763f04aac1f0c67e6d0996bb328bb976f8953dd1903b819f671b24 SHA512 9ca1d68ea3922e826b6a5e594d0fc7f7ab8fad6e8f907448c074f2f14bf62566222d9b9b30cf7b18aa6044ed7eae3ac45d416fb82258c679071f275d4d74cf3e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/acct-user/munge/munge-0-r1.ebuild b/acct-user/munge/munge-0-r1.ebuild
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/Manifest b/acct-user/munin-async/Manifest
index 1c4bf9f3f460..57e7d6ed6fcf 100644
--- a/acct-user/munin-async/Manifest
+++ b/acct-user/munin-async/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-async-0-r1.ebuild 307 BLAKE2B 9c9b46307d17ce85f68d63c95723bc408be957c8d060430cd54894eab474ca043ad181ab3200bb4536c49d9b8ff3e3a7d821d56119484b69804cad58f86a8129 SHA512 a7f4eefb2a2f298abae6c6920f7632c5fe44849b0d69bde38f51ea55eab4aee31e72a2b79e817f13fe6f2bcfd1607f2ca0c960e04d581a5db0dcb087cb0eea64
+EBUILD munin-async-0-r2.ebuild 307 BLAKE2B 9c9b46307d17ce85f68d63c95723bc408be957c8d060430cd54894eab474ca043ad181ab3200bb4536c49d9b8ff3e3a7d821d56119484b69804cad58f86a8129 SHA512 a7f4eefb2a2f298abae6c6920f7632c5fe44849b0d69bde38f51ea55eab4aee31e72a2b79e817f13fe6f2bcfd1607f2ca0c960e04d581a5db0dcb087cb0eea64
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
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/Manifest b/acct-user/munin/Manifest
index df56e6cd61d3..26ee85c9209a 100644
--- a/acct-user/munin/Manifest
+++ b/acct-user/munin/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-0-r1.ebuild 258 BLAKE2B 1f3c980f0e5d2f817473bcabcc6c094b6defe24f14106ee487e0de1b6694be547a1d89f67f575f24b1b9f45a9f9555763778327a6709147a59c99cd38a5b51a1 SHA512 50e2f8d063058834842d70a06851e5c04416d5affd9497d6e72db3c2b9be3162d06620fcb630dc7061d4bfc656974ed86d2a7ddbcf2e19e4e62e3a86781e4245
+EBUILD munin-0-r2.ebuild 258 BLAKE2B 1f3c980f0e5d2f817473bcabcc6c094b6defe24f14106ee487e0de1b6694be547a1d89f67f575f24b1b9f45a9f9555763778327a6709147a59c99cd38a5b51a1 SHA512 50e2f8d063058834842d70a06851e5c04416d5affd9497d6e72db3c2b9be3162d06620fcb630dc7061d4bfc656974ed86d2a7ddbcf2e19e4e62e3a86781e4245
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
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/Manifest b/acct-user/murmur/Manifest
index 481df5863389..852181fee6cc 100644
--- a/acct-user/murmur/Manifest
+++ b/acct-user/murmur/Manifest
@@ -1,2 +1,2 @@
-EBUILD murmur-0-r1.ebuild 322 BLAKE2B 68ff555c46ac47dbd3b2062efc2328f095338f79dc9b4fd788b16c52b7040af98c44648450991ca6426d975f91ad533698b024b0d117bd5a66b538312b60bfa7 SHA512 bbff61b4c9fc49e57e16f252e8fb59926f37c57ae0237a7295c44cef20ec85ba68080d8ac74b675d0e762ab3b01b1b1d7ce07180e50b2a2d0860bda40831bb9d
+EBUILD murmur-0-r2.ebuild 322 BLAKE2B 82014234f093bd1b5ee878daa113a23e2df6b5251b1f6fd4ccde10b31b01c6c37ad44c79e0120b7d574ee80ff0e9b71a0cf681253b7eca60ae542dea083e7eb7 SHA512 8aa909aab348b573d146ebce6fbc3e5e5a5642e1316c0995c92996e4aaeefa23698a90fd0efef6b48c625f867c61efe5c7d19a3ce33060b5f9589a469c52e4e2
MISC metadata.xml 259 BLAKE2B d393fe53508d06da051d73863657c1cf9f63ba80d8217c3c17ed754a7e652bc90be692dbb619d2a5e3e1d0dd258a6019c7b9a7aec0597bcc0f63e2f16c60774a SHA512 3292858f61d9b06b284b4cae18383cbd9cacbee726291402e1b3cd104f9498dfeb4074c6550ff64b5ef374f40d3d329b04f2f3010be782ff06e896d4c666c925
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/Manifest b/acct-user/mysql/Manifest
index a85e126b2b67..3fc3ebbb9760 100644
--- a/acct-user/mysql/Manifest
+++ b/acct-user/mysql/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysql-0-r1.ebuild 236 BLAKE2B 9068d4a86571ea5369d11eab6dcf8afdf9ccbf4a6cf2be31fb04564962e8ac6832f35b50a0b3821fc35da9c7e3588f833cf762b12d20677239817a88ef1f4bf7 SHA512 0be5ea55777d17fb5452260a0a7725e34f595fe39b98c5c683227d208fce80293c7fcaeb09e0a582e2bdf701e4234f12d3dc5469b5055c18c8b0d1a1b1c30e29
+EBUILD mysql-0-r2.ebuild 236 BLAKE2B 227a164350eb7c610faf4ed206620fe105da0ecf4a7b08d7d80d10eb57e9d4e17230931d2b53c2dc7aed86a7634dfc4466a8a631b76727b4a522a24fde25073a SHA512 7022cb81c69f1c2bc83ff8866634b692e70898c45a4efbe11d65d8049b97aaf5cce003e91acb64932d23e55b32c05a18f20b30c2e7ca3a21338b11b890f7fd16
MISC metadata.xml 258 BLAKE2B d72173be6096a07ac4d2cb3e8cc161e6d817e7bf3f3b87c82c8c490403d67487ad3f4d65edb951b3a9ddfbe38a5c2a28b335436fd14f7af773d630a61d34f2e8 SHA512 25f8d8e566c979bffdcba13749feacf7d50ed10ec9099018bb18984d97dafbadb4787b4e49e618658390afa31c86531d08d27e13ff8119a39195d6dde26d9b6c
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/Manifest b/acct-user/mysqld_exporter/Manifest
index eb27dd9ec399..b44a16d6f792 100644
--- a/acct-user/mysqld_exporter/Manifest
+++ b/acct-user/mysqld_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysqld_exporter-0-r1.ebuild 302 BLAKE2B 55a765e3055710d4e661bda33977238aaaf5cffa32af93c3d4714b10b83a3f7aba0d90c5ba68875f32476ca9736be2a9ac0652b88265a674d681e8fd7916597d SHA512 a27598a1e27403a17d709b48c4e7a212a954e60dfa85058fea2bfdded3fd77cbbc47f815df6e02711eb766b9ed7354fe7190412604b94aa191794271664157dd
+EBUILD mysqld_exporter-0-r2.ebuild 307 BLAKE2B e02791a1e387f58c5498ee8b68b505d311c10a3b6c403b2db80916171bc8221f06db715d227091f554a0dfb8d3a83d42b90583af8b6edd74e50a38b9c33c93f9 SHA512 20e68014a5b43a3e7c2048f0634b56a2845647c032f17d5db1f4701306062efcb49fdf18aa58e460995a09bc0aa2c7466442ab95277ca465daf253e9f6788fe4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/mythtv/Manifest
index 56550e9e7952..22a0e18681fa 100644
--- a/acct-user/mythtv/Manifest
+++ b/acct-user/mythtv/Manifest
@@ -1,2 +1,2 @@
-EBUILD mythtv-0-r1.ebuild 328 BLAKE2B d643663b87de960ddf934c0c3d8364b9ac63f3103425ef066c7c6536c4f026463383beecb53599c539cac266f8ff67d515eca5723f96d7f97f05c3b7d9a9bdf9 SHA512 4946f8af3e14eee96942486dc8e48da04d11bd6852688b6cfd5ce2fe91c5fb34a3a2d7a09fd242ecc0c40912a3118f96f1b8c97ee27efd17342af0c4f3ae2885
+EBUILD mythtv-0-r2.ebuild 328 BLAKE2B ae33da77409fa8b334fd736e20a1f8cfc5bfd12e54945cbb70c3c9347c6648148ab8bb1ad088fa213b231f9989cd14d0e6338387667f6410a654d2e5e3fda118 SHA512 34749afcfa6a3833530aa030fa8f2bf304b64c546f4523887dea56a98a25bdf88032b4d6087df2344f4a7f2ed7a157eea8403ce1dbb3a76e2f376cd81e2d8540
MISC metadata.xml 412 BLAKE2B 269dbfe3205f3520151a0d18ab4d2b8a1854a85020e0246471c4ed78dc7f57d7dab5dee7fe0fe12de2505410da9221183267ef9f09c6f903b5b1e4feaf98b4aa SHA512 093a35b0ee0dfbb9c841467bdb78c52699c712e94e8965c076a98be872f9a7cf545b75ccb8d44048488c6ec6d169c8c3ecf198c7e551f427bb9e0940102c054e
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/Manifest b/acct-user/nagios/Manifest
index fe64f3f2609c..2758da056917 100644
--- a/acct-user/nagios/Manifest
+++ b/acct-user/nagios/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-0-r1.ebuild 198 BLAKE2B 00dd014fd07d522c9c507a2e14b25068c7ded68f6627df9529eda4741cb5bd586ad575595d6fd3cf587b91751edf58a0b4e150ea400f8c4307f2a9df21b3284f SHA512 36cc74b548b4ce0b0df80d8c895ad77edc768bf7fd2369bf8eea984f5813aeaba939ab28cc87d65c731dbd19c5943b43c885bdf1f106e2b69818738fd6f61a67
+EBUILD nagios-0-r2.ebuild 198 BLAKE2B 695ac63b4a5be5ba88fe12d8d2f88adeef658341367c55d788a5fba43976fc7755b30402ba7a36568d4059b34f332a954b3207cfc85004b68b531efd29635cd9 SHA512 00261d93d998d70784c7648fc08cb5aba514be22626dabba8c37a3b5e1627eca04458a71e5bcef52845c40644ac399cf972ed8e1925ffbccd3f52dcdc47b7298
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/named/Manifest
index 0eee47bbc2a0..46ebc6a4dd69 100644
--- a/acct-user/named/Manifest
+++ b/acct-user/named/Manifest
@@ -1,2 +1,2 @@
-EBUILD named-0-r1.ebuild 257 BLAKE2B dba42a909f8cffee6cefe3c7857b4dd51fee0edcad28ed45471795ae0336583f03087c8e22b04c9909577a01154eb19bc3d0587ef763aafdacd8764e9d2f088d SHA512 7fde4359acfdbfd1dfff4d823ba198c127421d2e6bfe2d8b6ef14115d750d568c247e2bb874e4edaff91288da59d30411888056f46fcbf6116c362a296c35643
+EBUILD named-0-r2.ebuild 257 BLAKE2B dba42a909f8cffee6cefe3c7857b4dd51fee0edcad28ed45471795ae0336583f03087c8e22b04c9909577a01154eb19bc3d0587ef763aafdacd8764e9d2f088d SHA512 7fde4359acfdbfd1dfff4d823ba198c127421d2e6bfe2d8b6ef14115d750d568c247e2bb874e4edaff91288da59d30411888056f46fcbf6116c362a296c35643
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/netbox/Manifest
index 09efcfd7b867..775a5a2bdf0c 100644
--- a/acct-user/netbox/Manifest
+++ b/acct-user/netbox/Manifest
@@ -1,2 +1,2 @@
-EBUILD netbox-0-r1.ebuild 253 BLAKE2B 4d2ff7e46f1dfe8c716fd4c20cdd4079ef221a72d3d8cae992b3442e7a73c398807015077d149183a0b19c1d905a4d06de31be7bc766dab74f54e99fc2bb44ba SHA512 05eea396ec881818c31ee5a421f3882fc4e24e2c50518b997e951671523fe9d4638081517dd4616b8aafa8f3a6808f8de66c35b9d2cd53c89cd77321ed4660fd
+EBUILD netbox-0-r2.ebuild 258 BLAKE2B d4638b5021a134eacf9ab2e11d9a6ef0dc28127f00341d87d65c2005cad1c6a69c900c425e2459d060e707d00b8a0591d0b5f17c054104718b320c21c155de4f SHA512 58ba3083ee3507da2f23de53563517ffd02919caff31b9ce6ec82fa7164c7ae66ea472d29d9a568d845d19b9b7ea77a451a135520706de6754d0fe137faf57de
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/netbox/netbox-0-r1.ebuild b/acct-user/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 1d47bf20c233..000000000000
--- a/acct-user/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netbox"
-ACCT_USER_ID=431
-ACCT_USER_GROUPS=( netbox )
-ACCT_USER_HOME=/var/lib/netbox
-
-acct-user_add_deps
diff --git a/acct-user/netbox/netbox-0-r2.ebuild b/acct-user/netbox/netbox-0-r2.ebuild
new file mode 100644
index 000000000000..ee94820335d9
--- /dev/null
+++ b/acct-user/netbox/netbox-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for netbox"
+ACCT_USER_ID=431
+ACCT_USER_GROUPS=( netbox )
+ACCT_USER_HOME=/var/lib/netbox
+
+acct-user_add_deps
diff --git a/acct-user/netdata/Manifest b/acct-user/netdata/Manifest
index 8b267921befe..b8d3c155fe95 100644
--- a/acct-user/netdata/Manifest
+++ b/acct-user/netdata/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdata-1.ebuild 255 BLAKE2B dc6f008152244bcface104af37fe191c781e461d6739c40f00434dcd92b74543a1f45a9c20bce45af1fdc40ad0d55afee95e2c109f7780c02b2011b88c3ff97e SHA512 761644d4a0acef85d47b2785b4ca8829c2eaef27675c786c80491826f923ea86af0074fa249031b117ef8b8d8e7df1f0645b75abca5b426b2e08c6c7eeb992e4
+EBUILD netdata-1-r1.ebuild 255 BLAKE2B 4a07c13d959c8d7a9c03492967c3cf733330fe7f31a28573674c2d4461e470b4b6f1ab691089380ac1a2e78edcc6ac5cfc96a87fe0a2dcd7ee010177c27ca4d7 SHA512 5415d1a83fd00265afa78d545c3603813192f410f977b5edc00d63c23edea0b9c75b094f8c16b1ca298ca6036e5afcb3b4f616466957c292e47dd6d7fb33298f
MISC metadata.xml 255 BLAKE2B 5c405696da1838a5ef8da4bb3a32993157261b449cd28da0cbfb24fa2f33ea1a15ec1415fdeee87c2c051b023c58208065b0cdfdd5de15d648ab675420d9a2b6 SHA512 df4870842bef82cb206492fb14b03f0195dab3fd6aa1eed1c6aeb9c57978bfa68fb37a523ee3d8591937e750dbb52579e24b245e0213be6805b5ee461392cc12
diff --git a/acct-user/netdata/netdata-1-r1.ebuild b/acct-user/netdata/netdata-1-r1.ebuild
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/Manifest b/acct-user/netperf/Manifest
index e70d29048324..5468da3043aa 100644
--- a/acct-user/netperf/Manifest
+++ b/acct-user/netperf/Manifest
@@ -1,2 +1,2 @@
-EBUILD netperf-0.ebuild 249 BLAKE2B 0a861f33f2ded71d79e8ac917ed1f92c04b7f8caf1d11618a2a12c437ccdf27be63c7e4d562f6a84e9e57b1d7fe336946b4cc1a9f9411eee5691483b5cfe6d54 SHA512 e47c542031adcf69166926e3f3cb6f047ac6c6dfe29b585827571a240d0be8aca57876b525c49d72554bab931b25115748456d99d35efdcd0ee9819168f6e5aa
+EBUILD netperf-0-r1.ebuild 249 BLAKE2B 1d85d8990e96688d01d993d75339921f6fac129cd58db136c76612b734bdf62b4daf706504b2ff57190381c874b2707e07adf3941f5b346a1054717e69e213d7 SHA512 11632e4abae8008080b1fbeb5a24f3b20e00f96e86fcbaba5a722244eba20a11a778adcf8dbe403b17494d707966c4314af60e7234c58c0d37fdf7f9808024d6
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/netperf/netperf-0-r1.ebuild b/acct-user/netperf/netperf-0-r1.ebuild
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/Manifest b/acct-user/neutron/Manifest
index 368a5f668419..9c8783e3019f 100644
--- a/acct-user/neutron/Manifest
+++ b/acct-user/neutron/Manifest
@@ -1,2 +1,2 @@
-EBUILD neutron-0-r1.ebuild 304 BLAKE2B 3e25d884c30f4912e39f75bb3cce38c11368d04773cad7d1eb3d1e1df8ea70fee29b5154e98ad30ceed2f55f02c0eaa87f6fdb72e744103ed746acae54750b5d SHA512 90a449c4ea7d7436f421245c08e70e849293a99073e5fd49f8908f5f08695901fc3cea20d71b55aca9720bc581ed564cf24ea55bf31e5d9425d4583c587742fe
+EBUILD neutron-0-r2.ebuild 309 BLAKE2B 79f5366e01a3ac2015fa4e48c8a68c80a39c96c64b6ea517d64e5d3cd12fc3489bf4cfba063d27c2223bd0d0822ff236ae26eed2dc0c8cc144ada95a9b136f0e SHA512 ca26c30d3dc59263d9e4fcaae469b181aa3378dc3f6bdbcc41847ba0a6ffb3a592b5904d8578411b2db0b17b7f8ea3cd720c8c3f9dd3e5c685150feece85a3a6
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/neutron/neutron-0-r1.ebuild b/acct-user/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 8f58ff4800e9..000000000000
--- a/acct-user/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack neutron service"
-ACCT_USER_ID=446
-ACCT_USER_HOME=/var/lib/neutron
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( neutron )
-
-acct-user_add_deps
diff --git a/acct-user/neutron/neutron-0-r2.ebuild b/acct-user/neutron/neutron-0-r2.ebuild
new file mode 100644
index 000000000000..46060ff7e46b
--- /dev/null
+++ b/acct-user/neutron/neutron-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack neutron service"
+ACCT_USER_ID=446
+ACCT_USER_HOME=/var/lib/neutron
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( neutron )
+
+acct-user_add_deps
diff --git a/acct-user/nginx-unit/Manifest b/acct-user/nginx-unit/Manifest
index 9b92894dea3c..a4d4845bd128 100644
--- a/acct-user/nginx-unit/Manifest
+++ b/acct-user/nginx-unit/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-unit-0.ebuild 242 BLAKE2B ccc5855e43b1c3a396ea15a5e89e668ad3b833089f21509528e9e082bccdfc7343a414cf555f94ee95e3195db62561414dadb7a9ea398e5e38104405c46f540e SHA512 00f653c6453919020fa18f900d58abd6dca78fc82a3d49bc35ccd74cfd15147d1f6dfd2b30860073bb308054112ade0b8cfc5772d04c691cb4d7289678346a23
+EBUILD nginx-unit-0-r1.ebuild 242 BLAKE2B ccc5855e43b1c3a396ea15a5e89e668ad3b833089f21509528e9e082bccdfc7343a414cf555f94ee95e3195db62561414dadb7a9ea398e5e38104405c46f540e SHA512 00f653c6453919020fa18f900d58abd6dca78fc82a3d49bc35ccd74cfd15147d1f6dfd2b30860073bb308054112ade0b8cfc5772d04c691cb4d7289678346a23
MISC metadata.xml 223 BLAKE2B 095cbe9aa757b7e872656ee3f17c562e1628cbcc794c9776c46c6edb22e30ee62d077a5ec6a59f26fc453bea96c643cf710e773a399651bedebe8a5178f56344 SHA512 33143373e4f170a675d3f9edd8439432444e03242e1e9cae2166e5e2b189ba1401ecbf93a7496999faae23851c4de60b705b9598a59b97894dc89d6aabc4bd6b
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/Manifest b/acct-user/nginx-vts-exporter/Manifest
index bbbe0a6e7f26..b9e1f44a5dbb 100644
--- a/acct-user/nginx-vts-exporter/Manifest
+++ b/acct-user/nginx-vts-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-vts-exporter-0-r1.ebuild 251 BLAKE2B f828f346148dbeb9e73fcf11ceff4ec8b839c9ba3ac4b1816883bc871bcfb1e042071301c2e4031bfe33f6a2a78b64aa7804dca99de81d1eb48a37dd4b2f9675 SHA512 fff5e9a275befc5c68d328f60ced2ea46960fba8b6b4ca3daed7ceae721ecdd67ae0ce506d5c90923c051ae8ac7d1ec0dbb840171702c22f72c59fc335280336
+EBUILD nginx-vts-exporter-0-r2.ebuild 251 BLAKE2B ccc58f6173787595784353794d055c3e241c454863d21f1bc368bd74a3c17dfffc51bd2868da897788ff31ea36abc9e825fa254c2978c952d499decb2250e047 SHA512 1f16dc75844e7f4505c1921e31a7835b4dd93b3afb507c0a8afe80d6babdf71ec9e3d16fa47a71f6c6852e8effcac1c8ff42746f02128690e2b72aabc12e7d34
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/nginx/Manifest
index 1b4f6b296043..981ee40150eb 100644
--- a/acct-user/nginx/Manifest
+++ b/acct-user/nginx/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-0.ebuild 231 BLAKE2B c79c318d31bb9bbf7a65e5dd9b6f0e7b517c28efbf317f3c7d9a88994c91ed8f7390aa8144e001195a78ae2200236c3ddc04494989b24386f44a018a310bc9a4 SHA512 8e6e6b411a7b0fb680415a45271151d5070a49616d4306e3530f8be0d176e5b12801b8d91fa98f6a0704100737f83aeb9c28311875f1899eb2c2820221d381ea
+EBUILD nginx-0-r1.ebuild 231 BLAKE2B e38623ffb92d14144b168c77e408c828aae94d6b5468d38355732b495af793f687abc0da9ed1897508fdc13b573d9284581edee7b60549d51c9f8121ae5acb9c SHA512 31dddcfa5700dc59fed75c4cc4b2f5e629ff46610d06eb946548769d839add22f2da9536e4a65fc72b80981be7cd77b1e91f99c96e7d27eccfc2d993b19aaa64
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ngircd/Manifest
index 5bd2569d0513..7803beaedf87 100644
--- a/acct-user/ngircd/Manifest
+++ b/acct-user/ngircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngircd-0-r1.ebuild 235 BLAKE2B 13f36394d8e20146a44adce5e3c16be2ec02a2791472cb6ded2cdef17c345778273eaa00de15977c7f2dc9ebc2a52bf3755526b52b0d62dcd32c7e50d8b37972 SHA512 3d89f6042d3eecc39b4f7fc054cc6ea06011dc28142f6bfb7b2888101f9cf64f704a4eaa529acb9684bef1b46e463179db421374045f09094fa1c2af55d64648
+EBUILD ngircd-0-r2.ebuild 240 BLAKE2B d3225b5c628c004908e7324c0a585e0025a8aff88bb703fd8c11ed0ff140bf75980e1093d7b60c949ecf1332fa34c579ff1f43ce4f379bb231aed0e8f1edd4bf SHA512 0acb58088898872cf6db6e9d177e850597321333a43ab19fb402c1623d06007a0ec74722d7f2f3228c9563e9e315c02cb4a054341903f601750024260f2f1997
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/ngrep/Manifest
index 51a5bec481c4..4582dc7237f8 100644
--- a/acct-user/ngrep/Manifest
+++ b/acct-user/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0-r1.ebuild 245 BLAKE2B d3f29f165009a42f8802285ba094410cc1739a6355a9fc16ab4ae3c45ff91cee325c46e803138e2bb0ba58eebf228c0398eef68d2010476b4799e304e1044628 SHA512 1b1ea5e82218b74d3a2d0a3df0bf8f6e6b1973149e44ee887f3c0c533f2135b864a5cb7e6310f6783a6f52af0c9be973b87f4fdc599cec60a5e5833622f0cd7f
+EBUILD ngrep-0-r2.ebuild 245 BLAKE2B 6f62e551d7d7e2b8bde63f2e39914cfab40cb5d8f80d0d50fe1462ed069b63aa44b785d63392aac5d534b771be440fe82244abf940c117e8745b6723e25cf8a6 SHA512 34f15c43da49de9ecb24e41d67bb5e5bc6ddbda5a8fcec99c479ada812ce87e103cbc8c1a48828e4e447f193ba908c4e56c5bb34a7e4c546c7dbbe2c8eefad85
MISC metadata.xml 625 BLAKE2B dccaf7134c266c36cbb22380e96e5dba09a7b9ce70285cc21c10168b236c7b17e7dd52e3c84dfe4a311ab600263159f7acf04243edefdfa00937bc43d54b71dd SHA512 3f7d9d8ee4647bded5bf3b73b7fe5489b19b82e27a8e0150f08a6f3cb1a2dfe9292591ab4d378f897e09d98d77b276960aa756d22af7affb4ef2e40b90737003
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/Manifest b/acct-user/nm-openconnect/Manifest
index 692f84ee7e87..6176ab15ec80 100644
--- a/acct-user/nm-openconnect/Manifest
+++ b/acct-user/nm-openconnect/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openconnect-0.ebuild 270 BLAKE2B 6468b44cb44f674c7f06d568eec9d992b90eff7033495524dffac2078672accb76745637219cbfd85c1f417a3c233308f03c2af2af75b8ff4324acd989c6174d SHA512 410388cafd2571b943435a9f63546934db760e8919067566b7b5799cce29c5ace24e935dcc58019a3d390ed7f15603f11c5fd0cd6bba0f7fca526befaa1df971
+EBUILD nm-openconnect-0-r1.ebuild 270 BLAKE2B d10812aa8def630db0f0d95244e494978877913080b7c88f8360feed76166f98c38e48e262ec298fb9c67c0ab298d6ea66931fd6574b2914b6ad50e9991b28f3 SHA512 4e97bf7f6fe4b91503775a01749879033336dec7d7d40e2494928fcbb4c663f82e0c96b0bc882759f8447a3e3a560351a96283f99abddce0b31a73c18b8943aa
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild b/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
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/Manifest b/acct-user/nm-openvpn/Manifest
index 9edc8da7b085..dbc1b92f5dd0 100644
--- a/acct-user/nm-openvpn/Manifest
+++ b/acct-user/nm-openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openvpn-0.ebuild 262 BLAKE2B 841d3e5ae6d16a47463d3e7d1d7b946aeccc379daaa1a905e2ef4ce80218d27be320311254b56d1f0b2b407e89fc9402381354ccd8f690fb2c60cc463a1a0828 SHA512 3af825a6e17f5b840c5291152464747e55d7c1f0e436b8dc1002b868b42e1b9f1ad56d3de486db34d2fc8ded11a0d047de80f01018331aadb00b05332dd94d55
+EBUILD nm-openvpn-0-r1.ebuild 262 BLAKE2B f03e570cc10f73244f7d05c152c7e9c279641c2ab1be37752b3a7fa0e7c35f12202245f6c814bc2bacf4ecd19dbd44efa2401af41450bee9454643228fe906ad SHA512 d8de94f64d20b9120fd107280a47abd56d60900febfe8688d4dbd8e0fa70575c600fd8bd45a9a6fa70069fd30a501dd7d3535eb88a8156209326498f79302cfb
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild b/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
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/Manifest b/acct-user/nobody/Manifest
index 82e0e763ab34..7f43518e4958 100644
--- a/acct-user/nobody/Manifest
+++ b/acct-user/nobody/Manifest
@@ -1,2 +1,2 @@
-EBUILD nobody-0.ebuild 334 BLAKE2B 6a7ff630d53303039a124119521f6051d59aa7eb5c1f3a90f3a022b809b2af18fbdd4c8443789ca372c2324ac5a5a835e1561deae67504ec69f6dad6716958f2 SHA512 dad68f1111c2371b9367846527043837c7eb9cb594557c6956ed9b074ea59030b6d114903eced4c1409d25719a11d76d5efc3584dad96fd7c4f67d21bb11ac22
+EBUILD nobody-0-r1.ebuild 339 BLAKE2B 310baf04ae6cae681a79ec57cfdde5d3071e2b02ca6e72a323f2eba9516f8331e16a52b70319b163d8cf66d9acecb40336d39a9a82472a86c9d358e77d3bd74e SHA512 68edaf3b19a2e9fb77f95eeea1d7324ee72c5b0de163081384e615fd7b862fd1374997d16a76bb0b6a96665ee72ddbc2b97579418664d1aba956967482fb19cc
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-user/nobody/nobody-0-r1.ebuild b/acct-user/nobody/nobody-0-r1.ebuild
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/Manifest b/acct-user/node_exporter/Manifest
index 8076f3b42b33..b177d678da3c 100644
--- a/acct-user/node_exporter/Manifest
+++ b/acct-user/node_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD node_exporter-0-r1.ebuild 232 BLAKE2B 2ee0779cad879d941d1ddfa12a1dd23c4ed3a53c7f789621437276356f6a72d991405bf90350377569b3be9365d1d7ebc30b98288ad52d883cb07b0a76ca8067 SHA512 bdb22f269d086fdc421574b2ea21f68072fe6444c38c7f965d2a1b5b2a0dd343a74d4206d3fa8c13a1273cc52c24b4645caeae043a1e6f8c409c4a791e8a91e0
+EBUILD node_exporter-0-r2.ebuild 237 BLAKE2B 5b671846cc179a98c877164d765c3c7b487f71520af4c5d3fb30090fdc2ae2c6c657cbe97e20f93e70b1ea48617748e40daf01e49615acdd67f8e53321770f35 SHA512 5241b39d01465b91b8d15764f237e905ad3d37c2cbfa4e9b922fb5f68cf6a58e48d464233902caa572def7c315e1e06940005402c8bdd942bb5780b979816586
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/notary/Manifest
index 75285cc26a8b..f67959fcaddb 100644
--- a/acct-user/notary/Manifest
+++ b/acct-user/notary/Manifest
@@ -1,2 +1,2 @@
-EBUILD notary-0.ebuild 241 BLAKE2B 19d7c44b05e111b98ff42f6a1986219dffb1b4eb1c0f298630203df8560865720094c1fd9d8466fc93e9635ecac3429d29a1756e3e7035f54be6ecb2e2639fb0 SHA512 faf1e148c8e1b76690b1fbb961a4b06eceb994069fcdd29a07d046abd251314ee93855ce6374141bda3ae9fd661e38f658a19ba47281f55f33f006cee61c7d68
+EBUILD notary-0-r1.ebuild 241 BLAKE2B 373cb77b6d6a847b26233377b7361e83606f1f5df737dce22bd8659925f168f176166f3497dee6e4a303ea9f17d9bf10227a7c202226c4517d719bb75773896d SHA512 785b1643de19ebb204d99164e56b4a29666762e0f7a56a1268b193a1b90ae0cb2dd0a827ddf4f05f6a9759ccf8548ac84e74457140181daa51f815b384cea5d8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/notary/notary-0-r1.ebuild b/acct-user/notary/notary-0-r1.ebuild
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/Manifest b/acct-user/nova/Manifest
index e02355c96a54..03cdc9d7a38e 100644
--- a/acct-user/nova/Manifest
+++ b/acct-user/nova/Manifest
@@ -1,2 +1,2 @@
-EBUILD nova-0-r1.ebuild 295 BLAKE2B e134136c36a27792585511f1ac80755af05e5d0a8395899860703e2da9d3104af98f65284fc9f8d60234495f70a5502c41a13e48532286a809777e640933ebe3 SHA512 72c51363c9ef365217e7b302fc2fd94717bdf93a95e0379b0a2f8c303226c24f82bdc349696e1f243d1909fb54daa8b66eccd40d8018b411bf96719fc04df4fc
+EBUILD nova-0-r2.ebuild 300 BLAKE2B 94d9547c75c42d2d1051fadece14d314809da68f53b6fc561c79b89059c60f4d7e217e440bb7a54192b2deb8de394989ccebde411eec05a27d978b3496637c2d SHA512 017896cd4840f810c0f5470511dfc1e6e90da833f701978b7f5de13e9fcd963dbd7318816c80ff7cad985ecd54833aaee28a5afe9d8fc0c7cc7da33a94c453ce
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/nova/nova-0-r1.ebuild b/acct-user/nova/nova-0-r1.ebuild
deleted file mode 100644
index 660f668cf623..000000000000
--- a/acct-user/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack nova service"
-ACCT_USER_ID=447
-ACCT_USER_HOME=/var/lib/nova
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( nova )
-
-acct-user_add_deps
diff --git a/acct-user/nova/nova-0-r2.ebuild b/acct-user/nova/nova-0-r2.ebuild
new file mode 100644
index 000000000000..03c2a8b97662
--- /dev/null
+++ b/acct-user/nova/nova-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack nova service"
+ACCT_USER_ID=447
+ACCT_USER_HOME=/var/lib/nova
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( nova )
+
+acct-user_add_deps
diff --git a/acct-user/nsd/Manifest b/acct-user/nsd/Manifest
index 17f37a9a357a..ee63e493aab5 100644
--- a/acct-user/nsd/Manifest
+++ b/acct-user/nsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nsd-0-r1.ebuild 228 BLAKE2B 9111df8f2584fcbe988f38b164cc0406a077c4962052774555b2c7db8c28f8b730e69c6a2e775ec8906c02195f65c0fbd43f43980e49084ab3808a7cf0f6bc67 SHA512 467da74dc8081ad5259c25eb00eb87c9bed792d8e70b42f09fb1903f14b3d4f7ee91fed6ecf14fba5425c5e990482a065aa4677295b63db4188414c9de6cfd35
+EBUILD nsd-0-r2.ebuild 228 BLAKE2B edbbe76ae3743c60407d7cbfb081d19ca70b83e777811106b1e4e8189be7d11622a83936eac9f36ac8123fa6f3f423a63d51c1174dfc7335c62576d6b9f474ff SHA512 432590e0e9a1a319ec687ba1ea504d31b6345818641867e6a2ab2ffe05053bd020ec7117fd6927655d99c15b11eb512e6bcd2d4a759fe2b539c56a4ea4c85b59
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/nslcd/Manifest
index dffa2f1854c7..e18d32915ac4 100644
--- a/acct-user/nslcd/Manifest
+++ b/acct-user/nslcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nslcd-0-r1.ebuild 234 BLAKE2B 9d9702fa458c59fcbb6bcdd6caab3c6cfa3e006f0390f4f7d55620ad04c1a8f543733c55cfeb9de00c715903f2f4df132b12f40eeaa2e356a05a88dc8fefbc37 SHA512 a5c04515673e2f98b5668ecd0b049e8777a19c34c384cd627b747353e40399201ef084038957f0f71473aff7e19bbe07dbd210eee12bf3542b52e3169c1f7b62
+EBUILD nslcd-0-r2.ebuild 234 BLAKE2B 698561d921a594a6201c4ecec2b9700a84654cee2377374a6c0eb4c9a34beb727dc35ce48ebc89391eac5e45ecb8c045a1ac070cfd95bc775d089d85e570d787 SHA512 651ddfc9f722d1c5dbb69218b8d119e85983cda5c5eae45c6e60495fc1bf8610658342a1f93f3ba5f5ec2bcd5bbf52f577308dc63bf3b03185a99d6640fb7e37
MISC metadata.xml 377 BLAKE2B de37a4550f576438d2d9e50c63d53758876cb174ec6a40846b0c70f377cc1d0928d24951fe803bbb28dcbffa5a30dacf89c05a814ae7304b61ead2c115cc9b25 SHA512 29c89211671ec281f5aa38644ba64d43c90dc32251074e6c0a399b8087e3d5085f0277b1f7899ea278389b406270c0b35e18cbf30cec9fa52cbfa5e7ceb9038d
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/Manifest b/acct-user/ntopng/Manifest
index 2c3f62f9deac..eb5bf70944c2 100644
--- a/acct-user/ntopng/Manifest
+++ b/acct-user/ntopng/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntopng-0.ebuild 227 BLAKE2B a39b80a7a9b382b1304cf5ed081da07652027ba8d899bfedecde86d7ca9df2dcfe6bf1c4c9a17fb261ffc668ecb63ef0282b79b7afa683825846f18ba94ff006 SHA512 02b44adadb502ad0de9738426741fc4a724513c59404f805ef3e120cbc296c1a1563514cc78c51ce64a18bb1cf2b5c1b774a2a62deb896003f580003a738b5c0
+EBUILD ntopng-0-r1.ebuild 227 BLAKE2B 985a938b1721efa798225f203a35352cc77e2f8026e9e220007daa12f2e2e2efd4b037602dff04858fcc524cccbb555eb2cf96bbd621672253495af818d55b73 SHA512 5dec558dfa72eb8f845ca1eb136fdb57f9c4fb5aa9b2a33d275f68eb951ed52ab2b9e432e8eae595f07ae554ac28b607b5c7657b7a3fe5afada929e46468e4a8
MISC metadata.xml 219 BLAKE2B 5a19926bd602ddf2021d79fb07de89ce03868320d23f61ec16b122f9ba23e04bd24a71be898b22d9518d5792fac5d5860a181f3813a1b78727117a6a3bc93e6f SHA512 e55af6d159cb39bae94cf8b8c9adfc62ef53d56aa11c024e8c4001aae58d9b9256b059f1a4918f55bba17b231ff7725a002f67a5642f92f3118835f3036c2fa0
diff --git a/acct-user/ntopng/ntopng-0-r1.ebuild b/acct-user/ntopng/ntopng-0-r1.ebuild
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/Manifest b/acct-user/ntp/Manifest
index 7a1e6d4f69c9..e2a73c4f0ca5 100644
--- a/acct-user/ntp/Manifest
+++ b/acct-user/ntp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntp-0-r1.ebuild 228 BLAKE2B 41a90eeab279c7045f2b201a878c57c4c65381670ecbb336d6bb1115ed2120289b0f0f9fdd6a5520c362e959abaef5c1241fbdc98cecee02408d54e57f550768 SHA512 6e52b85aca1318e2268124402d6e534f1a2e1818edcb613b313c887796faa864fa533fff104a3dc3792f2fe1ae8d00d73df8cb44da8530c99a57e014f3611196
+EBUILD ntp-0-r2.ebuild 228 BLAKE2B 65a18c31686864449b009ba6a38a22ea853185bc82e0e62ec339f5c712d57de19798a08172a3bf145a8a3433231b3cc8f8b90b1828ff11eb017f274995a76747 SHA512 6cddbc1a107f68fa8e5b307e77b950d4986a6294e8de7050e41edb2243cd39a472733684b95fee8e1f68cd8bf00b31189958ac8e6e3a33f42807f7ffa2a3b87a
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
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/Manifest b/acct-user/nullmail/Manifest
index f5580ad2ce65..723150100687 100644
--- a/acct-user/nullmail/Manifest
+++ b/acct-user/nullmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD nullmail-0.ebuild 282 BLAKE2B 6dd6884992839b4a3f2ca7c3e74eec54368e087a8ff2eea08b86edc9b2c70c28161ad193b40b9694511faf987a3a6eadb90739dfbb5afd6b1940218113aa0327 SHA512 249989acf0074589218451ecf1dcd3f839bc72e7aa4a591560f89b17d88c2cc9745927cb8c897d6399ee43e9ad8ce3649d294f4cae43a7574a1be750dfd3c492
+EBUILD nullmail-0-r1.ebuild 282 BLAKE2B a575607b061a0a15d118761ced2ec68da6453beda15c82f0c625666c5edeea9cdfcc4842f7f7570b0bd2ae4e5af0d608e1ea54aa7c0e0627e18490542292eca3 SHA512 a6f002715cf0debc5b42087069e8388e46dcd210de7094f83e20ad9a6e9b6f3713822d3526356e9e347799e2eda6bfbfbfcfdc887f1b3af7f488bc7b1d2c776a
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-user/nullmail/nullmail-0-r1.ebuild b/acct-user/nullmail/nullmail-0-r1.ebuild
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/Manifest b/acct-user/nut/Manifest
index bcbf9643ced8..bc40889e1454 100644
--- a/acct-user/nut/Manifest
+++ b/acct-user/nut/Manifest
@@ -1,2 +1,2 @@
-EBUILD nut-0-r1.ebuild 282 BLAKE2B 47c635eca5726044e1857c152c0327f87bef38309a2b8089778d03e526e0231671fc92743b0c33d37fd62d240b51be34fef9e7a2a849288f6bd9f0de253e26d2 SHA512 e3565624f4ab5b65f315140b0fab9090e48f7bfb1100436b96ebbb6c88f896c36d584abec8b269566bd56ebef07ec26bdb86616d23bbc8156df9b10c77be1885
+EBUILD nut-0-r2.ebuild 282 BLAKE2B f4c1cd162165ba443d6189c79e6708739837213e1ffebdd950c028a4223d9d0c150e02e20d0e8e799487b5e56297092df6087e4f76bd57114129f007d73a2c7c SHA512 0aac22fd504dbde4db3e01f62a243c01c8a222a63c2235c6901c0b050a88d09e613b69de4b913e32f053c7d65d23038d9186acb8337afcf254f762c6642a2205
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-user/nvpd/Manifest
index 7b2478c5ecb0..c359d0b269aa 100644
--- a/acct-user/nvpd/Manifest
+++ b/acct-user/nvpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nvpd-0.ebuild 239 BLAKE2B 5ecc9f22848828aad5f3e87a6a14e597172367b601235212140ad547351d7a42c980e741730ddae13f7a9b6f7346f1dc60aa800fb15c14b3655162a1199bcd01 SHA512 e439e19ac0526f08367b6ff255cb757cfa720836e89d80563014733599fc2a360b5054b3e601a3858e41658be5f82101001c015d833a07d3e15839ea9cfe352b
+EBUILD nvpd-0-r1.ebuild 239 BLAKE2B 8169b5afa1415d450a0c806aeb0f6d5e1c752051af21d4ac21f81dcfdb44ff8469d2b34aeee48b9df834a31102c2cc61644f8576e5bec70416cff68a61153b11 SHA512 a47f8ff2b039874e1610833ee4a6e38f22f58949c9582553852535ea9aaf4d43356722632b654bf5f136f36c996f0357cc7430465c33be6dbf1324c2ec9b19be
MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/acct-user/nvpd/nvpd-0-r1.ebuild b/acct-user/nvpd/nvpd-0-r1.ebuild
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/Manifest b/acct-user/nzbget/Manifest
index 2547b72651db..34ae7c911c80 100644
--- a/acct-user/nzbget/Manifest
+++ b/acct-user/nzbget/Manifest
@@ -1,2 +1,2 @@
-EBUILD nzbget-0.ebuild 359 BLAKE2B be626efa15641f56263e2ac2721a399e30141d565bca1bdd240d4f0aee1b9d1c94fe6e510b02d14732a39e5179e5cd645a8726df80bef29e293d6952be9703c2 SHA512 571f60cd710556568201d716e879dcf5a86a9d4d0646bb2c33974fa469f966d7dd7f33227fe9cf079e7b2397f4213b201c31bbfa9d2cb884ede71a77f9ca9a69
+EBUILD nzbget-0-r1.ebuild 359 BLAKE2B 975eb0b03c81cf1f31d8a5afa86bae17a1d9052cc52b4f7038ecfc338212bfb97a791c96a93ebddef581fb42e2d13b053482efc2c2380f1df8b0465683156d6d SHA512 06fdbdcec151c3432977ef833b05ecc2ef9c64a8a0907772d0d26e79f8591d6dceb7121bea5fe314fe9f443ed33de6287227531ebec586b081d8f20bbe69c093
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-user/nzbget/nzbget-0-r1.ebuild b/acct-user/nzbget/nzbget-0-r1.ebuild
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/Manifest b/acct-user/oidentd/Manifest
index 4ab32fee45fe..806f25cfa6f0 100644
--- a/acct-user/oidentd/Manifest
+++ b/acct-user/oidentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD oidentd-0-r1.ebuild 198 BLAKE2B 34eb82955a942fd447d028cf6b85363db45d940072847b25d62893c75352cd0c667a77f9f8e16390c85856e30efbc294f283c43415ff5c11b5f8b185671e6028 SHA512 4c8b8057009972ce5aaa10bb12711ca98112b7c50f0650d97f4f1b4c1e455bed54ff8ef8d808215ab46a3f4fea48b7393a985d1ec802d91e323b341601781060
+EBUILD oidentd-0-r2.ebuild 198 BLAKE2B 80e7a6e29b56064d228eaf195697adb50e239947e7c017ff8d7eb45eaff32e18d9f1f8a3bcedc237ecf4ebaefc9d8435daec7f965821cc64e44c5b4150a1fd41 SHA512 883232784588fa1ccc7159a6b62e1ea63ee8267309b56751c68bbb72759ead9ae13dc87cc1a78ccc2d92c36c7562a00a97804a770e82ec07d655771c666d354b
MISC metadata.xml 393 BLAKE2B cece790dd0310b08c71dfc107e0cf9d28a86714a8d14361140f30820be5987008fbb1f0954db16c6686a8c087bc54f0935960d4ce718e2f61240d2e83e67823f SHA512 4b60a9a9e648418f7d7eb82dd3f5d4ab28caf622f9f84cd8db5a782cd5db5e6bf1b20a4dae54b65f27998db671aa1ddd64ddd3e9ef26ffb1d786bcae82760cb7
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/Manifest b/acct-user/openctd/Manifest
index 4ae554eb4807..39f2896f7810 100644
--- a/acct-user/openctd/Manifest
+++ b/acct-user/openctd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openctd-0.ebuild 240 BLAKE2B 3fe0dfb2a61307048ff8bfba1ab4bef023e5c5b763f878a0a5149b235242d736efc8c39d91486fc4fedb53ab9aef23f89173aa15f00c28682e6873254f84c315 SHA512 14643efa3850757463a8c63a909d3b459300cab75e87f9f3a9d28176f10ace7ecb90c4b1be0896a189b50f388ad13c03319e1ad64a4cc8d9f515c421ac904445
+EBUILD openctd-0-r1.ebuild 240 BLAKE2B 5cb5b5d6fd61a760931309987d88d50f3d14f004eea5d831d7293f102b204396f249992c871c77fbc1a25fcfa9a97878e5a6992cf3595724abc4b7be48845730 SHA512 1394b54aa22142f0aead250e72adc493c618acf19d86ae6adaa0b3897b4a154a150aa17d4f5a989ce00860058b08470d551ed53ed336ee050d727710255437ce
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/openctd/openctd-0-r1.ebuild b/acct-user/openctd/openctd-0-r1.ebuild
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/Manifest b/acct-user/opendkim/Manifest
index 1afddb0944aa..32e483797d47 100644
--- a/acct-user/opendkim/Manifest
+++ b/acct-user/opendkim/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendkim-0-r1.ebuild 232 BLAKE2B 56d87519a4242e428d61466b9b5699054c10c58ee41251b31dd09187b1f629f841c5032724be59b2117561dc8b2d55823f1e659dfe7d7df4240a915f970c9569 SHA512 804499e34a9a1e2e8f19b5102f45eea69bc738d6514b5f5198266ea06f49a4ef15aa18851546c1258b36c9ed4b11d041c0cc82173d501dd3e15cf243e9a35b02
+EBUILD opendkim-0-r2.ebuild 232 BLAKE2B 44cd2629fdc7a53bffb3cfc9a351fbc3aab63c6bc9563e118e78e10a9a576068a18b13c4b8a35912ec851c0a8f78d8c92ad4a1dda098972cdc8a292cb33d07a9 SHA512 bbf39b9461b96f5e8daf83e283c2027ab001d8460c0c8809eb4af4d8e3010c847182d31454c65fd2c13159313126eed9a17541bf4f5a0f694f80efa306fad427
MISC metadata.xml 247 BLAKE2B 4846dc5414f3478596a37af6a99c490ce9ac8dc341903d8fff794c05354b7a73309f70aac92faa801fff9f8a6aed87860af87e5d227fb2c6425b907038bf0052 SHA512 7a189fd4e7c0f67664c0788b4769a1c038374eb224c259fc206dd1d2448eaa1deab71c612186cff31cd380fb445fa4ba066a0cf881028191e8adb0aae9d862c9
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/Manifest b/acct-user/opendmarc/Manifest
index 820fa351aa5d..a6d87389ded8 100644
--- a/acct-user/opendmarc/Manifest
+++ b/acct-user/opendmarc/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendmarc-0.ebuild 309 BLAKE2B 23344727f00fc145d2cffc3f643506c5046df64734043e47a3dde52ab454d9fd4a4a936d3f945e71f747966d313887bb9268af395b5067ebe83c2634bd8d0bae SHA512 39a1928977cde0d6114088469e1dec904d36cb8ef03677ab0b70a95ab7f45ab19d1c39ce6a6ab6301dc8910e2b22371c74874f317b5ba4cc5999c1809a04948a
+EBUILD opendmarc-0-r1.ebuild 309 BLAKE2B 78ace2c37405320a08e2e7a463463d7fe06d80de2d25c014fecd07e51b067028e4799465c3fef5a9d94fa0e8642a04ad9bd7a7faafe90d5f609feeea1a1e59a7 SHA512 c5baa0cbb57ee8bb7406b50db08027192d9d0afd7cc10023b030f7c3e9345357c1564652f4681de98f11f56d58d642d0593ef787595d78dae297c4279aacb549
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/acct-user/opendmarc/opendmarc-0-r1.ebuild b/acct-user/opendmarc/opendmarc-0-r1.ebuild
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/Manifest b/acct-user/opendnssec/Manifest
index f80beef17846..be085c69b9e7 100644
--- a/acct-user/opendnssec/Manifest
+++ b/acct-user/opendnssec/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendnssec-0.ebuild 250 BLAKE2B 9f59fef05559a90467941d0cd5b8a199fe8091a4bd8d018ff51842d4b6d0cfbf2fe00fa543ec920c9b7cb23d6aefe6414466804f3f136e1aa0825bcbf433c288 SHA512 81411499e8bdd721a8d376c8398b4cd97392fab5067ddcfffdbe105dbf23190a795440fbd7ab3478f13158133541e0b3f2170cb754c877926bc4abe7d575764a
+EBUILD opendnssec-0-r1.ebuild 250 BLAKE2B e6d4cf60bb9c4dac75243cc93b6f6894e4c5f7bbd40b9206330c99f86065914b52553d53b93b77f520f2f643c63faef742be87ed34384ce1e55f5d358222ddb7 SHA512 9d6bec5e712dd0e6cc3c852570a42fd6db630e06e9f8a087f406a6e482360b3b129730e52824368fef278fb4517d43f332c1de327cbe28bd866c1a3eb55e340f
MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/acct-user/opendnssec/opendnssec-0-r1.ebuild b/acct-user/opendnssec/opendnssec-0-r1.ebuild
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/Manifest b/acct-user/openntpd/Manifest
index ed2611e94666..7952eee1d318 100644
--- a/acct-user/openntpd/Manifest
+++ b/acct-user/openntpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openntpd-0-r1.ebuild 309 BLAKE2B 858a999dd04a60e9520b448ddb3797f5a527064abdab0cac4e54eb88869bd79a95a0114bc7660d6803678f0f30cd32467838baf9590eadd736808a60f42f420a SHA512 49137194f13147070ac8432bc610cc45befc6feca90368a1d0fdd685a05a93b1e0d2bc05cbde823d2d55b088f0d7839cc005c34c0af9c3b07ec49d4fe5c872ff
+EBUILD openntpd-0-r2.ebuild 309 BLAKE2B 35853c3f18ffa365ec666a8403ffa05ec3d991ce95ed1f4641c653770a4d230ed4cf8d877fee96d16a193b6092e83431fe672010ae9079f5f742ab2d650cbb5d SHA512 6fc356308b8503692a4d0acbdd4d04fde7c12d94a4f13bde5a5f4c7c3f28a1d3f52c7989678addc0d0a8be662302f2c2a6ef220048bcf19f6be10169fbe8bbec
MISC metadata.xml 392 BLAKE2B a875ac61061b518231ca2dc61e92dec80b9a647942ba08b241bd897a2232a6b3ab804f875de8a64a1d323f4b289193571998d867279ca135dda95ab1f056abad SHA512 4418af84fefa90044cb549d2195537df74dcfe7a8c02011b8e0a975f660e0226c942da080b20529fc5752fe0e87928479ac433de3d7ae2947182672e3508a030
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/Manifest b/acct-user/openrct2/Manifest
index 6e934a055289..c4547584ce25 100644
--- a/acct-user/openrct2/Manifest
+++ b/acct-user/openrct2/Manifest
@@ -1,2 +1,2 @@
-EBUILD openrct2-0-r1.ebuild 259 BLAKE2B da686a31c48f2da816ecc5e1fbc10355e65fc1c7a545246e35da903d4de4fd01734703935127f725254d79968f48bc6a5bf714c31085a65f588fe3d10cc92fa5 SHA512 7a776f80babf0eb0ba7bb8107cf8cbf12b965258c70a52489ca2a2a7f98154e31e2015daa4d7bfad1e34cdad2a46483bd9246275cfc317bf2bfc83da7a505a91
+EBUILD openrct2-0-r2.ebuild 259 BLAKE2B 6f9902a1571200bd2031f74709f3776146f9fbb5e66c7c7d61ee279c2c0cebc274d9eaf5a6f1afe3422cd26836e70934dc8b9d033e92ee699f1ebf10f79ebff6 SHA512 2c3d2669661009c84f125593240a95e5daea9a4abc980271d0536be77117ab3576ecff7c49488ff2593435463e99d876010a79bb126d8b22fdb11c2f9d52dc91
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/openttd/Manifest
index 4eda90661c89..3441eb33fdf0 100644
--- a/acct-user/openttd/Manifest
+++ b/acct-user/openttd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openttd-0.ebuild 287 BLAKE2B 79e2897e6bf5fc6b17133d1a71869d0b771892815234d81a79c859297a797e73bc41d77bbde3c0c4a816513045738b7427f27f679837c76468a062737f85dcb5 SHA512 71125af5bbf55645156b4198ec429a6569dfc82679fafacde6e2e28e5658d722b4695649453ba8941da47ab665000eee7825498bc1e7e89900b3dbb0f45076f8
+EBUILD openttd-0-r1.ebuild 287 BLAKE2B 1847d1caff5dacde096b32c7275fac6b1e9f39cfd261d8c4b51b7978bb7ce4d19657a2e5a55e7b8d281966cc601d2983f0ff5265683d6675ab0f5b01980238d7 SHA512 5066821da839233804ef328cc22de025092090f76b60d5e8ced30a5479fc266c2ff127b43eb9e200e9cfd7aea9ddfd04b74d2f4f7426acb26632eaa397a00344
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-user/openvpn/Manifest
index 10f3c508a417..21b0baee1f5b 100644
--- a/acct-user/openvpn/Manifest
+++ b/acct-user/openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn-0-r1.ebuild 238 BLAKE2B 8b8d289fa313ccf9d5dd83ecd41ab28f2449c0c3a846e3e4d598e1b252fed6a08f75d7c8513c892e3540b675b9a6963c8f4926830ca29157f517f7a6b8161026 SHA512 aa92a087ebc304e072bfcfd0b04582e9831d90b9006b88364848196a17abc6889951780ad1e5a9d8f914ddf19c94ab543fcac0531d6b0706a074c8c6951f88fa
+EBUILD openvpn-0-r2.ebuild 238 BLAKE2B 28d82b0d6005b6845e3b052d2cf20997aa5406be682b95627859a2044a71a06c35fb6553bfab336e473dd1945685c25b6513ac46b467bf363bbcb4953bfd9146 SHA512 059a90ceb27930e2200b15167a6d9a719d525f87213b1b87e5a39f42416c903f034a646f818af6c9f085bffd50ead4c8854120496d5cc6855f0c6e2553e6a98f
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/openvpn_exporter/Manifest
index 3b68a9e90e81..b049ea758ad9 100644
--- a/acct-user/openvpn_exporter/Manifest
+++ b/acct-user/openvpn_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn_exporter-0-r1.ebuild 283 BLAKE2B 6fbefee1ad6e9c8ecd2bfa19e63341b5d4a8163357d70a292c3f7c64b9860b64c051d33db7e06e08bfe377af84438315247260249ac43b2ff9ff16387c216d59 SHA512 3d7b6762cd39547dbfd4f0d2682721541bc939034d64f1d23f0bcdc146c2a4ab703c1b3cfb9110be84d54f072b51ae9825061de02e6d0b79b4c73e37a04b86a0
+EBUILD openvpn_exporter-0-r2.ebuild 288 BLAKE2B f730246a6e21ac1dd18aa28ba33df6ca3b2b3cb27f9a66e2166356e3fca9052e96bb05e6c9726db2ebb993570b6ba78203c5a9c7decbd7786d2c6bbc4bbf0ee4 SHA512 c310e282d44b7f07fdc530205b7e4580cb255609606f68922feafc3c5b73d98feaade4b0841ffb20ba6cd4cc862d20bd6eaa61a7561441c2b2e442152c44fb92
MISC metadata.xml 250 BLAKE2B 24647b7269305eaebefbb6426c3543e9ecab2b478004d4353af64dd2281fd139059d4ff4450ea7545d357c3f14583e8f9acf6485abc570ef4a8ed053cd76df67 SHA512 5b3a845086e7023834b58c81bfc93f332349e17898f3bec944fa9430e419a5cbf064de5e71cdbaf570e68dbba1d69a8313c99021f8b68a94ef07f53cd52c34fd
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/Manifest b/acct-user/opm/Manifest
index 6b4b6b5d99fa..3fde56261111 100644
--- a/acct-user/opm/Manifest
+++ b/acct-user/opm/Manifest
@@ -1,2 +1,2 @@
-EBUILD opm-0-r1.ebuild 234 BLAKE2B 2daab98a3eaa01d77f8d3b79b9df1b879ddd455122329020b83d199e954543fb9c41498a2b55fc0b8deee898360971529d6fc9c5890c58c3eed9842592fd2c56 SHA512 ef134ec8d47b2675558f41701d57c724395cd8f75ec6ae3a0e07d8f878f02fb3108e9eaceed6d0ce7816f7d627c09542ecb837e7846fe06dd04775005c7159f8
+EBUILD opm-0-r2.ebuild 239 BLAKE2B e4baa011679cdebe03eedd416bd8b09e492d222fe1722de0a94960b7b3e4308476fc31e9066221cbe05b2f376a582dee0e3a7d0c313644acfd4797fc0e9527d5 SHA512 83f69de949b82d90ff27792162eab9afbe8ec51619ab34bd05436e6a54143ae6f2c038c84db89a7aa1f57c5b027a7a4d5876d4dee3b8011042ab0bf58c3c91f0
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/oprofile/Manifest
index a88ce078a894..f6a7e8236270 100644
--- a/acct-user/oprofile/Manifest
+++ b/acct-user/oprofile/Manifest
@@ -1,2 +1,2 @@
-EBUILD oprofile-0-r1.ebuild 254 BLAKE2B 7466e42780d328dc9f97499b6065a66879f2ee771e602a3541d108db7405242ea562363729707d7d45fcb8c2f42660136ce03f86c3cf26bcd5df351e76741bb0 SHA512 cc86ec38f94cc9011e4f0aab84ac749043e67d81ace47e62ec690ebfce312c020acc3c7224c362fda39da9ac7f7ea86ae276d08042c87133af314056774b350c
+EBUILD oprofile-0-r2.ebuild 259 BLAKE2B 20644b4935259e90c9469f1b37d3a8ff323a3103b8fcc666e344b8a84f0e92e7c3539fa36bb7d6e4583218a400084c55e40c20bf9b7796fb81d9075d690ac358 SHA512 69d2833ec5541264eef14bf614e9dceff32b1e73bfe28f139d0832cc58fa95174e54df508594830f170fbe3efc3ac65644ac4bef5177869e0b615831d5e5a208
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-user/oragono/Manifest
index 5f5737b4704d..d8ff44f595a9 100644
--- a/acct-user/oragono/Manifest
+++ b/acct-user/oragono/Manifest
@@ -1,2 +1,2 @@
-EBUILD oragono-0.ebuild 239 BLAKE2B e8f82c548e12a5b7bd08fbbb9ef4289335611a3629cdbdf9c47a36e602de8c531706b68e967c7a8824610fbc221fa7cf2e4124f92dba106df24b6b6fdd9e9bcb SHA512 b7cb950f561c4c0b25aaf18082f00e715ce68c6fdea9d7cb68a6c584763a7b6bc24f24d6322e05aac60088c90f85dc5b4d52f3a24bbc2f74c273b53c850d55f0
+EBUILD oragono-0-r1.ebuild 244 BLAKE2B 2a384c949f84fe38d3b28c57edc90af230709ab23c11e9bc74550089beb87b06a5cb24193f38e667056cc4534c74b5e56940c98ba8fe0d44e7f33f4ee2bbd7a1 SHA512 bdf7d2df71cd8b648252aae59f7ae11a6bee3de8ce4576dbc91e0e4145ee7bb7111e8c1a52f5679f353870ed2f6364844aa65d3e41b8c8d55806cdef3deb27c9
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/ossec/Manifest
index 9b523bafb9a2..f4a869cb4210 100644
--- a/acct-user/ossec/Manifest
+++ b/acct-user/ossec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossec-0-r1.ebuild 289 BLAKE2B 5820ea90a2ed2f8e100f8afa0e40b2bef5b80f4af88addeafe3bfb4f88b04c301457fba4a41c8a0b1a9ce5ce98136a2ed1f2d1990f4b5784ffe7679c696f09d9 SHA512 f1ca67bc0db90aeae7259039cc2e6a30a3190c054cd11c3b15b8793feff101d8961471ee488484bc4950b885c3d21934ef1554cd2b2d16fcaa5c3c40bbdb1240
+EBUILD ossec-0-r2.ebuild 294 BLAKE2B 47f6a90b9df53a66697a048c0757be29e3ecc5063791253304cd99fed7f2903397af5b63e850305f36111c0e6a09688eb532cf6a951fc531e436b3b797da5be1 SHA512 1846071fbfeaa68c19693c403b29a934767e1b8f6293289568fa79e1fb82faaea2e28459c77103ebdc669becdd7594da9ff232d7ea7516a3f73c576a0112de2e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ossecm/Manifest
index 26bfd5b4417b..f87e6fe4c0b8 100644
--- a/acct-user/ossecm/Manifest
+++ b/acct-user/ossecm/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossecm-0-r1.ebuild 247 BLAKE2B 288296ef31b602e1dac853b031fab1a5b3277259de84110ff223c3bd1e6f4ae5446c9404347f1b66c980cd0d5fdaf864212d1f0a36c1ab53b017e3bb1d321053 SHA512 cbb873005ab2ac5e17c2c2b2d8640a66d69fb9eede52bbb7ff27961509bf50c81f02cf47d1e850a9067980b4f820c499a8392f122506cdec1b7f05deda538465
+EBUILD ossecm-0-r2.ebuild 252 BLAKE2B 11c4b18a16b318787d7d37944360f9ee971ad5f60698225b630b58890a9ceec6abdf09a6d7779a5b3e6df372ca203ffa011e797cadfe5f983d944a51eb851f50 SHA512 c5621c45e783c44c5f4e9c76fd14b235efdc4efa76ab172525964550bfed57548ead1d7b31bec50d4c57513444d5c8c874ab8c3e6952243a7cb58759a4ae9b94
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ossecr/Manifest
index 6741e22f1289..62557ec1f2ac 100644
--- a/acct-user/ossecr/Manifest
+++ b/acct-user/ossecr/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossecr-0-r1.ebuild 239 BLAKE2B a3d0b70d0e176b6fd1bbfa834cb45807dde16139ae9e53646bd87e847b61bcec310f45b6a14b1d3617649b4335adcb55537f8556b8996813ea1bacac86b337fc SHA512 5d633783b8a8f680495fd116270b7b5dcaf2e3faff80bc3048fba5ca5c26f683a46e8864f91c85c6937fc4d2b2e9077e90b4ef4447d8fa66903d2d411d799201
+EBUILD ossecr-0-r2.ebuild 244 BLAKE2B e4f29f47c1d406d3c96d5dd0a5d6cdd103c66d2ca3221294e3a3007700dcbba87e30c8bbe6da5b43628b0ae28123a978159dda55e4535fe866a809f126006dc5 SHA512 bea423590213b2125e7b6469878a72732247d6a61c174f7cb549171916ac5491040db57421fd81189933013d0fcb0c86ace9b1b31b7da7fc8be8d282237e6b7b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/owntracks/Manifest
index 1b0260c8e6bf..51c5dabbad13 100644
--- a/acct-user/owntracks/Manifest
+++ b/acct-user/owntracks/Manifest
@@ -1,2 +1,2 @@
-EBUILD owntracks-0.ebuild 253 BLAKE2B 0d199f04e9aede45055e16d80e0bab3894a36a78fb85b56fff5b0980723893d1ed66fe35a5438f25af45cb4e6d1c846e480dce0bfc2aaf178c897de4f33703de SHA512 526ccc94032b748ab8a9ced584416bdf7f1c7dde5a76da529b29f60af33f1277ab1b807f83b0cf6ab75c62340f31779e08c3918023f243b48bd52c667e8299a7
+EBUILD owntracks-0-r1.ebuild 258 BLAKE2B 61cebc47b13366093ff08481594265bd5bffbe037d41314d72af01cdb7a9650d6a25d494142abd2e8ca3ba17797db877d2c95d8b02e665b9a48a3b90ca402613 SHA512 37a7052596a666f550ed05483ecf56ba16f2039b793dc129fcd47f44d91cfbbbc3caafe13d212f32985596bcc52f3de7e38d4dbecb5b6269b390b366cace74cc
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
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/Manifest b/acct-user/p2p/Manifest
index 68866b9601ae..5e23d868ba56 100644
--- a/acct-user/p2p/Manifest
+++ b/acct-user/p2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD p2p-0.ebuild 226 BLAKE2B c2fd54a7797a7b21642a49667bbf388e3feab159b5a7fa004fc58a1bfdfe3b5fc8a7db3bc157c49c871a25e9a2642737d82a2d143028b5722a2ccdecce3ed95d SHA512 32ac4a65866519ae80f285b1d5bc9142e192f0f2c41a462c55090d2513869d82535d0cf78c072a82d550379d09782965043265bac8032a4723d101ead1c4f64c
+EBUILD p2p-0-r1.ebuild 226 BLAKE2B bdb6503646ec6af5f7a455aac48962a6f1a0ad1330a39e44d5aea21252116b767e65974e3f2f1941ef3299ffff84d67d7d4bcf053efe5f3d9001b8e55966d792 SHA512 802bb19adbe81ed4dd7e5b33634e2a9839b21bb8d8d6db89f1940eac2625baa34b6ddaf2dd4349ce80c72c2a542319ba7911793fa3f9813c3b9c7da2161b27d9
MISC metadata.xml 407 BLAKE2B 6cd79e7645acb510b97a94008e57434ff0e0c1a6e01f0b26a7f1d1f9904b3eea8cc1039f621ecec6512c6bd463fbed7a6472b7fb9a61f7d94b9e6643fa443bca SHA512 d701b4402b608096a4b6aa7b89c6e789bb86d8c84cf07ebb0525d67a8f32b9db650da91ae01c7051d53e09137eb5a2c4734008eab43f029c06cfe47f9761272c
diff --git a/acct-user/p2p/p2p-0-r1.ebuild b/acct-user/p2p/p2p-0-r1.ebuild
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/Manifest b/acct-user/partimag/Manifest
index 3ff6689acea8..f792709098d4 100644
--- a/acct-user/partimag/Manifest
+++ b/acct-user/partimag/Manifest
@@ -1,2 +1,2 @@
-EBUILD partimag-0.ebuild 283 BLAKE2B cd3918d1a87ccb5e67f3505ed573a49a85b9dcfb8a8942146ccb0441d566926f1220aa24966530e1dd421b0561adcd8affa1d57865d13639df7d1aba459d167a SHA512 b901f7307ae3971b71e560dc8e1e7ac90f669e959e035e0a7ff88cde149012eafec840dcd3565125ad512845f103dbb90a2eb2488b400ffbad6336f404ac4d4c
+EBUILD partimag-0-r1.ebuild 283 BLAKE2B 96c9f4d87049ec9be5b3348118672c4c237a858f3b95d6e285040b542ea31278cb3019f645aef7d8fa5ffc06554fd1d057dcf6297bc7348489d91f7a48e6bfde SHA512 76dcfb8539fd9f9759615ecb9e5db35762437dce7597dad2626537aa7067935e5ebd1951b714c517d3aefc333492f85aa89a3baf8df06b49e5212dc21e909182
MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
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/Manifest b/acct-user/pcap/Manifest
index 5a68d5c37ca3..a514f9cb59b0 100644
--- a/acct-user/pcap/Manifest
+++ b/acct-user/pcap/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcap-0.ebuild 244 BLAKE2B 70f2386fda254c7477dc251e110e04ae5066c1cba5920fe338ed77478a173f096fd980b65fcfcb9163068270b50a33275f9c79f6f9f4d204d41a74117894e69c SHA512 611abd9f86111ed64a74de1d3fe78c8e58dd3d0676c1fc0eb1e6f4e2d3d2102a3ab6cdc5340ce8236369e884636edb6e127589cfd7279b14c0442b114f4f6eb6
+EBUILD pcap-0-r1.ebuild 244 BLAKE2B acb4cb1d81a91eedd86cf5405b814573cd530e509b8dc1c8cc1699149f4609ed7eb1451d4ed276eaaae00f1194bf57ac7cea2370165ca19f4c2d4900986c8e6a SHA512 1c127e2dbffa71b6574013995013cc1cdb30c252d594daac3a55271c69ea3b286852a3912df5909876e80cb65e6115612c7b47c733efeb4b9faa2b17f83b17ac
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/pcscd/Manifest
index aa252155c788..575e2c5b4f32 100644
--- a/acct-user/pcscd/Manifest
+++ b/acct-user/pcscd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcscd-0-r1.ebuild 236 BLAKE2B 1a54f403670b5c562972b331dc773458321b4e12566a82654d5be443cf9532928d39ee09dd778eaddcc3bfb03eb0fe68b16b8b7aa52f5586d080f7da483505cd SHA512 ab6e0cda6b608801bdaa109ca2b119619df9a7d4e91727fcc39b9507927f6d987a5f7e0466f228e297901597046caec4e54bc8846adcf5a60590a50370f9281c
+EBUILD pcscd-0-r2.ebuild 241 BLAKE2B d56175a6d8da3a2161ae67fbd0662c156b14b76d91d5e171201495241d4b9aa9b3828ac4b444563441c26cd835f33234b2f70810dbd90c9304bb217c9f76b2ff SHA512 263629a43a1b877c9dbf692c74b7948374455be9c13f18966c65c1b5840693350172a1c97d07b3a02e1c58fed728a8b5955f855bfe12ab12f2c6e827c4e0471b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/pdns/Manifest
index 9981f0f22662..2f9093c1ec50 100644
--- a/acct-user/pdns/Manifest
+++ b/acct-user/pdns/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdns-0-r1.ebuild 190 BLAKE2B 9c698917dd9043b4b265d9f2eb78382836b95972b0623057ee8bb5b56ffd4580f062fc2b7cdeb629ed6ddb0c219fc0dfc2cdcce14ca7891ca7f5fdb2bd56e102 SHA512 a02ccf0b9d44c8bea550b730d54632f1b098ddcd7c7186de1b96cc0b44ccc8b9b89b6a82c10472530dc7c1d201b2adfba49ef1d8dd38d216159bd0c65da79354
+EBUILD pdns-0-r2.ebuild 195 BLAKE2B 1a772053909946e436386e466852584291381addd2b3ec2fc44dba128f0a703cd5e4de836b5ed7bd4f3a4b3ac3df1ee6dc77a23bf950d6d548e89adb1f29dbad SHA512 aaac826ad14fde1c8d9ef677bd2f8532fb8b7ca5303ea2bc036d1fbb77586983d06279e582c473f265c0be92b1d6b68cfa558a0d3cdce1482fc2b3fd8eb08f82
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
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/Manifest b/acct-user/pdnsd/Manifest
index a28a2d29b75f..e82f12dbb516 100644
--- a/acct-user/pdnsd/Manifest
+++ b/acct-user/pdnsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdnsd-0-r1.ebuild 293 BLAKE2B 4019cb8509d1ed0769c926414defb9fbfc5233380b62e2eea837d62eaa166208d91763d21ab9f9038b7828540e865a9703ea9e2b40e3fc074bdba40653840396 SHA512 4ffc19a1cb1bbaa9ea9d30ca27853c94d0a3ab8b11a9779e956359139ed4d3430aafcdcedfa71be0d8435100d313d69a46461e96d7ed6db5ee01745b7d897410
+EBUILD pdnsd-0-r2.ebuild 293 BLAKE2B 66fada3ae2ad904b97b784fc59010a8a659b19c1a9dc3dc8a2e8193fe104a9fd0296c99d2ec3bc46892fede092bef68f494edc193124bd360b5994da0c38dc07 SHA512 71b0f2047608e4244533134f092b0baffba80b2a7553c328d43cc43c68001ea30df451d70012fbc0d8190e874cde194784cc9d5806e543800534757ca076e61d
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/pgagent/Manifest
index 35b86609bb9b..5b7c3fbe2b0c 100644
--- a/acct-user/pgagent/Manifest
+++ b/acct-user/pgagent/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgagent-0.ebuild 501 BLAKE2B 5067a4fea54efda0074414c02de861218b255dcdec20beeb0926f7e109ab115c17ddaae2456ed2fd4005641dfa29b87243622947d01f81be1c2a4efd615e796b SHA512 96f03e816d5b6952488a39ebd389b99fe9438ff5390b94ea42ebaee5a4a8fcbd36573a4edef0fd9f43d0a571c4056136f9acdab37fa538b3ca507d2932d59670
+EBUILD pgagent-0-r1.ebuild 501 BLAKE2B acf0eedcc45f5d1e0a7c4d3a8c09c8c0513a9042bf00f2c127e1daa620475a5978eab6660a1aa2fea40103be27d18be34875218ec298d6bafa1ac7216a37ea1f SHA512 105d3e43cda210272c0db2b651ee812ad9d79eea75e3687e84fc9cf52977031ee03c797ec94646c7ca203ca706debf14e5bea7b71e3b1499cfd4604f2358b5bc
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
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/Manifest b/acct-user/pgbouncer/Manifest
index 12b35e37bb35..6ab9eb8697b9 100644
--- a/acct-user/pgbouncer/Manifest
+++ b/acct-user/pgbouncer/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgbouncer-0.ebuild 239 BLAKE2B b7a009e430019b0137f5bd8634fc3031cdc7dd12882f49dda4ebf2648215ff6ddf23fbfe46f39aa833ab248f90bfa11e7ca079a0c38a91e1074a1e7e939fb8b2 SHA512 48fcfd49622f1007bb9553d123d303a4181c8352dbf054d287ce8d47b9df7ae08ecea46a7f63788f301c2b0613fe2825b9f891a1266f6daeac9bdaec6a63c102
+EBUILD pgbouncer-0-r1.ebuild 244 BLAKE2B 2699bb182f62ce9136412fb6bb2b795dee05c5ccdee60e571eeb5eb3fa9e91bbc93af56a54a709d29cd0baa0ca4ef8d381677119a0615246a76ebf0439098cc5 SHA512 0b1d775c990e6072b4a92603951021ee189a6c9c6f1630f777e76fbca9f1b5521ebf93b7b4b540430071de867b7a857c00b1b2b4f54400e342a1b524ecef59b0
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
diff --git a/acct-user/pgbouncer/pgbouncer-0-r1.ebuild b/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
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/Manifest b/acct-user/pgpool/Manifest
index 0152425bf4b4..62c885c1205b 100644
--- a/acct-user/pgpool/Manifest
+++ b/acct-user/pgpool/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgpool-0.ebuild 244 BLAKE2B 3e9aa7a172d0db3e6d5b728082be6d459111a3db382b7f1868c1f55962dda8ed43551be21c46d6dbea0917efb69eb03f80de91e0c1285f66b93ac13baed00007 SHA512 707534634703e0429220dcf7bfa1831f38b537fc5434b4451e53c0128a59b9a8a7e0c3c7286cd9f4f679c6622127dc83f315d03b28788d6cbc948e6106fc602e
+EBUILD pgpool-0-r1.ebuild 244 BLAKE2B 3de568ecd74719e9b35a39f81c5ca91af7dc26858ec27c8047e425957a0d4490b416b8a45ad00117bca3fac6b8ba88704682483c10faab788d9c0455554805ad SHA512 dc9678f47e3359b05eefc99efb9c59f5d61358e457eb58bde1fbb912eaa559670014fc107bf948725b3b3e7e2ffc6bb61f8361ca51758bad8173ba0ddb56e88e
MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
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/Manifest b/acct-user/pipewire/Manifest
index 2b974f3d6912..a50e3f93750b 100644
--- a/acct-user/pipewire/Manifest
+++ b/acct-user/pipewire/Manifest
@@ -1,3 +1,3 @@
-EBUILD pipewire-0.ebuild 304 BLAKE2B 8e05fa9d67ce8934b9900f5c8a01bc52e8b9c2c4769d5f1996a626c586b510e858dd1ce62d4f53d3f4e1e831425270abd539754624225b3f6988911da74f732a SHA512 d85678788914f8ba66ef2d03702442fa0576223e5d30c9d712dd821ac7862e4876fb2aaac642b42b68cf1e6d1b2669dd19e2518e1d5522d3f22d08d1f7b05956
-EBUILD pipewire-1.ebuild 296 BLAKE2B e1d875f4ef1e567f006fef2c1d62892024a7861f83ed205bba7cdf40cf0fe1e248cf2531a0677dac4a4af1c29ef45bf461451b6819db2eceaceab1795a829bc3 SHA512 6bfb6cea55816f5cd03f4d6d9e422fa2aaea53c0102266f5009a76ab815ef8f3144b03f6fcb6c635253e5f69f278781d75fde68c39853e042dea20840be751ac
+EBUILD pipewire-0-r1.ebuild 304 BLAKE2B 521e82b7a4dbd6b5e4d87504ee3cd60ee3e4b7db786fc2deb8fc1a586019eccde801d5b849739a8176d46fd79b5ef4482682c8ba1bd7ef4cd662126cb12b4cb3 SHA512 09aad60a9899b8069b864b26dcd4d0b8b11f6a5e111d4a5750da3a5b0d1312743e7b4b9518bc9ed3982a96ddec55567d95a35374049f14477630977916103c76
+EBUILD pipewire-1-r1.ebuild 296 BLAKE2B e1d875f4ef1e567f006fef2c1d62892024a7861f83ed205bba7cdf40cf0fe1e248cf2531a0677dac4a4af1c29ef45bf461451b6819db2eceaceab1795a829bc3 SHA512 6bfb6cea55816f5cd03f4d6d9e422fa2aaea53c0102266f5009a76ab815ef8f3144b03f6fcb6c635253e5f69f278781d75fde68c39853e042dea20840be751ac
MISC metadata.xml 345 BLAKE2B f519f452866108391c70c15f93d9c861d4d2abc2d7e8abad79bee5e5e2649119643c9563e2c256c5fa194df4b2bb8b641ff62136215ea3d79564edffc849e9f8 SHA512 1fe7551246560d5f17056ed4d8ef3b88f080d7beb1285054cdc691e392686b62107695fc35afaa4bee308bcdd850ae69d1302bb7127fec149854de58b226f469
diff --git a/acct-user/pipewire/pipewire-0-r1.ebuild b/acct-user/pipewire/pipewire-0-r1.ebuild
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/Manifest b/acct-user/placement/Manifest
index 04d9c9ec47f3..3b9173dd5d8d 100644
--- a/acct-user/placement/Manifest
+++ b/acct-user/placement/Manifest
@@ -1,2 +1,2 @@
-EBUILD placement-0-r1.ebuild 310 BLAKE2B 60fe6a26541f56b1fac7c64e2319069e0173cd018c6ffce2ed94d787273c79081ca211733c47a08f67ee3edd9f981b1f7d5f816a66472557c4e3bbb6d234d7bd SHA512 25e6b743aa49d03db305eef5b2a76d3adf59cfffefe90cbdd291455ecbfd2497268402bc7a0b0c50273e93db4a87df9144fc72dead6a6266f4a7d30a25dc761f
+EBUILD placement-0-r2.ebuild 315 BLAKE2B 1baa698922244e945852b118e7978a458faed39fee4165ea1841cfae71db29e2e4b544fc0a55a3176da166cb84c88d17888150c62bf68624d87dcdcb0ef47b72 SHA512 e31e31743a99151b6e58e4be51250592bd53a903dec14595c75ae970904ab62553c911f4d99422006bd1d4a378ec48933218fb949bd2385ed6a9a9ab2ef05b31
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/placement/placement-0-r1.ebuild b/acct-user/placement/placement-0-r1.ebuild
deleted file mode 100644
index 33bddfb4a00e..000000000000
--- a/acct-user/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the placement openstack service"
-ACCT_USER_ID=448
-ACCT_USER_HOME=/var/lib/placement
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( placement )
-
-acct-user_add_deps
diff --git a/acct-user/placement/placement-0-r2.ebuild b/acct-user/placement/placement-0-r2.ebuild
new file mode 100644
index 000000000000..9a2247f71e46
--- /dev/null
+++ b/acct-user/placement/placement-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the placement openstack service"
+ACCT_USER_ID=448
+ACCT_USER_HOME=/var/lib/placement
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( placement )
+
+acct-user_add_deps
diff --git a/acct-user/plex/Manifest b/acct-user/plex/Manifest
index c1be736bf88c..dc16101d289c 100644
--- a/acct-user/plex/Manifest
+++ b/acct-user/plex/Manifest
@@ -1,2 +1,2 @@
-EBUILD plex-0-r1.ebuild 278 BLAKE2B 7659458e6d7821b41ef978163542273b0d83558c672514f1d120b907d6850e9f702c9d7f4f7a0e15d527ab113da7f3a8a7289d0d59f90caf03d1ead150fda750 SHA512 e50691af58a4e0e32917353797ebbb7093ce3bd0f6ee6074ad04de5db0dfff6d16bcb632f83c87460e9a9ed1d23aa84c5ededb8a5148d668734480c93484081c
+EBUILD plex-0-r2.ebuild 278 BLAKE2B 8b02274ba5bf22ad416e785d36aefdc526b338df04f6068c2d660fbcbd54f23d50dec1a0ed07caa49f7fd2ceeb45342f6ef0c433cdefe65e98746270d252e5cf SHA512 aaed3b187eb78550c6ce909e1dcfb68744cf13a3205266e315e66c26abe71f794b1dcb3d22850fa604cabb7035999cfe3e504af390e7bf6896240e323b72f5ce
MISC metadata.xml 398 BLAKE2B b0364533e5e51af3ff46cce6e364786496e4a93a365d7566da1fad2f1a7a262cb18a2afb43d3e3f02d9a7e6a6f76148ae49c40653b63b3d11f242c99f113cd90 SHA512 c05d31ba64239181f746b0d3c66dbca84895f310378b754431ff3b8e27127a02ae3372c538fb21c23f94d4ad7331c9a9aa90b001a1fe581aeab2ccd913495a8a
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/Manifest b/acct-user/polkitd/Manifest
index afa286bbd89e..d2169a8b912e 100644
--- a/acct-user/polkitd/Manifest
+++ b/acct-user/polkitd/Manifest
@@ -1,2 +1,2 @@
-EBUILD polkitd-0-r1.ebuild 231 BLAKE2B e903a09bc1ed3ba8038e5ccf722f64debab81709a586d3ec2456a9fd918910fc778010293e5eda39a6caef643f042c069cce8fd3d0e7b65d915345452df027a2 SHA512 88fb1f885a9df9d42b5480d1e01f7fd364586126d34e89bb358940debfacd2d7f0bf980da0e8697fc05ecad0742751b80ec4a64e3268acd4e129861a380a9587
+EBUILD polkitd-0-r2.ebuild 231 BLAKE2B b01b4c3c5040b23f25568b0e3055685272ddfe17aa86f08d1ba9db32fa031cd288e1dc4aab7e74cc2a7c6b3278f2497e4e5ca18f6b9de55a58fc95ce78bdbaab SHA512 62fadcafb059b3b91da695c8b8a1fa14855dd2742389c9f37650d81699a0781028d36514b279a83b36cf7da717672dbd9980244ab9a9bc694ec0e600ebf11392
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
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/Manifest b/acct-user/polw/Manifest
index 70bef8312853..ab25d542a764 100644
--- a/acct-user/polw/Manifest
+++ b/acct-user/polw/Manifest
@@ -1,2 +1,2 @@
-EBUILD polw-0.ebuild 250 BLAKE2B e1cda9c9252b4c7fcf3968ffded6247ca9955b1c2716958faaec825312025131c4919bc406d69ab4fb64ce4448757d942ece299e327bfac22954c480a491048e SHA512 3963b0247f161b0df957aecb82dc61f146354a615157cba01d6e5dc6cff3fb20ff7519e034e72d603548c9605ec74a06c8cf231091321417f0c89ff59035dad9
+EBUILD polw-0-r1.ebuild 250 BLAKE2B 668f88d1f360a470e81b5e9af6cd6e77addb064dea00aa2ddaf8a1cd0a09016bcee8a3a6e37e4da3b3e4c04d56063eb397e0c795474e87adaf16f2d5b7b56b05 SHA512 23dd32ea9e8d391f3fefc0fafd89fb01523b397a18e4837224f115e51e0d6f7e346ed517a50798932e1d9d7a8960d050cf5eb723c51b99557285ea65c8e54b33
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/polw/polw-0-r1.ebuild b/acct-user/polw/polw-0-r1.ebuild
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/Manifest b/acct-user/popa3d/Manifest
index 0a5e1b961a6d..779be76a3152 100644
--- a/acct-user/popa3d/Manifest
+++ b/acct-user/popa3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD popa3d-0.ebuild 236 BLAKE2B c0c3bd0b3ccf4bc8e9c2c639d422e24a95bfc02b752cc4eedaf68c2854b22794d3eb499373cfe5ef1194a5c3e5ed3cf303ac3290856374818dc0f3a069c58e60 SHA512 03fffcc4713b2bf11fd7be1fc148b4e220c13624606aef1adcbd696c73255f22a6e8b351383df9414d800ef1f1d08d1dd2e2b58b5916ef4c4169c01faead5d95
+EBUILD popa3d-0-r1.ebuild 236 BLAKE2B f1826a104a205a1c622f6dc939f48617dc13a4f9b3bfd9b2c0205a0dbd17410442fb100091380ff54401656d868e91e558392d7b51359a424c763a2a068e4569 SHA512 522de732511dd13a45a434095a7dda0600723f0216ff775bba186e8f8d8cc537c8a4611a233aebe18c7bd60c0f7399a6c6353b52e2b3bdf9abb7b3200fb3af16
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/popa3d/popa3d-0-r1.ebuild b/acct-user/popa3d/popa3d-0-r1.ebuild
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/Manifest b/acct-user/portage/Manifest
index 583d8f93d88a..5ba99c356be0 100644
--- a/acct-user/portage/Manifest
+++ b/acct-user/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-0-r1.ebuild 237 BLAKE2B 50da337688798807174d65cdcbba8c5a19ec25ee9eee41a5a23127e48005a281d41a54281575d7afd7cf943fab6b258ddbc58c4fede601739a1d8d96e53f6ad8 SHA512 eababbb04a4d3887accc2aa003f5e099cd37f7580535e481829a36ce10dbed887d95b78d9fdba651daac10f19bb4e71866853bc1e60601eccb0126585df348f2
+EBUILD portage-0-r2.ebuild 237 BLAKE2B 50da337688798807174d65cdcbba8c5a19ec25ee9eee41a5a23127e48005a281d41a54281575d7afd7cf943fab6b258ddbc58c4fede601739a1d8d96e53f6ad8 SHA512 eababbb04a4d3887accc2aa003f5e099cd37f7580535e481829a36ce10dbed887d95b78d9fdba651daac10f19bb4e71866853bc1e60601eccb0126585df348f2
MISC metadata.xml 224 BLAKE2B b8b01962c2bc1d5abaad41f5f9c1af011244a3a3c73ca8544a532a151b5afd90cd1a423ff4d796bd9dc76ac7504a385a850c5f6ceb4c8a5d76e44aa52452d24e SHA512 fa9628394e8600bac8ce6f6f75926875f02d5469f9f5e33f4ab3180504d1a4f614a72973fffb21513b73bf93e22e97d03a4b3fa5360c52e322a0d2919e1f47ae
diff --git a/acct-user/portage/portage-0-r1.ebuild b/acct-user/portage/portage-0-r2.ebuild
index 5d8cc4b82ab3..5d8cc4b82ab3 100644
--- a/acct-user/portage/portage-0-r1.ebuild
+++ b/acct-user/portage/portage-0-r2.ebuild
diff --git a/acct-user/postfix/Manifest b/acct-user/postfix/Manifest
index 5e55381526a0..154b908a358a 100644
--- a/acct-user/postfix/Manifest
+++ b/acct-user/postfix/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix-0-r1.ebuild 241 BLAKE2B e3459163277555cf4d8331c07a197d43f2c84bc65dd3bf53999e4984c985e125c5131c02b62f6318cb3673e7f0e54699fe4ffa337060d610c4d24c410f0e27e7 SHA512 2024fee13494f2a013954c6e7f7e35c18aac13456313518b40883a68081a7b1265b6cf0ecafd90da5fb279cdd197d442fa1413e0509a70838e49bff6d10936ba
+EBUILD postfix-0-r2.ebuild 241 BLAKE2B 0fb050f06980890ac98f64002a5903473ca13b7b56849136e89c9101bcd1caded942e2b21486819afabbb819c762df53674e5557143f0ad125973b4e83049900 SHA512 f590f8dcfe05db3e360cd9cc40c5a0bc089453061c5407d75122751e6f0e65956a73ee5e88841f57dbc5f7309f24580dd1d1e7c4e0f91152c6ae34bd8d9eb1d8
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/postfix_exporter/Manifest
index 783e77870bfc..048ee2e91d11 100644
--- a/acct-user/postfix_exporter/Manifest
+++ b/acct-user/postfix_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix_exporter-0-r1.ebuild 283 BLAKE2B b7bab64d7864d313f35304b21b4a58abf55517be2c2aa9ea2ca29a96c591e03cd549cb8faf53544752cec7e38ec39a3d7451cbe8352566bd4b8aab9a471ef78f SHA512 284da6b5b3f7205b9601feb657f441ae167f8fbdadd42ab9b58b6e5b17c1b9e560684b7620492df96e11761a3943907429d7f50329a5749869fe524c24e6442a
+EBUILD postfix_exporter-0-r2.ebuild 288 BLAKE2B cfd3f7559f4ad3e0883211d751539992141f1e3f7f1faa324f5dc6bff8edfe8798d29ae7f1377ef1ff854c6c93922e63e7864f7ac0e5b334769d67a686e0583b SHA512 7f56e61084701490ff700462916c09a8c54b536e0c4da3e07c9181773bfd84c51b10d75c7b83db79501c2930dbb7fd6a806530be492598e1eb75efec7c74c00a
MISC metadata.xml 250 BLAKE2B 24647b7269305eaebefbb6426c3543e9ecab2b478004d4353af64dd2281fd139059d4ff4450ea7545d357c3f14583e8f9acf6485abc570ef4a8ed053cd76df67 SHA512 5b3a845086e7023834b58c81bfc93f332349e17898f3bec944fa9430e419a5cbf064de5e71cdbaf570e68dbba1d69a8313c99021f8b68a94ef07f53cd52c34fd
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/Manifest b/acct-user/postfwd/Manifest
index 92745a99001c..746bf607ef28 100644
--- a/acct-user/postfwd/Manifest
+++ b/acct-user/postfwd/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfwd-0.ebuild 248 BLAKE2B f84198c5e9e4255af1b81ae85fb3f8d72c6c1d15e0c820d3ab8c2c9c9867392a88b6148f64b8d8b32dad7a092d1428dc010db8378eedca1ce7cbd999ddfcc1b2 SHA512 142f32020bcd43806aeaf141577c864943b787b5ee2f25b1ee4d4cb3eed19d71f25660e98354cafffcabc2077e61cefd8ee45e9437f5395eee6dc24d28d3a4e6
+EBUILD postfwd-0-r1.ebuild 248 BLAKE2B 0b769d0ca58ac82bed9a87763fea720d59feb78f6f11c6ff0ade529bdf0730e654bf77f454f8ad7f953fdbe14780ce057aa39aeb3aa672f4b500dcc9bf51ad54 SHA512 f644cc754ac46225f0aabaa7a27f650b90bef7f580fce4b991ec1f64a415763aeb1b4ea53798faeba18a528fdecf34883900d89491369a203b6019a0b3835455
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-user/postfwd/postfwd-0-r1.ebuild b/acct-user/postfwd/postfwd-0-r1.ebuild
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/Manifest b/acct-user/postgres/Manifest
index b10caf469832..52c3f3ed4b3a 100644
--- a/acct-user/postgres/Manifest
+++ b/acct-user/postgres/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres-0-r1.ebuild 324 BLAKE2B f8ac6ebd72a8de33f6881b20c023b172969e4622b6c86411957f4166bc570fec32b7758e222466ea55872f8b82e854cd7f726a0d16fa16d705ca76d4e7ab0b9c SHA512 c6801fe0a4f054b98545c3b9708266878577bd2fd1df542794ff812c43aa55ce8c82febf3f1e4ce7b342c2e931a97454d0d96000a7fe88ba38e00e8b3cd5b7dd
+EBUILD postgres-0-r2.ebuild 329 BLAKE2B b0f8eebff1de8f254d23effda8f6b5e6638937ca71e740b87137ddf48ec86b5ece1b4d0cee0e5d9db2b673054319cb1acd2964af44c01962080b5db2f5d79cd4 SHA512 71231f9291e6275af67b193f2178af90463c7b9a2542fbdbc77b827f6bac78c085d6761ecb8f66a24eb02edb140ae8c936656794c42eff6f6fe69ca817dd85fa
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
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/Manifest b/acct-user/postgres_exporter/Manifest
index 85b2ba951c41..dfc9b4a1b604 100644
--- a/acct-user/postgres_exporter/Manifest
+++ b/acct-user/postgres_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres_exporter-0.ebuild 244 BLAKE2B 25c75a69d0f124f5164fe25115125bc5d7168196c93648f0e9a1835490c51e9601ae97711cd0b87908e1856317ddb812916f158139fd9efe16a45e77b52b16b2 SHA512 89a0092040304028be681b4cc62334c9bc313188b9c2acd19d4c80b3e1146ad5a6cbb00b507549afeb990a6765828f87589e8bb5e36858bb50abcbae75df21e4
+EBUILD postgres_exporter-0-r1.ebuild 249 BLAKE2B 70d77b3c155a7e39cfb448488a6262d8f12de029576f55e6710c0faa99df006ac99c978ae39c6abf623da9269016f11e705ae705cfc4670c66549cb468ab7ed6 SHA512 ce7969910c53c6d9a369f6d4bea4bf5e8e9f34ec6c25556a5d053151b548ccb72ceb63a9f318ee21b0296e3c03fe09850ecdb1c81af2e00c3f05d081a1b29996
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild b/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
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/Manifest b/acct-user/postgrey/Manifest
index 69ec34a99bf8..207c02b046a4 100644
--- a/acct-user/postgrey/Manifest
+++ b/acct-user/postgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgrey-0.ebuild 242 BLAKE2B 140048e65fe7acd33e4874f955991bab40fcbd298cf3aae359247afe374e81d3d30f47e90a6322f5991afd4808a09f326bdb0ab5b8ffc372dce2c9904167f0fd SHA512 c9753e811af95ea04de11487ecbfc42098865971cdc63edd50687a2855be19aa88406bbb41a3318c978c4a8199b44d1920d5fc64cae523bb53be070be015c1a3
+EBUILD postgrey-0-r1.ebuild 247 BLAKE2B 0eec250a67c031b3c3c3cf2d71ca6639117d5183b5d8eb0711bd4cd8c12e47a47cc5165c0be84f8ceb96f02b1716cdeb1c9ad1fadc223d4e81d4f9582a0ef3ab SHA512 9b9dcd550437da9fcc71d76c3cdd0fff08c4f21ea327838ffc46b5490ce36b0bf6ca5da15aee411bc66bd1806b7ad2911d91c042018a5cbf16d23ce12ee761c3
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/postmaster/Manifest
index 98ec37706b3f..9effd5143c36 100644
--- a/acct-user/postmaster/Manifest
+++ b/acct-user/postmaster/Manifest
@@ -1,2 +1,2 @@
-EBUILD postmaster-0-r1.ebuild 313 BLAKE2B cb00981e854cc20a55b7646eb72722fd91a7ae49925f866ce6ea743a08a8a8eafffb4443df2dee1550e4811381705081a48b385aa497089dd244ab13123f19ae SHA512 64ec90dfbb63bafb63e42375e45a8a8cb55c007cd9286db862b5d0ca97486a0b9e9689b99e73e1bffdb287a55dcedc1b8a557c5508a9ecea11cf88bd1eca7837
+EBUILD postmaster-0-r2.ebuild 313 BLAKE2B 6d32e82a9a63166f740f00bf0eba03f5496b3ede61e03059aa68ea1eb8f8c8cf89cedc6b2718d77e73c5df95cdef572b649f49b3fa9d0e7a29bbc5f2082526e2 SHA512 6bb9c9523b48d9a3cc3c77a40c6fd7911167b47cc476d1640532b7472bc5dbb8836b12e244ddd5477ddaff74c8a04dd61a534fdcd7205c78da091ad495567eb1
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/privoxy/Manifest
index ae3686907f4a..0dc796cbde52 100644
--- a/acct-user/privoxy/Manifest
+++ b/acct-user/privoxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD privoxy-0-r1.ebuild 248 BLAKE2B 0a8b6cabf92c93d74154614617658340a89726af5e693573ff466af664c0e6d8fa5ebdc47281539a72c038593dd39503cf30c5f49fa35cd9c141be30a9d9f1d7 SHA512 de640e59c77b6a1336a9caedacd016ce42314b48fb99c2a35d7aebfd0a6a6af75d5fb62cd5f5c6ce49d16c9e9e224160eb0bcea4b153c89b7adbe17177f01622
+EBUILD privoxy-0-r2.ebuild 253 BLAKE2B f7f6b1a3345b22d385f03374a8a715e20f1b4a5b86cffa8de8144e0efbac0638aca73e8719eb4555019443058b31bf299b15fe070cf37a8203ea0abf00fa502b SHA512 0fd1908bb7e003d171688cc71364ced53543b1a183199dd481c5f3fd0ed9e26265aa24ab2564cbb6f324b1c10a91c94b81adf3ea51b5f58e62a0cb8c3999e5da
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-user/prometheus/Manifest
index 77a7d7d6f422..886a03c638df 100644
--- a/acct-user/prometheus/Manifest
+++ b/acct-user/prometheus/Manifest
@@ -1,2 +1,2 @@
-EBUILD prometheus-0-r1.ebuild 265 BLAKE2B b1b95d382fef5bf12dca99d2453872ab5c79e5c1a375c6b31a3e1bfef6c17d2445362d722692ec567eaae6ea7a044e48b52d1664f060b7f2a39a30bc0ef71b6d SHA512 964f3eabe995ecd6c388f2db50f0188725572202387baf76bcbbaf1f21685bf605ea0fc3778f009d171e0fc1325eedd27a9d40c3f31a663e4f4ab30a2092d93e
+EBUILD prometheus-0-r2.ebuild 270 BLAKE2B 0c92917e66542262229d538744457d41118ba0be91fac441c48b265e81a23541cf14f1274cfb2d8f212407df8d91fcc157817823325a8574304f06961316fce0 SHA512 9a0a4af3d1e4f909fc22fbdaa85f296834d038d8b665024b75ad597ba1ebe96242f94115bf590091039052027ef98a425871c14b31ab5f34eef8b4f4f79355ad
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/prosody/Manifest
index 1720956ea140..51ed9e6619ca 100644
--- a/acct-user/prosody/Manifest
+++ b/acct-user/prosody/Manifest
@@ -1,2 +1,2 @@
-EBUILD prosody-0.ebuild 243 BLAKE2B fba7d09fd545e83ff9eb1631eef52c6f5ad88d0fa7a8aeda6a98baf4e6f197b9dab7efb95c9fb680e23a7cf66f6a8f0b3e437167c15f6a2e80ee2dacf0ffedc7 SHA512 eb7c1932673ec18db3bbf1effa26ef90040f8a73d1d8584d1e15acf7b0ca4f465b4ffd1e9a345f1255d52e796c33d0fd7874c2d82f7d7abbe8c8db33dba6509a
+EBUILD prosody-0-r1.ebuild 243 BLAKE2B dcfb6ded4e66b99a6029722efa6f64400a5393ad7169dd212bd1b1e96c2c449a151c6531a2f46356be267fef8021be95d6ed792396d4fd7deee7f6dee2a75d75 SHA512 fdf0dcfeae41082d400822c46619d85135e11120583294ec98fe85fe959198e95c25f5efc0eeba3a1e9340750464e3d22fe1cf2f38e7d848f286e02c514680c6
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/prowlarr/Manifest
index b62ada6bb5ff..1de0b1646023 100644
--- a/acct-user/prowlarr/Manifest
+++ b/acct-user/prowlarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD prowlarr-0.ebuild 264 BLAKE2B a60850fdfd08d5e148767b893f6b18b37201eedb6b9e08a8761ddb4df5061ca725d88ef3a4a2bec42ea3b9aff7b94cd88a9ff1d97a22737d245211cb9e9f7a15 SHA512 d66335cdf8c0fe28611f95fc0dcf9f5ba262d03cc00bc2496b1971b94bf47352f33c21742047726b09488b0d51ad2de2782a55ba0ce786da297cd1cd8ef85b16
+EBUILD prowlarr-0-r1.ebuild 264 BLAKE2B 1f1afb6d64fd7ea61540b95d38ab362ccc4bc6060251426770b956f9b50f0d1f7d9901cfe377f16f5907d55f744b1312863031815fbeca9448251317ecefeae2 SHA512 a0b463d83d75e38e3a80ff9b19309dba8372c2cf741d7bf608887e5a93d6215fb785e97d94bd5d5262d54659f8231744c952dfce2f169c7ae0036d74103d0e24
MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
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/Manifest b/acct-user/psybnc/Manifest
index b8015180af1c..405b46a515ad 100644
--- a/acct-user/psybnc/Manifest
+++ b/acct-user/psybnc/Manifest
@@ -1,2 +1,2 @@
-EBUILD psybnc-0.ebuild 273 BLAKE2B e5d99c05c387092ba0e42a49f92eb606db34848fcd10b3ae7e23fe5ec17474c31d3e531045e2fff7ab454f4857ced4d5358972b000cef544ff0dbf0955a31a7d SHA512 6ec8ce95075ce391d43aaaa5376de47618dde9e99ae4e81e70b0f15a69393d8d0cef26332ccf327a6a4fc47508e9845563ef7c730459616e7b3b789c20794e8c
+EBUILD psybnc-0-r1.ebuild 273 BLAKE2B 86e8cba3538b2f74b9ea552ee1a952bcd7c4be3ee55854970e967ab64097e52d7956dedbe04d4ff59337bb2eaddc9ac3f42274946798ee83c610e948d0e5af20 SHA512 f7365659d85db38ca7f42d96bdfb5a4bc352afdd220f5387aaae080c5c22bb7e2d9f3abc4f23470a334cde4ac50a14b6640bad4991060329a5cc3d58e5992b4c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/psybnc/psybnc-0-r1.ebuild b/acct-user/psybnc/psybnc-0-r1.ebuild
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/Manifest b/acct-user/pulse/Manifest
index 49188aa8c9af..582ce611cd9a 100644
--- a/acct-user/pulse/Manifest
+++ b/acct-user/pulse/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-0.ebuild 311 BLAKE2B 9ef945e674872b39940ea9a245996d3bd55c6c7870ea15e10df39921a6b9a4cc4604c213ef5bb0f70499890ae5bbc8d198a2908ae44e6cef2590b52bb32efd7d SHA512 c1ed685899ce34a6703e026534eeea17c70420f176da06b81497c9b09a96096377c334f1605558f0b24f725b00e32b04065122f2ce506563075d1caabe8bbfed
+EBUILD pulse-0-r1.ebuild 311 BLAKE2B 1253db627e39ca574b2d430db04093f861a73e6fd44c8d17f95469b0d19bcf4c62c10eb203ce7a5dc999ce380f29898b379a9d308de60c35ce3979c492159abd SHA512 8d24118920f8992ca31cb3309ccc1fe0a4648b7bd2a6a0f797f4f9e824e80b38031cad5c26e739859fef4fbd7c7947842b46551dc7310d2ebf1b7aacc22a0361
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/acct-user/pulse/pulse-0-r1.ebuild b/acct-user/pulse/pulse-0-r1.ebuild
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/Manifest b/acct-user/puppet/Manifest
index 714f5490abf6..f0f4f6fae401 100644
--- a/acct-user/puppet/Manifest
+++ b/acct-user/puppet/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppet-0-r1.ebuild 288 BLAKE2B d4389ff4fa1df370cc54534f3309d35130d237c9ef64b5efe6a4594375a87616ba92a26b13ec49e9abfa682fcf7460b4ffac61a88364954e0fc21c6246e3701c SHA512 2c177faf68c5a71b9d2156b655ffdecebfa06507fbe807cfa67254635df54e299520acf3c985ddd6c5c49b12f3a72a6a119b3da553112b00849b774cfffbed1f
+EBUILD puppet-0-r2.ebuild 293 BLAKE2B 399d924d4a31aa70fce85d37407b1f4d946bff4db37cdc1e166d82672afda20c263cc649033fbfc0440af43d8b42627f5dfce2071b3d61be7d730f5f22a67a40 SHA512 1c0f83ea36dde9009661d656278f3a6cdc86ace870469f95b23ba367a8b91b32971f05e9657dfaa0c6e4ecf3eb3f637c9be433af5a1017a33957f237a5eb254b
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/puppetdb/Manifest
index 07722db1cbe2..e066c861033b 100644
--- a/acct-user/puppetdb/Manifest
+++ b/acct-user/puppetdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppetdb-0-r1.ebuild 320 BLAKE2B e23ace284f713be4ec1f12638d361c31d956ffbdd01ef4fa751d8c10555a026c7c8d959dee5c04d47fb49bd339768a0ab299d349d95871c0f0879ce9ec4ae01d SHA512 040f9ecdb9f0b415857240ddd676917d340ef4793a350efd090c9436461902c609c17e73442ce2273d7ad020e3f2a88f9c60c95c67788368c32ad5adebb6a5ee
+EBUILD puppetdb-0-r2.ebuild 325 BLAKE2B f0417caaffa8899df8ecc55c25379ed274f8261e97bf24d12c81dd698431559ae3d7b31f5f3429f96ad1e45c61c7ca6e0f48bfb3660f0d1f5925818f6e8fb2df SHA512 c504c82f423afa444c80052f44a95b7851b5f33ce4e9974fe8201d1d7b2acc3b362e8352724ed9cfb780029006708a775836e54921a318b7c2fe5df69ca64ef3
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/pushgateway/Manifest
index 249df42d9926..527ce12b9aa1 100644
--- a/acct-user/pushgateway/Manifest
+++ b/acct-user/pushgateway/Manifest
@@ -1,2 +1,2 @@
-EBUILD pushgateway-0.ebuild 256 BLAKE2B a49fb3d243d4c603afd7880665dbaf61c2f1c6663a5df00c07f339b31688629b87bec0ec7c2fd4a9991700293870776fe135c3e1f7eb9efd465cb5ba32d94df2 SHA512 16c349b3300a241657fd314c24fe5207145299e48893afe36a4059f5c15dd31965a9ff2dbc1ce873ac33c6d5629c61efff42d9e39c4d561519ef95609d98bfc7
+EBUILD pushgateway-0-r1.ebuild 256 BLAKE2B d2b66b812a9678f4234622631b6d85ef661916d37dd766c385a56e1dcbea8bf22b7acd01b445f97ebe6e7bcc73f4db0c4c3daf6cc182e0ca22c927ce542bb278 SHA512 af60d89b59a530b9ee6910cf7b30f4752a13089606e4207fef374ef03e04b9dcf4c46ec569da12a2aafc67f8f91fd7c40d18804cfc8abe2eae4664880bfb55e0
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/pushgateway/pushgateway-0-r1.ebuild b/acct-user/pushgateway/pushgateway-0-r1.ebuild
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/Manifest b/acct-user/pvpgn/Manifest
index d737ab99ac81..cafb1775b300 100644
--- a/acct-user/pvpgn/Manifest
+++ b/acct-user/pvpgn/Manifest
@@ -1,2 +1,2 @@
-EBUILD pvpgn-0.ebuild 270 BLAKE2B 027e999f93f4b2e56ee37b353fb4d2e0d64938eb99b4d5abbc5e80f741caa3a8fbe24d1544a2dcc27ea6b1bc4b0e9fba096d23654cf33edecb19800879f530b9 SHA512 b15d7ea7cddc4cbe228b4428f55925499b6021f65817420886ca79d3721b5b601d0c1a61b93d1f4924d668dc1f53188f05615c514fb95fbccde404e40e9a4e32
+EBUILD pvpgn-0-r1.ebuild 275 BLAKE2B c9191b4b984c2108cfbe7bbbaa93cf9d822740e6d4f0ad00a9de62f0512630590ed952ed04fa0a8dadb3f6b0516558f992162b76cee0ba140e822703b85a6739 SHA512 5992576fe68e3360ad67ef7f834893198291db2950b9067b0d1cbc4f4e9c9af6fe6cfbfbcf21c83c86553b3a1ffda5901951123377de9a939f46f3332211b784
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-user/pvpgn/pvpgn-0-r1.ebuild b/acct-user/pvpgn/pvpgn-0-r1.ebuild
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/Manifest b/acct-user/qemu/Manifest
index 9ec800e0131c..55f4e2a36a82 100644
--- a/acct-user/qemu/Manifest
+++ b/acct-user/qemu/Manifest
@@ -1,2 +1,2 @@
-EBUILD qemu-0-r1.ebuild 198 BLAKE2B 5cc71095367861855afcff1cf2ef4121b0b9e875689f27e6bb7c54c00f8bb04a5f22caffba7df37bf5a927cb1fb87ffb239cc9e9d47033271d274be7a1c67b3c SHA512 26d2056d1676e62adb65e575ad6428ef629dcca56866c1f42ebfb3de2dbac349168a98acb73e5b8f0218a79c4d06b44f45e87e23980728610f53f669c4c765b8
+EBUILD qemu-0-r2.ebuild 198 BLAKE2B 01e2e45a3a86887f0c1809c4f5b9c5cee3226afe81c4ac4637b049fd37086cdd69d56c87db755d70c25e18acd500cdf8dc5715f9467c1c148efb7bb969ea946d SHA512 015f383b96f744b4fc5ee4ddbe2cc77570d4881161e4ed13b6a0d00369443fdb454baa35432cb703e54246a840b11f0d1798dff0a97fff9a131a25b5598f2e09
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
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/Manifest b/acct-user/qmaild/Manifest
index dcecbc299914..2970c4031747 100644
--- a/acct-user/qmaild/Manifest
+++ b/acct-user/qmaild/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmaild-0-r1.ebuild 233 BLAKE2B 27038cc9fb9fc419e3cc2ce623789364ab1835913c5b506df16bea08c2f8e656bdd4e42e08dc7fce631858c0f5fb8b4c83caeb20343d287ee29044fc306b4049 SHA512 98968b7a8ddfd1ef1384de372b3f1f9bf8a2f6652e0ed069f68dbd7e217485766be1193bc709b19dc05319350b5a41e78df60872afd594d8be86582a60ea5ae8
+EBUILD qmaild-0-r2.ebuild 233 BLAKE2B f2f0e4cd7ebc1d4463e4c2d3893be4f69bf9f65d96906315117ed24a1eef790aa84dd189e084a4859a5c4de29dfcd8546ec84a22f94088a8a0b82e5ba4f32213 SHA512 d151fdaee174785902b9d237c7d03dd578732a04b51bb729f6c1e71c2db21b37b414a5b887bfdcc29d381b3d887f692810c47f91f8e5fb3570e21daa0f433597
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmaill/Manifest
index 8061516e338c..c622fee3e346 100644
--- a/acct-user/qmaill/Manifest
+++ b/acct-user/qmaill/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmaill-0-r1.ebuild 235 BLAKE2B dd2ad59231375414f51add32940742362a518a71f9b4f0abdceed14097355071e0f0e872c787442bd6f4ebc57f75f899ac2497489eea2890db20e8a93563e4dc SHA512 bdd80e0bed5689577f7b11b2a5619de755407914531a7bc7dc9678f8df466fcb9ce58def346a6fa87926b27e50e0789328aa6e71acf802e47a1a95daff41750c
+EBUILD qmaill-0-r2.ebuild 235 BLAKE2B b81459112c64532791f1dc5328fb70eaa5ad9f8e913385f073f02c148d939cada9dfabbc0a70f889b654253cff18dc47f6001dd10b2172fe5c34edbc88812d4e SHA512 6444dc7203ebe0e728584b5d1998eb9756b806669e1812cb17caa558d7934d6d04f11e8072a5c889ba0a63f65d2b43e3f90051dce1224f593f3f01a51db02c94
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmailp/Manifest
index 0b7ff8c5d8ca..58e7f0f1f6e5 100644
--- a/acct-user/qmailp/Manifest
+++ b/acct-user/qmailp/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailp-0-r1.ebuild 233 BLAKE2B 2d96e7ee8b958bfc6418f6c4d83aaa591c13392c2a6f0d44f0172b824430866b5d894d80797dabd0f3ffa162a4f81d91bfe5b49a392596b05e6f753b633a127a SHA512 7505cee64d4ff5c4e26c9dbcea71983ac49a3e83b7ff7f977a99c61ae41f31524cfd56e4fdb8d87373db10b145a01d330098c7a4d9c16f837f6b571d76511dc8
+EBUILD qmailp-0-r2.ebuild 233 BLAKE2B 1400c916c64891b6cdc217fb3edb91691f3ad774eebed5056ea3795e4c78c66c1b8b74d46d6917355a0c44ab4ff1e7c583f69920d8b2861ece0810e2b808580d SHA512 352348f3f13bdc75fb91cfb864cd8948791ee43ea427ecbfdbe728b5de2eff62f436639a2602b5bb61bd74e74cf44e74dbc409805c9a5bb886c697ae501062fd
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmailq/Manifest
index 9209ca579cb0..6fb15b0ae415 100644
--- a/acct-user/qmailq/Manifest
+++ b/acct-user/qmailq/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailq-0-r1.ebuild 231 BLAKE2B 3039f2b284ba5830496778f6cc6008da94bf852f043f0e84918d3be1e168373780c454f1171352ca53a4a9b4fa44fe9c93a4b85feab156c875c27d9c12430eb9 SHA512 6262cbe3d3973692e57e90085c405f74c59a6adcd693d73904553e919eb317572384e0d0dd569af9978a4fd649d444a5f9a97a061a72ddf84a5faaa77e80d72c
+EBUILD qmailq-0-r2.ebuild 231 BLAKE2B 5d5d333c0b28f5b8acd3c4e753642052d16a35521415fd6ff95d8f1e0e5aa5d655775cbb5d7099f4ea4f2b157141410750a828932de2e8628260e4ea7b4bdf20 SHA512 c6dea88197fb89fdfc16435d4b867e492c19f6176244b1bc57c97bf5eb31eb5648ec56405e1947ab74b74096bd59d67b47702cdcca7b41d1cf98f92ee2517cc1
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmailr/Manifest
index a6fbcccc83ac..20df193e8c6f 100644
--- a/acct-user/qmailr/Manifest
+++ b/acct-user/qmailr/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailr-0-r1.ebuild 249 BLAKE2B a3fad32aa421e2905ab9673d569f400985ea539115e327d087304d418b941ae79837f48df93a075dc2584d42d47ea3c71429dbbc16a51d0802ead9fe683aaaa3 SHA512 f6f699adc85a3f671f1b4edf59c3720f59182d16edf866a9ab4c32806d87be22fa7e132c2cf17d5b7cc07bbd5e6b9fad3e07bec89321c573a185512eb30fa081
+EBUILD qmailr-0-r2.ebuild 249 BLAKE2B 337cc1df1911592bf54e4d0c4cb329d554884b355a16d8fa8c6e8065426caf5c48780425a32d67979be1c0135ed904cf58e8216a152ffd615e675ca0cdbb573e SHA512 1bc49f3540759f26836ae97a6b30b6e57b1db562b9eb76196164f7ca71627cd1d68c0a0fd3cf118089628c80e84f92c07f766b8887f7b6dba7b10f21a8af1fd2
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmails/Manifest
index c1eb320ced0d..674db3adf86e 100644
--- a/acct-user/qmails/Manifest
+++ b/acct-user/qmails/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmails-0-r1.ebuild 231 BLAKE2B bda6b7098137baa45a7820073bb045530647fc99941ee4e40ffd99f904e526bdd0fff9121af124c7129e7fc227030ebf6ceb2893748aebfeac950dcba0bcc1c7 SHA512 1746363a9170dc894cc258936afd4766081ffb64ec4e43ce993d99f477ba699f87d9d80945c3fc8fa5666d56699c4fdcac123efbe3f2ab93d4ed4f24fee5b134
+EBUILD qmails-0-r2.ebuild 231 BLAKE2B bfc936515840995a2c4643fe3eb584f0cd76309cc89dce8c5a3871473c43709cefdbc60cc04086bcf5b69784ec48c28b518d3fc196f74d3a18a696524c672a56 SHA512 102c66e127215835fb18aae3d83326d0381f1ff3005460eb964581ce12942a66f5f035cad85c752cdb0952aca4883bcf0e139260bb08553486dcbcd01655807e
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/quagga/Manifest
index 15b9442087ff..36b485fc6974 100644
--- a/acct-user/quagga/Manifest
+++ b/acct-user/quagga/Manifest
@@ -1,2 +1,2 @@
-EBUILD quagga-0-r1.ebuild 197 BLAKE2B 66b6c1993a236ce6f91fe66d99dc04cc07b733b12c060fec82b49e1c1eec732447e7f94e495b389407c82d7644917a521ba143e797665a142ed2cb6607d91d08 SHA512 8d7475f057fa8bdf94aeb91d3495815f5994f026215b1cf7a2ee5b8434216d0f849e63d59f30b548c007b463fcb9a4f719b27d6fd095629c083d450c7e872a3a
+EBUILD quagga-0-r2.ebuild 197 BLAKE2B 2cf6f93ce72da76d5d414d43416da56dad1013370f0e6450752157fd6efbf6876d2bbbf83331cad059e8592c42a20c9de92633cac2b2f3afe826fea570bc410a SHA512 d7f33a3a290ca6b6324e3bee7fcb8978095d0fb015b348a6885593a6f2d7200f6b955abb6b76098abb68c8da2cb8e79fab0f73adbd3b50459db952f4a5a1acdb
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/quagga/quagga-0-r1.ebuild b/acct-user/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index d40e6dace3fe..000000000000
--- a/acct-user/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=424
-ACCT_USER_GROUPS=( quagga )
-
-acct-user_add_deps
diff --git a/acct-user/quagga/quagga-0-r2.ebuild b/acct-user/quagga/quagga-0-r2.ebuild
new file mode 100644
index 000000000000..bf4a158964ed
--- /dev/null
+++ b/acct-user/quagga/quagga-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=424
+ACCT_USER_GROUPS=( quagga )
+
+acct-user_add_deps
diff --git a/acct-user/quassel/Manifest b/acct-user/quassel/Manifest
index ab1510adac10..a4565b4a075a 100644
--- a/acct-user/quassel/Manifest
+++ b/acct-user/quassel/Manifest
@@ -1,2 +1,2 @@
-EBUILD quassel-0-r1.ebuild 225 BLAKE2B 17e6953df90d1af5f10e3994e1079dea31f85aabfe8bcaf362f66ca7a49986c48ebb5363359e6b98187ea326170e3ef634226884df634410402c054b9f1db320 SHA512 dfa2db7b46740adab83ced29deffe75d35c02ebecc45fedf97923c76514fea421d3cb5e2c255b11195ed49a5a6582bc4a3136796ad279182082f701d856c228b
+EBUILD quassel-0-r2.ebuild 230 BLAKE2B b7fb48c4d8ccdbe10fe1702e869a9db3720542f0a03dce8a1bfda9742aa2c1e828509d45c1eaf7d00dd68ab999091bd8cc1e799c6a80dd99e3c02c680555dbed SHA512 e2e5a53123a2ce2dea5ab887753ddcb57569b63acb2a3914d3ca9321392f7ed6402a958abecb4a7996d16f4b0d1c3890b0a050de96ca6eff355fad6a74edf7a9
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/rabbitmq/Manifest
index a0dc4645bf1d..3fbb96f5eed5 100644
--- a/acct-user/rabbitmq/Manifest
+++ b/acct-user/rabbitmq/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq-0.ebuild 317 BLAKE2B f1c1a2dcadf76d82630a02b448fa1ea3b25c29f65901e91d440b1dfe2168782689cd212a05784933f9fcbc1a97a21fa3f95398a298ab31369388b1f8f7c7a863 SHA512 6d095af0f7fc2ae35101130aacac3f59ec426bf91f3c88469db7abec21225cdaac1e4525ed684d63d6fb89cf37191111333160968a0dbb9796f57437723c802b
+EBUILD rabbitmq-0-r1.ebuild 317 BLAKE2B 36666ca0e5dc21fae4e6f2146843cb92ae2e7f25da88ebd78e76232f96963488ca0713e37b6b04a6aa2c28cde61bf2bf65cb9b355de8cbdb361b7e3a965c818e SHA512 686d90d8129db3968f9e3e21413747f4c6666158ca36b0f5a0c06bb9f434e4cb25dede39ce76db742bb5a7859c617971b165bb96e62d39493d3eb0ea6f1aac0e
MISC metadata.xml 244 BLAKE2B 7a5cfcea42b430285e098019ccdf99eccf96c5ba82feeb5354a023aeb0c197c9e7c138b8329bc20a0080cc028c546a0fc52b74c383a64645aef2eea22b894522 SHA512 04757d267b2495bcc0f50cd5354a9bf2f5093ca396744f4cbcdb4eed249e94333226c52e346261ba8da975d3d5fc7bde3c50a5627875a15247b338bb1eddc2e7
diff --git a/acct-user/rabbitmq/rabbitmq-0-r1.ebuild b/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
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/Manifest b/acct-user/rabbitmq_exporter/Manifest
index f2564e215baa..2aa984d64da5 100644
--- a/acct-user/rabbitmq_exporter/Manifest
+++ b/acct-user/rabbitmq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq_exporter-0.ebuild 263 BLAKE2B b5522b1a5440e3fdeb9e7555280e0982c0f2647553ab7e2919e236609367722ab2b37a315c55169a91a344708aa0cd25bb3ca1fef1d63847ea6d8202f6a0756f SHA512 4e409d9e9f445844f0df32245d18cc5c217ebed97f136f544cdd28fe036d5ee18237e1a05036f8be3df7fca2f6074e68f28769b01f651ddeb78c534afa0a73f9
+EBUILD rabbitmq_exporter-0-r1.ebuild 263 BLAKE2B 909cbeb33e86f1ed31067602b0dfd13e583cb7960fec3c4ea61e72ed93a77e0294e1b18a17863b6d6d8e8bf183cdbb330bd5a37077e53bd7edd6bc3e1915637f SHA512 3e7203e92e392cfc888f3cac8c6b1e845cbe0e6e697bfe31b8a2570a08d3c2ba0beeb7f4b2768b8ea222e496cbf13d09ee35a44cb20b24c31516780f3d1acf55
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
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/Manifest b/acct-user/radarr/Manifest
index fbeee19b0095..0d50831464c3 100644
--- a/acct-user/radarr/Manifest
+++ b/acct-user/radarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD radarr-0.ebuild 258 BLAKE2B 7ccb886e683987d5648e2eea76b79d47e0138aebe160e930b0303acb6bde2237b766e8b9d8ad8fdd5160b4dfdb33da86b5c95906a88e9fc589695e40301f1a1f SHA512 5f831c6014e3ffe2e6f8fdf818bfa26400e98a6ca7e9e27c5147dcde32d75d5a7f27c96e969b40e92c8d86dd793543c78097e69545b1faad104f3d5a1e249274
+EBUILD radarr-0-r1.ebuild 258 BLAKE2B 8f79d281d07e5aa49d455334b4a1c54f2c52480527503e32043ff7c5359eaa8f1247610ba1ffe2c4e5c245660a96e41866b550d3d088a7265454f263072f74f8 SHA512 08d335debefb7f373d57cf90b1a8413646efe692e320adc9c43ff6866c3ca6a6b0f7e62ff2b63bcf092d8c653663773d2d5df275275046406c0610ab5929df7f
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
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/Manifest b/acct-user/radicale/Manifest
index fd640055c4d0..06bf71f8ee5d 100644
--- a/acct-user/radicale/Manifest
+++ b/acct-user/radicale/Manifest
@@ -1,2 +1,2 @@
-EBUILD radicale-0-r2.ebuild 273 BLAKE2B cf85d86628fdc259bc7381d96883fe0af567fc47ff96584784525b8e467baf1138c660ce6b834d8618795ab69b04b9a7a75976811c0625187b553e3c6f2dbea4 SHA512 48a89042a550a615ce97d396e3f8821ca10d3f1a75339bfe7b19560640caa9a43afba8c74a7aa5ffd6a8b8161f38b271c3ad8426e3ffbe2604e6b3ffafc6fb40
+EBUILD radicale-0-r3.ebuild 273 BLAKE2B ba3bc772ba745c24bc4bd050fdf19a275c8822d7fafcc71efb61b2232e152a123874adf757e54df2e88b4b29a66add019f912690d907964c9ef6468e72739ad2 SHA512 ba01d4fac250f9eda6b8ba4b9856023680df862ef96fd00cd5cd7f63e86af076b87b3ba208dac8e21144dbcaa7565e23c5172b41264a2024c72aa0c4d62a7f99
MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
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/Manifest b/acct-user/radius/Manifest
index cfa124cf5174..52d1ed74f4e9 100644
--- a/acct-user/radius/Manifest
+++ b/acct-user/radius/Manifest
@@ -1,2 +1,2 @@
-EBUILD radius-0-r1.ebuild 233 BLAKE2B c92dba45cb0be09ed08d2c3c675170ddf3dcd909ffb7c56d60fecdb98bcd4077470a7946d4f630ba271f671fa562496981b0bd8418cd57b188f0419cb2dea2d2 SHA512 9cd75d55de303b1c8cb16a9fe39d975b9020cfdc303f1caac5c77c226b72e8aabec1aafcc8efe3d5c7489bfbce2b5f9b8e3b500ca0c5d2a218f4521f9e12a9c3
+EBUILD radius-0-r2.ebuild 233 BLAKE2B 6e8d66eed9911a3387356d7780de05efb7eef4e68462963b51124d16d6876f57ea25bc01ca266b39865a0c3d428238d6c25571667e5fbfbaaf6979ed67cdc00c SHA512 f14c9e9f3c9354d3408b1fda80cb2421066b8ed81134abaec8096cc8529beb0b11a25595257aa2fd55d92d18c71f51afeb11d071f5ce4cbe112a9ad964eaa508
MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
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/Manifest b/acct-user/radvd/Manifest
index 26a98cb2220d..21209c932a08 100644
--- a/acct-user/radvd/Manifest
+++ b/acct-user/radvd/Manifest
@@ -1,2 +1,2 @@
-EBUILD radvd-0.ebuild 258 BLAKE2B 6a8c6a5a2948ee870413e2fe2960fdfac17824e7abf5c8c61d69a7dec23c9e67caaa9eab2016649d8d376726b419cece11331b165639ff3ca2a4901cb996700d SHA512 6f430344c025d05772144c2c3b45ed9302902d77e681d8bacd805ce05d8f3457329cac81e6c84e74eb63c1bdbc77076170ac30f0444d6b12b8413f42cc7be439
+EBUILD radvd-0-r1.ebuild 258 BLAKE2B 288198478b32c2705ecadc482cad4bb2b4731fca9e5c19a9dbc9884112d0e7cb143a90ca2e513b7a08eceb76989fd5b609a07a822a2fc998f73bcf609c257926 SHA512 ac2102e7037cc11f954480c82d3a1c9f423fcb63c0cba9d0fddf3c451925dd1539610e393e29edbd29d0aff7e0b40de221ad3d40e713acb20a1b94f0310892a1
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/radvd/radvd-0-r1.ebuild b/acct-user/radvd/radvd-0-r1.ebuild
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/Manifest b/acct-user/rbldns/Manifest
index dab4c193ebcc..c45aa0b95fbd 100644
--- a/acct-user/rbldns/Manifest
+++ b/acct-user/rbldns/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbldns-0-r1.ebuild 198 BLAKE2B d1a0491736dd79ffbb5be6282e10ceb491af80864f27baa89a60b5d4cc315bebaa5c98049ec5ffbe4c3efb435b9c49926fddcb8b29133ebc9e3fe35844bc8b50 SHA512 8f7a92f9848e6affa35f4b41398f878fda76cdf94601055dea411ff03adc8f3d5dc4afb5ffa97f0be391fbf93e199ea0325a2f017a75c063eca66b0e80804868
+EBUILD rbldns-0-r2.ebuild 198 BLAKE2B 3ae83dfb49cef5a21662cb464237554c17a688b336173ea528bcad5f3b61967fcc2fb5b5fa2ba9a6761694c8192c2c3f0fa53acc5c6fd0deb560940431aacdff SHA512 ea9d166bd9287e43862fa6c747b7c90510a15d70e22fad2609042e430dce7c020cd020c7781b81533ceb1a47bd10bfc7e9db7747ca1a9fa9538aa7382a14dff4
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/rbot/Manifest
index 9dd97f2c8239..b7bb51ccea6b 100644
--- a/acct-user/rbot/Manifest
+++ b/acct-user/rbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbot-0.ebuild 269 BLAKE2B 8e10224f68393f76eb342d4a932335db70ccf6bab68d36985fed46b666e59c842b8be290629ef9e3ea4e22f561a2304726bc1fbda5600349e6f3008605145317 SHA512 8b7d57a2f138ffe0cc88d8a4dc3136b8259b1c30c0eb2d4e0b8425656fd44316dcb40b31ecb33f49a19dd24946d017ee356a6993c31cc382b2e13dfe67942196
+EBUILD rbot-0-r1.ebuild 269 BLAKE2B beb60d2ed630b9fc0b8209993e1eaea34e969d6d25775e70fe064f2c66fe99e729a928b7230285dd3e6c8b07f08e676052eb8475133ac577beae0bb478325bce SHA512 d7d330135c2ac00e564a35084ee65f6c600f3cf90f903f9ce0b09c9e44ef724d3ee3b3e17cbb969a5234f958ca3077440545c06fcd64ba45e60350e067974154
MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/acct-user/rbot/rbot-0-r1.ebuild b/acct-user/rbot/rbot-0-r1.ebuild
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/Manifest b/acct-user/readarr/Manifest
index b2d8fd1a4abc..304e2c0eec03 100644
--- a/acct-user/readarr/Manifest
+++ b/acct-user/readarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD readarr-0.ebuild 261 BLAKE2B 1b182a8a891fb02a7f85649d9294a54d116c0607ff6270e7e9f27e0e6c7210a5761c873519ade49b26db4810465363c1c2b5a24a5f1332dac021f40d62dd2597 SHA512 b5c830b6d3b6f51eea1ff80d63622917e163f4aa5f6c60d7c5d13f5a8887553a44c6ea96a5f01a9be6dfcca768d4b12c9f96517d3e5f0307f7c03175e4a3aa07
+EBUILD readarr-0-r1.ebuild 261 BLAKE2B dd174b1667c3530ad07fa6fce952786dba16d1ce8268f243afe64d40b71ed300b0f4c47139f5767744daa74322bfdc57aa115520cec9a46ee09b175e15c01786 SHA512 934f42c65ae8a439bbc95d6c5933b3fe047d44f84f71df23b4aa9fd2b57d32cd60fa092fda89df1f095e003e8b6531b7d518ac7731bba9ca0356ab32ce7d2651
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
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/Manifest b/acct-user/redis/Manifest
index 41e4e7aa8168..79e831879c69 100644
--- a/acct-user/redis/Manifest
+++ b/acct-user/redis/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis-0-r1.ebuild 227 BLAKE2B 6f5483beb285537a5671003c70d6c28ebc5292da16359cad317df8380603687fecbf2766a948a27f34f37b89989e8eea9fd99dca0061c3b7628027dce0cdbdc1 SHA512 c7a9bab7c8752d1e5e296427be169365ed6d4f09c5a8fd152c735022a7d1c699a0b7f975fed0421f8408e03d7f80d2fafb675ac58a2ecc1d483101f00c49cbac
+EBUILD redis-0-r2.ebuild 227 BLAKE2B a90c1c3c3f8c5398d86e3159f99215471cd12cf7b1b72677f593e142a8efedb80a6b1672325672714a02d3165b65b473e062f12f8363fe7bee0c2de339fac88a SHA512 00f9cc8ae900398e9b663165d643301c7e17abf43002c96419549b82cb0578f7c879743c9c3a3986563cd32e840fb9af26a45751c4ecade99c541587a6c29aaf
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/redis_exporter/Manifest
index be68bc7d9e80..2e5b93c1602e 100644
--- a/acct-user/redis_exporter/Manifest
+++ b/acct-user/redis_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis_exporter-0.ebuild 296 BLAKE2B 3fb282550a52df88ca4dcf3e2fff3222005feed09c95ba97029e34d5c2dccdb767a5cd4c9a2a79e70d72b10abf415af731e11ac9935ef84615501342216dba2f SHA512 c9ddf85840a37aa04acfb4c06e473de189fc7be8239dacca1528b73eb66ed4eb2549659363b3235eb275354068a5ecb5b758c5e05c08e69ea229fec24eef3056
+EBUILD redis_exporter-0-r1.ebuild 301 BLAKE2B 38a15039eb8554a248a3dbbde5b0fa2567a713271834eb9111de844b048523be33d99e839958ca93dea14cf17869a87d33c5c06e40146cafe2e1720aad818b20 SHA512 62003cfe128d2e62eb891583a433680ca721c12d80797bb0f0e72e90a32654cfcd94168ce7146d1e85d01986077aee0feabc787ebd205203e2e27fe6a6f37aaa
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/redis_exporter/redis_exporter-0-r1.ebuild b/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
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/Manifest b/acct-user/redmine/Manifest
index 1f2d5daca7bf..acac48f52423 100644
--- a/acct-user/redmine/Manifest
+++ b/acct-user/redmine/Manifest
@@ -1,2 +1,2 @@
-EBUILD redmine-0-r1.ebuild 236 BLAKE2B 6e45ec678b369c577b9f70a26fc5eb4c2ecca097c7b31c7dc23e1f94fb35ba86ad4e0d9d74ac4fc874be6ede391b08be1058c55ae1cce5c0cd14556e5f9cea93 SHA512 0cb0f1679f7aacdd424756c9d18356301b037cd9fec6bf5a173443dbf9795b47869d0eaed7de23505f6c9f522f99aed06bd927e6361014aa75d316e2c3916b24
+EBUILD redmine-0-r2.ebuild 236 BLAKE2B 4bfebe80927891a8e9000c9c474236a996f800e6bd2380b4603549048773b738e7461b79d5ac95f4d32562da2bfa31791e89127441d3bf29bcd5a160a90c48fb SHA512 c369d1a0a4804c1208a0407f1c85a954a6a8c0785269f6b632310a977988e81eb3c660d73b78622d578412b2881d352932c9f219e83c5231c7cae315b316b35f
MISC metadata.xml 439 BLAKE2B b2e195109d27e64d38fa965e29a1759e01d7bd4377b9b239ebaadd35023bff49e2981d0df3102d395f368ac970188dc81d31d021dfc48bc4f17d486bd7bf339f SHA512 b82761ab3e617b9e1edce602ad937850ee801633fe478a91f16320f6000394ce4b5653c86ab227fc0b00bcf35331fe0b059f6b101942e22ad7673f6e7b54080e
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/Manifest b/acct-user/redsocks/Manifest
index 8c1690485ec7..04d77913ca66 100644
--- a/acct-user/redsocks/Manifest
+++ b/acct-user/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0-r1.ebuild 248 BLAKE2B dd8af09bacb87f34440451d88c41c27ad5cb0b0abc761e14eeaa31c0905fb784c133af4756b34f909ed8c644402a65f3af192367abc21a27c2b5aaad73b16cbc SHA512 99759876fdfe7e4e8ce0f68afc1388551cfe1ea1e46a0de924226dd5e0ffcae5e5afc87e580b318d4e49a3fe6b7c1211cad4cf8268dc6f58439d5d3b6f8645e2
+EBUILD redsocks-0-r2.ebuild 248 BLAKE2B e6d339ae0e36dccb354b3dd6fd3e5390b5fdb55bc8e77fb44a4a6b27b394c30918dd11eb241be54d7bbe7595f831cc7639e1d624024d381e8791f29647e1fe72 SHA512 a98e66cdc73520ceb23a7cb2222b724a323d0b2d44e6da832f5ccd0de4affba6bdf4636912ed51dd15a19d6e4a9ba4322dbbe8c617eaea738ea5007413749f2a
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
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/Manifest b/acct-user/reg/Manifest
index 3ec4b02f6beb..bf015204180e 100644
--- a/acct-user/reg/Manifest
+++ b/acct-user/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0-r1.ebuild 266 BLAKE2B afba4526f33416bffc04a02af10c3ebbbc5707893f32838ac489c6365cf787aca18a17a0fdd12c458c4328fdf640df7c91345e03ab8173d50e2993717b274cc2 SHA512 a24ecfba3bb6b449f6a50d923e902ecf74eb857fff5944803ef69c4a82ac378f8c999f598e6ecbc65adc3583cfd691c72a7de2b4c1ef96ae78d96552ef207fec
+EBUILD reg-0-r2.ebuild 266 BLAKE2B 2dcc4d93cb84287b9c83bde19fc4a7f0299edff7816dfb37d0dcb1a1723be578fb1313e9cfebbed1d72ec2d2d7ee4ef3b6d17551625c317f5ad98a932ea3e4fd SHA512 0bff441471447e110d3433e401902027481a04d00aaa64a9d688cff551bb085acbcd2fb911f18f590132d31f5d4e339b3f578f77a4be4ada5bb10b0db188ef44
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/registry/Manifest
index 53c109158c6c..dac5449dcbcb 100644
--- a/acct-user/registry/Manifest
+++ b/acct-user/registry/Manifest
@@ -1,2 +1,2 @@
-EBUILD registry-0.ebuild 260 BLAKE2B 38ee067d9a593df80ec11f19c3c19af3bda5663d8eb83c1d48c58a4e18580cbf2400ac28c8e79150ad8bc6767c4f4467baa5a80e7c329d6852371864c851cc8c SHA512 6bee03be6a291a91c41719da5a7cee74b995db22ff78c03980dc6ce037451a1f744dea08ac26aaed99e464477157aba6225b9f4a5512d9767ddb36fb23e7ef15
+EBUILD registry-0-r1.ebuild 260 BLAKE2B e78e293d142e191898c01bbbd65f0ba6a4f6d0088b048ac08fa45efa8d91a7726116e7138d61f793e50d9a7d722025bb6f6cce1feb691d5732d303732dc46174 SHA512 21ff211bb91a27732b847c1a757734dbbec30161c4582482bfd34d5cd283b623b1add069dd8ae99859e8147bf3e9bec7bfca490fd28fc32b06c02d5e136f5d30
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-user/registry/registry-0-r1.ebuild b/acct-user/registry/registry-0-r1.ebuild
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/Manifest b/acct-user/root/Manifest
index 0a61f74ddd76..049d5fd972a3 100644
--- a/acct-user/root/Manifest
+++ b/acct-user/root/Manifest
@@ -1,2 +1,2 @@
-EBUILD root-0-r1.ebuild 441 BLAKE2B cf2d3fa5c74c9dcb45786eaeabad00969a0cde6091bc495dadce313767b36edbd5debef38b94f55b7e9519d0c67102c994b3f5e9fd48ec367c38af63969dfe18 SHA512 6f11fae662873287cf6c341a145998394b8ab2bbdc67d672a206140b3f9dcc3cf45c174e2766eca73daced0c5a1dae06a9f957cb657ee6a06be68ab6d42a5036
+EBUILD root-0-r2.ebuild 446 BLAKE2B 5293473378883e209b8dd42fa7c6c2d2f2658565ff34baa236530a5c4f92937c9837fc5ade1515f179d90b6112a8ed8463801fc5fb080ac5216230a518158087 SHA512 711f329a03412064cb6e220c6295fd0e40254779f9e9e91753d08979c1f9210893230d70d2fd59d1d8076141f7502156edc4f09ab7d04002733791ab6ef6c83e
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-user/rplayd/Manifest
index 903a8b725542..094cbf25fed0 100644
--- a/acct-user/rplayd/Manifest
+++ b/acct-user/rplayd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rplayd-0.ebuild 245 BLAKE2B cb1ad829dc0e82512496e95a0ad3ddd76434c586cc891f2fd8538e782afce7fc16ad797f064ef38f31a79c3a6b49e1950163a17fb8bcd79962f9f931a35f6909 SHA512 cb666dd1a1eae8fca37fbcabc0e7fdc13cfdffe9b6f40b472365d7d0808e6e0e7416eab85a9356c45d5488894599478b9f0decc658587bf0eddacbe64472b2be
+EBUILD rplayd-0-r1.ebuild 245 BLAKE2B d8306d3e55f32a32e4ce74d606b6e05db17567d6bb4343f3b14c5ab4e19a80f9d40662dbf8ab3b17f07151d149059b1185fc8dbbdbee0518d4e9cc4dd360ec35 SHA512 ae79ed1e4e599881dbca992ba5f0897d17329035c9d6c1c034ea7a12aff4fb9173626cb10571a1e68be383ebce11bf63ec7bdc6ce27eedcb16a629a369b9f908
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-user/rplayd/rplayd-0-r1.ebuild b/acct-user/rplayd/rplayd-0-r1.ebuild
new file mode 100644
index 000000000000..d181450d048f
--- /dev/null
+++ b/acct-user/rplayd/rplayd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/rplay"
+
+ACCT_USER_GROUPS=( "rplayd" )
+ACCT_USER_ID="161"
+
+acct-user_add_deps
diff --git a/acct-user/rplayd/rplayd-0.ebuild b/acct-user/rplayd/rplayd-0.ebuild
deleted file mode 100644
index d0f4a9ffa47e..000000000000
--- a/acct-user/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/rplay"
-
-ACCT_USER_GROUPS=( "rplayd" )
-ACCT_USER_ID="161"
-
-acct-user_add_deps
diff --git a/acct-user/rrdcached/Manifest b/acct-user/rrdcached/Manifest
index 2d4524583e09..5bc6da7690b8 100644
--- a/acct-user/rrdcached/Manifest
+++ b/acct-user/rrdcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD rrdcached-0.ebuild 287 BLAKE2B 3ef91d2abbe81b891b8aa43edf1d1a35206bae202589bf04f62cc9e9fe65572a88c72fb926b734cb8903663eaa0485f504e0d586fdcd141fb97b5a4f4e8f60df SHA512 846212aad42255a707a17ea4f917e5ce25d4f2099c9f752dc761d736215fcbd1c1914d9fb3eb9cb93e993e375a531a93f1824caa560fffa348fa5806c8cd4c54
+EBUILD rrdcached-0-r1.ebuild 287 BLAKE2B c00bb0a0a5e493df9f68e727534aeacb710c28effcd17dbc3e2c46340755497d42cc7a44cd91b1addaa1467d6d06687cc2992f677192725233448a063e22a791 SHA512 721737a412639bfe3f6bcde514af5d100e2126ea524ddec2ba55742ef1c6e0f084e1a5eb2c3551644d449f1b91c74fafadfbe969445914453c27f700707592da
MISC metadata.xml 392 BLAKE2B 96d11acefa9a7cf18f9240f08a5b1c36e769f4e7000632301d3f763169fd15e20fbf3adac95e2e0463d3184ea4baf9792b0f061c95a6b79d3f95da03dfb3fb6c SHA512 c88eb6c28199d5baae394310b0ebcd6ebc186642d4700735eb1f712b176a7750acacf2c8d5a417d2c716bc43d0cdf5f3e11ceec1895f84dd1ea4f0186e3183e2
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/Manifest b/acct-user/rslsync/Manifest
index eacd8ec4c7e2..b580f366ce9e 100644
--- a/acct-user/rslsync/Manifest
+++ b/acct-user/rslsync/Manifest
@@ -1,2 +1,2 @@
-EBUILD rslsync-0.ebuild 316 BLAKE2B b6e4aea69886af636424d52944b6e81884be35927a34192fda671a89954fd75eb53d4332f733bfdaf2961211a80fc3d7aa7082f5597bbe328a2f4fc22979e49b SHA512 b2e3cd38d8e6f98621e05b43317313d09965b0704d0d5dff65eb8e126584cae4c1d5fd88de0d15948c4da162a259368402e2eeba9420ed7d7d8d8bbe6bf26881
+EBUILD rslsync-0-r1.ebuild 316 BLAKE2B a4be5f2d215b95ca41d77f0ff7c938dac48af0177a54736a9c8ddf7bd503f2a32c270847c68047af2fc05ac5fb9af99fadc1c9c72b1b602782c2bc9457e638f4 SHA512 6826229a77fbefa0aa188b28665666804f41405da9ef1dd18fe0e0477a866cd580e143010b2f4d7b57713a3f294dc83f7b6fbbdf3cd138f9629a9a942ed06901
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-user/rslsync/rslsync-0-r1.ebuild b/acct-user/rslsync/rslsync-0-r1.ebuild
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/Manifest b/acct-user/rspamd/Manifest
index c43231144bc6..00ee3be47ee4 100644
--- a/acct-user/rspamd/Manifest
+++ b/acct-user/rspamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rspamd-0-r1.ebuild 257 BLAKE2B 528c6849e445cf5785dd89314209da971a736da5ef56ae5d0890c7f41d6aac84cc4a4bfc474a75262ee93f2452aebc58be9330675d1b93640634d76578eb9456 SHA512 1d340ff2bfdf0031029040d75790b10825209c6da9a7161e376638c362e0a9eb16dc614466c0343bc9b49fa332a15908df58163548b6f8982303c3671600b008
+EBUILD rspamd-0-r2.ebuild 257 BLAKE2B 0c2c31f2d984760091c171f5b5bc583d4c2c072e7078cbb3ca6f6110a6b9c4f9dac58190f3c281187476be7520fc5fb5335b0ef1d1b0b3fda5154547cca14634 SHA512 4415adcd7594b1fe4bae205fe484bb2d3c2e362bfe46cdb61c5838d291c2dcefbdbc8ceeb763628d862a235ea4c8dde25b6a1fe368d5a165dd93a95e8b087add
MISC metadata.xml 403 BLAKE2B 73564783a1a9e3c1822097309be28fbfdfce03d09e2ba8b1238693ef4fb59cf01542dbecdf41ae5153550d17a39943e6e966ec1a69757f4179c2e8f756de5534 SHA512 31fe521e9638433c2c57240d7f9cdd037ba099c19f62b3b28049a730afa017107a21e5bb61603ba6aba98a11b05cfa8911404a154233269c0ced1ed53669504b
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/Manifest b/acct-user/rstudio-server/Manifest
index 9404c5563065..13e082857ccf 100644
--- a/acct-user/rstudio-server/Manifest
+++ b/acct-user/rstudio-server/Manifest
@@ -1,2 +1,2 @@
-EBUILD rstudio-server-0-r1.ebuild 247 BLAKE2B 678502a041a67595247c53ea628084bd031a880607ccc482898deb0cd87abef8ea38375ab1463b4209e7a689ee8cbbe4b225d8f94e508b42b20bfcc489fc9186 SHA512 52bccba7fe5d90ec23d9ce1d4f368054ab1356a70d2944045ad8caad549a5bf6bbecb05e454b25bf5dcf3e7399f7b445f87c989c591d6d8ff9288a8138f185db
+EBUILD rstudio-server-0-r2.ebuild 252 BLAKE2B 7290753a9f0dd14a99420d0d76d1990e2f02eaaabca2ec17b1f587f685bec43a294f13845b85277b4ebda1986bd1994ef7a7b9db116d00b88370216dc3cd172a SHA512 8be1102797aedeb6bbe9cf03eb1aaa7496027430a5aff5d7be94485a9173671cf34c617541df0cf7aa1460d46f96e08e44bcaf2a82be1495a7808cbb925ff690
MISC metadata.xml 245 BLAKE2B a7cadf465163ca1df604d88e904902634f1559b696dd48e5a57ebf2b7d27917f6ebbef65492ffdf5b620df01825f242d9311161f5624adaa709eaf7eebe0f5fa SHA512 27160785fd59931535cbc1c56f34e2f7e79f477bc9157eff9a07bd7b3f49f1c8c1c20106c9a7148123dcdc3b64411b9f706d49b544eca4415d8d13152fd05c9d
diff --git a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild b/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index a77f8b72ddee..000000000000
--- a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sci-mathematics/rstudio"
-ACCT_USER_ID=466
-ACCT_USER_GROUPS=( rstudio-server )
-
-acct-user_add_deps
diff --git a/acct-user/rstudio-server/rstudio-server-0-r2.ebuild b/acct-user/rstudio-server/rstudio-server-0-r2.ebuild
new file mode 100644
index 000000000000..bc297edcdd2d
--- /dev/null
+++ b/acct-user/rstudio-server/rstudio-server-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for sci-mathematics/rstudio"
+ACCT_USER_ID=466
+ACCT_USER_GROUPS=( rstudio-server )
+
+acct-user_add_deps
diff --git a/acct-user/rt/Manifest b/acct-user/rt/Manifest
index f76a43f14c4b..0e46b0c3b610 100644
--- a/acct-user/rt/Manifest
+++ b/acct-user/rt/Manifest
@@ -1,2 +1,2 @@
-EBUILD rt-0.ebuild 235 BLAKE2B d3576e210edaab188ae33efd177d2d97658f08852885962dbe6746ed24764c26f3443ce354ece5ca0d243a3d4818972fcd97a49dc8656315c57fd5bdb2b3731f SHA512 45ba887001b845b49d24ef9b9fc0ca485b73ad4df77b827144beab36c535bbbaccf87b9b7030dd395568de7d77f9a3c6b35298cf5412dac502399c8a7977585a
+EBUILD rt-0-r1.ebuild 235 BLAKE2B dad858030bdbc7fe8c06e1edf4721e30b51ab970b8d61ac76644dbef57ba65cf95d68ec87f796af42af5a9746eeae9b8ac28129e6df5fea0bc665484e127b18b SHA512 abda36e36e7937ce0ca3b980e1e61b8244993ac365ff7fc1430293c9566caf0b8444571cdf5bc1c5be60052fdeb70a2ab38fab18a32c770997a56b27a66b1930
MISC metadata.xml 365 BLAKE2B 525d0782e438a536ebb72d196efcaa8ec809b12a1aa3be17b4a1171cf3f41282ccf1a000fbeb3bbc81a296a7c97742c6c5a6c4794d10859566b2d4c927caebb2 SHA512 e527c901611d310ce54e32b4ec518477b8421cdde73dbb9b2d1e8cadf3de8ff291229556264a5275d94952c5b7e77ee7cec80febccae455b253a69b786a63c32
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/Manifest b/acct-user/rtkit/Manifest
index d0305710df9c..1d4804a75505 100644
--- a/acct-user/rtkit/Manifest
+++ b/acct-user/rtkit/Manifest
@@ -1,2 +1,2 @@
-EBUILD rtkit-0-r1.ebuild 259 BLAKE2B 2a06b148e92e3445611155ece596421b97933b22f232bca48757fa735f8adcd34982c208a8882dce1f6b1f00f7f5b7094350b704cb6955f4d6aab0f378dc9b10 SHA512 35d67d9a9981b619857764114e5445204ffff665d3d719f327f29469d2965b880a65a8319695e775a9a934fa2ecae8a3befdfe12c5e2e368242c8c48f532cf3c
+EBUILD rtkit-0-r2.ebuild 259 BLAKE2B 0ed6aa9b8670d967abfe1adc9670f53f3adfed67947f20afeb0b5aafe048c80bf9a14b6dade7d83cf10a8c6e81b4b29f66db47b83610e8f70fb2e246e9678d25 SHA512 7dc969cc30abfa2f6cb97bbc7e25e11fb505be6f1cf214d9e57e23fa7c5856842b82007f29b7a3c1844cc9c86fb2217c0fb332548a6b2cc23116cda51578a9a9
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/rundeck/Manifest
index 4df1d8e14ded..7e5f7e880d44 100644
--- a/acct-user/rundeck/Manifest
+++ b/acct-user/rundeck/Manifest
@@ -1,2 +1,2 @@
-EBUILD rundeck-0.ebuild 302 BLAKE2B 8d39433484db94f8d13b24c9f0b51ef08dd5a90da752acf917f6487662970be113b85791c0f946386331a8b2521747b7ed46802752a8efbd35cc4ada7097cb76 SHA512 138333b90a265930d835dc8265933c58ddda4a14fdfc5dbb8ea6a6162667c47b05134e185d31c3b8a21f6b106df52a98fcbb3e47e76b8f05b5d3025ec4262af3
+EBUILD rundeck-0-r1.ebuild 302 BLAKE2B 807533390326c21773e7dff3ad69ee9a265a2c0dc3c835792b463978b6e0631bf8ab1dafef2f88049a7f07845b289cd4a937b317a2d72576cdae51d43e2a1314 SHA512 fa0aa90d59f674de27c7b4bd5e8040f733640ab5c6daa563df861bec77e720403ad70b01ce893c6505a59d68484413644d487c810558ad8fc4a994b98ed2265f
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/rundeck/rundeck-0-r1.ebuild b/acct-user/rundeck/rundeck-0-r1.ebuild
new file mode 100644
index 000000000000..076ebd251f6a
--- /dev/null
+++ b/acct-user/rundeck/rundeck-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/rundeck-bin"
+
+ACCT_USER_ID=109
+ACCT_USER_HOME=/var/lib/rundeck
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_GROUPS=( rundeck )
+
+acct-user_add_deps
diff --git a/acct-user/rundeck/rundeck-0.ebuild b/acct-user/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9c34344b34ff..000000000000
--- a/acct-user/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/rundeck-bin"
-
-ACCT_USER_ID=109
-ACCT_USER_HOME=/var/lib/rundeck
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_GROUPS=( rundeck )
-
-acct-user_add_deps
diff --git a/acct-user/rwhoisd/Manifest b/acct-user/rwhoisd/Manifest
index 2a63be033325..16c4f91ff91b 100644
--- a/acct-user/rwhoisd/Manifest
+++ b/acct-user/rwhoisd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rwhoisd-0.ebuild 273 BLAKE2B 42ce70ab6e1ccacb03da4f94ccfc329870a077dcd81acb05de4eba0ea50df05c68761cbf9f7783bda5e3be5520ecd16294401e2206bf966df55ea721f35bcfd3 SHA512 4315026b3f87a8c502c882ba7812889ddcc5ef5c43cb003f3661303e73739229231f6ab0fc2c63522dd58decd29bf96c2806a52af146698fae0cf98ca663b9d3
+EBUILD rwhoisd-0-r1.ebuild 273 BLAKE2B 19e17561a1b07fbe3bb38510cf44d8f1c46bb06ef6f47475dc33ad0d895eea68cc1be343df415494b83feb33b408920ead23f651a8b0f1957d7c09a5033ded9b SHA512 645aa4c85f69676ca63e445229c52c1442fba492f951cf23df4b45b3a113d36ff2ecee33d5a47cf3559893b2055eb7796aea83f6cfef7cb3e1559dd8fb86c181
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/rwhoisd/rwhoisd-0-r1.ebuild b/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
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/Manifest b/acct-user/sabnzbd/Manifest
index cafdaac8f325..5f3bc2809b84 100644
--- a/acct-user/sabnzbd/Manifest
+++ b/acct-user/sabnzbd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sabnzbd-0-r1.ebuild 287 BLAKE2B c9e0de01f7b6d995de39737ff63858fe5e5c7ac801f06a6e23f10bf891162bec98e1135914587bebe696ef1aaf7fbc72fb6869f915cbe64bc11dcebce79f82ac SHA512 2c3a6762fdc1302c8ef73aaad3197b79c1bf543b9f9c73cf8aed5596b0b5fd1ac548865f9672149a62ed13eab3d3ab8beac47e608a7cb24c628a422985b51e69
+EBUILD sabnzbd-0-r2.ebuild 292 BLAKE2B 76b594342fbddfa015167330b2ee20d28d2bef3c51609bfa839225f33e71029b243e8e1d2c71aecda8a80692e0b090a897a01ab58841ece899ed861d594ac3f9 SHA512 d630fe74df513c07bdec2fbafc82550921002afbc59b33caf5646d6cabaf7e200fa80f8a73e49b6d7054b7ef17caf1cd1845bb12ec2717ce2e389443f0cd76e5
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/sagan/Manifest
index 71840e2c0018..d4d8292be145 100644
--- a/acct-user/sagan/Manifest
+++ b/acct-user/sagan/Manifest
@@ -1,2 +1,2 @@
-EBUILD sagan-0-r1.ebuild 246 BLAKE2B 63b7cb9412e18b329724e3c17ddd1cb77fdd3e694131d71a26dfa732bd309e1d1592b11bd82e0c048f4177afc04fddce130f33e221ff74c5b6355c77893dae7f SHA512 5ca89924496635c420791707161a2d250839540b9e5c3c9d56db4375d0b27d498a7956e1459c939a1e2dff6bc01db19652a5b1e5bc6063edec39f8b69228c46e
+EBUILD sagan-0-r2.ebuild 251 BLAKE2B ec2faa5471df7a0bdd4739bfcdd864ad20d5f11af05567182bb871198549337e47cb0f67838cf798b676722670a95dc9e87eda4825a0944299459f3c46e8f263 SHA512 999a4f0a5682dc2aa535b6c05b7adc9e59b160654bb39901522bf6691f8251d5bb8519a0686ed75db33375c437381182d8d162e2b1e61151de31ddb09b24b507
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/samplicator/Manifest
index 672299247709..e1138e37ff6b 100644
--- a/acct-user/samplicator/Manifest
+++ b/acct-user/samplicator/Manifest
@@ -1,2 +1,2 @@
-EBUILD samplicator-0.ebuild 287 BLAKE2B c8bb28f2ddff5e05f8ae762bb4690714335ef1e8c300fd8f18c20f44b4e7b033c6e8bef6df07f041af75bf85b6f0e78ea1d10f9bb157a3eaa14bdf4f79e59ed3 SHA512 92a6c830b68ef130625834aa17ea1025babde29fab21bcf9f2ef708f207ba2375488677e603bd9693d2d6f96fe2295c35db2d5c591b9a4f1a9c5115ec8d279cf
+EBUILD samplicator-0-r1.ebuild 287 BLAKE2B ae8aafeff05febb6277e7abc5e27fb10695507a75df2db2b4ac831bfc683d3a3a6acf5b9a732c4bb9c669a46d186218003bd8114d97bc4b51786f7c22fd56b3c SHA512 1a5b28e0e74206aea2ea92fbb2de4bf70709b711e103b91b5077a34f33661e46bbe4f647a56e46fb517fd00bf530292d13c0f73aea145f012ff14fbaae442c1c
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-user/samplicator/samplicator-0-r1.ebuild b/acct-user/samplicator/samplicator-0-r1.ebuild
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/Manifest b/acct-user/sancp/Manifest
index c3cf5301df31..9cc5d71b6c51 100644
--- a/acct-user/sancp/Manifest
+++ b/acct-user/sancp/Manifest
@@ -1,2 +1,2 @@
-EBUILD sancp-0.ebuild 232 BLAKE2B 311a9295e723e5ba671b863ff5f85a909b3ab27f4bb660b3c3602b702aca0a1ffa40fd4378e7346af1ae3e6bd36f371edbb9bbeed8ba21fc388f1813bf356b43 SHA512 77c3cd2a7b2ab9b6008495832a89d23363aa5316e74566a2eb94e5f0954c5f740bdebc36c77629d87f3692f78175c6b6464e719a7f11f8cc7e83854e8c278ac0
+EBUILD sancp-0-r1.ebuild 237 BLAKE2B 08ec3659efdfd9a144556dd9551aafc70eae541b309d8075ea464ee5c3e1fc5c221ff13973e187a45cb76d0972157de3e9115f386d0b9b8ed4d7bbc5bec6a3da SHA512 f8f583d488ca539e6aa7c4ad17155d770273673ae00a075ac58fd875d2423a47b8c7fcd17504d9630a4cc923cd2fefec3e927a0cccaaeaa38295a23a8ef239a4
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/sancp/sancp-0-r1.ebuild b/acct-user/sancp/sancp-0-r1.ebuild
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/Manifest b/acct-user/saned/Manifest
index 225bdc92070a..834fda6ed2bd 100644
--- a/acct-user/saned/Manifest
+++ b/acct-user/saned/Manifest
@@ -1,2 +1,2 @@
-EBUILD saned-0.ebuild 250 BLAKE2B f2a9bde30ef71474734b1d79c810799b6ab463d19432e9a50e5145ae45bdc8a969edf6fc452a05fb87d914a476e9b347ad8f168b161486d8d8cfb5560a6ff9e5 SHA512 d842cf932d16e6e177f650185e3176ea29b589d832e17d7ebf7af07a6180f0529da076bba338707c8f4858f1b6d942283bea7a34392017da29f19233dc46d66f
+EBUILD saned-0-r1.ebuild 250 BLAKE2B 77991e40ca6e5890d36a9059974ab000c7f69dc462508df15391137d597b265730869f2b978aa66bfae931c95d7467612b975317b727a93f8b56f70f63768d90 SHA512 bf3090c6a81ec2cb58b9457d5515ce4b44f8d2b7211eea83c2c0b55d88eb22a74577b518801f3ab6b546b1be5ab6f112564a05584b85cdc61e8099f4b024c7d6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/saned/saned-0-r1.ebuild b/acct-user/saned/saned-0-r1.ebuild
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/Manifest b/acct-user/sanlock/Manifest
index 88a431f086a5..48f42c974a1b 100644
--- a/acct-user/sanlock/Manifest
+++ b/acct-user/sanlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD sanlock-0-r1.ebuild 263 BLAKE2B 5107420ae062c4f5e4c5fec6443ca372ed7d67f325fff933445923c6fca718a1237a5076999eae01119ad1ebe3e6d0df68565fbbca472fc0468f80da69c3f12f SHA512 e84c2244ffee49ce192cfd1bfe4f4f5a06458ea46749972a47cf663aa5d3e237d23aebc38bfc7fad1e36a6e770629c2e419b3ef266fa6521f3892b6a7bf988cb
+EBUILD sanlock-0-r2.ebuild 268 BLAKE2B f14dc4a02dbb0814e424ea188f1867d0711babb6d4f2e1b6e72c06861038a07ddb152d48a49729314d022bebbfc4f434ef459b74cf80c73e49a2702e7e8af303 SHA512 20ad7ab294544b6a7fb2895e8cf08ae1d6f9836424967794b81a715a878268bd6f1de688a21714a781bf5062b061eabc62f89019c42c8eeb7d9bd0c614ee3066
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/sauerbraten/Manifest
index 00b50b7759b4..ff25947f6ce6 100644
--- a/acct-user/sauerbraten/Manifest
+++ b/acct-user/sauerbraten/Manifest
@@ -1,2 +1,2 @@
-EBUILD sauerbraten-0-r1.ebuild 261 BLAKE2B 1025b19e42e0b945d8372ebbffd55c0c2bc42c93df5979bbac20b8418c9f4220f5a9d052ba736a6b56f50555367e1b7578f3f636d321883e8e864500d96edced SHA512 f3f05b0bde2f5fedcf956cf5a853484298b41980cee70cff16bd154de1e6caa09f16900199182e2925938c06fe5d7019166ce3d94dfaae5686f93035c0e12f4e
+EBUILD sauerbraten-0-r2.ebuild 266 BLAKE2B df70a10ffea87c53a7384d890d1fe2d957323d3f82660bb1a4cc3cf642b9e0f00f8cc294b7b31cb79c437c9a44819028212d32b353a5c5adc68d772b1ca9e5aa SHA512 0d5aa521e1f44fcc1d8b7840ebd0abbe6d8552987a0f2f48a03f413846ac168b567bcc1211ecd87bb820b2b66ff32f67975cdbbc158a25e19c6940f1256a0638
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-user/scanlogd/Manifest
index a1f253ce4ecf..e26c0f2f97df 100644
--- a/acct-user/scanlogd/Manifest
+++ b/acct-user/scanlogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanlogd-0.ebuild 251 BLAKE2B 5ca99c2e438d3e234569ac47168e946f0b45715ccb97fdc2e8c930ae6f90336c57023d47432c80895e9f660546870a32325d527b5026efe40e568c7ef9610572 SHA512 ba1e552bdd48e440e2f04747167dcd20d19cb0fc5d7a1b3f6bebc649a6606b4e255000a01350c967e7ce9f0471c866938d25bf35b4d0ee698deb192c69e6bf3c
+EBUILD scanlogd-0-r1.ebuild 251 BLAKE2B d5af47ca62ca9059279251042ff265cbc9f3afea0249066533ffa70195d27b5387038319768129dc056556cd545dc34c1ed06f9467e8e9adf4bfb97cc3f3804a SHA512 c20c14856286e9c687a5a599775acc93d528106c4f471e91ae4d3246f3b10901d4a95549e0df1ec108cf316eaf3b9b56b47ade10123c1c3609e782d7e92e0053
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/scanlogd/scanlogd-0-r1.ebuild b/acct-user/scanlogd/scanlogd-0-r1.ebuild
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/Manifest b/acct-user/scponly/Manifest
index 8300040f0f7c..febc66c4fdac 100644
--- a/acct-user/scponly/Manifest
+++ b/acct-user/scponly/Manifest
@@ -1,2 +1,2 @@
-EBUILD scponly-0-r1.ebuild 378 BLAKE2B 37f4a81b52b05d83fbd58959a1f869ad8a0040a1e57c1c8edbc5ab1db8b3d46d2b5163cc70f9511662d5e3bc57648eba2df373ce74de8b245162d0c7a960382f SHA512 d18eda238f1cac265c058c0375231f30b94e1fb7a7f48d92471edc61cb989c4e50eb66f095493b60c7dca4320b6eafe27d898cab3eba6654710077242dff3415
+EBUILD scponly-0-r2.ebuild 378 BLAKE2B 6770c852e390cb9e6fceb95c5052fdaafc1383824e760cdbbe8ba1dcc4dce1521e1aada601a572e90b28df00605e0e8bd0cfe5fba18e3df6cb14b585ef1eee96 SHA512 9a17767b63487799003bdb731aff82700f08f7010044d19ee85b9ab2d962c4ecf814b0b095d00c5e25d4e44383a31e9104226326b64509527507c208040e66f3
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
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/Manifest b/acct-user/sddm/Manifest
index a6d339134cce..216eda65271b 100644
--- a/acct-user/sddm/Manifest
+++ b/acct-user/sddm/Manifest
@@ -1,2 +1,2 @@
-EBUILD sddm-0.ebuild 278 BLAKE2B 9aef91f57e0b567a2c65aa86d3ce82aacee5337199d59b482a61133ac35e9460e58b8e0e4726d3e2a747bf88f8be2af783595110de314aa19e5099ffd3a8baa2 SHA512 29f17772e3ef81aef06810fdc8f8f3626deb5482c2b2038152757c183715a23ce3aed26eb7b92dd4a45d8addb326f44a80a1baf4e7e3514d2477742dbf547cab
+EBUILD sddm-0-r1.ebuild 278 BLAKE2B ab5c78ceefe56f341bea6f49868e1abe3fc871d186786856233a8936524de5927b77388cca1fa96ef98e7dbbce1e33e73e8bd4e6232038015cb3c2ac78054dfd SHA512 6e2adeac6e0f9a2e03857c85a8767f662e7d38b92ba54d7d87003d2549a811bcac46740788086fac579dc809a2810017871e2ecc9850081635f6ee0e3bf2cf3e
MISC metadata.xml 347 BLAKE2B d35c41092c587e21f53b8622fb40c8d2625f2ee7b71a645ec478f1e90eb2645eb87b6cb8f06b7e1a317fd9074594da44de68642de0ab45ee748aa93106dcdc89 SHA512 b9fd27f1b7465b3fdf254604066d230ce01eb1713354ed90f95f8963804d32c37e02ceeaadef01a4019abacbcabd044dab9ca0b55e9709505cbdb7d7415c2071
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/Manifest b/acct-user/sendpage/Manifest
index b214acfe2a5f..d04c762f1660 100644
--- a/acct-user/sendpage/Manifest
+++ b/acct-user/sendpage/Manifest
@@ -1,2 +1,2 @@
-EBUILD sendpage-0.ebuild 242 BLAKE2B af0c86b9a45ed780c97da55d727914520083cc6435a07c4d998f516592e3807aa882ce5699d33e82d94e7c58bdb8cb642fedd77384949ebec3203122fd640ad8 SHA512 2a607c0be7475ce85a98e57bc3bb74e011d03bb51cfe82fcae86006c38cdd7266509f7a9f51f1ef5213d5ea5d4893c5f7130b082566d2757ac123365cb98226d
+EBUILD sendpage-0-r1.ebuild 242 BLAKE2B ff88e0e1644aecde3bae1d00249ff0944f59a2ac45ffd1af78a147723571d953991d850c378dfd3779e6c48043e56220adedac595060a7ef7810669e306aa4d3 SHA512 2bb9d4cd6cc05bec6ad47d6543f92eeca83375e8891c8dc506cb99d36a3475c44bf1b12c35b78696975e1e86f20bf9fd91ce44f277872decd4381ad7a445bba4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/sendpage/sendpage-0-r1.ebuild b/acct-user/sendpage/sendpage-0-r1.ebuild
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/Manifest b/acct-user/serf/Manifest
index 4accaf1705b2..b4dd23a017f6 100644
--- a/acct-user/serf/Manifest
+++ b/acct-user/serf/Manifest
@@ -1,2 +1,2 @@
-EBUILD serf-0.ebuild 264 BLAKE2B 0dbf1c43ac94e621e5e8016a475e8e76b275b7e1d30138aea4786041bb40ffa69e252803ec8b4232758cdb17e91e27e637ce8df4d18c85d4eb502340f6a106a2 SHA512 3637e5e938308a345ecf645ab379a9a3ba0db7c71abfa7fd391347c9d6ab68f6948e4f01dc90888bcb3243b2d93a2dcd381cee72970cce7296e29a1561d714dd
+EBUILD serf-0-r1.ebuild 269 BLAKE2B 37444007f4c8558fb7b48aa70e3bb8c965c0c1fecfd64dbe013d6b8e2aa2b7776134e23c68087a496a682246c1c9c957673d33582d5afb2ac3172755dfc9cc95 SHA512 93425c15e76425853d9da48655630234c70b6827c2957877fd3ef28ebed65e2daf6fa35cd0a07bb52e005a6bc6c7b670901a69592538ac7c020a1a37fd4233b4
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/serf/serf-0-r1.ebuild b/acct-user/serf/serf-0-r1.ebuild
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/Manifest b/acct-user/sguil/Manifest
index 596969b60232..f1052659769f 100644
--- a/acct-user/sguil/Manifest
+++ b/acct-user/sguil/Manifest
@@ -1,2 +1,2 @@
-EBUILD sguil-0.ebuild 284 BLAKE2B 1e47c59b531e7d7aa405a28b775526456b9bb078e19ede68e1493440c95d8d0796595591a57eee4b72c4529d076123d5c98325dfdaee04d7381c3c3c6743aa39 SHA512 9ef071fda592ac8de68b3c218d0dd7e2283f41590a1a0caadbc7a9500115fdaa8b2b9690349549c65bc447cf6c778f7c3ddb34bdfb69199a536be5584b3e0aeb
+EBUILD sguil-0-r1.ebuild 284 BLAKE2B f7ed03fd6071b186e85fb4bf62485117544bc4a8c693d9820658601d86280aef8cb7002b95e5c79875be3d997665850ee5cd5355be45cc9c62fc14566b25563f SHA512 14949245a6325ac541418270b0a07aae27f99adab973e5fd673aa47cfcef707759a05e4ae6df19a87d9a97aaa85d839e41bee220ae1a4db4745af8aa563ea03e
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/sguil/sguil-0-r1.ebuild b/acct-user/sguil/sguil-0-r1.ebuild
new file mode 100644
index 000000000000..9c178d7f2dba
--- /dev/null
+++ b/acct-user/sguil/sguil-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/sguil-sensor"
+
+ACCT_USER_GROUPS=( "sguil" )
+ACCT_USER_HOME="/var/lib/sguil"
+ACCT_USER_ID="165"
+
+acct-user_add_deps
diff --git a/acct-user/sguil/sguil-0.ebuild b/acct-user/sguil/sguil-0.ebuild
deleted file mode 100644
index 01910dcc0edd..000000000000
--- a/acct-user/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/sguil-sensor"
-
-ACCT_USER_GROUPS=( "sguil" )
-ACCT_USER_HOME="/var/lib/sguil"
-ACCT_USER_ID="165"
-
-acct-user_add_deps
diff --git a/acct-user/sigh/Manifest b/acct-user/sigh/Manifest
index 2d76e9e9af86..ae51dceee892 100644
--- a/acct-user/sigh/Manifest
+++ b/acct-user/sigh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sigh-0.ebuild 198 BLAKE2B c71e87d8818c692471fe73692046c8c84d9f00bfaf744cbeb9702e325f115fd0447199f5c09ca2c8a3dc3ffbbe6b35f98fbbad13494d647999e08fac1adad346 SHA512 b31a67ecacd9892817039947552de8f5d48e137ef7029b2299beedbd4bac1f9b809d94e080c952c0eb6ad2dab3de2637d247565c4c84579cb3ecf4c172e1be51
+EBUILD sigh-0-r1.ebuild 198 BLAKE2B 5091e167b40969912ba46dda1e71e29472840099f67ecff3fef220ff32ebf73b09ebcb18ed51ca73f769a85711bf7e3c79a28c2c217a9930d2b667e63e827a45 SHA512 aec0dcdb3de5ba0c80e61fbd068876b33dc6e2ac0f8e8597c1799caa145283eef22b8b96474e184c3059226bad3a22527b664ef8fd40d30170df62a708459e36
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-user/sigh/sigh-0-r1.ebuild b/acct-user/sigh/sigh-0-r1.ebuild
new file mode 100644
index 000000000000..c28ea40470f1
--- /dev/null
+++ b/acct-user/sigh/sigh-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=363
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/sigh/sigh-0.ebuild b/acct-user/sigh/sigh-0.ebuild
deleted file mode 100644
index 13f119b89edf..000000000000
--- a/acct-user/sigh/sigh-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=363
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/sks/Manifest b/acct-user/sks/Manifest
index 9698b8743595..a762968799f2 100644
--- a/acct-user/sks/Manifest
+++ b/acct-user/sks/Manifest
@@ -1,2 +1,2 @@
-EBUILD sks-0.ebuild 238 BLAKE2B fbb07018220034f399ee5e4b9ebac259187c3dc46f701f5f0face54805d36c138822b257fbdfcfbae0dfd00c571e2d7e3f70f65a16c525a1e87913b6b6948090 SHA512 96c7193a38df4c6ccaf8739a4951e0c3df39690605d93b4d597346fdd66bc8dc8d215183194d399229a91f6275b381f71dead2e5aecd06dfe9e940cdf98dea93
+EBUILD sks-0-r1.ebuild 243 BLAKE2B 70431e0342874178f6b045df9763d51d67903bd2a28f019c9f1decce9bea415eb9c663119249cb7fbea93490444bfba6b0ce082e80b279db38314cd10225f88a SHA512 04b1f8733e3c1929795721a6da4e690d07a50729f591d0436a85aa113f870a80119e161550bad81a513129fbcb389dd72c3e6cf4bb76fcd69e056b285c5629ac
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/sks/sks-0-r1.ebuild b/acct-user/sks/sks-0-r1.ebuild
new file mode 100644
index 000000000000..5844d199183a
--- /dev/null
+++ b/acct-user/sks/sks-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SKS OpenPGP keyserver"
+ACCT_USER_ID=370
+ACCT_USER_GROUPS=( sks )
+
+acct-user_add_deps
diff --git a/acct-user/sks/sks-0.ebuild b/acct-user/sks/sks-0.ebuild
deleted file mode 100644
index 5f78df813304..000000000000
--- a/acct-user/sks/sks-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the SKS OpenPGP keyserver"
-ACCT_USER_ID=370
-ACCT_USER_GROUPS=( sks )
-
-acct-user_add_deps
diff --git a/acct-user/slurm/Manifest b/acct-user/slurm/Manifest
index 680189501db5..003ef0660188 100644
--- a/acct-user/slurm/Manifest
+++ b/acct-user/slurm/Manifest
@@ -1,2 +1,2 @@
-EBUILD slurm-0-r1.ebuild 320 BLAKE2B 79476db6e526d029d5e6417fcbc60f7e2824daf29b8bdb70a7d0777f2d88e82d15958f2853d7318685f102a32b1b6ae0d10caab612346c9120ac5a25731df653 SHA512 7c90160649a522673dd40231300529c9315bdb9da86318b04e3511ac9b1e929cb1d6a4af0c14092607f81a1e2a1fa8196a182bda9a75b1a124cc6cc4a4f09507
+EBUILD slurm-0-r2.ebuild 320 BLAKE2B c32abe96d9886e3eb410ec801d6a0d1bee3566c4849aee387cf14e8f864e53e3c3893eb8fb40fb47f8e8bbe29ebf37e9c7ab928876e060f270ec4cb5afa583fe SHA512 6fb79a3be49bed95703ad348019d6171b1f95c9166ab8f3d968c0cbae02159fef536eed19cf56105ad16e46ef550a6006972f9aa72df6dadc14d6f0c1301464a
MISC metadata.xml 367 BLAKE2B f7377cc4c8ab6161736e0b676f04156059b020ebb1bce3eba0277b419458a520c595dc43dcc2ac7545bd91a93630d5809ab8194757dbdb092d06473ebbdc9bdc SHA512 07ecc9173013e5b0d47c90f5c5fda05bbb127e4401ccc2bc2c92ca04c4e300f1b6fef8f40f12ea58db212e3f66f7f9085af42ca8e0c6fb1e7be5d193a8a09831
diff --git a/acct-user/slurm/slurm-0-r1.ebuild b/acct-user/slurm/slurm-0-r1.ebuild
deleted file mode 100644
index 76604870735c..000000000000
--- a/acct-user/slurm/slurm-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the slurm - Highly Scalable Resource Manager"
-ACCT_USER_ID=400
-ACCT_USER_HOME=/var/lib/slurm
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( slurm )
-
-acct-user_add_deps
diff --git a/acct-user/slurm/slurm-0-r2.ebuild b/acct-user/slurm/slurm-0-r2.ebuild
new file mode 100644
index 000000000000..2a2d155f5fec
--- /dev/null
+++ b/acct-user/slurm/slurm-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the slurm - Highly Scalable Resource Manager"
+ACCT_USER_ID=400
+ACCT_USER_HOME=/var/lib/slurm
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( slurm )
+
+acct-user_add_deps
diff --git a/acct-user/smmsp/Manifest b/acct-user/smmsp/Manifest
index 4693f1601796..6e1c75cf93bf 100644
--- a/acct-user/smmsp/Manifest
+++ b/acct-user/smmsp/Manifest
@@ -1,2 +1,2 @@
-EBUILD smmsp-0-r2.ebuild 235 BLAKE2B df9b6fdc9306b0c858743d8cf75131804174974a4c12007582768778b2fcba43febaf19c6e8fdd5e3822f7c8f8c1caf907f9a074e8cd2e18e56628920addcd66 SHA512 810420c21f883f16988728e7a652082caeb3f0495f5ead60e641d7ce7c5fda6f532f6f7d2d5d7f274346c94375d723cc97740a32b5520768b5556730c6e3d8a1
+EBUILD smmsp-0-r3.ebuild 235 BLAKE2B 36a6753e052aa48998d095c443c7c11438964b172223452edb055e95769f09615e6524cde5ad55a821b352d9c7397e91a551ab6d27a4dfd2e61f107c1407012b SHA512 66f18a5a81c071536dd4e9c1835f19e1103596e8e692c34431b79b9ddd26d6769a3523a41da943d11c8480e0275562cad1f1d13a2f97a2f3679f35a256a2a90f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/smmsp/smmsp-0-r2.ebuild b/acct-user/smmsp/smmsp-0-r2.ebuild
deleted file mode 100644
index e0eda5440e18..000000000000
--- a/acct-user/smmsp/smmsp-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sendmail daemon"
-ACCT_USER_ID=209
-ACCT_USER_GROUPS=( smmsp )
-
-acct-user_add_deps
diff --git a/acct-user/smmsp/smmsp-0-r3.ebuild b/acct-user/smmsp/smmsp-0-r3.ebuild
new file mode 100644
index 000000000000..8a12ba2c6cc4
--- /dev/null
+++ b/acct-user/smmsp/smmsp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for sendmail daemon"
+ACCT_USER_ID=209
+ACCT_USER_GROUPS=( smmsp )
+
+acct-user_add_deps
diff --git a/acct-user/smokeping/Manifest b/acct-user/smokeping/Manifest
index f17e59c8f61d..f78769f1eafa 100644
--- a/acct-user/smokeping/Manifest
+++ b/acct-user/smokeping/Manifest
@@ -1,2 +1,2 @@
-EBUILD smokeping-0.ebuild 289 BLAKE2B 7cca7dd113b27fa7f5bf675964f6acee2dd470ba590d443866db0467eaf2cd09c940b29f377b6a38e5c3581a5dbef047d6f8eb5f34af1b5f5377f3d1b71c02d4 SHA512 17c15053df57fecceaf2922943f39340d2969e0406309156db4b163b8e1dd1fa582a375b2424712330fc77527a1ab2acff2a0c94a39a84a5488abaeae455fb17
+EBUILD smokeping-0-r1.ebuild 289 BLAKE2B 9366e1e662397c9e0e4ec5b4f0fcc0a2c8fdd07dbf61fa7e744a31e89bd092631866fcda639b473a25cfb66cfabd9f62bda279d61a8ee4978f9f64a5c8955da0 SHA512 f63ca43e24aa51f57fdf92c1f80cf7a13b1565729d3e00406f91008a2fd383379924ca39efd1041f0fd44ab605d633d122c127d772ec6a4465b7485b7ffe6539
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/acct-user/smokeping/smokeping-0-r1.ebuild b/acct-user/smokeping/smokeping-0-r1.ebuild
new file mode 100644
index 000000000000..e53ca960d5b6
--- /dev/null
+++ b/acct-user/smokeping/smokeping-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/smokeping"
+
+ACCT_USER_GROUPS=( "smokeping" )
+ACCT_USER_HOME="/var/lib/smokeping"
+ACCT_USER_ID="164"
+
+acct-user_add_deps
diff --git a/acct-user/smokeping/smokeping-0.ebuild b/acct-user/smokeping/smokeping-0.ebuild
deleted file mode 100644
index b3c157563d54..000000000000
--- a/acct-user/smokeping/smokeping-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/smokeping"
-
-ACCT_USER_GROUPS=( "smokeping" )
-ACCT_USER_HOME="/var/lib/smokeping"
-ACCT_USER_ID="164"
-
-acct-user_add_deps
diff --git a/acct-user/smsd/Manifest b/acct-user/smsd/Manifest
index c491802bcbc0..8eecf08cc5e7 100644
--- a/acct-user/smsd/Manifest
+++ b/acct-user/smsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smsd-0.ebuild 224 BLAKE2B 3f062bf84ba5703748b4cedb90b5f6ddf153f93538e087ff714afa2080895e39873b841f20b8891f1f25c5251017b761e5b195ed64ef2026ee9b4c43a2d480bb SHA512 876238f712e3f44fad98c90cb6676b5457cefcf07bb7b19a95ecbbf603594074b8b266bf24f8a4b939397f0f3a635ba4dbed69c66a8d4b09dfe957f909c9b082
+EBUILD smsd-0-r1.ebuild 224 BLAKE2B c6e7499b197c7b5e13eeb798f705a26bb94b31e2217c3157d022508c96b15ecc930c504b741867a1fd70a7bded8d2ad15ab6d7995655eefbaaa4e67aa18066ab SHA512 bbfb1206aa3832fb9facd2b087553440d8680a94a6ac8402ac9148cdc000660e4b18f8f4cc7ddacc8a70765806c07ac63c2214b6e8045e989803f26e4545b217
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/smsd/smsd-0-r1.ebuild b/acct-user/smsd/smsd-0-r1.ebuild
new file mode 100644
index 000000000000..69987ac6919d
--- /dev/null
+++ b/acct-user/smsd/smsd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=359
+ACCT_USER_GROUPS=( sms )
+ACCT_USER_HOME=/var/spool/sms
+
+acct-user_add_deps
diff --git a/acct-user/smsd/smsd-0.ebuild b/acct-user/smsd/smsd-0.ebuild
deleted file mode 100644
index ecad0ea94087..000000000000
--- a/acct-user/smsd/smsd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=359
-ACCT_USER_GROUPS=( sms )
-ACCT_USER_HOME=/var/spool/sms
-
-acct-user_add_deps
diff --git a/acct-user/smtpd/Manifest b/acct-user/smtpd/Manifest
index 76e9dc8891c7..e8e82aea9c36 100644
--- a/acct-user/smtpd/Manifest
+++ b/acct-user/smtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpd-0-r1.ebuild 252 BLAKE2B da285e5cee70e745532fa19fd08bbc3c2689526eb78ef72e2fe926cae806ec3351ce3938ae0dbeb35a46e595f92d1736f834e0f4799e257439cd7e3688035d8a SHA512 18f3fec956e3ef3d97b2b1127942307a49c677e7b4727ed42bfca1a207cf62634300f6a1339dabd3a50dad5e9972dc5e120800faaed366c767bd9e0105447c7b
+EBUILD smtpd-0-r2.ebuild 257 BLAKE2B bde7c5fa697e039fa2826efd9d3a9a0b39abcf7376a1deec50f991a88affe5bb630b8a951cf9031d6193af7e08471ad541f0884992afecb25eae55ab97f8590b SHA512 8cee99bb245640d0fc6cd736c554a2c510402bd0a8f49e8787c94e070052e079896bdafb2c98090165fbe1c8be7d66a0094829ced4835b190fff95a60aeb0983
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-user/smtpd/smtpd-0-r1.ebuild b/acct-user/smtpd/smtpd-0-r1.ebuild
deleted file mode 100644
index 1a15db05401e..000000000000
--- a/acct-user/smtpd/smtpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="daemon user for smtpd"
-ACCT_USER_ID=25
-ACCT_USER_GROUPS=( smtpd )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/smtpd/smtpd-0-r2.ebuild b/acct-user/smtpd/smtpd-0-r2.ebuild
new file mode 100644
index 000000000000..58eb0dfaa32e
--- /dev/null
+++ b/acct-user/smtpd/smtpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="daemon user for smtpd"
+ACCT_USER_ID=25
+ACCT_USER_GROUPS=( smtpd )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/smtpq/Manifest b/acct-user/smtpq/Manifest
index 2309a4fa0d84..57705b8a8776 100644
--- a/acct-user/smtpq/Manifest
+++ b/acct-user/smtpq/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpq-0-r1.ebuild 252 BLAKE2B aba98fb501321149d054f5ee45d1e4b535ea69f4bb1502e8eb658f50d1a659b16c30168e6234305f0960b281c7c0ee1e6274ef5e79600700990076cdd51071ce SHA512 7eaec7a4692d78cf421d058121ef1de5c3d32f38e900be4d84106e485fef8cd31b666a95a4c863e858f76a7598e096fe87801ca934ff210db1e18ce9e588afdc
+EBUILD smtpq-0-r2.ebuild 257 BLAKE2B a31fc2340a062968b59b3f2162848739b918c0aff071b1a90c20b359454c72a0572361ae966bd3dfac516b2f44ae2a6e384ca4056fcfd2eb3805ba4ad5f638dc SHA512 9730d9f3a864e4f2121445bd1f43cdf29d0e6d4294454947200c875641be58cf3c47dc45821a6cce8b9ad977bf4ff32214c62611d8595e0fe3f14f707eeb9e0b
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-user/smtpq/smtpq-0-r1.ebuild b/acct-user/smtpq/smtpq-0-r1.ebuild
deleted file mode 100644
index 6ba87dc3739b..000000000000
--- a/acct-user/smtpq/smtpq-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="queue user for smtpd"
-ACCT_USER_ID=252
-ACCT_USER_GROUPS=( smtpq )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/smtpq/smtpq-0-r2.ebuild b/acct-user/smtpq/smtpq-0-r2.ebuild
new file mode 100644
index 000000000000..fcf4136aa1eb
--- /dev/null
+++ b/acct-user/smtpq/smtpq-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="queue user for smtpd"
+ACCT_USER_ID=252
+ACCT_USER_GROUPS=( smtpq )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/snapclient/Manifest b/acct-user/snapclient/Manifest
index 5cfc4a32f146..ba50bd339436 100644
--- a/acct-user/snapclient/Manifest
+++ b/acct-user/snapclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapclient-0.ebuild 305 BLAKE2B 4815a666e9c1126758f4ae26c34e7474a5392b39d8cdfa81c37fd22a1ac4da7c60487956c0236954fe311051fbd4a176a36003b2c9a0529eaf25950df27d52f6 SHA512 0454400b750cb7b62791b053a83b8992a5940593d708f89209dc82f43341c961c19240633bf3dc033850e4739653f0801b6c029af081a471aac1120ffbf96289
+EBUILD snapclient-0-r1.ebuild 310 BLAKE2B 48f69b28ef45059d0b3f48a7537889aaf732c3fd0a8fb294acaa9adbb4b411735a32ac68be923b256125d17c4983a15b313de2e2bdc6acd59dde85acdfb8479a SHA512 1949e4dff585d09b28bf6618c93b112c1e5e3a2e6e65806d1e4544807f862a7ad9483ba0d66e7272e1f94f7f01a100ac132233c466784bd4fc79682c1f6a5943
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/acct-user/snapclient/snapclient-0-r1.ebuild b/acct-user/snapclient/snapclient-0-r1.ebuild
new file mode 100644
index 000000000000..8d1da6fe79b3
--- /dev/null
+++ b/acct-user/snapclient/snapclient-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Client user for media-sound/snapcast"
+
+ACCT_USER_GROUPS=( "audio" )
+ACCT_USER_HOME_OWNER="snapserver"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_ID=373
+
+acct-user_add_deps
diff --git a/acct-user/snapclient/snapclient-0.ebuild b/acct-user/snapclient/snapclient-0.ebuild
deleted file mode 100644
index 9bd49cef21f7..000000000000
--- a/acct-user/snapclient/snapclient-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Client user for media-sound/snapcast"
-
-ACCT_USER_GROUPS=( "audio" )
-ACCT_USER_HOME_OWNER="snapserver"
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_ID=373
-
-acct-user_add_deps
diff --git a/acct-user/snapserver/Manifest b/acct-user/snapserver/Manifest
index 45c001bb49bb..2bcb63485f34 100644
--- a/acct-user/snapserver/Manifest
+++ b/acct-user/snapserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapserver-0.ebuild 281 BLAKE2B b40d5f29e5209ece908fd6fd3c5b8061da43faddf4e286f7b31e89642bb8131ee43038f58e7dec0acd0dbb859ae22fff47cec6c6e6e9003813c9e8ddfd0cd888 SHA512 560d4134c77e1272b58a66203f6ee90ef0a4a30e55f19fdb90cb28fc4a57687e49512ef2cbded81a7c39cb4f6c72c66eb8f23ad5cfa1b2910df930b89d44b328
+EBUILD snapserver-0-r1.ebuild 281 BLAKE2B b40d5f29e5209ece908fd6fd3c5b8061da43faddf4e286f7b31e89642bb8131ee43038f58e7dec0acd0dbb859ae22fff47cec6c6e6e9003813c9e8ddfd0cd888 SHA512 560d4134c77e1272b58a66203f6ee90ef0a4a30e55f19fdb90cb28fc4a57687e49512ef2cbded81a7c39cb4f6c72c66eb8f23ad5cfa1b2910df930b89d44b328
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/acct-user/snapserver/snapserver-0.ebuild b/acct-user/snapserver/snapserver-0-r1.ebuild
index b4b8bbda6968..b4b8bbda6968 100644
--- a/acct-user/snapserver/snapserver-0.ebuild
+++ b/acct-user/snapserver/snapserver-0-r1.ebuild
diff --git a/acct-user/sndiod/Manifest b/acct-user/sndiod/Manifest
index 6c35bd964eb9..85788b39508c 100644
--- a/acct-user/sndiod/Manifest
+++ b/acct-user/sndiod/Manifest
@@ -1,2 +1,2 @@
-EBUILD sndiod-0.ebuild 227 BLAKE2B f23c38f28eef87235778e1d7d75a1e2c983d932bc943adfd48db0d9ccc7da1c8f66e7fa1759e46a1f7e5fff5007f4b85d1921bca95bbb37851661e1d01971fa9 SHA512 350ffd18a975a992bffc9e2c1ddc76137a868d9c2627a96f354814bdf27e396f169edaca607f6a44229cdfe34e10d7e472be040aeac684edf5b942f21d11c9dd
+EBUILD sndiod-0-r1.ebuild 232 BLAKE2B 2d502c3f9afc2fd1e3ba14a5aed1a0650d9d6723b9f346c8af59a124831fd54687885ecdf9e63e911bb7212ad7e4c56cca21b0581e1279881d8f8763b946dcd7 SHA512 d28781d33d781e4dce8d23fa78e3bb88de95087e33913b91d576d75510d49bd16b60dc050290907d72c38688484341286a35bf8f6b0c0574b037974fee577d44
MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483
diff --git a/acct-user/sndiod/sndiod-0-r1.ebuild b/acct-user/sndiod/sndiod-0-r1.ebuild
new file mode 100644
index 000000000000..5e796716760b
--- /dev/null
+++ b/acct-user/sndiod/sndiod-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Daemon user for sndio"
+ACCT_USER_ID=461
+ACCT_USER_GROUPS=( audio )
+
+acct-user_add_deps
diff --git a/acct-user/sndiod/sndiod-0.ebuild b/acct-user/sndiod/sndiod-0.ebuild
deleted file mode 100644
index 19dbeba029c6..000000000000
--- a/acct-user/sndiod/sndiod-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Daemon user for sndio"
-ACCT_USER_ID=461
-ACCT_USER_GROUPS=( audio )
-
-acct-user_add_deps
diff --git a/acct-user/sniproxy/Manifest b/acct-user/sniproxy/Manifest
index 69caab7b5797..2ac43d1e7732 100644
--- a/acct-user/sniproxy/Manifest
+++ b/acct-user/sniproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD sniproxy-0.ebuild 198 BLAKE2B 8245a6d58456047d64afe6e98aca816155ad5cc6235f96d773500b2f034af9977b4600ff0934f6c36d957586beb9d8e2d4c97ec792862dbdf4a22be973b46d62 SHA512 02d651442209696e263bc90b2b6276ff0e616a12f2153b5025ec042876b92fdd626b399951ce2f1b251a2a79f3330bb40c4d47e51d0d526010ab5e8653639d03
+EBUILD sniproxy-0-r1.ebuild 198 BLAKE2B 1c03b7a628e2b1b68d3b0c6a05b40541d68fc7c90afef9eecd35193d2e00624270e61d46be3c7bccd8855ed5f0d0bbd7bfad4b9ae92c824d531f41389ba83fc3 SHA512 2782ff5a9257c2d4a7aaf0b12db95a6955225d292d9920c2e1b60cec30da152a2f8b951d03a6c15c75c82c72fd9e93f4a5de6cf2ae9cfbe14f32c751629ec400
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
diff --git a/acct-user/sniproxy/sniproxy-0-r1.ebuild b/acct-user/sniproxy/sniproxy-0-r1.ebuild
new file mode 100644
index 000000000000..5bda56cd6a17
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=366
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/sniproxy/sniproxy-0.ebuild b/acct-user/sniproxy/sniproxy-0.ebuild
deleted file mode 100644
index d7566da9196d..000000000000
--- a/acct-user/sniproxy/sniproxy-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=366
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/snmp_exporter/Manifest b/acct-user/snmp_exporter/Manifest
index 7f129f54b438..46d4584a87d7 100644
--- a/acct-user/snmp_exporter/Manifest
+++ b/acct-user/snmp_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD snmp_exporter-0.ebuild 255 BLAKE2B 33233e7cc09237a828b4727fdffb970f00c1e6dfb2a404a3dfa7d36c262ca7e43abbab711a120eac98b07ad096c1275520199e89977e23aa2f261aae816c315d SHA512 cec9e071a5ee865de18835dc0430cb3c87fbee9b1e1b35ee9312065d97de88318b078db60457b419c630226cd839febbd37f33c5b5529e13a493df353ab1776e
+EBUILD snmp_exporter-0-r1.ebuild 255 BLAKE2B 2a008b1d6e9a49aa882566c9019d51ce1db74f6b172b95e645ddd4f350c9e3b65e5c1b326cf6a13bba64ae305c07b947b3d210947b4a3cfe41eb81d2515dd8c2 SHA512 ede8abedc4211d81650ddcaa26a651b49e41b7893d121ff17b6db201ae6a6c9b491b59fecff3848479a14f96a46f7420e0475e177f44517293eb4d5d163def36
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild b/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..f1b3d5a78eab
--- /dev/null
+++ b/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/snmp_exporter"
+
+ACCT_USER_ID=108
+ACCT_USER_GROUPS=( snmp_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/snmp_exporter/snmp_exporter-0.ebuild b/acct-user/snmp_exporter/snmp_exporter-0.ebuild
deleted file mode 100644
index cc920e57202e..000000000000
--- a/acct-user/snmp_exporter/snmp_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/snmp_exporter"
-
-ACCT_USER_ID=108
-ACCT_USER_GROUPS=( snmp_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/snort/Manifest b/acct-user/snort/Manifest
index ef9b4a93d483..f82402208527 100644
--- a/acct-user/snort/Manifest
+++ b/acct-user/snort/Manifest
@@ -1,2 +1,2 @@
-EBUILD snort-0.ebuild 220 BLAKE2B 182b20f6e477e5cf055bceed938dece508ffcb144531e445d4db11edbd7c75965be861078a7bfea22ae87f8dba8bd286b56038a3760afdb56d5340c012880a79 SHA512 32ae2d723d3743a766e2939d4d196f9f014cf492f0880db9b75360542144543629d54104c0f1baf60cd97848bfa81687f3226e468aece4a61ac4cecdb01cfdfe
+EBUILD snort-0-r1.ebuild 225 BLAKE2B c287337bfe81463b4f839b02ce4630c8ba796ac7fafda3767e0bc18e30994ae6df395eefc4eff2486a09ff57d4d0e7ee70c17b0ebf99e92a1df2ab7db7641873 SHA512 1a510cc129719a099253e29efb9ea7c1ef2a3e274f1d689d137408561ee53655700d01d16fe969b100b7646be1b4eadbf711f1ce662ddc93eb77a7a8b7053e34
MISC metadata.xml 389 BLAKE2B b2f0c48986e152a58902a98acda9b6ebc253156c5ac3d13bd16b71ea428ffd7456bbe58a8565c5900a581242c11ea482b4f71a65b30962c96c4b7f26c292a86f SHA512 bd0a333026d7f5448f2451950ec3c2dae9a8fbeac03faf2fa9f516c331913e5eb6bcb8c43bc935d25cae1df5a275cc43df301e8834e585ba174fef4d336f8392
diff --git a/acct-user/snort/snort-0-r1.ebuild b/acct-user/snort/snort-0-r1.ebuild
new file mode 100644
index 000000000000..6b52f5bbce84
--- /dev/null
+++ b/acct-user/snort/snort-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for snort"
+ACCT_USER_ID=328
+ACCT_USER_GROUPS=( snort )
+
+acct-user_add_deps
diff --git a/acct-user/snort/snort-0.ebuild b/acct-user/snort/snort-0.ebuild
deleted file mode 100644
index 553fa786a9b0..000000000000
--- a/acct-user/snort/snort-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for snort"
-ACCT_USER_ID=328
-ACCT_USER_GROUPS=( snort )
-
-acct-user_add_deps
diff --git a/acct-user/sobby/Manifest b/acct-user/sobby/Manifest
index 7c1f9e721cd2..f23fd705cbf0 100644
--- a/acct-user/sobby/Manifest
+++ b/acct-user/sobby/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobby-0.ebuild 289 BLAKE2B 7e40c55984166f67ff81ed3f390fc48a25c6b5016b1d1518ad05546aa87e7fc7292669ba4d87f61a6863e8b75b8f90bd44fe97aa3b313c353705ac2c5c4558c3 SHA512 f81a7ca7f82e65e57e245a5424c9819d983aa6dd9cdc23b080e308fa987492ea73d7bb6bce13093046c6133b926b7565e452c32bd604e4565c01ff1fcdbe8c4c
+EBUILD sobby-0-r1.ebuild 289 BLAKE2B 58b6ce3ea2b6608b66eb60348fcfbdb0b31b4eb0934f9051a6537142f65d8ce20fb783a871a9be11a76567d697f8a8c53f1721ae63df161eec04356f799f82da SHA512 39a1d69928e6a351bf444ef04c9297f1100cb0eb8f4325b9cdcc6bba359c6b2dfe2614f5647445ec48476f828a25c4d6bb5cae0ef4ee072f45ed432a737d1b6f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/sobby/sobby-0-r1.ebuild b/acct-user/sobby/sobby-0-r1.ebuild
new file mode 100644
index 000000000000..4a8e1a4efd95
--- /dev/null
+++ b/acct-user/sobby/sobby-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running sobby"
+ACCT_USER_ID=322
+ACCT_USER_GROUPS=( sobby )
+ACCT_USER_HOME=/var/lib/sobby
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/sobby/sobby-0.ebuild b/acct-user/sobby/sobby-0.ebuild
deleted file mode 100644
index e3bb30a78d14..000000000000
--- a/acct-user/sobby/sobby-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running sobby"
-ACCT_USER_ID=322
-ACCT_USER_GROUPS=( sobby )
-ACCT_USER_HOME=/var/lib/sobby
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/sobexsrv/Manifest b/acct-user/sobexsrv/Manifest
index 510c9bdea1ea..7568f0608bc3 100644
--- a/acct-user/sobexsrv/Manifest
+++ b/acct-user/sobexsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobexsrv-0.ebuild 284 BLAKE2B 1cca06cfb4fba9bead35f2555fe43d2c5ef82258701e37fc619082f205f32b25ac0704d6765cebadc0bd88634637467baa5c2568ca6f2d6b3f29930581aa851c SHA512 9638f612d2ee35c2c75f59df1c77d90e10293306d8c444b69cea0951c9530a363576133170c708ed4d1ea69d67c455ba242a8670bf93f8509155b34e0023da10
+EBUILD sobexsrv-0-r1.ebuild 289 BLAKE2B 2bd7a6f4bfb12b5c382046c86dfbe951717b91b01c58ce4ccc453a69795c92198e950847db6404dabb42750a99c1a4359446ea43fc4ed4416e0ce9040ae35fc2 SHA512 45c8946515a0cdd887444f716ae7baf8a57da275ed3fbc6094de914bbb408bd9c7a46ebdd2276dfccb3ec752e12c53c98c9f3a94af5e1088edc307070890d333
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
diff --git a/acct-user/sobexsrv/sobexsrv-0-r1.ebuild b/acct-user/sobexsrv/sobexsrv-0-r1.ebuild
new file mode 100644
index 000000000000..fab5653ea299
--- /dev/null
+++ b/acct-user/sobexsrv/sobexsrv-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sobexsrv: a secure OBEX server"
+ACCT_USER_ID=387
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME="/var/spool/sobexsrv"
+
+acct-user_add_deps
diff --git a/acct-user/sobexsrv/sobexsrv-0.ebuild b/acct-user/sobexsrv/sobexsrv-0.ebuild
deleted file mode 100644
index 613bd931349c..000000000000
--- a/acct-user/sobexsrv/sobexsrv-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sobexsrv: a secure OBEX server"
-ACCT_USER_ID=387
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME="/var/spool/sobexsrv"
-
-acct-user_add_deps
diff --git a/acct-user/sockd/Manifest b/acct-user/sockd/Manifest
index b2ebde859cd4..1fc9b8953d28 100644
--- a/acct-user/sockd/Manifest
+++ b/acct-user/sockd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sockd-0-r1.ebuild 242 BLAKE2B 410be555fb037953b618341fbaa1c283a116bd5dc841d682112de6b601b7487563e42cdbff960f733c2187404acdcc6892f2316c2745b7d9cd166c03ab504339 SHA512 0ef759bdb8f263737267dea28786ea0025fa02c0500b6b519a4a9f68426f809c81b9a7298ccbed137a516bf1988029e76abe1c092f059999925b60deedd9c06d
+EBUILD sockd-0-r2.ebuild 242 BLAKE2B 0e5fe92aff767a7991f89796d03762289e5b5e7c951f02570ecce89a121e91a7cf8c4f423ccc776f32a0e975b8a81c5088c03c2dc658f3277b22c4bee29bd0ea SHA512 daef1e8a35e3603c7455df11586d7f910817e12c96b47f5c2f32f534d117f2f0d7a0649b1f5ed3a82dfe4f4b11855c0e0abfe992af424c8e828fcdbc394abdad
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/acct-user/sockd/sockd-0-r1.ebuild b/acct-user/sockd/sockd-0-r1.ebuild
deleted file mode 100644
index 2b3b94b74510..000000000000
--- a/acct-user/sockd/sockd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-proxy/dante"
-
-ACCT_USER_GROUPS=( "sockd" )
-ACCT_USER_ID="214"
-
-acct-user_add_deps
diff --git a/acct-user/sockd/sockd-0-r2.ebuild b/acct-user/sockd/sockd-0-r2.ebuild
new file mode 100644
index 000000000000..582e473c1667
--- /dev/null
+++ b/acct-user/sockd/sockd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-proxy/dante"
+
+ACCT_USER_GROUPS=( "sockd" )
+ACCT_USER_ID="214"
+
+acct-user_add_deps
diff --git a/acct-user/sogo/Manifest b/acct-user/sogo/Manifest
index 72d823927bab..0a54f6b95615 100644
--- a/acct-user/sogo/Manifest
+++ b/acct-user/sogo/Manifest
@@ -1,2 +1,2 @@
-EBUILD sogo-0-r1.ebuild 293 BLAKE2B 43e4a660e351f631eae2dbd6eb90660c61e17d8db493d55f97266151fc79350c0bcbf8c6795f351194c56083222743a7e079eb6df05a48bfb0775846fc8bb7d1 SHA512 1d724dfd62bf209c51c99a73cd7a69f2bcd213761c1b180af0b4768b6c98ca3018079bd7398c730ac259b5bc0d08961d9810e1d4aea322e3795a4a93ff796bf3
+EBUILD sogo-0-r2.ebuild 293 BLAKE2B edcb55a1e4a644d58d4d862759c3a774359c7ecb8d43ca42eec73e761c54e2729325f9b19e48ecc709d82029ea357227a10e4bb3f8838c0a12fc0ec7a479d559 SHA512 a6db807bd21801c1936fff0ff0ee9061cdbc85ffc53cc9dade7f52c9f1baa86f4dae979b4e56da537047782c7b0f43bd753374106d16d8c81ad15c53f762a76a
MISC metadata.xml 254 BLAKE2B e0f44b5b45dfaee5d78327c0a786de9629c29eb26b6ef1e06e499f8ebc1c72c0d0cee20d68992fe79df2498d1664a49f2bae19b5a115b97896300d741cb4a0d1 SHA512 48119cf18eaf9e217ca2203ccbfcd28aa8c6d2f7de7b21e347ba3c4d5f23147908620d158fab2bf0b0211670d091949b5ee3bed0044d4c86656703d20bdc6ee1
diff --git a/acct-user/sogo/sogo-0-r1.ebuild b/acct-user/sogo/sogo-0-r1.ebuild
deleted file mode 100644
index bb9f732e18a1..000000000000
--- a/acct-user/sogo/sogo-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for gnustep-apps/sogo"
-ACCT_USER_ID=475
-ACCT_USER_GROUPS=( sogo )
-ACCT_USER_HOME="/var/lib/sogo"
-ACCT_USER_SHELL=/bin/bash
-
-acct-user_add_deps
diff --git a/acct-user/sogo/sogo-0-r2.ebuild b/acct-user/sogo/sogo-0-r2.ebuild
new file mode 100644
index 000000000000..47590bc2fc6d
--- /dev/null
+++ b/acct-user/sogo/sogo-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for gnustep-apps/sogo"
+ACCT_USER_ID=475
+ACCT_USER_GROUPS=( sogo )
+ACCT_USER_HOME="/var/lib/sogo"
+ACCT_USER_SHELL=/bin/bash
+
+acct-user_add_deps
diff --git a/acct-user/soju/Manifest b/acct-user/soju/Manifest
index e57d27325d9e..e226e43ce436 100644
--- a/acct-user/soju/Manifest
+++ b/acct-user/soju/Manifest
@@ -1,2 +1,2 @@
-EBUILD soju-0.ebuild 297 BLAKE2B c5fb4b12aa340c1a649acd8dfc807a24434d578e966333f6736f9b32330a34b2e399cc39c41b87eed4f4b0f421bda20faf73766691f2d96cadac25bac7687a9d SHA512 436393cbe1e6b0b12b7d6bc5839507bcf357a908c8bb1ecabd418be5c4196ab910b7be86856d16bbcdc14da1e434ae8b1e8c1f8c3670520166ffc5de077ca2ad
+EBUILD soju-0-r1.ebuild 302 BLAKE2B f289b2a0a26d8b4db19ca39f7dab01332d6f3852e39f11dec3eae43be85089d5e84fe856bdf6294ca8bea9a3838ea9a93687e643cd612ac04d240970f1d3974f SHA512 4680976aa40a9d2575d79f9f7b23dac7240b2ba047cac1952a6a5f200ceba4876dfbb35232b025843766ded2d9dc57cb17ce9bd2c9d26a5fc9e4b6020ad7a960
MISC metadata.xml 422 BLAKE2B fe4d62d0b24cded0b5aa967f6a05c6ed0bf70dfe8a50910194ef9d6de170b9e9f696854839207417e6f4bc4cab2d807133efbbbdf9c6ab30c743bda5bc749e2e SHA512 c3375b49d2d26fafa1bfbd91f4ff00c0c57f9bc0def840ee2e20c8f2f45ecb5e1d857c8170261fa32faa1afc6b72b2a975e9a6b11d38d6f8e9cd3243951fd41b
diff --git a/acct-user/soju/soju-0-r1.ebuild b/acct-user/soju/soju-0-r1.ebuild
new file mode 100644
index 000000000000..73240ed21963
--- /dev/null
+++ b/acct-user/soju/soju-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_USER_ID=526
+ACCT_USER_HOME=/var/lib/soju
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( soju )
+
+acct-user_add_deps
diff --git a/acct-user/soju/soju-0.ebuild b/acct-user/soju/soju-0.ebuild
deleted file mode 100644
index 2ca7f2de748b..000000000000
--- a/acct-user/soju/soju-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the net-irc/soju IRC bouncer"
-ACCT_USER_ID=526
-ACCT_USER_HOME=/var/lib/soju
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( soju )
-
-acct-user_add_deps
diff --git a/acct-user/sonarr/Manifest b/acct-user/sonarr/Manifest
index c5b5593fc54f..dea7bc02457f 100644
--- a/acct-user/sonarr/Manifest
+++ b/acct-user/sonarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD sonarr-0.ebuild 258 BLAKE2B fb9734e4014c1ae5628a279edc0b33650fa66d40dc861adda6590d3dbf7ff051cddfba62289d2151c4a2bb429b391bc69e104ace0cddaba7288dbcc922817ca7 SHA512 30a01aaaad28f4b33ed4ce0a2df4eaf86359f397c9bba607317d588341a9f95f406da38d6e5751888f66947da9c3a1f691561d8ebc59c4afc918559b34924d7a
+EBUILD sonarr-0-r1.ebuild 258 BLAKE2B 96c87acce8a186fa17e018179c28ced9caf3cab4ee4653896be41941f8eae52dd238f667b6db74a0d08fec111bfc81f23ef43d47949cf2f85eb8db0b5f32cf0f SHA512 3136e9a5af3480bf0d88e20046a6c36964cd73ba1ef0b6300649ed6f14c4c9bced82460558065ef27493ddbb709dbf606c6707eb7275c668cdb6d6e665a22c26
MISC metadata.xml 642 BLAKE2B 07b76043cbc16155ebb695d0da638c0b2c07215d14a41c9ebbbee672d585a9d46ed5073d85d3b1e5bafb5ad63019c9c67285636e97e1a52984abf0dc3651f3f5 SHA512 2ff3b4e96e6811da3f832a142466be9529287427f4268715e574b97cb7653d6034e0aa20ae88b549d177c53cc1881e646743f0ee6bc4b45006b67a5d6f877755
diff --git a/acct-user/sonarr/sonarr-0-r1.ebuild b/acct-user/sonarr/sonarr-0-r1.ebuild
new file mode 100644
index 000000000000..7343294d3a08
--- /dev/null
+++ b/acct-user/sonarr/sonarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for sonarr"
+ACCT_USER_HOME=/var/lib/sonarr
+ACCT_USER_ID=515
+ACCT_USER_GROUPS=( sonarr )
+
+acct-user_add_deps
diff --git a/acct-user/sonarr/sonarr-0.ebuild b/acct-user/sonarr/sonarr-0.ebuild
deleted file mode 100644
index 1cae0d6f268f..000000000000
--- a/acct-user/sonarr/sonarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for sonarr"
-ACCT_USER_HOME=/var/lib/sonarr
-ACCT_USER_ID=515
-ACCT_USER_GROUPS=( sonarr )
-
-acct-user_add_deps
diff --git a/acct-user/spamd/Manifest b/acct-user/spamd/Manifest
index 91992f73283a..24044cbd0ee9 100644
--- a/acct-user/spamd/Manifest
+++ b/acct-user/spamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD spamd-0-r1.ebuild 731 BLAKE2B 0f219605b86301fdd33a1cf0d4a2d45d3f97167de46b1cebaa45c010a1b4faabd42e92b69ef3d39c83bff145889fa6a6abdd66aec236c91758911ce57e4bf5e3 SHA512 ed22f0112627def013342d1998f5580220cd078dd03dcee6801c332dabfda17680176ae9ca9e0ee1e950f3aac897b3a364bc04f6c097a8e9598610972d66e3d3
+EBUILD spamd-0-r2.ebuild 731 BLAKE2B ae140b5b2183c44573f00d4900a767553e331c4db1a375656f075cb022f571f5fe576eaf74c47c4dde81e28d3e58e74ade618e1c15f27c1022eb2e34707bcb4e SHA512 6fbc200082bf4684eb432465b1409db64f1e0881862cdcd08652375daa01063801f05935a9f9cf30be1e18f904286bc354b4d69ed35f3864cb8d26b7e8b019ab
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-user/spamd/spamd-0-r1.ebuild b/acct-user/spamd/spamd-0-r1.ebuild
deleted file mode 100644
index e4fcb0a0378a..000000000000
--- a/acct-user/spamd/spamd-0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the SpamAssassin daemon"
-
-ACCT_USER_ID=337
-ACCT_USER_GROUPS=( "${PN}" )
-# The spamd daemon runs as this user. Use a real home directory so
-# that it can hold SA configuration.
-#
-# Since spamd's home contains user-modifiable config files, it's
-# a violation of the Linux FHS for it to be here, but it's been
-# decided it can't be in /home/.
-#
-# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
-# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
-#
-ACCT_USER_HOME="/var/lib/spamd"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/spamd/spamd-0-r2.ebuild b/acct-user/spamd/spamd-0-r2.ebuild
new file mode 100644
index 000000000000..0b184739667c
--- /dev/null
+++ b/acct-user/spamd/spamd-0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SpamAssassin daemon"
+
+ACCT_USER_ID=337
+ACCT_USER_GROUPS=( "${PN}" )
+# The spamd daemon runs as this user. Use a real home directory so
+# that it can hold SA configuration.
+#
+# Since spamd's home contains user-modifiable config files, it's
+# a violation of the Linux FHS for it to be here, but it's been
+# decided it can't be in /home/.
+#
+# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
+# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
+#
+ACCT_USER_HOME="/var/lib/spamd"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/spectrum/Manifest b/acct-user/spectrum/Manifest
index 41c56e4d3207..435f588e7770 100644
--- a/acct-user/spectrum/Manifest
+++ b/acct-user/spectrum/Manifest
@@ -1,2 +1,2 @@
-EBUILD spectrum-0-r1.ebuild 298 BLAKE2B 6b19bb252700092bd37b3c152079b37f713af6efae7cf373fd62b713db2dee9efdce18e7b0e747302f1d3b7536d44479f7f410da091bd783c97be5da94aaa30e SHA512 b0a39b5b390a37a0c73a4c5ccff1db7b6d3c7e834782f4658bbeed3066c0b2165520b4754375172fd0458684ee7259872a504455c5ec406d3620b17c9de2bea9
+EBUILD spectrum-0-r2.ebuild 298 BLAKE2B c87157f715c19e52c4f0c650b8859a96911c893d470ea6a29722061e9c426219862b6a2c3e4bc9691bd16ae9192d1afa58bf1e3bd26d38f04e61f464e1f2ac99 SHA512 17705e6715ed813a74479d3984dee77a02f5b95230dd5e5ecd47b4d81cb28c3b84b49d7dad932d50f9e2c3237a02165a4e2cfdd7c358c72ae7ab52f943810f6a
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/spectrum/spectrum-0-r1.ebuild b/acct-user/spectrum/spectrum-0-r1.ebuild
deleted file mode 100644
index 08902275a61d..000000000000
--- a/acct-user/spectrum/spectrum-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Spectrum messaging transport"
-
-ACCT_USER_GROUPS=( "spectrum" )
-ACCT_USER_HOME="/var/lib/spectrum2"
-ACCT_USER_ID="486"
-
-acct-user_add_deps
diff --git a/acct-user/spectrum/spectrum-0-r2.ebuild b/acct-user/spectrum/spectrum-0-r2.ebuild
new file mode 100644
index 000000000000..54a2098366ef
--- /dev/null
+++ b/acct-user/spectrum/spectrum-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Spectrum messaging transport"
+
+ACCT_USER_GROUPS=( "spectrum" )
+ACCT_USER_HOME="/var/lib/spectrum2"
+ACCT_USER_ID="486"
+
+acct-user_add_deps
diff --git a/acct-user/spire/Manifest b/acct-user/spire/Manifest
index 369e8eefcc3c..7657834538c2 100644
--- a/acct-user/spire/Manifest
+++ b/acct-user/spire/Manifest
@@ -1,2 +1,2 @@
-EBUILD spire-0-r1.ebuild 246 BLAKE2B 2399a1ee5a750bf32332bab0ec053a4e552731763c300069652679213baaf619bcc7375e6e3b7233ebfb220f8e609902a644ce200a76464e2640e8d127cd47b9 SHA512 64fc5b5b4479ddf0f577eaf62f82844d0adbcb4e338c81119b7d9e08e12e0f40851ce48e3165d2be64e2813b1e997cdc82ee28ba216d932b886933b56874f5ec
+EBUILD spire-0-r2.ebuild 246 BLAKE2B f5225e883f4abbe59e9ba1323b12a4a44e077b116df191339fd8656cf21bdeffcc33431b3619da3cf9e7551a2aadfbb8da27119e07361dccf1b58733a534eea4 SHA512 d1b677c7efb251cf5af0ac5f5327db246ca798ec0bbb89e0d33adc1475b3878583c464c68f9b6318db2e6872bb035d246e9b16d1901cdf9c3be9119baf3620a9
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
diff --git a/acct-user/spire/spire-0-r1.ebuild b/acct-user/spire/spire-0-r1.ebuild
deleted file mode 100644
index da8dc43e7824..000000000000
--- a/acct-user/spire/spire-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for spiffe runtime environment"
-ACCT_USER_ID=271
-ACCT_USER_GROUPS=( spire )
-
-acct-user_add_deps
diff --git a/acct-user/spire/spire-0-r2.ebuild b/acct-user/spire/spire-0-r2.ebuild
new file mode 100644
index 000000000000..18e15e27892e
--- /dev/null
+++ b/acct-user/spire/spire-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for spiffe runtime environment"
+ACCT_USER_ID=271
+ACCT_USER_GROUPS=( spire )
+
+acct-user_add_deps
diff --git a/acct-user/spread/Manifest b/acct-user/spread/Manifest
index 6c80b3235120..b7c46974db8a 100644
--- a/acct-user/spread/Manifest
+++ b/acct-user/spread/Manifest
@@ -1,2 +1,2 @@
-EBUILD spread-0.ebuild 243 BLAKE2B 42b87ad57755d4f18c74690b61a6de8d3688ceac7b983342c26f982a62ed6465d443c6d2250c01cffcd70df053ae0f70714431b4b20e7150cce59d2ffe79c05b SHA512 f3a8d28ea3f2761d349b84fcf3efbd0022088298f2259e0fbf2d9f09c53b71092abd9a37db918cfe92165fd9ab0b7ca2324567a0a9c801f56dd9f05612a13757
+EBUILD spread-0-r1.ebuild 243 BLAKE2B 6001f4660d40b8e050b2d0dffd422ff4c4cce322ffbc37ca2b510795961a3d4af7786a2e801c67bcedde1f1deb90929b5dcd4226eb847ef573ab75898db98a16 SHA512 7b4ade2b2ecbb9abdf7a29bb82605ff7fcca1243b50916a1c1a03d85ec11a9ff229e0e1304f9bfe425b393623f9601100a127e5e914162e3221058a81403328a
MISC metadata.xml 246 BLAKE2B 8c6c4ab0f28d2c1596e95ac77be8fc6cf749d8729b00dd5020e45d3ffd91fc171e6785bb8d4669d3ba6384acac52ab891092fe4b02b70d04241a346e5af23c78 SHA512 ab9a981b4aff83ec5b1f003eddd7768a0d74a7701ce47ea0f813be72552450e02493c8705561b02975776537d0896539537bd95b89921b15cd2faa501339998d
diff --git a/acct-user/spread/spread-0-r1.ebuild b/acct-user/spread/spread-0-r1.ebuild
new file mode 100644
index 000000000000..14694ac04946
--- /dev/null
+++ b/acct-user/spread/spread-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/spread"
+
+ACCT_USER_GROUPS=( "spread" )
+ACCT_USER_ID="159"
+
+acct-user_add_deps
diff --git a/acct-user/spread/spread-0.ebuild b/acct-user/spread/spread-0.ebuild
deleted file mode 100644
index 25e453efacf3..000000000000
--- a/acct-user/spread/spread-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/spread"
-
-ACCT_USER_GROUPS=( "spread" )
-ACCT_USER_ID="159"
-
-acct-user_add_deps
diff --git a/acct-user/sqlgrey/Manifest b/acct-user/sqlgrey/Manifest
index 34f9f46fc6dd..357b3606bce9 100644
--- a/acct-user/sqlgrey/Manifest
+++ b/acct-user/sqlgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD sqlgrey-0-r1.ebuild 266 BLAKE2B a8c08dc3ce0eec728976d5b7c5cec3bd1ff14a8cf42ca72c32b51dbbc9030a0e48689cd27ae062606bee1c631b0fbc6bc96f27d978227ee7adc438a9ff04465b SHA512 416b9c749ba10f7453d2b7aecc4ee69957810c00d421b2369eec1e0fc2873c42df063f8c40805c43f5d0b33c3e99f074cc2b00624d4f9efd9b4aa1632896ffca
+EBUILD sqlgrey-0-r2.ebuild 266 BLAKE2B b538665a15206f3459888078ad15fb06b65305ec6855f89ccf5dd66d80751b660cae47bc9c5eb4812b227bd6098364b929432721d041d4ce94a3ba54b5ff3c83 SHA512 8eef292307571eb4adc1211b2ed6cf185dd56d0be23bb22b1e10c524d2f7a861ee59c96687963ec1bdbb01ad40a9773f23715842245a14a6289981d920d4898b
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
diff --git a/acct-user/sqlgrey/sqlgrey-0-r1.ebuild b/acct-user/sqlgrey/sqlgrey-0-r1.ebuild
deleted file mode 100644
index b0a125d82524..000000000000
--- a/acct-user/sqlgrey/sqlgrey-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for SQLGrey"
-
-ACCT_USER_ID=336
-ACCT_USER_GROUPS=( sqlgrey )
-ACCT_USER_HOME="/var/spool/sqlgrey"
-
-acct-user_add_deps
diff --git a/acct-user/sqlgrey/sqlgrey-0-r2.ebuild b/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
new file mode 100644
index 000000000000..097a202f2595
--- /dev/null
+++ b/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for SQLGrey"
+
+ACCT_USER_ID=336
+ACCT_USER_GROUPS=( sqlgrey )
+ACCT_USER_HOME="/var/spool/sqlgrey"
+
+acct-user_add_deps
diff --git a/acct-user/squid/Manifest b/acct-user/squid/Manifest
index caddc646fc8e..80e4d6ca4bad 100644
--- a/acct-user/squid/Manifest
+++ b/acct-user/squid/Manifest
@@ -1,2 +1,2 @@
-EBUILD squid-0-r1.ebuild 275 BLAKE2B ac7ec04e332a257ed77aebd1d877edf95b32211f90a492159b071f6b3dc578e7a074e932068a425609db0583dad52d7dbaffe30b405ce7ab3e17a3b024db20c5 SHA512 bbdf6c82363ced54f1bef26c6bbb78ffe9c0dd1a2f32b46c3d4dae43fd047f3ebf387a82c30d91d5bb56139e0fa7cad45819bf03a888adfad5a90835d8c3a2a3
+EBUILD squid-0-r2.ebuild 275 BLAKE2B 7bc15115d27837bed3d4cef0ad23f57d947c4d3d21f9943651454e3d994ed27ec90e2a763ae47c9c1b54db7e2684c5612ad870d99df5e557fae6d387c5b0c31c SHA512 10c251cde8a214ae16977043be38b81ec32c8e0aebb19bdb74ff60a93cae255d5d3a3cb968e3f4338fe22425a042195c77b30fc1e1b1add4703d68cac1c4033c
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-user/squid/squid-0-r1.ebuild b/acct-user/squid/squid-0-r1.ebuild
deleted file mode 100644
index 97e03021f293..000000000000
--- a/acct-user/squid/squid-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for squid web proxy cache"
-ACCT_USER_ID=301
-ACCT_USER_HOME=/var/cache/squid
-ACCT_USER_GROUPS=( squid )
-
-acct-user_add_deps
diff --git a/acct-user/squid/squid-0-r2.ebuild b/acct-user/squid/squid-0-r2.ebuild
new file mode 100644
index 000000000000..e009bd51a92d
--- /dev/null
+++ b/acct-user/squid/squid-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for squid web proxy cache"
+ACCT_USER_ID=301
+ACCT_USER_HOME=/var/cache/squid
+ACCT_USER_GROUPS=( squid )
+
+acct-user_add_deps
diff --git a/acct-user/sshd/Manifest b/acct-user/sshd/Manifest
index be8e8b922f6f..9f8aeb904718 100644
--- a/acct-user/sshd/Manifest
+++ b/acct-user/sshd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sshd-0-r1.ebuild 274 BLAKE2B 1a2b901a3daa6acf6a7a2b808ec1a772925c3696485571c9cd859496b52638ca2c3e64ea415fca4f65bdcde0488bc4c5faaf5571d2e7f28cfa954d0b6aba7346 SHA512 4c3856ef2c73749079cbd5595aa44d47f1951b9d2ca5b8494f37ab1ff97977d65fafa420c23481014b249d30cfe0e766ed8538700b2aa8212d04ee711f7951cf
+EBUILD sshd-0-r2.ebuild 279 BLAKE2B e4efa829ebf6cb1221ea975c1ae062db53c1db7a3f874977eb59bea414ff74981abbe4066c8d2d4d2f3fb007521b9f630e83b56c5d52d7b09aa40428bdab8077 SHA512 2a3bcb79baa0a7df4bb83753d19e01fd40fed90364c93fdc469d8432bdc3275ba0708994357a7b0690b00ea5767bc4537b439b57632c8f095650f561404d7f11
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
diff --git a/acct-user/sshd/sshd-0-r1.ebuild b/acct-user/sshd/sshd-0-r1.ebuild
deleted file mode 100644
index 06703c1956ba..000000000000
--- a/acct-user/sshd/sshd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ssh"
-
-ACCT_USER_ID=22
-ACCT_USER_HOME=/var/empty
-ACCT_USER_HOME_OWNER=root:root
-ACCT_USER_GROUPS=( sshd )
-
-acct-user_add_deps
diff --git a/acct-user/sshd/sshd-0-r2.ebuild b/acct-user/sshd/sshd-0-r2.ebuild
new file mode 100644
index 000000000000..1f398feda6db
--- /dev/null
+++ b/acct-user/sshd/sshd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ssh"
+
+ACCT_USER_ID=22
+ACCT_USER_HOME=/var/empty
+ACCT_USER_HOME_OWNER=root:root
+ACCT_USER_GROUPS=( sshd )
+
+acct-user_add_deps
diff --git a/acct-user/sstpc/Manifest b/acct-user/sstpc/Manifest
index 61cdfc26251a..5670cb5e6c05 100644
--- a/acct-user/sstpc/Manifest
+++ b/acct-user/sstpc/Manifest
@@ -1,2 +1,2 @@
-EBUILD sstpc-0.ebuild 245 BLAKE2B 4c31475643f5cdd650b916f9572a743767fee0e3f4d702603cff0d8749f7262c3ffb717dc1d3120f130facff6f583e1f8dcc1b358a06ac671ab9b17af7f1ce93 SHA512 ebd010822c21d381c5cdc70872502af3179466b6ef23edac09388c7209dff13c86fdf25079f9827d7b39e5462abee86bf83970c033c25a82dbf3a096e8df0715
+EBUILD sstpc-0-r1.ebuild 245 BLAKE2B bf997794850030a5c7b5cc76c3137e204276ade2ebc07870252c387ba63d9ea487161ee5964b604bcae7ff485f293f319112cc27c63cf3a4e0af4f440f8deec8 SHA512 1209fe3e9b061bcc1cc549f5828e21b2957113fbf031ac33daa158e3f5555e4cec4bf5c59d300fc737b3eac6a587885d4565a58eb85d8ebe778c464d1ae1d7d6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/sstpc/sstpc-0-r1.ebuild b/acct-user/sstpc/sstpc-0-r1.ebuild
new file mode 100644
index 000000000000..177d09eeb1f7
--- /dev/null
+++ b/acct-user/sstpc/sstpc-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/sstp-client"
+
+ACCT_USER_GROUPS=( "sstpc" )
+ACCT_USER_ID="257"
+
+acct-user_add_deps
diff --git a/acct-user/sstpc/sstpc-0.ebuild b/acct-user/sstpc/sstpc-0.ebuild
deleted file mode 100644
index 328b3ce93fc7..000000000000
--- a/acct-user/sstpc/sstpc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/sstp-client"
-
-ACCT_USER_GROUPS=( "sstpc" )
-ACCT_USER_ID="257"
-
-acct-user_add_deps
diff --git a/acct-user/stdiscosrv/Manifest b/acct-user/stdiscosrv/Manifest
index 1c984046190c..0616269155c4 100644
--- a/acct-user/stdiscosrv/Manifest
+++ b/acct-user/stdiscosrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD stdiscosrv-1.ebuild 682 BLAKE2B 2bd28a6db284f6ad8693703e16bfae5f7ce8183546b8e6945e0ae44cf01c32d2452eda673e39e63b42b741a449d66a09833a8337caa076603f5ec749b3630210 SHA512 c4147a460c29581da50c689107a467c9d61b559932eb56225bcc08d740d227578c2577cbf1011a2721c24aa89097644569bd4668db3dd9dc00a3560f01bd5e2f
+EBUILD stdiscosrv-1-r1.ebuild 682 BLAKE2B 7b42a0c73e254b87b67d41778a9b08c8e7937d2854e354377207a195f4ffc6be5fe5a0efd4d7030424bc97dcfc2e1b7ceea607794d1c4015962ce7ffb9c6eee1 SHA512 bb97fc7d614842397f01cda35a48797ceccb9a88111995d35ddea040b124141f2650653c18d14a2f53102124ec682b1b7aac7056fdbf249fb1aae29415c35974
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
new file mode 100644
index 000000000000..7ec9267bc6f2
--- /dev/null
+++ b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing discovery server"
+ACCT_USER_ID=497
+ACCT_USER_HOME=/var/lib/syncthing-discosrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt 1; then
+ ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
+ ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+ break
+ fi
+ done
+ fi
+}
diff --git a/acct-user/stdiscosrv/stdiscosrv-1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1.ebuild
deleted file mode 100644
index fc1db7a4a130..000000000000
--- a/acct-user/stdiscosrv/stdiscosrv-1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing discovery server"
-ACCT_USER_ID=497
-ACCT_USER_HOME=/var/lib/syncthing-discosrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
-
-pkg_postinst() {
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- local rver
- for rver in ${REPLACING_VERSIONS} ; do
- if ver_test "${rver}" -lt 1; then
- ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
- ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
- break
- fi
- done
- fi
-}
diff --git a/acct-user/steamcmd/Manifest b/acct-user/steamcmd/Manifest
index 6c0a73fdd0f3..4dd82d3beddd 100644
--- a/acct-user/steamcmd/Manifest
+++ b/acct-user/steamcmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD steamcmd-0-r1.ebuild 280 BLAKE2B 9df3d4a5cb2a5298fe28a2e715869e487b0a360a10b25740b3f06973c64524ad9463a8b54738163685e70ffb4f8ab19148bb86b44a9dce412ce20fd3c917e8d0 SHA512 9a71363fad26a6edecce9b77c7a2aad676011f9f2a9e9d6823f0caf072925812f405cba2f247dbb7f1207a299cb71a6a43beb81c586e45a63fdec1637022d437
+EBUILD steamcmd-0-r2.ebuild 280 BLAKE2B 8b6c0231de46c079cf984f93d77b83d1c0411d7c6215155b908669713109e98bb39a016379e3d4ba456e4113b924b4564dd109ac9b8147ed26ee5c69e4613a01 SHA512 aea3d431b858da1efea415a04f0444ead4a20709853c5c6ab652d9eb65959d4be9d648ac953102d84f5a3463a510d07af485f009f73e6fb06602dbc44c38bf01
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/steamcmd/steamcmd-0-r1.ebuild b/acct-user/steamcmd/steamcmd-0-r1.ebuild
deleted file mode 100644
index d86f0daa649d..000000000000
--- a/acct-user/steamcmd/steamcmd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the SteamCMD server"
-
-ACCT_USER_GROUPS=( "steamcmd" )
-ACCT_USER_HOME="/opt/steamcmd"
-ACCT_USER_ID="489"
-
-acct-user_add_deps
diff --git a/acct-user/steamcmd/steamcmd-0-r2.ebuild b/acct-user/steamcmd/steamcmd-0-r2.ebuild
new file mode 100644
index 000000000000..c587360a5303
--- /dev/null
+++ b/acct-user/steamcmd/steamcmd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the SteamCMD server"
+
+ACCT_USER_GROUPS=( "steamcmd" )
+ACCT_USER_HOME="/opt/steamcmd"
+ACCT_USER_ID="489"
+
+acct-user_add_deps
diff --git a/acct-user/stg/Manifest b/acct-user/stg/Manifest
index abdc6da2310a..c5d8b6f437f7 100644
--- a/acct-user/stg/Manifest
+++ b/acct-user/stg/Manifest
@@ -1,2 +1,2 @@
-EBUILD stg-0.ebuild 243 BLAKE2B 08c1fe40e5d1ee366456fe6eb29f8f3f6c3c123fd75adca618e04d2053c3c6c1e163db54336d13fbe8652c4865ec7d3a8d00dbb6d09a7c59d63495bf4d9dddbf SHA512 f8804579b797496f6477e6f84c4d58156356ebcdcf30c6e2c3bccac3a2722cf4192559600ca0e6373bcf18569ca3c8e217bc001f1173b330a87223fa05fea02a
+EBUILD stg-0-r1.ebuild 243 BLAKE2B 49df9e5e5321650ae415c66cdc2673a9cc1ccdae71a98efcfd1df4bbf8c749a52762917b118ef224f763357babe779e37e3245e2aaf2d06ec259dce174d71327 SHA512 a783dedabf7ea88e905dbe9bd0a80a239d4f2451fbe34c20af50472c78212a2096f16a0ae5f64929e173788df0ae4984598a15dbc6bfad2a836cfa36ca99921b
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-user/stg/stg-0-r1.ebuild b/acct-user/stg/stg-0-r1.ebuild
new file mode 100644
index 000000000000..5c899c73be93
--- /dev/null
+++ b/acct-user/stg/stg-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/stargazer"
+
+ACCT_USER_GROUPS=( "stg" )
+ACCT_USER_ID="176"
+
+acct-user_add_deps
diff --git a/acct-user/stg/stg-0.ebuild b/acct-user/stg/stg-0.ebuild
deleted file mode 100644
index db254cc77e7e..000000000000
--- a/acct-user/stg/stg-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/stargazer"
-
-ACCT_USER_GROUPS=( "stg" )
-ACCT_USER_ID="176"
-
-acct-user_add_deps
diff --git a/acct-user/strelaysrv/Manifest b/acct-user/strelaysrv/Manifest
index 9383f429d0cd..b04ca8334c45 100644
--- a/acct-user/strelaysrv/Manifest
+++ b/acct-user/strelaysrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD strelaysrv-1.ebuild 678 BLAKE2B a9d8047f40daf1c9b8b67edcdb577d4686a15c73813734f9ac26e84b76c2d9b5d0b00b5a67b0c4180550a25c78bc35f42e94c060699656d2e725f0f6cfdfaace SHA512 51322e2cd3b58282278e7a94489c74c7847587d08000131fb42368e2e30ccfcc27b701b08bae99b49ac7131cb333dead23042dadd63a770508414c5b993aeae6
+EBUILD strelaysrv-1-r1.ebuild 678 BLAKE2B ff8fba1422bdf78a30d2ef4a0dfa298e08c122878c7446affed61680b03dbe2c1740aa6c67f96fa63caace4a9204cf3a2d216c5228256cb386abcc4424272d1c SHA512 f7d861379fc156ab36f4450be5109457d2e40e99666b745b9fecefa5fbedda9b783ab91cfc4b48ab711f2804014abfa4aabfc1caf2f40aa449c708886c88ca8a
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/strelaysrv/strelaysrv-1-r1.ebuild b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
new file mode 100644
index 000000000000..57f5a650afb1
--- /dev/null
+++ b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing relay server"
+ACCT_USER_ID=496
+ACCT_USER_HOME=/var/lib/syncthing-relaysrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt 1; then
+ ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
+ ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+ break
+ fi
+ done
+ fi
+}
diff --git a/acct-user/strelaysrv/strelaysrv-1.ebuild b/acct-user/strelaysrv/strelaysrv-1.ebuild
deleted file mode 100644
index c4b804d8160c..000000000000
--- a/acct-user/strelaysrv/strelaysrv-1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing relay server"
-ACCT_USER_ID=496
-ACCT_USER_HOME=/var/lib/syncthing-relaysrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
-
-pkg_postinst() {
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- local rver
- for rver in ${REPLACING_VERSIONS} ; do
- if ver_test "${rver}" -lt 1; then
- ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
- ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
- break
- fi
- done
- fi
-}
diff --git a/acct-user/stubby/Manifest b/acct-user/stubby/Manifest
index ad73ed0c9a9a..ccb6758256de 100644
--- a/acct-user/stubby/Manifest
+++ b/acct-user/stubby/Manifest
@@ -1,2 +1,2 @@
-EBUILD stubby-0-r1.ebuild 253 BLAKE2B 47b5fee9e2a33cc53ae3cbe67504dd4f9bd3615057b4e62c9913ba9e615e3bd4f118c581a8947acd976087b131dab6cd3fa5b5b5bd4b2063ed0b97d0e4444de7 SHA512 8de6a36fcca7f04256229cfe80297cbd0ae476d624b2395f8fad4fd9384d7e8b44f5811beb1a993b5513bbb02b94b9fd122b9c20210b41a7ce6176f3403644a3
+EBUILD stubby-0-r2.ebuild 253 BLAKE2B 85a950e6b5b4147a52711efc7726080fbc55829fd551d58c77c869667a7353c93ab032e679ce6bad80bdbb941c6b9e677b9f4cc7095980059e092f21fae4b91d SHA512 39b669edaff2c179c7b3df69b7c039709f8baa2954746a3cfb441bbe349bfa70d3678cf2d0a3d234baba80de3d32808c8306662943a93eb2dcbd8e5b28085c24
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/stubby/stubby-0-r1.ebuild b/acct-user/stubby/stubby-0-r1.ebuild
deleted file mode 100644
index bfc4ccc9dbcc..000000000000
--- a/acct-user/stubby/stubby-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Stubby program user (from net-dns/getdns)"
-ACCT_USER_ID=476
-ACCT_USER_GROUPS=( stubby )
-
-acct-user_add_deps
diff --git a/acct-user/stubby/stubby-0-r2.ebuild b/acct-user/stubby/stubby-0-r2.ebuild
new file mode 100644
index 000000000000..c2edde79f5ef
--- /dev/null
+++ b/acct-user/stubby/stubby-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Stubby program user (from net-dns/getdns)"
+ACCT_USER_ID=476
+ACCT_USER_GROUPS=( stubby )
+
+acct-user_add_deps
diff --git a/acct-user/stunnel/Manifest b/acct-user/stunnel/Manifest
index 96a967b9fe3c..417633e471f9 100644
--- a/acct-user/stunnel/Manifest
+++ b/acct-user/stunnel/Manifest
@@ -1,2 +1,2 @@
-EBUILD stunnel-0-r1.ebuild 229 BLAKE2B bc81dee51d4642c16ec4f06e00401154de43049c15b4ef6306b20752da8b732728055efde497df4f37306d78bb65964a81a776dee0584fbe5c7590176b3f5f1e SHA512 16ce2e8b3db25342ae03d409464c1319ace4d47aa2e79e399ef3ab8702452ccc374e5a25544016e0598cdbc2e8b3250a84e6f5b95ab6dc8f6878da687d2728b3
+EBUILD stunnel-0-r2.ebuild 229 BLAKE2B c34ada120d208ad791b21c97e7d01f65f281684e908173bff11a9e7b5f66042f28e9a620e3fd82b23ab184af05daa226531732ea6a5528fa15d5b5fc7a6b83a6 SHA512 da56ffc4e2f3589cbc6d10f843eaeda1ceb4854477e8f3fc28233f1306376679ab17a60f056ca6ec9e983a84361c9b041a264485429fdf46c6641460cba60791
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/stunnel/stunnel-0-r1.ebuild b/acct-user/stunnel/stunnel-0-r1.ebuild
deleted file mode 100644
index efd92922c779..000000000000
--- a/acct-user/stunnel/stunnel-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for stunnel"
-ACCT_USER_ID=341
-ACCT_USER_GROUPS=( stunnel )
-
-acct-user_add_deps
diff --git a/acct-user/stunnel/stunnel-0-r2.ebuild b/acct-user/stunnel/stunnel-0-r2.ebuild
new file mode 100644
index 000000000000..06aa05483ac0
--- /dev/null
+++ b/acct-user/stunnel/stunnel-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for stunnel"
+ACCT_USER_ID=341
+ACCT_USER_GROUPS=( stunnel )
+
+acct-user_add_deps
diff --git a/acct-user/subsonic/Manifest b/acct-user/subsonic/Manifest
index da78619d0032..80eae668089d 100644
--- a/acct-user/subsonic/Manifest
+++ b/acct-user/subsonic/Manifest
@@ -1,2 +1,2 @@
-EBUILD subsonic-0-r1.ebuild 289 BLAKE2B a423eab553884b0ef6fa011c946b1e416294118e08d09dbaa036db45e348613869b23199e032b21e38bd16f154a706862b9d3b017266acba132446367d836b7a SHA512 8273e612e96c6a3a6107de37227ce4948c8a1600b7a3ad78258f92f04645022894ef477f9172fb2be8a9743607e8687beaa21e8700b51bf124df8b2e2af0767c
+EBUILD subsonic-0-r2.ebuild 289 BLAKE2B bd7f6ea73d100a5e994568ebbc4aa010f6cd26077c5156d2d64207795de4567d8010bb6b782c39278bdb5197d96d0027f8e6bf1136698590f64121bbb44c5aa0 SHA512 94daded5da0c5db9a00b162e4fe19dc85db4332ac5d4a908d1fce35350c21e06c7cfb4dc317f768f978212b87214ac8d0511743d100013b23b6b3159a6f87466
MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/acct-user/subsonic/subsonic-0-r1.ebuild b/acct-user/subsonic/subsonic-0-r1.ebuild
deleted file mode 100644
index 6ca134e7f2a6..000000000000
--- a/acct-user/subsonic/subsonic-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/subsonic-bin"
-
-ACCT_USER_GROUPS=( "subsonic" )
-ACCT_USER_HOME="/var/lib/subsonic"
-ACCT_USER_ID="136"
-
-acct-user_add_deps
diff --git a/acct-user/subsonic/subsonic-0-r2.ebuild b/acct-user/subsonic/subsonic-0-r2.ebuild
new file mode 100644
index 000000000000..c5c61c23e2b7
--- /dev/null
+++ b/acct-user/subsonic/subsonic-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/subsonic-bin"
+
+ACCT_USER_GROUPS=( "subsonic" )
+ACCT_USER_HOME="/var/lib/subsonic"
+ACCT_USER_ID="136"
+
+acct-user_add_deps
diff --git a/acct-user/suricata/Manifest b/acct-user/suricata/Manifest
index ce937d98c62b..0e4d3dbc585f 100644
--- a/acct-user/suricata/Manifest
+++ b/acct-user/suricata/Manifest
@@ -1,2 +1,2 @@
-EBUILD suricata-0-r1.ebuild 234 BLAKE2B df512404da28d9c8f619d6f0790099f4187ea7d0b42fa1004e2fecd483c1d34ddc17742ceb94a6460c55c0e4a09517508f994eaa7de6f3bbd713fd2365056095 SHA512 0df82ba4cb86587c048881b18249835ba89fcf9f976a8c2fa9d4df08a10ad6841a1cefb70750a66dc8507b4699b4854fd128a80ad83d6723ba32c6e583eba774
+EBUILD suricata-0-r2.ebuild 234 BLAKE2B dd15990ac2d36f1a0e48879e513ba1ed0fdf8b9ead0d7a7b9597ce01a8886c115d73ce3af6de2f49b6d0b6a45c474ac1049e1b6aed0ebf2ab7c969851f29f687 SHA512 d04ca9a63473d35e892f18bdfd7108a09f87d7575531f76861b98acff7d9d3ef49d6bde3033700e9c6a57e11680538cb58b76f92bb6ad52336c0b5f7e74548b5
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/suricata/suricata-0-r1.ebuild b/acct-user/suricata/suricata-0-r1.ebuild
deleted file mode 100644
index 37142d57f340..000000000000
--- a/acct-user/suricata/suricata-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Suricata IDS"
-ACCT_USER_ID=477
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/suricata/suricata-0-r2.ebuild b/acct-user/suricata/suricata-0-r2.ebuild
new file mode 100644
index 000000000000..8542433ac1cb
--- /dev/null
+++ b/acct-user/suricata/suricata-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Suricata IDS"
+ACCT_USER_ID=477
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/svn/Manifest b/acct-user/svn/Manifest
index d1a5e8a82dff..c2adb564d2af 100644
--- a/acct-user/svn/Manifest
+++ b/acct-user/svn/Manifest
@@ -1,2 +1,2 @@
-EBUILD svn-0-r1.ebuild 199 BLAKE2B 2d27885d7816a6d5275f358ac9df4f3a703339cf044e1ddae541fe95484ca31c4d02365a962cba526ebe92448fa363b07c1cb6f344410174859d1aaec1872197 SHA512 92e42e07dff6a1412af61b9a766eadf503d2e3b22d8a61d3c6448f1106e0c9d5402abd23b3051faaa2d20a641043de54f720d25d8d7a0a93a23944abf825324b
+EBUILD svn-0-r2.ebuild 199 BLAKE2B e74e5efd57bfdfc0bdd7dc09a5a4bb7bf5486a60fd73b5cc68ad24f8817c033b23e8fb0e9ec4c40891db3de4f389c1dc9e5f16e261f5c0ca6e9652f2a9cce467 SHA512 8fce8975f4f5ba76059f0ee8efad2ff4ad37d0084a514a7bd8365dd1173b59ed4fc12fa10a02b567375046866803d0a616273706c673b96211b7d1e0a57a8e8b
MISC metadata.xml 255 BLAKE2B 6d9704c53f3cb2feb306acb4fda9d377fd979897237080046e5e5285bdf057281bbb32309764e654c06cce3f6690196f39896508ae6c1dc937e5d3e632fa3cd3 SHA512 ec50c1a81ca10bd96a826462eaec981359cbc400462e7ba7c3d0ded5edcefda5433c21be5df7644adf567e518bd865775e298e48f7d13c92740a80e5be044be4
diff --git a/acct-user/svn/svn-0-r1.ebuild b/acct-user/svn/svn-0-r1.ebuild
deleted file mode 100644
index 6f7d567a7edf..000000000000
--- a/acct-user/svn/svn-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=399
-ACCT_USER_GROUPS=( svnusers )
-
-acct-user_add_deps
diff --git a/acct-user/svn/svn-0-r2.ebuild b/acct-user/svn/svn-0-r2.ebuild
new file mode 100644
index 000000000000..ccadd54c2705
--- /dev/null
+++ b/acct-user/svn/svn-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=399
+ACCT_USER_GROUPS=( svnusers )
+
+acct-user_add_deps
diff --git a/acct-user/svxlink/Manifest b/acct-user/svxlink/Manifest
index a3f3132324e4..89caa3e38ce4 100644
--- a/acct-user/svxlink/Manifest
+++ b/acct-user/svxlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD svxlink-0.ebuild 242 BLAKE2B 98c2df3a23a3a2bdfff0462f1617a4a2209667d6cf5719e4ef1486d5708abfef2b350aea01362744ea7ac5039517be8c331654e52bae48bd305bf1f1d61aa894 SHA512 eb4622f9f52f2d4f9dbcbe7a6f446ebc066b21a0076479ad7083f1e8f8a3335db201e144c2783b3a2b90adae289d4600579ff5bdc0b7c3300e7a8694a36483b0
+EBUILD svxlink-0-r1.ebuild 242 BLAKE2B e805f600357d7aecf462a8f315038a54ee42b25b673a1b388bb0313a3494e4f435334e44014c5177661fd74642041fce50314aec6527a4e7b0dc407df1dc8a8f SHA512 637a4353c2f2d10439d47ea29b2747ee748ccc2b4b89a5b3afd1ff5de2272356f57936fb5cfe2210b450fee71a66885cda4a0d7298c4b39119ab29e252dbe116
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/acct-user/svxlink/svxlink-0-r1.ebuild b/acct-user/svxlink/svxlink-0-r1.ebuild
new file mode 100644
index 000000000000..a1db366fdc42
--- /dev/null
+++ b/acct-user/svxlink/svxlink-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the svxlink server"
+ACCT_USER_ID=247
+ACCT_USER_GROUPS=( svxlink )
+
+acct-user_add_deps
diff --git a/acct-user/svxlink/svxlink-0.ebuild b/acct-user/svxlink/svxlink-0.ebuild
deleted file mode 100644
index 347fb69f8eca..000000000000
--- a/acct-user/svxlink/svxlink-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the svxlink server"
-ACCT_USER_ID=247
-ACCT_USER_GROUPS=( svxlink )
-
-acct-user_add_deps
diff --git a/acct-user/swift/Manifest b/acct-user/swift/Manifest
index c24fd7634f2a..51946f6c7b80 100644
--- a/acct-user/swift/Manifest
+++ b/acct-user/swift/Manifest
@@ -1,2 +1,2 @@
-EBUILD swift-0-r1.ebuild 255 BLAKE2B bb90b66e836ef91980365a23621a00b44a92d03431927571f884395e95adce2d8212457f2aa80c7b59c386717d073c0df4b3dccdf046ae4a1f39aac0235bfc9f SHA512 0e18a41e1094e0c237b6a11475e0f22d2f3024a74093d6717b4bc3ece92a40490b4f22f4c3adecff2306b17eb8bf54230c213262a1d3a14901973231034f6502
+EBUILD swift-0-r2.ebuild 260 BLAKE2B b3c90d902995b95db618a48143e2b4cd1aa2b2c9f9728a42ede1d72efe145f905dafd8f8a7b5e511235bc09ab57b57eea8be62fb98b9b62b846a69073baa8c69 SHA512 3c75013e480cca44ae6da2dacd4f68cb5af2d411a2782f5676f66d8188d9523dd9b6d7e62f1c4d2377580a8b0040044e35eb154b512b47fd617a0c86c76a4de7
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/acct-user/swift/swift-0-r1.ebuild b/acct-user/swift/swift-0-r1.ebuild
deleted file mode 100644
index efee86cef2da..000000000000
--- a/acct-user/swift/swift-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="USER for swift - Openstack object storage backend"
-ACCT_USER_ID=449
-ACCT_USER_GROUPS=( swift )
-
-acct-user_add_deps
diff --git a/acct-user/swift/swift-0-r2.ebuild b/acct-user/swift/swift-0-r2.ebuild
new file mode 100644
index 000000000000..f3e36ece0c61
--- /dev/null
+++ b/acct-user/swift/swift-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="USER for swift - Openstack object storage backend"
+ACCT_USER_ID=449
+ACCT_USER_GROUPS=( swift )
+
+acct-user_add_deps
diff --git a/acct-user/synapse/Manifest b/acct-user/synapse/Manifest
index a325a8648fe3..bd945a3e9b44 100644
--- a/acct-user/synapse/Manifest
+++ b/acct-user/synapse/Manifest
@@ -1,2 +1,2 @@
-EBUILD synapse-0.ebuild 233 BLAKE2B 643656e5c2bc4531c4417731218e3727955662961421a7391176065c14ac6e4a23eb75afbf021144e0fe19672ceff35706608ca1ae8b9d06316dd015b9ef37bb SHA512 5025226fd564c361c32bb97dd6c003f24b98a8de2419433cf40e5fd8b5c1c00abd02abba24d247f8786788af9dfaa2ae3832e0ad4d673c2591c299514927b75e
+EBUILD synapse-0-r1.ebuild 238 BLAKE2B df77efd28b4c7b7d736f19735b19a2e2001ebd10acc6e2bd0790375f6aab8bba987b9358068abae6063744eb7846479b6b056803a9e48f90596c3fe3838750de SHA512 d8468cd4f0bd8e632b451bc877479f119e5f1d8891ae63ced7c815cc3ff285e2f337aab95fcee456b286d09704b6dde47bb3f0727cf4e480fbb4a1023af9f5b9
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
diff --git a/acct-user/synapse/synapse-0-r1.ebuild b/acct-user/synapse/synapse-0-r1.ebuild
new file mode 100644
index 000000000000..ad0ebb7a6709
--- /dev/null
+++ b/acct-user/synapse/synapse-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/synapse"
+ACCT_USER_ID=519
+ACCT_USER_GROUPS=( synapse )
+
+acct-user_add_deps
diff --git a/acct-user/synapse/synapse-0.ebuild b/acct-user/synapse/synapse-0.ebuild
deleted file mode 100644
index 0fb650ac5752..000000000000
--- a/acct-user/synapse/synapse-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-im/synapse"
-ACCT_USER_ID=519
-ACCT_USER_GROUPS=( synapse )
-
-acct-user_add_deps
diff --git a/acct-user/syncthing/Manifest b/acct-user/syncthing/Manifest
index 99808d702f87..fdca12c0b648 100644
--- a/acct-user/syncthing/Manifest
+++ b/acct-user/syncthing/Manifest
@@ -1,2 +1,2 @@
-EBUILD syncthing-0-r1.ebuild 324 BLAKE2B 0f12cd1c2d08b11088cbc7a542480792f2fd800a1ae2dce6b707eb22794b198cbba03eb9461c8a4247737d058190a2a3bacd8196aea73a0391ebe56d8f8d0f57 SHA512 9140c7945b16315c5cc50a001589c2585053a98baf5fc9cbf0f15cea0965f75b63ab3aa197c0b3a6ea6810ebe4b219312d0752a73ff8100f1334c0690a62b8bd
+EBUILD syncthing-0-r2.ebuild 324 BLAKE2B af417934b4afaa17f4cd5786126599f184f05790c8c39bfc1a2f1b29b4564d8cf4f7f149513cf503ad570fe85766e50803ff39ed6e94c32f80e444d584d0e32b SHA512 ac6ed4a8f6a811c15f89f4f7c685ae12d227ccc8db6dcff866476be885a5c06edf8ade6e827b893d0a823f5e5611427663e2c6d05eb60945d881c39e0b8df9c6
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/syncthing/syncthing-0-r1.ebuild b/acct-user/syncthing/syncthing-0-r1.ebuild
deleted file mode 100644
index a97b75e13343..000000000000
--- a/acct-user/syncthing/syncthing-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-p2p/syncthing server"
-ACCT_USER_ID=499
-ACCT_USER_HOME=/var/lib/syncthing
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
diff --git a/acct-user/syncthing/syncthing-0-r2.ebuild b/acct-user/syncthing/syncthing-0-r2.ebuild
new file mode 100644
index 000000000000..bb5f5ae16039
--- /dev/null
+++ b/acct-user/syncthing/syncthing-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-p2p/syncthing server"
+ACCT_USER_ID=499
+ACCT_USER_HOME=/var/lib/syncthing
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-coredump/Manifest b/acct-user/systemd-coredump/Manifest
index 168721075e85..51c946e1244d 100644
--- a/acct-user/systemd-coredump/Manifest
+++ b/acct-user/systemd-coredump/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-coredump-0-r1.ebuild 207 BLAKE2B 9de5f9da8eb7d3500085de6e4d2e3a1f60e0c257136edf76919cb45f615d686a22761bd819f0245f920bc77f97bdd511ddb978e3ed39a56a4d9f8211e8ffd1e8 SHA512 f78f570dc9cf80826bc9d066a016d00fd5f122a1fecefc76fe9727b5e2c34129edea987ab68b642c06c6df7d5e6325aa741c740654e7f8396798bf79897d13e1
+EBUILD systemd-coredump-0-r2.ebuild 207 BLAKE2B 34c74113c41bb33c7bb1e9ff01ece409e504dda9fffe6d77efb8c5aaed0ea530d4153fafc1148d264963fc9e751ab3b2fa5f5520dc9baa36ca4d7b9a62ee9c51 SHA512 35d52bab439a172248a4e8a7b1ea997f551292c9b7a348043be401ec897fa762573518ea2a31cd7f9f6af9d81c2fc13afaf6aeca37285cac0f00400bc5d787b9
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild
deleted file mode 100644
index 24e1948da8c3..000000000000
--- a/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=194
-ACCT_USER_GROUPS=( systemd-coredump )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
new file mode 100644
index 000000000000..c6a2b8a225e9
--- /dev/null
+++ b/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=194
+ACCT_USER_GROUPS=( systemd-coredump )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-journal-remote/Manifest b/acct-user/systemd-journal-remote/Manifest
index 92043dd7046f..a7933da23bbc 100644
--- a/acct-user/systemd-journal-remote/Manifest
+++ b/acct-user/systemd-journal-remote/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-remote-0-r1.ebuild 213 BLAKE2B 98e5579aebe2bfdb7317cc1ba83c58d3884977e10f728e716e6efc62a9261c3ef571df11b81e71a49f2fb0a778089a149a59627ea26399a3ac0ae080defed1cb SHA512 3ef100e964263877ba2c328140e9a931b35bba8ca4859503cf3295412b90147437fa4eb1c8ed2b1a61534c5185ab7c39ad7f1c6db0250e2cbf731a10b1a3aa75
+EBUILD systemd-journal-remote-0-r2.ebuild 213 BLAKE2B 36ae5af00a3c63ae23e107db0584b23b9bf4ad0672b8604f57ccb1ba790068c5a8f68c581ea47cab306ff77ec441e30e72199bc8563de4beb577fa613ef25e43 SHA512 c623b3334f8a8aec656265548a1978e93476e11575ac2e0121e83fc8150f670783a5cf41d10e3a1c71dba9538e85a62699f324961e28f7ba0131d1ad022826ba
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
deleted file mode 100644
index b05096297b8b..000000000000
--- a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=191
-ACCT_USER_GROUPS=( systemd-journal-remote )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
new file mode 100644
index 000000000000..79477b5fc172
--- /dev/null
+++ b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=191
+ACCT_USER_GROUPS=( systemd-journal-remote )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-network/Manifest b/acct-user/systemd-network/Manifest
index a459a8323845..2fa1413bf3b1 100644
--- a/acct-user/systemd-network/Manifest
+++ b/acct-user/systemd-network/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-network-0-r1.ebuild 206 BLAKE2B df7d7b2d235d862820cc781a08f334102c9f5f94dc670c8c64bde5f2a55761bebe20bdeb2344f1bbb21702aa825ee539fed8388f889fa2592a516c53bf66ad4e SHA512 9235c82c06834fd2664cfc84d25a3828fdd69851ba477e7e99f007d262a4d14a54b41dd0851ba6ff5e3f325ee57828ab75763ca2334cdbb7967ce11d2fd8b82e
+EBUILD systemd-network-0-r2.ebuild 206 BLAKE2B 0b0dedea20c22b2ddc7b12831775c3833471fd245c9858c7750c8c0b8691152905026536f2ed5cc860a729421d257759ed7b51bdabdaa0571dd5e68dffafdaf7 SHA512 f1dd4835f4c810dcc5e8b633a857989a41c483840d0be1329ef82b425ed129ac2055db85b281517ea9641c3510507a866eb7d9bb3b2dd58bcdedaf61ac424dfb
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-network/systemd-network-0-r1.ebuild b/acct-user/systemd-network/systemd-network-0-r1.ebuild
deleted file mode 100644
index bf308627c415..000000000000
--- a/acct-user/systemd-network/systemd-network-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=192
-ACCT_USER_GROUPS=( systemd-network )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-network/systemd-network-0-r2.ebuild b/acct-user/systemd-network/systemd-network-0-r2.ebuild
new file mode 100644
index 000000000000..d4ed5bb35fb1
--- /dev/null
+++ b/acct-user/systemd-network/systemd-network-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=192
+ACCT_USER_GROUPS=( systemd-network )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-oom/Manifest b/acct-user/systemd-oom/Manifest
index 06ed435f019e..9d410490154e 100644
--- a/acct-user/systemd-oom/Manifest
+++ b/acct-user/systemd-oom/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-oom-0.ebuild 197 BLAKE2B a602003eb64851ee796044e1997a62a05b5d4e62b8cf80eff4d60ae09da76fa2d87a3fdc3240c0074d1a9c13cbc5556437190fba11daf30ef6a929ac5a2ffa91 SHA512 f464b98d3e731ecbea2611b19dd624c706c1a88c5c19c243914c84333a5ad386db809063e1cabd2f2ba28077b4e100ee92b61011482f663ef3d39951ef8a40fc
+EBUILD systemd-oom-0-r1.ebuild 202 BLAKE2B 04d3746b8aee287256650e62bbba61867e56aee7d081466ba4c102faee292fa198247eb235cd968e6dede6cbbdbc8a514c354a00ebbd3be965e7d20d45d1d9f2 SHA512 e7d4688723503aa8217635f9014bebe263c9aae70db5e0e93478821a97df7b8950ef4ce4449fa1a1cb7a0e7f876c03a89994ca99360d8e2fe8b6d1e7355e10f4
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-oom/systemd-oom-0-r1.ebuild b/acct-user/systemd-oom/systemd-oom-0-r1.ebuild
new file mode 100644
index 000000000000..4cdc4a3944c7
--- /dev/null
+++ b/acct-user/systemd-oom/systemd-oom-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=198
+ACCT_USER_GROUPS=( systemd-oom )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-oom/systemd-oom-0.ebuild b/acct-user/systemd-oom/systemd-oom-0.ebuild
deleted file mode 100644
index 9c3f3e365120..000000000000
--- a/acct-user/systemd-oom/systemd-oom-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=198
-ACCT_USER_GROUPS=( systemd-oom )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-resolve/Manifest b/acct-user/systemd-resolve/Manifest
index 056c1738b68d..582032828692 100644
--- a/acct-user/systemd-resolve/Manifest
+++ b/acct-user/systemd-resolve/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-resolve-0-r1.ebuild 206 BLAKE2B 1ed87c559f342baf19eb3f60fd0bd63dc5d08fd083688c79041bef23e31e2404c3d3860be79381f08c778a5ffc5a237030939fb172a689c17002dc12c4e5eacb SHA512 35a495a0ff3b7fa51b39680ae803eae1ad882efb297131bcec6fa3e64edb3af6e60523296074e4e044ab3fddcbce62f30eccdbe1de0221e6f4a023d015c9f2a1
+EBUILD systemd-resolve-0-r2.ebuild 206 BLAKE2B 51ee552776b7de3fecc99e960e15a4e0f280b6b6921de92eb431a63c9ac2ca1a99469f813ff5a69486661c291acb44bb6f0f3f2a05d55744121b87546d04cd39 SHA512 032664be2e795ccbfa5096f62ecc34ce9c1477d4ed75b29e612da8f7c2aa0ae1e6ac3db70ae0cd29007330ccf380d08b416091cfaf24339fe4bab154e650e271
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild
deleted file mode 100644
index 5eb0b3096dbe..000000000000
--- a/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=193
-ACCT_USER_GROUPS=( systemd-resolve )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
new file mode 100644
index 000000000000..c8316cff5ac1
--- /dev/null
+++ b/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=193
+ACCT_USER_GROUPS=( systemd-resolve )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-timesync/Manifest b/acct-user/systemd-timesync/Manifest
index ce365a37807e..5890ed34d011 100644
--- a/acct-user/systemd-timesync/Manifest
+++ b/acct-user/systemd-timesync/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-timesync-0-r1.ebuild 207 BLAKE2B 7d236f52e15d3860188827ae2d417730d745a46a71ac8350e39fd804819458ca54a0a7b2ed425eed315b6908c2a9c16ec9b39bf81b961920641acd9ad0b65ad1 SHA512 d210304f0730b4dc1592aa5791868aac8b3e24d247018394a81df3e862826d08566b3d4735ab9061fd3cfbd4545a76f88e8d15924ee103b1ec336eecf5156cb6
+EBUILD systemd-timesync-0-r2.ebuild 207 BLAKE2B d0ae649650d6193feb5388d33aca6c200ade30671ae7c6e244ddcf1715c0412a3d1a2132505fce1d6a2115ff6ea6a0e3bcb41b69412e03e04f204d373ed59836 SHA512 b8f0a27ff1d6e531df0b29b19272154a9f6f83358a630dc3578ed0fc7bf8db281da17db788bb47fedb73d112afb2dae7129661276671074920b187f94cde8846
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild
deleted file mode 100644
index 3a09984648ac..000000000000
--- a/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=195
-ACCT_USER_GROUPS=( systemd-timesync )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
new file mode 100644
index 000000000000..3f4554bdacbd
--- /dev/null
+++ b/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=195
+ACCT_USER_GROUPS=( systemd-timesync )
+
+acct-user_add_deps
diff --git a/acct-user/taskd/Manifest b/acct-user/taskd/Manifest
index cfa61b66932a..e4fc3bd8b719 100644
--- a/acct-user/taskd/Manifest
+++ b/acct-user/taskd/Manifest
@@ -1,2 +1,2 @@
-EBUILD taskd-0.ebuild 301 BLAKE2B c2362be0d6bcf628ed0d81240d5c6c4cf8e1964ad3f9b5ae4dcacf6d61999a825c28ede707ec28693fd14baf3aeefb8085c4aa732367ffbd265e06f2c238c29a SHA512 871f65a0942d0a28b2a128c50f1d7e410430c6e209c9656214e391fd142d60ba73132903ef262558ec9410422b0f7931343901192c286ab281e97eb5179d5fe3
+EBUILD taskd-0-r1.ebuild 301 BLAKE2B 352fd504542dbe14d73258d5911cc02b1b810f3d9409ae5134c13e0cf5a3e0b5d878f0786445fde8c6fdf41b091564e26cda58f38a908891747944f45b3ea7eb SHA512 83bfe7539157a710bfc75d4c78715470de83a00906869a1b3855e5d61177638691331cca2aac0f889c38ecfe0b23d0873d46035ed6839efb5215c23a14e3d7cf
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-user/taskd/taskd-0-r1.ebuild b/acct-user/taskd/taskd-0-r1.ebuild
new file mode 100644
index 000000000000..a40214d5f105
--- /dev/null
+++ b/acct-user/taskd/taskd-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/taskd"
+
+ACCT_USER_GROUPS=( "taskd" )
+ACCT_USER_HOME="/var/lib/taskd"
+ACCT_USER_ID="152"
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/taskd/taskd-0.ebuild b/acct-user/taskd/taskd-0.ebuild
deleted file mode 100644
index 013b234af3d5..000000000000
--- a/acct-user/taskd/taskd-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/taskd"
-
-ACCT_USER_GROUPS=( "taskd" )
-ACCT_USER_HOME="/var/lib/taskd"
-ACCT_USER_ID="152"
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/teamspeak/Manifest b/acct-user/teamspeak/Manifest
index ec79ffbfc170..0fe5a2598df9 100644
--- a/acct-user/teamspeak/Manifest
+++ b/acct-user/teamspeak/Manifest
@@ -1,2 +1,2 @@
-EBUILD teamspeak-0-r1.ebuild 291 BLAKE2B 0dc46ccd74abe8fbda99204f8e160cd52bb5e073b176b1bf9a34a47f907f70e66706ecb29a4f694cbc34ce526260caccc31e5821aaea87050099f2b8d3a5df1e SHA512 9bb4419927530d3280546f5003ddd1c90bcb21a842f6e3d5d6e8ca531a1858082a192e1f7755626a6004a92e2848fda1c0ee879ea27e346861afd53ac4002eda
+EBUILD teamspeak-0-r2.ebuild 291 BLAKE2B 73b2e7e042a2110c0654294ea84130c49de25deb336114064664c6202b82610811e5a26a00b2df1450765b4b6955b5bab58d7e2273324defe586d94c1a22d12c SHA512 56062989ea1420379e55d20394c86043efa16ef79af39661818d1305e636c83ca09505f963b3aab33d75465913e4bba0432b0e2a9517728c93e2b66697fee3b1
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/teamspeak/teamspeak-0-r1.ebuild b/acct-user/teamspeak/teamspeak-0-r1.ebuild
deleted file mode 100644
index b0495444ce4f..000000000000
--- a/acct-user/teamspeak/teamspeak-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the TeamSpeak server"
-
-ACCT_USER_GROUPS=( "teamspeak" )
-ACCT_USER_HOME="/opt/teamspeak3-server"
-ACCT_USER_ID="488"
-
-acct-user_add_deps
diff --git a/acct-user/teamspeak/teamspeak-0-r2.ebuild b/acct-user/teamspeak/teamspeak-0-r2.ebuild
new file mode 100644
index 000000000000..4d3115689ebc
--- /dev/null
+++ b/acct-user/teamspeak/teamspeak-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the TeamSpeak server"
+
+ACCT_USER_GROUPS=( "teamspeak" )
+ACCT_USER_HOME="/opt/teamspeak3-server"
+ACCT_USER_ID="488"
+
+acct-user_add_deps
diff --git a/acct-user/telegraf/Manifest b/acct-user/telegraf/Manifest
index b2af3371acab..244fab74fb1c 100644
--- a/acct-user/telegraf/Manifest
+++ b/acct-user/telegraf/Manifest
@@ -1,2 +1,2 @@
-EBUILD telegraf-0-r1.ebuild 226 BLAKE2B 55454828f2f9271f33eb5802b23b7df2179b5dece5c3f52ee22d1ed2463d1ad5c89e3ab693a2f660e2871c506fa7a06a64c8ef63bd28b5396dfc30b4a471250f SHA512 1774cc00c5684545480f4dbc4c262d5ba5a5ddc0f191e6b84c40fa32db88e7d0452ea35dc6a105c4e64b93f1f229ad9503013b68da1ea1345982ca97a04de9ae
+EBUILD telegraf-0-r2.ebuild 231 BLAKE2B eeb73adc0940e50cee15d98d1900a0cd0df00af566c5501d9d8e85070e4484fcf2cb553b4ac0bb7059b176a29375121aae0e7ddaeef9e22fdd2eed15aefc76d9 SHA512 7647c718a44104f3f5c0f3836b457e418de8b9cfe9ab8d0c94312a5f72a6b246fe20d742a14a32865a2d128949e4506add3f034c8ba3b5a27f65bd380876b5a5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/telegraf/telegraf-0-r1.ebuild b/acct-user/telegraf/telegraf-0-r1.ebuild
deleted file mode 100644
index 7cfacc19c7c4..000000000000
--- a/acct-user/telegraf/telegraf-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for telegraf"
-ACCT_USER_ID=428
-ACCT_USER_GROUPS=( telegraf )
-
-acct-user_add_deps
diff --git a/acct-user/telegraf/telegraf-0-r2.ebuild b/acct-user/telegraf/telegraf-0-r2.ebuild
new file mode 100644
index 000000000000..a5b9ca2670f9
--- /dev/null
+++ b/acct-user/telegraf/telegraf-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for telegraf"
+ACCT_USER_ID=428
+ACCT_USER_GROUPS=( telegraf )
+
+acct-user_add_deps
diff --git a/acct-user/tenshi/Manifest b/acct-user/tenshi/Manifest
index 95bd506f3cc3..b3a7ef2cfc38 100644
--- a/acct-user/tenshi/Manifest
+++ b/acct-user/tenshi/Manifest
@@ -1,2 +1,2 @@
-EBUILD tenshi-0.ebuild 275 BLAKE2B bd5522374a767d166c11a53831c8a9aa71c18dd185350be7d51d6b5999c6d1981517cc486ec5cee881810b445f0b10d11ae19239b06d7a5e078fda7762056c6c SHA512 e50b1a327791900fe0867122c97e7aa0afda9035e78e4dbc20af46fb2d9f8cdfdb7a6bca030b0d8c7485e5e6ec847f89f0a4a1b3d66fc686cc1e05b47517c750
+EBUILD tenshi-0-r1.ebuild 275 BLAKE2B 58bd5e9cc12da21fc4e2c19d489fcf9528f216a44df2f7227837f38c3a411b6d87e302e80ec6be32ec75ea301443d56cc32f00c263ce75ecc0c8ad6af03b72d5 SHA512 afead065da14470382032cc5c80fc8eca0dada6c5cf9a65cc6e5e41d3cc64da45aa69355f48f1bc75266f08400dd70316a2610acd887552a11323501918411c2
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/tenshi/tenshi-0-r1.ebuild b/acct-user/tenshi/tenshi-0-r1.ebuild
new file mode 100644
index 000000000000..4b78147bf97d
--- /dev/null
+++ b/acct-user/tenshi/tenshi-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/tenshi"
+
+ACCT_USER_GROUPS=( "tenshi" )
+ACCT_USER_HOME="/var/lib/tenshi"
+ACCT_USER_ID="283"
+
+acct-user_add_deps
diff --git a/acct-user/tenshi/tenshi-0.ebuild b/acct-user/tenshi/tenshi-0.ebuild
deleted file mode 100644
index e28212db5350..000000000000
--- a/acct-user/tenshi/tenshi-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/tenshi"
-
-ACCT_USER_GROUPS=( "tenshi" )
-ACCT_USER_HOME="/var/lib/tenshi"
-ACCT_USER_ID="283"
-
-acct-user_add_deps
diff --git a/acct-user/thttpd/Manifest b/acct-user/thttpd/Manifest
index 448091fbacda..f4dcdabe255f 100644
--- a/acct-user/thttpd/Manifest
+++ b/acct-user/thttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD thttpd-0.ebuild 246 BLAKE2B 7c68fec86f532966eb754503f62cfa1bed197681336afcec1865fe7a9b46840983d94902f0e66610dc968dbbdfa9224cd6daab7d3bfdffae4472a69dfba1ebb4 SHA512 e73e97b870bafd17058090152d080c9eefd4c5e8e62ffdddd46839894b2e8944c0adadafbf75951de301dd3781e49eba563e708eb811d41a4855e5d56afec9e1
+EBUILD thttpd-0-r1.ebuild 246 BLAKE2B 162411172bc36b3da2f132170183f9444b8b835a49e31b88857d1d1cd65b04b040cfb791175ca4ba6d38a40646cb55f5c93cdc5a83fbd3f69c7a38d89d7d7b98 SHA512 40a3003e4cb07e3c67a4f8cb62319aa68cfec06167e1c1aaf766b90fcce7f4580be25b80ea250c32ef4690793723901795f5e0173df0fc8ae38cb1d3da3a76c5
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/thttpd/thttpd-0-r1.ebuild b/acct-user/thttpd/thttpd-0-r1.ebuild
new file mode 100644
index 000000000000..b1c643e901c1
--- /dev/null
+++ b/acct-user/thttpd/thttpd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/thttpd"
+
+ACCT_USER_GROUPS=( "thttpd" )
+ACCT_USER_ID="155"
+
+acct-user_add_deps
diff --git a/acct-user/thttpd/thttpd-0.ebuild b/acct-user/thttpd/thttpd-0.ebuild
deleted file mode 100644
index 4dcafd47f24b..000000000000
--- a/acct-user/thttpd/thttpd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/thttpd"
-
-ACCT_USER_GROUPS=( "thttpd" )
-ACCT_USER_ID="155"
-
-acct-user_add_deps
diff --git a/acct-user/timidity/Manifest b/acct-user/timidity/Manifest
index 690992fc8e3d..943cb3c4fb43 100644
--- a/acct-user/timidity/Manifest
+++ b/acct-user/timidity/Manifest
@@ -1,2 +1,2 @@
-EBUILD timidity-0.ebuild 313 BLAKE2B d3b6a42dd652ec2001ed91e4e57956a9683fed36da7ff094e0b0d8526f2632bcbea17de54c4b0b66b7e7233799c6057e73d8591303e7678efb3d47d92372d829 SHA512 7ffd1902fa991204654aa6a51fe5df8eac60c5890eb6ab52158431e94d8406410521ae85be91dddae332955a7d6a870c1e202ce5ea6a3bba2918415d3c0ec8fd
+EBUILD timidity-0-r1.ebuild 313 BLAKE2B 7a38a387a1cf04458ffec2f5f84083eca0275b6872976d9d4f37c602ee90d7324c8fece7d02cd154d74d1abacc40af4bb9e444ed1cc790079d4d96bc1a928fb4 SHA512 53cc528859730b593205286268b5530306a21478937df02f3ba59ef0e7a293542823fe722b37f895617b1bdd8ba5667f85dc59f7ab35418c40caaa5cf50261f1
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/acct-user/timidity/timidity-0-r1.ebuild b/acct-user/timidity/timidity-0-r1.ebuild
new file mode 100644
index 000000000000..b5ce42f013a5
--- /dev/null
+++ b/acct-user/timidity/timidity-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/timidity++"
+
+ACCT_USER_GROUPS=( "nobody" )
+ACCT_USER_HOME="/var/lib/timidity"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="306"
+
+acct-user_add_deps
diff --git a/acct-user/timidity/timidity-0.ebuild b/acct-user/timidity/timidity-0.ebuild
deleted file mode 100644
index c4e6822876db..000000000000
--- a/acct-user/timidity/timidity-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/timidity++"
-
-ACCT_USER_GROUPS=( "nobody" )
-ACCT_USER_HOME="/var/lib/timidity"
-ACCT_USER_HOME_PERMS="0700"
-ACCT_USER_ID="306"
-
-acct-user_add_deps
diff --git a/acct-user/tinydns/Manifest b/acct-user/tinydns/Manifest
index b64da7c9cd16..80cacdcdd269 100644
--- a/acct-user/tinydns/Manifest
+++ b/acct-user/tinydns/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinydns-0.ebuild 198 BLAKE2B fa2ddfc2da1469a91ffc62115e3a4793e40c1e53cb2e0ff97a5341f1d81da7d55956a40f2be7974396e1c5c112f4d43bbafa1fb52926f85851e0ce89221abd4b SHA512 baa5323c7b5985dddb3dae404ae4a9948ae93fd61e0bd97c4d45d9cfe0cf563979b9ce9a706df800b65670ed55dc4a2284a27c7655656ca8c79a818c82dff158
+EBUILD tinydns-0-r1.ebuild 198 BLAKE2B aa47c14cb31febc727f10318a783ce78e218d3f4b9b55e979ca5957d11a6799c7474678d8260f87d3b5537cc62e87c5bc4b236ff92737d87b8093073ad6db839 SHA512 002e27a6f254feec38323c5b78b987ffe974bd10304f2b8d50b072dcff2ea9a9af812606a3f7e26f92de9f6c451e019efa6de97667f39329f9eea406fabc5020
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/acct-user/tinydns/tinydns-0-r1.ebuild b/acct-user/tinydns/tinydns-0-r1.ebuild
new file mode 100644
index 000000000000..91a3a9c097d3
--- /dev/null
+++ b/acct-user/tinydns/tinydns-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=227
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/tinydns/tinydns-0.ebuild b/acct-user/tinydns/tinydns-0.ebuild
deleted file mode 100644
index 2a0ffd69000c..000000000000
--- a/acct-user/tinydns/tinydns-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=227
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/tinyproxy/Manifest b/acct-user/tinyproxy/Manifest
index 1fd5c84dd189..2fdbbca4fdcf 100644
--- a/acct-user/tinyproxy/Manifest
+++ b/acct-user/tinyproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinyproxy-0.ebuild 237 BLAKE2B bb7a90cc5110c82e6d9964d2d4b70729c7fb60f90d744e50fdbbb2f53fc7697b6336bd393e261a9a7cb228a6b54e001584b2f303de994d62337991dbd4bc3083 SHA512 420f426fdf1ecaf90a0fb6a2cf108f15e4555101afb6c63fb3948435ecc3c9385dfda1d7a7d7a3302879fe81819f9dc52ed8767dc11d695a95c4a4dc34e2b0a5
+EBUILD tinyproxy-0-r1.ebuild 242 BLAKE2B c4c625723e62b89c2dc2d20a7b844cd48ca282b75e95d04095c034ac1b6bf37e3e90319181a2f10ba0911881d6dd187b597c125d625d424d694ea158e33bf33f SHA512 41d17a787e756031ac65e2dffbb3ca9169424e96a53497835b99798f24bfceb9d4b87a3ea4259ca3d9fcbae1b860b2fd2dbc38879549ca01027128ad4615d460
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/acct-user/tinyproxy/tinyproxy-0-r1.ebuild b/acct-user/tinyproxy/tinyproxy-0-r1.ebuild
new file mode 100644
index 000000000000..20c6ba419bd0
--- /dev/null
+++ b/acct-user/tinyproxy/tinyproxy-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-proxy/tinyproxy"
+ACCT_USER_ID=186
+ACCT_USER_GROUPS=( tinyproxy )
+
+acct-user_add_deps
diff --git a/acct-user/tinyproxy/tinyproxy-0.ebuild b/acct-user/tinyproxy/tinyproxy-0.ebuild
deleted file mode 100644
index fe5783267fe3..000000000000
--- a/acct-user/tinyproxy/tinyproxy-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-proxy/tinyproxy"
-ACCT_USER_ID=186
-ACCT_USER_GROUPS=( tinyproxy )
-
-acct-user_add_deps
diff --git a/acct-user/tomcat/Manifest b/acct-user/tomcat/Manifest
index 975537055641..29a0161438e5 100644
--- a/acct-user/tomcat/Manifest
+++ b/acct-user/tomcat/Manifest
@@ -1,2 +1,2 @@
-EBUILD tomcat-0.ebuild 235 BLAKE2B 7455005d468cd6c0cfdf14e1bc11e2239fb4c9b8825ddf1f50cca656d60410760d8528a82961890c618f1b3fa14c40a0cad842c7ce55e2250e08d39a363f7e31 SHA512 b96b328c2ef56620fa64ded3acd159889cde176c786c5e38b6f1b012cc356cc41fa5f2a10b6592696d3cbbef5bf82780fd1f9641258aeda1ec73c47265c31ce0
+EBUILD tomcat-0-r1.ebuild 235 BLAKE2B a3a4298d83bb1e49b578d6b068091634656fcb2b8315ac36ad8f4e0ce6c6511a59589b9e0b992065107a57d47bede9b18d1da890fc3120e354a51f5aca44f9d1 SHA512 424f7edfd11e466c790c51a058437f3bbcf1469780e4ba3080bf6d7561ab024def1fbd42a6b2ee062a23872b6030ab5c5e6b367f07806d0c79dbda299aa55dfb
MISC metadata.xml 252 BLAKE2B e978e2d30d81f57b533bc3620751605e0fd123c669e280af424c68ebeba5f7e61391fc59ddea55598107aaf3c9f901e38de6bfd4da55e926a9d3567de08e7d2d SHA512 e509c95968c64f0f3cb9c16a437f100e3d1f64ee8e1d412baac733f4698b7a0f0c91136c480a9078eab6c3c6497eb93b7fe891f9a28e43e31f0bdb73eb3ea9a4
diff --git a/acct-user/tomcat/tomcat-0-r1.ebuild b/acct-user/tomcat/tomcat-0-r1.ebuild
new file mode 100644
index 000000000000..ab1a33ae6172
--- /dev/null
+++ b/acct-user/tomcat/tomcat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Apache Tomcat"
+ACCT_USER_ID=265
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/tomcat/tomcat-0.ebuild b/acct-user/tomcat/tomcat-0.ebuild
deleted file mode 100644
index fd230aa19e0b..000000000000
--- a/acct-user/tomcat/tomcat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Apache Tomcat"
-ACCT_USER_ID=265
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/tor/Manifest b/acct-user/tor/Manifest
index d0ee368c2181..b5db64d6f382 100644
--- a/acct-user/tor/Manifest
+++ b/acct-user/tor/Manifest
@@ -1,2 +1,2 @@
-EBUILD tor-0-r1.ebuild 227 BLAKE2B b9744b164dccae7d5981ea8a757906212f73589d559e075f71fbff5a59ccf80f708df92c56c7cbb1397565b992830190d1c45fa8c4d5f7d2be94ef739977653b SHA512 fe4d39ecc77ff1cc1d9d9d350f24eef08dd5d1eee3ccba86c1a57bdf7de9d4fe34f6d19cd0996bb6ebf533db34764375747e1e728b1eb68e76fc0d4519ca76ac
+EBUILD tor-0-r2.ebuild 227 BLAKE2B 043918999ba31996165b88e31340a4e572bbfb3402c25105ebca291ff2d93532ac79d69b29bfaab3a43ce9d56b24a3ba4c969aa76b8482319c65d60ffa60bce0 SHA512 ddec4aeee20dc57688c7e9f05ea414804c2e3af746c6b028acc0c345d145bf5d91be792c425c7e21d604b853c37f48487134ad85b97993bcdde2e3e55ba0fc03
MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/acct-user/tor/tor-0-r1.ebuild b/acct-user/tor/tor-0-r1.ebuild
deleted file mode 100644
index 86496b34fe7c..000000000000
--- a/acct-user/tor/tor-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for tor daemon"
-ACCT_USER_ID=43
-ACCT_USER_GROUPS=( tor )
-
-acct-user_add_deps
diff --git a/acct-user/tor/tor-0-r2.ebuild b/acct-user/tor/tor-0-r2.ebuild
new file mode 100644
index 000000000000..9a356fc4f42d
--- /dev/null
+++ b/acct-user/tor/tor-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for tor daemon"
+ACCT_USER_ID=43
+ACCT_USER_GROUPS=( tor )
+
+acct-user_add_deps
diff --git a/acct-user/tox/Manifest b/acct-user/tox/Manifest
index 4e93f0367b5c..4d29c98f5a99 100644
--- a/acct-user/tox/Manifest
+++ b/acct-user/tox/Manifest
@@ -1,2 +1,2 @@
-EBUILD tox-0-r1.ebuild 270 BLAKE2B adab7b62c1f8e01390b55d91621e24ee01e13ffdde29134a6f4c4bcbacba0ba346395ebd52a89fca4f84b445b9e8f23d0ee6a03c53647e4a5801e37ddc102ffe SHA512 f0e7dec78bbe435bc45254121c1d24f3f3bf20c24dfe6d5e4511b97b7c8a11d5796f3fe30d4bcb137ef858876623c507aabf76f2ed2ae0838db50ec83a62f472
+EBUILD tox-0-r2.ebuild 270 BLAKE2B fbc78416aa6f9339a07f20249d3568129224bb3ddfe4b016071bb7fcd67e95916ec6037053aefd3a0926813f761ad735bc6d5350319585476be69ca3bad41f2e SHA512 0f7171366b6a341883617315d1479bf0693a87307d0dde2a2ee9908d1d99104d5e0b8fc395cb589e726adbbe4b1747b1e194f79148f4f70a47cb5e6f578f8591
MISC metadata.xml 401 BLAKE2B 0a0d5a25868d5ad4b1b9b6212ab038e94628f9b2428fc62dcaf1e0fa672a6a4ef4b555767dd6d1ae1e58f82e31a194e6ac5f914fcb21b7a4a5f52bee97ad2eb4 SHA512 58b858736e5503593517b113c9e5417306caf20137303fc03afb43071c088ad5314495f6203e401544e48a87793a0d09d8d231d6f6740639836415c4857a22a2
diff --git a/acct-user/tox/tox-0-r1.ebuild b/acct-user/tox/tox-0-r1.ebuild
deleted file mode 100644
index b75ed771a3c5..000000000000
--- a/acct-user/tox/tox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for package net-libs/tox"
-
-ACCT_USER_ID=236 #day-month of first tox commit
-ACCT_USER_GROUPS=( tox )
-
-acct-user_add_deps
diff --git a/acct-user/tox/tox-0-r2.ebuild b/acct-user/tox/tox-0-r2.ebuild
new file mode 100644
index 000000000000..f2e835541b0c
--- /dev/null
+++ b/acct-user/tox/tox-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for package net-libs/tox"
+
+ACCT_USER_ID=236 #day-month of first tox commit
+ACCT_USER_GROUPS=( tox )
+
+acct-user_add_deps
diff --git a/acct-user/tpm/Manifest b/acct-user/tpm/Manifest
index fcd6f91ffd59..e3710bc5317c 100644
--- a/acct-user/tpm/Manifest
+++ b/acct-user/tpm/Manifest
@@ -1,2 +1,2 @@
-EBUILD tpm-0.ebuild 223 BLAKE2B bafbc12109ddbe37e4a32c9908ad88c87ff4d3e613bc7edcd54abc9438a5ce2038db3b5e3736623ceb66b25915ca6a855bdbdeaf5169fe488ac691063e3d170c SHA512 244626c9eab3c5885be688fd1788517d6b14b7fb6f926e872134d327076231d5c969bbec3195b3c0f232eef638909fc8036c08e79d56374eda2e0cacd038c291
+EBUILD tpm-0-r1.ebuild 228 BLAKE2B 024cf2ff78d5c62ec71df85d4fa6a9b07cb01e4fdfecc2368307724cf43d0d060e403e2df5d8abda2f5478a32567fc61ba2fde0fe913f260fc982ebdda0ae3e0 SHA512 4d2f0becf56338f60592999f2d29a4b0181be5cb0ee956d629a31c324c8a1d20ef92541a476c25c58507d909cf47eb2bfef38278148efee720cc8eb336e8e8c6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/tpm/tpm-0-r1.ebuild b/acct-user/tpm/tpm-0-r1.ebuild
new file mode 100644
index 000000000000..7423e856b40f
--- /dev/null
+++ b/acct-user/tpm/tpm-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=347
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/var/lib/${PN}
+
+acct-user_add_deps
diff --git a/acct-user/tpm/tpm-0.ebuild b/acct-user/tpm/tpm-0.ebuild
deleted file mode 100644
index 6a4401d03020..000000000000
--- a/acct-user/tpm/tpm-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=347
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/var/lib/${PN}
-
-acct-user_add_deps
diff --git a/acct-user/transmission/Manifest b/acct-user/transmission/Manifest
index f7e901db8fe3..39d5dccb2934 100644
--- a/acct-user/transmission/Manifest
+++ b/acct-user/transmission/Manifest
@@ -1,2 +1,2 @@
-EBUILD transmission-1-r1.ebuild 203 BLAKE2B 667a5546490bd54c8524e29452b7866dce7382b52d870f9ac868c73a975f5c247ac44bd5cca8f56667efae93a204bcb2f70871428df7f9f2708f90f1ce94fd0e SHA512 ded2afb7003a77751ef159cf5dd9ed0396c34b89e4c17c368488009e31b9e903e760f6bf4d219a85ade06e25e49100628a4fac6340189a453a7a4d5dff086c4d
+EBUILD transmission-1-r2.ebuild 203 BLAKE2B bd83de359298a898f6e5f52e3945ff98c8820baa4513226caba8ed3565c3cd559fd4fd19f9ad048837a3ccc559ed919e771111d85885fa84a9f25df9d6f85d5c SHA512 921f3f3b0a3be04d99483f18fd05247fb23d4edb6bc3c5123bb4d46d0dc0184dfa621d1b76eb47d567f92d1eecb22c7cbc2c066e43248e8cabf4c922d9ffc811
MISC metadata.xml 247 BLAKE2B 9dcf90d404c84f0ce3da367274c25984b6497a2d8fb68496f497e76c7061c9c7ca7f444f7e4ccb62ba06223caaf0eea4d6aebbb2409ba1f08bb57123e72f0836 SHA512 4681b02c210bf3f869157694af1f80cb3e9b2dd619283a249aaafa85d3bc328c1306af5d61c69040fc503feb3271490bdd2e38e61479a94940fa225810b9e8cb
diff --git a/acct-user/transmission/transmission-1-r1.ebuild b/acct-user/transmission/transmission-1-r1.ebuild
deleted file mode 100644
index 2f1db989b988..000000000000
--- a/acct-user/transmission/transmission-1-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=169
-ACCT_USER_GROUPS=( transmission )
-
-acct-user_add_deps
diff --git a/acct-user/transmission/transmission-1-r2.ebuild b/acct-user/transmission/transmission-1-r2.ebuild
new file mode 100644
index 000000000000..1f899e09ded8
--- /dev/null
+++ b/acct-user/transmission/transmission-1-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=169
+ACCT_USER_GROUPS=( transmission )
+
+acct-user_add_deps
diff --git a/acct-user/trickster/Manifest b/acct-user/trickster/Manifest
index e77f015e563f..c09b9ec9569a 100644
--- a/acct-user/trickster/Manifest
+++ b/acct-user/trickster/Manifest
@@ -1,2 +1,2 @@
-EBUILD trickster-0.ebuild 245 BLAKE2B 35122cc50a9d56ad75bd9aacd73dc01381a354675764839e5752409bfaa27a8f46cfc96110c30cf38915e71840806b0e221bff62c7a0b25975aace609af80e2f SHA512 7c7337889b692472d75abed90c3e867008bf19e0a35f9b65318fc3609ee7b2e8430734041eafa9deb0d688d92d63f223d73b40b38fb2c16ceeed8c4fa84adb72
+EBUILD trickster-0-r1.ebuild 245 BLAKE2B d81a3835d326538b76b159a2074c55236f70501e3eedff6a5badb5aef996c28ea919ae00017836dc7d4c14a253ee88c135e9e3f5ecf3a1d63f5b0fed02aedf6f SHA512 fa80ff3c63ec63dcb76c93ad006b832e938ff3a07ca06501d6f23f5b7386290bd3bc2d3bb5477b7b758c4379afb8238c33b644f78cbe901ff33575cabb460bf3
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/trickster/trickster-0-r1.ebuild b/acct-user/trickster/trickster-0-r1.ebuild
new file mode 100644
index 000000000000..9be7fc094450
--- /dev/null
+++ b/acct-user/trickster/trickster-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/trickster"
+
+ACCT_USER_ID=119
+ACCT_USER_GROUPS=( trickster )
+
+acct-user_add_deps
diff --git a/acct-user/trickster/trickster-0.ebuild b/acct-user/trickster/trickster-0.ebuild
deleted file mode 100644
index fa378b29a456..000000000000
--- a/acct-user/trickster/trickster-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/trickster"
-
-ACCT_USER_ID=119
-ACCT_USER_GROUPS=( trickster )
-
-acct-user_add_deps
diff --git a/acct-user/trojan/Manifest b/acct-user/trojan/Manifest
index c3b76b09072d..97fb0d2bdaa9 100644
--- a/acct-user/trojan/Manifest
+++ b/acct-user/trojan/Manifest
@@ -1,2 +1,2 @@
-EBUILD trojan-0.ebuild 237 BLAKE2B 4deadf59a3927452a7a469fe43876dff3d7f8f84897d8becd8f0c5732b4d905095dc30179a9a6d0daa87fe1a495398232cacbd8c9d3aa5fe6cf294744bac72b6 SHA512 36cbc089cbea26dbd6d4721d77690e7e96291ba065c182c98954b8767cc1155f6ffdbec8d877ede3e8408cd47ac42049b7840bf87b803025331f2bbc2ed0cd91
+EBUILD trojan-0-r1.ebuild 237 BLAKE2B f8780a02559b6c3d032b9acf0f7243fe7d24cfad96a8341ae97a5c798c7e045afc602a8eab37a7107d8d39064f5ae619ecc590b4dd5ef6b3417d26047762ab35 SHA512 992101288a8ef84291b221a81e8eedc5185b2ebbfcf67f0e653a4d31f5754b2b8007dcef24de249606419612f41cac0d2e71eea53008a169a3aa9118598d57b6
MISC metadata.xml 243 BLAKE2B 4dab510dfc22f0316308b8d483b8e96c7c0653d3bc091820de0d8208213f39c165322c661abfa6fafa50977beb3839a0439079f949cd6a3f590122dbc59e53a4 SHA512 917ed98b7482f15c8444aaec331a88ef97bf689d708489c3bd68ccc1f2f4093a8739930081dcae9db5eac912c638c0ff286015b8bd9d51da866878e64e0f7248
diff --git a/acct-user/trojan/trojan-0-r1.ebuild b/acct-user/trojan/trojan-0-r1.ebuild
new file mode 100644
index 000000000000..233972ae9f97
--- /dev/null
+++ b/acct-user/trojan/trojan-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/trojan"
+ACCT_USER_ID=326
+ACCT_USER_GROUPS=( trojan )
+
+acct-user_add_deps
diff --git a/acct-user/trojan/trojan-0.ebuild b/acct-user/trojan/trojan-0.ebuild
deleted file mode 100644
index 4f3784fb3d3e..000000000000
--- a/acct-user/trojan/trojan-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/trojan"
-ACCT_USER_ID=326
-ACCT_USER_GROUPS=( trojan )
-
-acct-user_add_deps
diff --git a/acct-user/tss/Manifest b/acct-user/tss/Manifest
index 9156cb404522..6ce98fed27e6 100644
--- a/acct-user/tss/Manifest
+++ b/acct-user/tss/Manifest
@@ -1,2 +1,2 @@
-EBUILD tss-0-r1.ebuild 244 BLAKE2B 45ecfcf0930cf0a341c1e2170bc27d051f7c491fd0e95c4ca002696d3cc07b82ade747bd9846ce632c1edf306f6eba774adbc243e05443d9f0586d304f462f04 SHA512 39a1af5dcc193cfca73e65c505455cf9667b49be02c09ba651ee5d0a2173186a5835fa5169243d1d3dd37659d2a4a65c6fd94588f1636b3d437de0615191438b
+EBUILD tss-0-r2.ebuild 244 BLAKE2B 8203fbeaa66875d1c11b5576c5dbd94e9bd4ebba4b5b0ee2fe09a4c09191f097c68111acd54cfa2ab0c7c310608c46d008af0cc8aaa4558f453c9b2367205966 SHA512 f45652e8b886be5c4a1e25b8529f50381a65262fa916dcfe1daa2de8e42eaa6a7a74bc300c6ab1ff5cf4ae32bf50274d73116b98fa6c00b485f3d3d026f74a3c
MISC metadata.xml 404 BLAKE2B 08ad2d09bfd3697b69bcfd85280cb3965aff26e91a49f0840c2fe81d02a5795254a283b95124bfc97a610034e668332d06abae1db1c34657d7aab8ed6963654b SHA512 9b8ca2c33c33a1f4e3f30244069486fb1dd970555c9bb719a5bb8c4e2bc979745e0511216ec70481f0c3b1e716dd631662a1986e1c89628b29b0a85d6b4b9f76
diff --git a/acct-user/tss/tss-0-r1.ebuild b/acct-user/tss/tss-0-r1.ebuild
deleted file mode 100644
index 55a6438895df..000000000000
--- a/acct-user/tss/tss-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Trusted Software Stack for TPMs user"
-ACCT_USER_ID=59
-ACCT_USER_GROUPS=( tss )
-
-acct-user_add_deps
diff --git a/acct-user/tss/tss-0-r2.ebuild b/acct-user/tss/tss-0-r2.ebuild
new file mode 100644
index 000000000000..d5b5b705be41
--- /dev/null
+++ b/acct-user/tss/tss-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Trusted Software Stack for TPMs user"
+ACCT_USER_ID=59
+ACCT_USER_GROUPS=( tss )
+
+acct-user_add_deps
diff --git a/acct-user/ttrssd/Manifest b/acct-user/ttrssd/Manifest
index e90014d0ab79..d52f764165c2 100644
--- a/acct-user/ttrssd/Manifest
+++ b/acct-user/ttrssd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttrssd-0.ebuild 231 BLAKE2B a051a89c8f058c775ecff1b165fa391a2bd21784031649e272f0aa099ea14b90d087820ac604520c589ef71f399bc8d766c59c53db40fa5e1247d6400d7d8ebc SHA512 ec15ea80ee3bbc6c331cbead869902615ec94ac3e07970a66f6371168bbc6f357412e2e277d31e721be10a47f3182a668f53a3cc52ba5d758fd22a184e4f00db
+EBUILD ttrssd-0-r1.ebuild 236 BLAKE2B 4c428f50273171c8794c6489b7a8a4ea50a805e6736c9bc944fb88703ac1a46f47360bdea5ea315371a60e080fecc1747e6f4153252abfbde4285848ff93294a SHA512 828578fa7be089546bd6e2b30b8659e82813da350efa811295077cf5394ac9c1371ffc86f9d0f0e1f8b53418c1308217ad6487929acf654056081e990a10ac92
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/acct-user/ttrssd/ttrssd-0-r1.ebuild b/acct-user/ttrssd/ttrssd-0-r1.ebuild
new file mode 100644
index 000000000000..6068ea16c406
--- /dev/null
+++ b/acct-user/ttrssd/ttrssd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/tt-rss"
+ACCT_USER_ID=386
+ACCT_USER_GROUPS=( ttrssd )
+
+acct-user_add_deps
diff --git a/acct-user/ttrssd/ttrssd-0.ebuild b/acct-user/ttrssd/ttrssd-0.ebuild
deleted file mode 100644
index 1d4f4efcaaf8..000000000000
--- a/acct-user/ttrssd/ttrssd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/tt-rss"
-ACCT_USER_ID=386
-ACCT_USER_GROUPS=( ttrssd )
-
-acct-user_add_deps
diff --git a/acct-user/turnserver/Manifest b/acct-user/turnserver/Manifest
index 7e3228f53e7c..12c2d23fc1b7 100644
--- a/acct-user/turnserver/Manifest
+++ b/acct-user/turnserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD turnserver-0-r1.ebuild 252 BLAKE2B 9b0067470079f14af9db80a1e87cb7a2cd0ddf7819e49ad4a757c66bc6889f4747cf6ef5a240e55753ce8c5d9261b83b6420dd4e7fd2b9e94926b09d8a51f00b SHA512 94e8e6a8fed74d29a0bbe54d26c00629d33a3326dd2de4bf1cd92547da0f74da63fc0c86542b62aabf91c32dce68b6d1f3b245d1aba66f4c568ba576f4b4779b
+EBUILD turnserver-0-r2.ebuild 257 BLAKE2B 98ad7dfce5363309ab50508f6b14886dab53e6a316a95b44417220ccbb162187683303b9ceb7684483c407226634aa1a420066b19ab7b04a9b540fe41fb06c37 SHA512 fc7564536c04254461d78d20087882d1b1d86f79020a6354f4873af0e7710c5ebc43671cbcf7724b98ed253d24fa4769871656844243d25098ac2771c506888b
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
diff --git a/acct-user/turnserver/turnserver-0-r1.ebuild b/acct-user/turnserver/turnserver-0-r1.ebuild
deleted file mode 100644
index d84de4a708a1..000000000000
--- a/acct-user/turnserver/turnserver-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for a turn server like coturn"
-
-ACCT_USER_GROUPS=( "turnserver" )
-ACCT_USER_ID="235"
-
-acct-user_add_deps
diff --git a/acct-user/turnserver/turnserver-0-r2.ebuild b/acct-user/turnserver/turnserver-0-r2.ebuild
new file mode 100644
index 000000000000..7b96d5e1bdb3
--- /dev/null
+++ b/acct-user/turnserver/turnserver-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for a turn server like coturn"
+
+ACCT_USER_GROUPS=( "turnserver" )
+ACCT_USER_ID="235"
+
+acct-user_add_deps
diff --git a/acct-user/tvheadend/Manifest b/acct-user/tvheadend/Manifest
index 00a37afa3dd0..41c4cf15ed28 100644
--- a/acct-user/tvheadend/Manifest
+++ b/acct-user/tvheadend/Manifest
@@ -1,2 +1,2 @@
-EBUILD tvheadend-0-r1.ebuild 284 BLAKE2B ba491eab275ce324a7d89f7c8397c03cf9110ad43fbf03bb65b9bb72739925f39320941f2d9efc46e45826f0f4f378c249cdab3aa12f270cf2fd3f4543f002f5 SHA512 f214a3cc4eafee1d4749713d225541df2b85c75b791ddebda9c71ac4fb416e94d27d8ff692dcaedf5628752a6975f016b02954b7c175afb359a1b694a7301c99
+EBUILD tvheadend-0-r2.ebuild 289 BLAKE2B 8e07c1cba79a55a013f16f73c8bd0e104684a1446242d063c7e1fb537de09436bdf60cf4b245bc28eae17a7a0d63fd49d068c7cd3efaf36c7569743eca829b16 SHA512 c6e2995742b73d336570cfbee5dbecba53fdcadcd48778826e5b323d652ae542c3716b2f63d46dbbefd85f410fac52d57de77c5988c1136c95e9fd97054b0022
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/acct-user/tvheadend/tvheadend-0-r1.ebuild b/acct-user/tvheadend/tvheadend-0-r1.ebuild
deleted file mode 100644
index 371ace1855fc..000000000000
--- a/acct-user/tvheadend/tvheadend-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for tvheadend"
-ACCT_USER_ID=462
-ACCT_USER_GROUPS=( video )
-ACCT_USER_HOME=/var/lib/tvheadend
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/tvheadend/tvheadend-0-r2.ebuild b/acct-user/tvheadend/tvheadend-0-r2.ebuild
new file mode 100644
index 000000000000..81c83454fa65
--- /dev/null
+++ b/acct-user/tvheadend/tvheadend-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for tvheadend"
+ACCT_USER_ID=462
+ACCT_USER_GROUPS=( video )
+ACCT_USER_HOME=/var/lib/tvheadend
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/ulogd/Manifest b/acct-user/ulogd/Manifest
index 6aa1fdc13b02..bdf022d8ea29 100644
--- a/acct-user/ulogd/Manifest
+++ b/acct-user/ulogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ulogd-0.ebuild 225 BLAKE2B c0b96b744ca1d4a23f702aa29ce86406674f5557fbc924998902c21bffc7f848b15787b1ffa5ce7feecf31e680789b9e05200ec552b4d49ae67985fbfe39807c SHA512 4c92cf2a31900ba4ed4d1841dc3a5a965e83411cbef582becb1ee8f94e9ba415ec24c38860a2da958406a7bfd6bd0cd3c58615198b255cf582446b9c5052700e
+EBUILD ulogd-0-r1.ebuild 225 BLAKE2B 41c3abea37840071b2190ede74f3b37d493f1925ea44d05e3e4c0db8875ef8a6d7487f4d27dba598a67646c320474b7e1fe3ce84bcbc16f258a63ab199d982c7 SHA512 34a5aef6383cb73613cbed270108ea1cbf94c1f8910f010cce79746e5f2eced8547d13dab13ad4154e1bf462dc409b9c40815d0ded198f2b1221fcb407eb2bc3
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/ulogd/ulogd-0-r1.ebuild b/acct-user/ulogd/ulogd-0-r1.ebuild
new file mode 100644
index 000000000000..b188dd0e935b
--- /dev/null
+++ b/acct-user/ulogd/ulogd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ulogd"
+ACCT_USER_ID=311
+ACCT_USER_GROUPS=( ulogd )
+
+acct-user_add_deps
diff --git a/acct-user/ulogd/ulogd-0.ebuild b/acct-user/ulogd/ulogd-0.ebuild
deleted file mode 100644
index 0058aa8e7aff..000000000000
--- a/acct-user/ulogd/ulogd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ulogd"
-ACCT_USER_ID=311
-ACCT_USER_GROUPS=( ulogd )
-
-acct-user_add_deps
diff --git a/acct-user/ultimaker/Manifest b/acct-user/ultimaker/Manifest
index 96df5d849770..ad676fa004ba 100644
--- a/acct-user/ultimaker/Manifest
+++ b/acct-user/ultimaker/Manifest
@@ -1,2 +1,2 @@
-EBUILD ultimaker-0-r1.ebuild 224 BLAKE2B 08b32a28d645f5abb2746d1a6e7145076b276b577c6fb9c792dfffeb20e55c8347007acce827535f82daddf5a421dbbb23d0f1087489c125d433a2a3ae663890 SHA512 2281989b7558915568473cf658015e9f856f626c71d2e4294f49825df0c2799af97914e6d8dfab6ee50b560c8b9cf1542d9bd1f3da58824d01231fe583be32e3
+EBUILD ultimaker-0-r2.ebuild 229 BLAKE2B 597616b609281633d61999ac05b1d12b4077cf7f30236f1144901ce6a41da33867968e402880564c5bad3302b912f9aa0f741a92548cf76887f5c32693325e10 SHA512 cd29202c1456a7dc63b5f3acc3ea802f9b2615cd520e963c2d0610e0a5588e581cf635013e90ddfff2e40606db2f78cbf906f27b5deffde013f5b20e085bba44
MISC metadata.xml 261 BLAKE2B b411d17d40b41f8f5f79ed195f3d7ca29655c5c6a7da8284c4d111b1ce405f2a881bcd675081561a606bb37df59e3344892ed4277cd5a0fc06f9138595c30f80 SHA512 5cb7f83ca6a8b52b542c4060c67615c400556b98837f9e6fa989cf60999446c7e14c91a3d335734f835652019ef64fee3f9ef57a403657df21b09f843462598f
diff --git a/acct-user/ultimaker/ultimaker-0-r1.ebuild b/acct-user/ultimaker/ultimaker-0-r1.ebuild
deleted file mode 100644
index 547a4b09a66d..000000000000
--- a/acct-user/ultimaker/ultimaker-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ultimaker"
-ACCT_USER_ID=369
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/ultimaker/ultimaker-0-r2.ebuild b/acct-user/ultimaker/ultimaker-0-r2.ebuild
new file mode 100644
index 000000000000..9d9286777842
--- /dev/null
+++ b/acct-user/ultimaker/ultimaker-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ultimaker"
+ACCT_USER_ID=369
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/unbound-telemetry/Manifest b/acct-user/unbound-telemetry/Manifest
index 1f9676c427ba..df812e36c013 100644
--- a/acct-user/unbound-telemetry/Manifest
+++ b/acct-user/unbound-telemetry/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-telemetry-1.ebuild 257 BLAKE2B 8ab8ef2306cc1baee08dccb07432c22e8c8e46482a18ebca09ec4763a0864a27e9bfdf7518acdc85b6b4f5f6d8b3a47c744ba5cf3d466edcf40481035967e1b6 SHA512 9f151814d73419cdbd538cf4f29fe00922ca709525b424a83087851bd4a1c1aba1e1eb522601d15c8a69a6fbe239640eda081f695dd170471badf673b2bf3306
+EBUILD unbound-telemetry-1-r1.ebuild 257 BLAKE2B 3a4d850f649ca74bb12bca66f09d9d7cd72aaf9da79b836db063438354db59dbcebff42ac3f42fbbc8430751ad0f49e9d3c1d47f20d9c8d896c2945ce70374a5 SHA512 c392b469a5e58379867c738a1024eb874ad7d3149b01a1dd93370b3f6b5e37058fdf123a76314962145e8702359272d2f921b61c52a0f6ceb456e3a8291a0fc5
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild
new file mode 100644
index 000000000000..2ea65c1a449e
--- /dev/null
+++ b/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for unbound-telemetry"
+ACCT_USER_ID=279
+ACCT_USER_GROUPS=( unbound-telemetry unbound )
+
+acct-user_add_deps
diff --git a/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild
deleted file mode 100644
index 5c4d78d7b701..000000000000
--- a/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for unbound-telemetry"
-ACCT_USER_ID=279
-ACCT_USER_GROUPS=( unbound-telemetry unbound )
-
-acct-user_add_deps
diff --git a/acct-user/unbound/Manifest b/acct-user/unbound/Manifest
index 52b8c2204b33..2947466e3529 100644
--- a/acct-user/unbound/Manifest
+++ b/acct-user/unbound/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-0-r1.ebuild 315 BLAKE2B 36993b58d0602164884f3343c105602bd535489b42de04359c2db8bf2c2670a05aaa7c1352cc3ec99081795f63a9cceef65dc9648141d3cf8bed845c4829ce41 SHA512 2002d227d8ce62b3c211afb72518c65926ecec508d4938b4f9cdcfc9bd92f56761ad6245d7ce74512f01fd9a2c9853dcf26bfcc6bed6ee79888c00d3411e898d
+EBUILD unbound-0-r2.ebuild 320 BLAKE2B 289392878f28f84f1ccb17c10d2c55a3682eb4a28b92493476894d51d064edc4bffa44184ad204c85328e05e7d74e7c39a7e088f494c3a9c542a7d269a1fb038 SHA512 26b118e823256a847438e9922c729b00ca5019787d1a323e9ec6f7a12af9fd000609c54db5137d1083d1010ce8c233eceb5e3682a37a98741e21a87af4bf713c
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/acct-user/unbound/unbound-0-r1.ebuild b/acct-user/unbound/unbound-0-r1.ebuild
deleted file mode 100644
index 13a6f407ad87..000000000000
--- a/acct-user/unbound/unbound-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="unbound program user"
-
-ACCT_USER_ID=391
-ACCT_USER_HOME="/etc/${PN}"
-ACCT_USER_HOME_OWNER="root:${PN}"
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/unbound/unbound-0-r2.ebuild b/acct-user/unbound/unbound-0-r2.ebuild
new file mode 100644
index 000000000000..df1e218524b2
--- /dev/null
+++ b/acct-user/unbound/unbound-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="unbound program user"
+
+ACCT_USER_ID=391
+ACCT_USER_HOME="/etc/${PN}"
+ACCT_USER_HOME_OWNER="root:${PN}"
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/unifi-video/Manifest b/acct-user/unifi-video/Manifest
index 72dc91f449b5..2902822b86b8 100644
--- a/acct-user/unifi-video/Manifest
+++ b/acct-user/unifi-video/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-video-0.ebuild 232 BLAKE2B b79e38c349bfec6cf716a2c32cb012b51fd47bbf5ac887c657601ec53e6ae2d5062fefd3663c60fe02437bcf3f5a14d2396123a2d301fe8f14844eacbfdd9b56 SHA512 6cdd7be966484189efaa482ac6cd673480c1036b7d814c3f1674ddb15a822ab1c18116e6d9bf41d4176ab7275e040440def5d8119364911e1e35914e2d6ec2d8
+EBUILD unifi-video-0-r1.ebuild 237 BLAKE2B c3c070c5e493b9d5b94a8a6d639b2cf910f89e6e1ec3a8760e617fc3b685d56c121d889bfa2531974b7b16546b6fcf027264b4c3c0a06e737d3b14d3eaaf71e2 SHA512 7542b79fdfc1ab0a1d56907409e59c195508cbc1ebba5836bfb5bd8df965f84de6a12c1b089f95eafff2712c565f55915644b0532eec5eb12a51fe839eac42a4
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/acct-user/unifi-video/unifi-video-0-r1.ebuild b/acct-user/unifi-video/unifi-video-0-r1.ebuild
new file mode 100644
index 000000000000..61784923cdd6
--- /dev/null
+++ b/acct-user/unifi-video/unifi-video-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Unifi Video"
+ACCT_USER_ID=348
+ACCT_USER_GROUPS=( unifi-video )
+
+acct-user_add_deps
diff --git a/acct-user/unifi-video/unifi-video-0.ebuild b/acct-user/unifi-video/unifi-video-0.ebuild
deleted file mode 100644
index eb80d98698e0..000000000000
--- a/acct-user/unifi-video/unifi-video-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Unifi Video"
-ACCT_USER_ID=348
-ACCT_USER_GROUPS=( unifi-video )
-
-acct-user_add_deps
diff --git a/acct-user/unifi/Manifest b/acct-user/unifi/Manifest
index fa9d972e016a..35272b4d92d2 100644
--- a/acct-user/unifi/Manifest
+++ b/acct-user/unifi/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-0-r1.ebuild 279 BLAKE2B a62cf945fc8d484af502d2d5dd2f0e43cfe738aff7bf1eb044cb4d2fd234b547d0987981d689172612e5cb3e085a1802b7b74c69259ff392fb7ad6d375e27198 SHA512 efca3e2d2e9163b951a09ac1cf9c86b13069ee30d8dc24ed02fa2d39cb037dcbbdd1b50ff1e5328f20950e94780f136321b3f96f74797a11d4defe54f3a73fab
+EBUILD unifi-0-r2.ebuild 279 BLAKE2B a62cf945fc8d484af502d2d5dd2f0e43cfe738aff7bf1eb044cb4d2fd234b547d0987981d689172612e5cb3e085a1802b7b74c69259ff392fb7ad6d375e27198 SHA512 efca3e2d2e9163b951a09ac1cf9c86b13069ee30d8dc24ed02fa2d39cb037dcbbdd1b50ff1e5328f20950e94780f136321b3f96f74797a11d4defe54f3a73fab
MISC metadata.xml 580 BLAKE2B 29e2c3d6f265a80010ab1c110bddcf2b32d0609c6cba665096ef1842d1f964f26672fe4f1fb051861115b7796888c98b8f458cdce4b5bdbc1ee94d5c2ea69c47 SHA512 87b708f2edca5e9b1bdbecf9ff34ab59ac4c2523840dd011e86fcdc91c7fa9cc7a908ae55b11eb09f3dd435124cd5689c1d370eeaf62ca163722ad75b9bf1e98
diff --git a/acct-user/unifi/unifi-0-r1.ebuild b/acct-user/unifi/unifi-0-r2.ebuild
index 6e7e3dae218f..6e7e3dae218f 100644
--- a/acct-user/unifi/unifi-0-r1.ebuild
+++ b/acct-user/unifi/unifi-0-r2.ebuild
diff --git a/acct-user/unrealircd/Manifest b/acct-user/unrealircd/Manifest
index 4e5d115493ac..c165a7069791 100644
--- a/acct-user/unrealircd/Manifest
+++ b/acct-user/unrealircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD unrealircd-0-r1.ebuild 201 BLAKE2B c9a249832accd6b4d8bb131ca55d7ee25a718a9f550fb828c47ff014d7ba0d8e39732c7ef031fbc4afb7b8c5d8c005bc3f9f6d6b950cb22708b7306d00c289d7 SHA512 cf7ca352430d3e5556ae49f38f3809c837031b38d727eb8938a3cea4eb047477d43fc5926f39916b633bb3bd25ced25e4a9bae622c0b4f0c3801b900527ee62a
+EBUILD unrealircd-0-r2.ebuild 201 BLAKE2B ea03689d8c13ff305ab47df75195864305cff9ecc776f3cdf7ac3dda47fa04f9e8d74051a7047bfcbd16723461791df2d03ce17eec2cbf765b37e8059684d34d SHA512 2dda4cab8e402fbe82c244ffab52c7777807e113b9a8fd14c9566fb56ebbeffe77276c8142a8141cbaad681347906c4dd1de8c6fc6150e15560f84217f46ca99
MISC metadata.xml 354 BLAKE2B e6293be3ab53054ee019e6f1ffb7d9708ac9c484222a3c8246f071fdf330f5a55209e5795b94bf54ceac52d914aa769fb8be9516133531eb656079efe5f8b507 SHA512 3e73bc21404a047c69d7144e7c1daa0bb1b2203778bb1f98d0de1e6298b6641fb1e02c3dff88ef9ea11f60198a4fe2cbb6e884bb914cdfb0277c018f4406538f
diff --git a/acct-user/unrealircd/unrealircd-0-r1.ebuild b/acct-user/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index b405153f3985..000000000000
--- a/acct-user/unrealircd/unrealircd-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=494
-ACCT_USER_GROUPS=( unrealircd )
-
-acct-user_add_deps
diff --git a/acct-user/unrealircd/unrealircd-0-r2.ebuild b/acct-user/unrealircd/unrealircd-0-r2.ebuild
new file mode 100644
index 000000000000..a0ce96a834d8
--- /dev/null
+++ b/acct-user/unrealircd/unrealircd-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=494
+ACCT_USER_GROUPS=( unrealircd )
+
+acct-user_add_deps
diff --git a/acct-user/upmpdcli/Manifest b/acct-user/upmpdcli/Manifest
index 6af2954e0256..0d0b60007e80 100644
--- a/acct-user/upmpdcli/Manifest
+++ b/acct-user/upmpdcli/Manifest
@@ -1,2 +1,2 @@
-EBUILD upmpdcli-0.ebuild 226 BLAKE2B f223bd96f4e726267663b6b49ad8787880a8310f070d2bf3af2399ac2026a5f005eff5b302e14f3d3d4b15dc87fd87452542ff9c38d28599b2af289a6a52f802 SHA512 885ccde303d62d6df25cba85bac6ef5244186eb2eec4e8dadab499b8f10ea335290e7454251b3c2a31dd53c3cb7b78e1b1fcdaf736a317c045efe536cd9da4a2
+EBUILD upmpdcli-0-r1.ebuild 231 BLAKE2B c50db5c6e723240ed6bf409c646e4b2c17b0ef62af65558aa2f4365dd69fcfc9fd3f688971db694da2cb1560d3fce8eca7ffa875204236513408e6fa5526ce86 SHA512 73f9ad55f17c4e6efe78a7e10cb2102109f832595d202e55aa617e284d5b745e623f6fb454e83c0d13925c79c8bc38173e8c18d7cd0e1b13dad74c05cfc4d40f
MISC metadata.xml 221 BLAKE2B 2d476ee9b4f837c436a8d48ccf3e1701c26fa9425db522f35db7eb9900b4b138e44d9f268157ad2158798ed289514445a8d67215d52276a040273bb390f54a77 SHA512 8ebc577b68909c54481d68bac9ad40cf736dd58107bc714adef6782eca59cdde7aca08edf3dd8f595138c6a5cacb8c7ff6af9633321f7dbf37a7e865da37bf0a
diff --git a/acct-user/upmpdcli/upmpdcli-0-r1.ebuild b/acct-user/upmpdcli/upmpdcli-0-r1.ebuild
new file mode 100644
index 000000000000..29d8cc165013
--- /dev/null
+++ b/acct-user/upmpdcli/upmpdcli-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for upmpdcli"
+ACCT_USER_ID=372
+ACCT_USER_GROUPS=( upmpdcli )
+
+acct-user_add_deps
diff --git a/acct-user/upmpdcli/upmpdcli-0.ebuild b/acct-user/upmpdcli/upmpdcli-0.ebuild
deleted file mode 100644
index 8ec71887042a..000000000000
--- a/acct-user/upmpdcli/upmpdcli-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for upmpdcli"
-ACCT_USER_ID=372
-ACCT_USER_GROUPS=( upmpdcli )
-
-acct-user_add_deps
diff --git a/acct-user/uptimed/Manifest b/acct-user/uptimed/Manifest
index 23da8193eca5..4d3e477fcd4f 100644
--- a/acct-user/uptimed/Manifest
+++ b/acct-user/uptimed/Manifest
@@ -1,2 +1,2 @@
-EBUILD uptimed-0-r2.ebuild 240 BLAKE2B 11dc5adc3bdc778c1de9fad5208e7ef8d95b4beb51998c86ac48b3af29e232df1ba42d31b7ab1b1e2d91ed357fea8841f2662e0a41f451ab99c28f07609690b1 SHA512 dd51f5aee491dffdb2e2e23e06f2903ed9b8af464b58abb6017d8592ce26e4e7065790acac727d74b33aec5c627d352cf49f406936f59e443cf30c0734017ae9
+EBUILD uptimed-0-r3.ebuild 240 BLAKE2B 2def9236e775cc5534435101a21156910e0127f754a1ac4ac08eb189998df68acecbdcb939e2948ab398d245603c29a7e6b4fc3b7f23cd10ae1cfda1ae2322dc SHA512 448831a6bde24c5b02efadffb2aa2542d658857f0b465451b02f204f6b2dc5bb42291b715ffc56969272474170eaf84964f3e6e3dde19bf49f00652a5f368d2d
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/uptimed/uptimed-0-r2.ebuild b/acct-user/uptimed/uptimed-0-r2.ebuild
deleted file mode 100644
index cc93c4ae6ea6..000000000000
--- a/acct-user/uptimed/uptimed-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for uptime daemon"
-
-ACCT_USER_ID="220"
-ACCT_USER_GROUPS=( "uptimed" )
-
-acct-user_add_deps
diff --git a/acct-user/uptimed/uptimed-0-r3.ebuild b/acct-user/uptimed/uptimed-0-r3.ebuild
new file mode 100644
index 000000000000..c1c42c2dc37c
--- /dev/null
+++ b/acct-user/uptimed/uptimed-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for uptime daemon"
+
+ACCT_USER_ID="220"
+ACCT_USER_GROUPS=( "uptimed" )
+
+acct-user_add_deps
diff --git a/acct-user/usbmux/Manifest b/acct-user/usbmux/Manifest
index 9ce4cc78826a..c6c89976c88d 100644
--- a/acct-user/usbmux/Manifest
+++ b/acct-user/usbmux/Manifest
@@ -1,2 +1,2 @@
-EBUILD usbmux-0-r1.ebuild 239 BLAKE2B 0dd6be66c31b6fb6b02d14a60d5da0d65e40d9706f91163a49a2afcd5c31dfbd55eaa45e9f7067af729013d18d3186fca807d1e48b650a8093799d38dfa092dd SHA512 81865b809cf0a5102511af564400f8014dbc77e143b6c9996679096c951b60224dad8307223c7df35efbdaf84547b4e08610e9ccfc480448e054923910342901
+EBUILD usbmux-0-r2.ebuild 244 BLAKE2B bd3232c9dc768ead3d68c5115941a4a65bfd47dd63dd12c8fa390cc61248cf5835dd65d2edbbf992aca0cf4c40a463b815bd139b257e7b10ec7a9a7572be1bab SHA512 c922c90a7db2f63c140b0d1750a6ffeedeaeb28356ad4da39e53ffb82e394fb06d6348374167b14fda1076687bd6dfc611424a714b2d181ed90494c4e06a0969
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/usbmux/usbmux-0-r1.ebuild b/acct-user/usbmux/usbmux-0-r1.ebuild
deleted file mode 100644
index 6607c1e3c5c8..000000000000
--- a/acct-user/usbmux/usbmux-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the usbmuxd daemon"
-ACCT_USER_ID=418
-ACCT_USER_GROUPS=( usb plugdev )
-
-acct-user_add_deps
diff --git a/acct-user/usbmux/usbmux-0-r2.ebuild b/acct-user/usbmux/usbmux-0-r2.ebuild
new file mode 100644
index 000000000000..e3eef86c0e7e
--- /dev/null
+++ b/acct-user/usbmux/usbmux-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the usbmuxd daemon"
+ACCT_USER_ID=418
+ACCT_USER_GROUPS=( usb plugdev )
+
+acct-user_add_deps
diff --git a/acct-user/ushare/Manifest b/acct-user/ushare/Manifest
index 76d25960cf17..45054f364581 100644
--- a/acct-user/ushare/Manifest
+++ b/acct-user/ushare/Manifest
@@ -1,2 +1,2 @@
-EBUILD ushare-0.ebuild 222 BLAKE2B 100185b4ef76580c293e173d2b92ad08b91a7170340adda16e87622ca48dda5a6a287d2d7245be4763221dc21e574e664d70e67867f7937d35bd7e4611cc9947 SHA512 be905445552789caf076d3b4dfad08950add8e277bd2385d11fdc8709522e679501501a0d20d0aacd4330724b4eb940c55904ef83fb51b4508954d49dec2e227
+EBUILD ushare-0-r1.ebuild 227 BLAKE2B b72677b3e862147a46d789a89850533eb78864011c5a4afba0f09cc17423cfdee203e149e6cbce4f10eb28a448f78c4f82ddb967d40ccac8cdca127a89bf2bfb SHA512 a5c926ff6431b484983a9a80102aa72102d8ecfbb6b8596b3b4ed3c3506a27e228df4b95d5fdc6671c0493925ec2cbe7292388155161e3326df1c4a275a8dec1
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/acct-user/ushare/ushare-0-r1.ebuild b/acct-user/ushare/ushare-0-r1.ebuild
new file mode 100644
index 000000000000..86e0e2ed7b1b
--- /dev/null
+++ b/acct-user/ushare/ushare-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for uShare"
+ACCT_USER_ID=349
+ACCT_USER_GROUPS=( ushare )
+
+acct-user_add_deps
diff --git a/acct-user/ushare/ushare-0.ebuild b/acct-user/ushare/ushare-0.ebuild
deleted file mode 100644
index aaa047c4f218..000000000000
--- a/acct-user/ushare/ushare-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for uShare"
-ACCT_USER_ID=349
-ACCT_USER_GROUPS=( ushare )
-
-acct-user_add_deps
diff --git a/acct-user/uwsgi_exporter/Manifest b/acct-user/uwsgi_exporter/Manifest
index fd3a81ec4211..740b48fdf9d7 100644
--- a/acct-user/uwsgi_exporter/Manifest
+++ b/acct-user/uwsgi_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD uwsgi_exporter-0.ebuild 262 BLAKE2B 22587220b370c6dee95583d3a4a227ea9fe0264d61ea24777d5acab159e8623a7e28dd37498975d01310e35fe0f74a0b588f9736ef17ac90311ac97acfc0a84c SHA512 df57d00697dd1e64d3115b9c3706beb21f7f8a09e00a8c8e95e354c595cc59dddde85ce94a3f2e32e3dd5f49ecde1b0ff7f1c3e3560b16e3d9421f422d3fdaba
+EBUILD uwsgi_exporter-0-r1.ebuild 262 BLAKE2B 1eecce84eb6ab97fc90a138baa2321c08586c5030b0d58f22abd7476590dfbbbeb27f90483a031b69206a88748f02a9b8de13a61b0e3ed0790f17bb1b0db7f6a SHA512 f2c075e7145e42565195c1559c4a7bfc8cca613ffc030d88ab4fb9084189e1159006338802e3eb8d8af5116140fbbbded95ec863249481ffc568c7f785b6ab6d
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..ec75b2e127f1
--- /dev/null
+++ b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/uwsgi_exporter"
+
+ACCT_USER_GROUPS=( "uwsgi_exporter" )
+ACCT_USER_ID="289"
+
+acct-user_add_deps
diff --git a/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild
deleted file mode 100644
index 616326db2f4b..000000000000
--- a/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/uwsgi_exporter"
-
-ACCT_USER_GROUPS=( "uwsgi_exporter" )
-ACCT_USER_ID="289"
-
-acct-user_add_deps
diff --git a/acct-user/vacation/Manifest b/acct-user/vacation/Manifest
index c8baa7fca130..56ceb100cdf3 100644
--- a/acct-user/vacation/Manifest
+++ b/acct-user/vacation/Manifest
@@ -1,2 +1,2 @@
-EBUILD vacation-0.ebuild 251 BLAKE2B 2f90a12abd0d44bed2e78a576042011a79643349551285e00f08f14bcd3622ea26a8023633b838deeced25e0e0f88d6b3fc4502b786261afb5e06b75b3c9b6d0 SHA512 ff302e688ee57f27d223c42c5d69a27ffd6ed288740c290e7398088aef8148ea75680bf97b06bae1e6278db126cb8bd152b4033b5d928b1ab06231ea342adb3a
+EBUILD vacation-0-r1.ebuild 251 BLAKE2B 45a3fa1fd22e458bf6568341c2ccd0237cc4200e596b4345bce4bfcda108c77e8875ef5ccd448f7f04badea0ca2b1bafdca2c4a38dcb6dbb842b8c24fb2540e1 SHA512 7ec13d0385860989b94ad4e0da51770c283d43cace258e05591b48d6f2c5dab95c0051e9edff16eee8e180db59baefb88c2e1ba971737077342d5c93c5e664d6
MISC metadata.xml 389 BLAKE2B ac06410660acab2a286a3b05b8b7a555a2aa224a1367637df478144817edb912a8b6b7029214b1404d813ea1e83c553a53fa92069932a63856174039b987f501 SHA512 3871c02b144d3f4bc9d03a21b29d44e18fbe48222f753324810bec5f8f004a4ca94161c322c3b28b31526d4c2fef91b137a19e0397280608d5ef276ac8b9df92
diff --git a/acct-user/vacation/vacation-0-r1.ebuild b/acct-user/vacation/vacation-0-r1.ebuild
new file mode 100644
index 000000000000..a08d55604bb1
--- /dev/null
+++ b/acct-user/vacation/vacation-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/postfixadmin"
+
+ACCT_USER_GROUPS=( "vacation" )
+ACCT_USER_ID="125"
+
+acct-user_add_deps
diff --git a/acct-user/vacation/vacation-0.ebuild b/acct-user/vacation/vacation-0.ebuild
deleted file mode 100644
index 318ff1bf4acb..000000000000
--- a/acct-user/vacation/vacation-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/postfixadmin"
-
-ACCT_USER_GROUPS=( "vacation" )
-ACCT_USER_ID="125"
-
-acct-user_add_deps
diff --git a/acct-user/varnish/Manifest b/acct-user/varnish/Manifest
index 49dd796a7f41..32bec8cf1371 100644
--- a/acct-user/varnish/Manifest
+++ b/acct-user/varnish/Manifest
@@ -1,2 +1,2 @@
-EBUILD varnish-0-r1.ebuild 287 BLAKE2B 339e3e77ce26135cf94988a3c0dd26f2ddc6f83ba754bb5f80910b3973c02bf8e34df9cb1685067959f0cb90d1fa74703ed935ea1f45f78c5e7e892983c75c7e SHA512 4ee44a2679a59f7e8535295f200730b8e1777e9adc65fba62c895a249730ad5e7280fc3cdd491abf4386ef4bf4609aee46b9ee497c8ed7a46551262e3d3affee
+EBUILD varnish-0-r2.ebuild 287 BLAKE2B 5689740b1642ca99c427d00d769b459b30366ae2fbc55f7f941ad4eb0302001d83a7a7d09547c6589b877891a9956aabe9fcdf428ac4e17cc9c2b66db84d7f08 SHA512 4fdb16a4da64e3222195d4dd5e327d2316c85b661a8f228947617f1dd3ecdc0b9a45a7f3d64316fb822315fa7f765482764cb2766d477e98def89496fb1ad593
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/varnish/varnish-0-r1.ebuild b/acct-user/varnish/varnish-0-r1.ebuild
deleted file mode 100644
index 009609104d11..000000000000
--- a/acct-user/varnish/varnish-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for varnish"
-ACCT_USER_ID=474
-ACCT_USER_GROUPS=( varnish )
-ACCT_USER_HOME=/var/lib/varnish
-ACCT_USER_HOME_PERMS=0750
-
-acct-user_add_deps
diff --git a/acct-user/varnish/varnish-0-r2.ebuild b/acct-user/varnish/varnish-0-r2.ebuild
new file mode 100644
index 000000000000..5727e7795c24
--- /dev/null
+++ b/acct-user/varnish/varnish-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for varnish"
+ACCT_USER_ID=474
+ACCT_USER_GROUPS=( varnish )
+ACCT_USER_HOME=/var/lib/varnish
+ACCT_USER_HOME_PERMS=0750
+
+acct-user_add_deps
diff --git a/acct-user/vault/Manifest b/acct-user/vault/Manifest
index 218d20d6e553..645b0994d411 100644
--- a/acct-user/vault/Manifest
+++ b/acct-user/vault/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault-0-r1.ebuild 220 BLAKE2B c0f10627e14098b5b15a1aaf7ea25274ee7c541b9dff36a2e5d1fe44e104e889379154e9b33a5274ab076ea849234efcf74d3e09b954ed3f09d8fd34b29fee26 SHA512 3c9f21cf9b7131224f5e083b20bddd4e7220322ac8e8c84bac5532a2c1fbaaee44f6c5c42ff9a075251cc2462fdc03036331ac42a1323eff6e85de82ea05fd3c
+EBUILD vault-0-r2.ebuild 225 BLAKE2B 3bf68a3d7bf750c5f447ac1ae0f1485d999bab8ff09b3aa718bbcec3c53338e8d0a4ce77499ad2457fae05495e12cdad905204c4fead61eba9c76e35acc57259 SHA512 ba9a34159637fd3c59df3a0ede7e8b279877952e5ac066bfcd2a525a8b453fd5c0af93d748b17c2a7f615e2bd15c5f60b3090423405d5b16281f428510879a1e
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-user/vault/vault-0-r1.ebuild b/acct-user/vault/vault-0-r1.ebuild
deleted file mode 100644
index baa714562281..000000000000
--- a/acct-user/vault/vault-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for vault"
-ACCT_USER_ID=410
-ACCT_USER_GROUPS=( vault )
-
-acct-user_add_deps
diff --git a/acct-user/vault/vault-0-r2.ebuild b/acct-user/vault/vault-0-r2.ebuild
new file mode 100644
index 000000000000..a47d6ed16eec
--- /dev/null
+++ b/acct-user/vault/vault-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for vault"
+ACCT_USER_ID=410
+ACCT_USER_GROUPS=( vault )
+
+acct-user_add_deps
diff --git a/acct-user/vault_exporter/Manifest b/acct-user/vault_exporter/Manifest
index b10956c8ee8d..0b3862e1d192 100644
--- a/acct-user/vault_exporter/Manifest
+++ b/acct-user/vault_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault_exporter-0.ebuild 262 BLAKE2B 50a4741285e9e65efb2ece1ac814965cf87e50683bc6faaf94421af0526bc0378ab47f6077bf606621061db8ed6c90f0698919fa55ae40cb97232aaebce0aaab SHA512 00d91375e8e82e1270f35fad4e99fe917b5c83f16d204f3b56619fe4f1022388e042fd58e974e65af31819de6936241e44375c7de4f0875808e50b8cd054f4af
+EBUILD vault_exporter-0-r1.ebuild 262 BLAKE2B f0b56f58a9426d786e955c50f64712a82cb2d2fc3cda535c081d5a23cb17d6882338c2960799a4ad3d9416539a5ebb8b16b7b51a422baf4d81a88a24e3d1b3fd SHA512 acb1dda6d7766d259c9a80355e0ed157a14ce37fef8a928d43b6ee7b8e533f5b644d51737b5baab31210a4b8815086accc4bdef63c0aa64a67a57702cec7e784
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/vault_exporter/vault_exporter-0-r1.ebuild b/acct-user/vault_exporter/vault_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..a1be409f83a2
--- /dev/null
+++ b/acct-user/vault_exporter/vault_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/vault_exporter"
+
+ACCT_USER_GROUPS=( "vault_exporter" )
+ACCT_USER_ID="323"
+
+acct-user_add_deps
diff --git a/acct-user/vault_exporter/vault_exporter-0.ebuild b/acct-user/vault_exporter/vault_exporter-0.ebuild
deleted file mode 100644
index 876469c0a6aa..000000000000
--- a/acct-user/vault_exporter/vault_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/vault_exporter"
-
-ACCT_USER_GROUPS=( "vault_exporter" )
-ACCT_USER_ID="323"
-
-acct-user_add_deps
diff --git a/acct-user/vboxguest/Manifest b/acct-user/vboxguest/Manifest
index b92ce4d79cf2..ac0490aff6e8 100644
--- a/acct-user/vboxguest/Manifest
+++ b/acct-user/vboxguest/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxguest-0-r1.ebuild 276 BLAKE2B 4a33892ee812adbb8f0b1933a178631b351bde885f8f264e74c53b81612761c2ea8412f4a9eef9f4dfad58522319cf17c240484cedc5daf3755782849cc0fc1a SHA512 1227ef2412cff5bae41d11fd42fc6d062562c50ceb3c41496b6e3bda1c1eb80db921ed7eb79d786948cede0326e7cd72c1753f64c3cab7bd975a15e1920f547f
+EBUILD vboxguest-0-r2.ebuild 276 BLAKE2B ce0c6be7b81744307906b2f7d111ff6fccac7ce50572530489d9b81c6133c17cc1adfac62731d8050602ea8aade34b013190b1dff12156e84f6af99a11365ff4 SHA512 ec12339422ffb6a3a4e303f715ecddd14a5648d624b12cb6dc0d713c0daba315342a9f4cfe987c3475bf940e0b8e079d1a0a1074df7f4b25bbec7f3434958bf4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/vboxguest/vboxguest-0-r1.ebuild b/acct-user/vboxguest/vboxguest-0-r1.ebuild
deleted file mode 100644
index 1abd618bc469..000000000000
--- a/acct-user/vboxguest/vboxguest-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for virtualbox-guest-additions"
-ACCT_USER_ID=305
-ACCT_USER_GROUPS=( vboxguest )
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/vboxguest/vboxguest-0-r2.ebuild b/acct-user/vboxguest/vboxguest-0-r2.ebuild
new file mode 100644
index 000000000000..dc0bced73287
--- /dev/null
+++ b/acct-user/vboxguest/vboxguest-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for virtualbox-guest-additions"
+ACCT_USER_ID=305
+ACCT_USER_GROUPS=( vboxguest )
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
diff --git a/acct-user/vdr/Manifest b/acct-user/vdr/Manifest
index 352c35d6ab50..4a6769de00ce 100644
--- a/acct-user/vdr/Manifest
+++ b/acct-user/vdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdr-0-r1.ebuild 1972 BLAKE2B 629b351969cc6e5cb5960619ece6daa4035a2098186e2a0ff1a325f2f01b6c7639bd2ae0cda9a5d24ed1905be1809ddfcab1cbe707b2ce6cb91c2afc5ac56935 SHA512 d5e131454b5817069a38b2479d6718cbbe78d154b43992b7d40bee65a6c1eaecf972465910fe791cdf139ac8957979e63d73989b0f6865e2f43de331779d3251
+EBUILD vdr-0-r2.ebuild 1977 BLAKE2B a04914f4fd2eda6294988aefe51517d855d36f505f268caf07460310bafc97b4f8ac3ceb47e4d2c32cad16f3a1064c31643be7e73914fbaf2bb58c8174557016 SHA512 3e90b247faf6e910a713497459d8fda5de7d5388b4d80414c774df73a2f19f09f962a9b2700267f4f7d21f80ce056384190bc388d6200b93252f901586064205
MISC metadata.xml 1006 BLAKE2B 20307dfc3e06caad49997853cf0e6349243b6cd464fe83346e93369d7c691633ae2882f3b6c0c700404fc3dca0013b36a320c32d3c236199221561ddc6009b00 SHA512 90da2b83cafd636f6be7d6a10ba281a63d9a10e897e6108abaa9bf88625a5431a3a527aff6c918fec8a5a8d59c41844f0e7ad3ddac5ce4fb19dedfc76dafc1b1
diff --git a/acct-user/vdr/vdr-0-r1.ebuild b/acct-user/vdr/vdr-0-r1.ebuild
deleted file mode 100644
index 7871f9fcef97..000000000000
--- a/acct-user/vdr/vdr-0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user user-info
-
-ACCT_USER_ID=452
-ACCT_USER_HOME=/var/lib/vdr
-ACCT_USER_GROUPS=( vdr audio cdrom video )
-
-DESCRIPTION="VDR (VideoDiskRecorder) service user"
-IUSE="graphlcd legacy-homedir remote serial systemd"
-
-acct-user_add_deps
-
-pkg_setup() {
- # if user wants to preserve his existing vdr installation,
- # he can set USE=legacy-homedir
- use legacy-homedir && ACCT_USER_HOME=/var/vdr
-
- # media-plugins/vdr-graphlcd
- use graphlcd && ACCT_USER_GROUPS+=( lp usb )
-
- # media-plugins/vdr-remote, _only_ when systemd is installed
- if use remote; then
- if use systemd; then
- ACCT_USER_GROUPS+=( input )
- else
- einfo "use-flag remote has no effect on systemd systems"
- fi
- fi
-
- # media-plugins/vdr-serial: add group to access /dev/ttyS*
- # on systemd systems: add "dialout"
- # non-systemd systems: add "uucp"
- if use serial; then
- if use systemd; then
- ACCT_USER_GROUPS+=( dialout )
- else
- ACCT_USER_GROUPS+=( uucp )
- fi
- fi
-}
-
-pkg_preinst() {
- # if useflag legacy-homedir is _not_ set, check if user vdr exists and what his homedir is
- if ! use legacy-homedir; then
- local EXISTING_HOME=$(egethome vdr)
- if [[ "${EXISTING_HOME}" = "/var/vdr" ]]; then
- ewarn "The user \"vdr\" exists on this system, his current home directory is \"/var/vdr\""
- ewarn "The new default home directory for user vdr is \"/var/lib/vdr\""
- ewarn "You have three options to continue:"
- ewarn " - set USE=legacy-homedir for ${CATEGORY}/${PN} to continue to use /var/vdr"
- ewarn " - move /var/vdr to /var/lib/vdr manually and repeat to install ${CATEGORY}/${PN}"
- ewarn " - move /var/vdr to /var/vdr.old or anywhere else (to keep it as your backup), repeat to"
- ewarn " install ${CATEGORY}/${PN} and let the installation create a fresh /var/lib/vdr"
- ewarn "the emerge will stop here."
- die "user action required"
- fi
- fi
- acct-user_pkg_preinst
-}
diff --git a/acct-user/vdr/vdr-0-r2.ebuild b/acct-user/vdr/vdr-0-r2.ebuild
new file mode 100644
index 000000000000..7c25955a8feb
--- /dev/null
+++ b/acct-user/vdr/vdr-0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user user-info
+
+ACCT_USER_ID=452
+ACCT_USER_HOME=/var/lib/vdr
+ACCT_USER_GROUPS=( vdr audio cdrom video )
+
+DESCRIPTION="VDR (VideoDiskRecorder) service user"
+IUSE="graphlcd legacy-homedir remote serial systemd"
+
+acct-user_add_deps
+
+pkg_setup() {
+ # if user wants to preserve his existing vdr installation,
+ # he can set USE=legacy-homedir
+ use legacy-homedir && ACCT_USER_HOME=/var/vdr
+
+ # media-plugins/vdr-graphlcd
+ use graphlcd && ACCT_USER_GROUPS+=( lp usb )
+
+ # media-plugins/vdr-remote, _only_ when systemd is installed
+ if use remote; then
+ if use systemd; then
+ ACCT_USER_GROUPS+=( input )
+ else
+ einfo "use-flag remote has no effect on systemd systems"
+ fi
+ fi
+
+ # media-plugins/vdr-serial: add group to access /dev/ttyS*
+ # on systemd systems: add "dialout"
+ # non-systemd systems: add "uucp"
+ if use serial; then
+ if use systemd; then
+ ACCT_USER_GROUPS+=( dialout )
+ else
+ ACCT_USER_GROUPS+=( uucp )
+ fi
+ fi
+}
+
+pkg_preinst() {
+ # if useflag legacy-homedir is _not_ set, check if user vdr exists and what his homedir is
+ if ! use legacy-homedir; then
+ local EXISTING_HOME=$(egethome vdr)
+ if [[ "${EXISTING_HOME}" = "/var/vdr" ]]; then
+ ewarn "The user \"vdr\" exists on this system, his current home directory is \"/var/vdr\""
+ ewarn "The new default home directory for user vdr is \"/var/lib/vdr\""
+ ewarn "You have three options to continue:"
+ ewarn " - set USE=legacy-homedir for ${CATEGORY}/${PN} to continue to use /var/vdr"
+ ewarn " - move /var/vdr to /var/lib/vdr manually and repeat to install ${CATEGORY}/${PN}"
+ ewarn " - move /var/vdr to /var/vdr.old or anywhere else (to keep it as your backup), repeat to"
+ ewarn " install ${CATEGORY}/${PN} and let the installation create a fresh /var/lib/vdr"
+ ewarn "the emerge will stop here."
+ die "user action required"
+ fi
+ fi
+ acct-user_pkg_preinst
+}
diff --git a/acct-user/vdradmin/Manifest b/acct-user/vdradmin/Manifest
index b559c85617c5..dadddabdcd65 100644
--- a/acct-user/vdradmin/Manifest
+++ b/acct-user/vdradmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdradmin-0-r1.ebuild 305 BLAKE2B 359e195282f1ddf53fda76e1976dbdc67f9a414cb22bcd4e1e091de408509bcb7095ce0f84263c69276a73777bc387e4372c299eae6831a137bc76aabfbb4db3 SHA512 d384932dc59d8a8fe8b45ac0276fe0c30997d94739e3ab92530dc61d1f0aff14b13fa5c37c50b5b849877ebc2ab268fdbdd7345b678b010ed2949580083799da
+EBUILD vdradmin-0-r2.ebuild 310 BLAKE2B 66122597cf9fd9fcadc8f93724be779bb0797e088991084a7a082a608d1cb6176d009d49a5b815898c4b6265d87c691d8259fc4e023cef50dd1724ebc75cbd15 SHA512 64ceea49884eb17bcfb5f8a22d3d2a613fcf1f8b13f3d48624cc0c21916cbbc415e38149eab79dd8f3be9d48fc8564fb615ed2745262328be274f6c90dbace54
MISC metadata.xml 246 BLAKE2B fa708d64ea2840e21fa1a00402de140be19ef4c1cf90b00fcd40f2ab10fe5e1397e5bd0a259162c3571a01056535d42d4cb492e97e6ae1756d38831019463db0 SHA512 503c7151fa63101f3a082546d033ecabb7f5ac47f752200d450faaa46c2cd6dfdfc387aa029ad8cb5786d91f7217a3ba64d92dc21ce9268de823fd58feed7db6
diff --git a/acct-user/vdradmin/vdradmin-0-r1.ebuild b/acct-user/vdradmin/vdradmin-0-r1.ebuild
deleted file mode 100644
index 5e76895dfb57..000000000000
--- a/acct-user/vdradmin/vdradmin-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-misc/vdradmin-am"
-
-ACCT_USER_ID=453
-ACCT_USER_GROUPS=( vdradmin )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/vdradmin "
-RDEPEND+=" acct-group/vdradmin "
diff --git a/acct-user/vdradmin/vdradmin-0-r2.ebuild b/acct-user/vdradmin/vdradmin-0-r2.ebuild
new file mode 100644
index 000000000000..59912a877e0d
--- /dev/null
+++ b/acct-user/vdradmin/vdradmin-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-misc/vdradmin-am"
+
+ACCT_USER_ID=453
+ACCT_USER_GROUPS=( vdradmin )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/vdradmin "
+RDEPEND+=" acct-group/vdradmin "
diff --git a/acct-user/vnstat/Manifest b/acct-user/vnstat/Manifest
index f0965403756e..441c9cc5edca 100644
--- a/acct-user/vnstat/Manifest
+++ b/acct-user/vnstat/Manifest
@@ -1,2 +1,2 @@
-EBUILD vnstat-0.ebuild 241 BLAKE2B 5c5877ed7fd47b7196f62ca71cc4225783970fa35e76d0e82130864d0ccc6bd8e3abebd98261ed064a14cceaf7d83321fbaa04ab67455adccd7b10fc670cdb04 SHA512 0c74e637fa4bb6fc1e09ca67a723f18477efc10b2790ac955ca2472f1ff744b5fe10242a2a7f6316838f44a0e7eb9ebcea43d99b99c5d73e258430ff60bc5705
+EBUILD vnstat-0-r1.ebuild 246 BLAKE2B 2944b091154692403186822fa6c744b492ec41d74d2d6926fb578bfc002e2f9c1a1c2e627e0bccfcce5e85faba3e6c5dfec61cdb54611c0079dff8013d38715e SHA512 7045409f5059ae95dea1c30cce01c347352bb0eb46c7866ad53a58b121a2476300bd5fdacdf74e9ec4979494487a741038418953a9add1af5bd6c892a6996fda
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-user/vnstat/vnstat-0-r1.ebuild b/acct-user/vnstat/vnstat-0-r1.ebuild
new file mode 100644
index 000000000000..d141e2298d5d
--- /dev/null
+++ b/acct-user/vnstat/vnstat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for vnstat network monitoring"
+ACCT_USER_ID=229
+ACCT_USER_GROUPS=( vnstat )
+
+acct-user_add_deps
diff --git a/acct-user/vnstat/vnstat-0.ebuild b/acct-user/vnstat/vnstat-0.ebuild
deleted file mode 100644
index c1ed848bd7f3..000000000000
--- a/acct-user/vnstat/vnstat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for vnstat network monitoring"
-ACCT_USER_ID=229
-ACCT_USER_GROUPS=( vnstat )
-
-acct-user_add_deps
diff --git a/acct-user/vpopmail/Manifest b/acct-user/vpopmail/Manifest
index 6fc83181f56e..30f914233db8 100644
--- a/acct-user/vpopmail/Manifest
+++ b/acct-user/vpopmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD vpopmail-0-r1.ebuild 259 BLAKE2B 7979697a3b27841574a9489797bdd95ee6e26410e678314a044f6b711004a79c7af6f27abfc7fe6c834c759a546126996f477b6a3296f17adc830dfcf0d43032 SHA512 4a8464ff13af5f0dca49a2d4491f3fac6be23149c84293f093f73af7728ed912a296dd8ee28ff624d9fcddc25d50beeca7a731895c4ba16388f79ed43e1e0fc8
+EBUILD vpopmail-0-r2.ebuild 259 BLAKE2B d3f509bd19e62f97395938a08ce44766db82610d4e14960d742caa19533d8081f5c89565b99e71f551b1f24e2c5ffbb2d8768ee33d24f42f25655f6f32c31a67 SHA512 c53c4aca2dec2ddd1474d69e1148f76806e6dcd2c1e66a9da6089f7696c27413280c76b58fffd17e726e54a96ccf4b81cd5e5d31d61f7dcd4e79b6f37f3c9d55
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/vpopmail/vpopmail-0-r1.ebuild b/acct-user/vpopmail/vpopmail-0-r1.ebuild
deleted file mode 100644
index 01a50ab30112..000000000000
--- a/acct-user/vpopmail/vpopmail-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for vpopmail"
-ACCT_USER_ID=89
-ACCT_USER_HOME=/var/vpopmail
-ACCT_USER_GROUPS=( vpopmail )
-
-acct-user_add_deps
diff --git a/acct-user/vpopmail/vpopmail-0-r2.ebuild b/acct-user/vpopmail/vpopmail-0-r2.ebuild
new file mode 100644
index 000000000000..1992b9dc7f63
--- /dev/null
+++ b/acct-user/vpopmail/vpopmail-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for vpopmail"
+ACCT_USER_ID=89
+ACCT_USER_HOME=/var/vpopmail
+ACCT_USER_GROUPS=( vpopmail )
+
+acct-user_add_deps
diff --git a/acct-user/wesnoth/Manifest b/acct-user/wesnoth/Manifest
index 3144eaef0215..6027e176dad5 100644
--- a/acct-user/wesnoth/Manifest
+++ b/acct-user/wesnoth/Manifest
@@ -1,2 +1,2 @@
-EBUILD wesnoth-0-r1.ebuild 272 BLAKE2B d4b0732715380974feaeb099e5fc537c4b50d7ef6c1767dab8434f9d5ab0fb8c567fec72f6d10550c7628ef218dac7f3ff21f17cb956b2af04a82f6c6e6a7d36 SHA512 046c74d8174da446ffae33584706b828245be3990af292dede5c8b8fdd407838f67b4630516e6bcad7602815f5307ef6982ad1ed1daa736a109c36d199ecf2e1
+EBUILD wesnoth-0-r2.ebuild 272 BLAKE2B 1526fc0a6388b0e32063077767022228645d11c070aa267ba1067db0b5fdbf82071a3128c2400847d4cd394cf57115581682fe9398c375391b7dd6e3e4003d52 SHA512 5169cdef71754e95466bdf998c5982b1e322218205e923dd88e6190f8bd700fad504caddfbf6145d26fc712b2bff2dc2bca5e0f4d1786291d4e77c8ec8d8447a
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/acct-user/wesnoth/wesnoth-0-r1.ebuild b/acct-user/wesnoth/wesnoth-0-r1.ebuild
deleted file mode 100644
index cf9126ff0b8f..000000000000
--- a/acct-user/wesnoth/wesnoth-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for games-strategy/wesnoth"
-ACCT_USER_ID=419
-ACCT_USER_GROUPS=( wesnoth )
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/wesnoth/wesnoth-0-r2.ebuild b/acct-user/wesnoth/wesnoth-0-r2.ebuild
new file mode 100644
index 000000000000..f7391c12fca0
--- /dev/null
+++ b/acct-user/wesnoth/wesnoth-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for games-strategy/wesnoth"
+ACCT_USER_ID=419
+ACCT_USER_GROUPS=( wesnoth )
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/wwwoffle/Manifest b/acct-user/wwwoffle/Manifest
index e70aecb23d16..280b50a2f1ab 100644
--- a/acct-user/wwwoffle/Manifest
+++ b/acct-user/wwwoffle/Manifest
@@ -1,2 +1,2 @@
-EBUILD wwwoffle-0.ebuild 283 BLAKE2B 2068ad2bf804da3d40647d35f76517bfbc39d972582639d8eaed65e2616337063870f28da81ac3f338e69fe708dd6c38d2494d64eb8fb30abede241aa1f6b493 SHA512 478e83fdfc2f24281ca4cc5a6fe1a9da49f5bc952cc07bcce86e4c5e13c98ec2673159fd73fabcb2cda262dd0c5c5c9733c62e2f6d73666e2b27c48f63ccff6f
+EBUILD wwwoffle-0-r1.ebuild 283 BLAKE2B d885d83b5eff9b709a48ce8851073fa357edffcf66cbec57a16f41fe4ecdad1bef98695381568b721894d49525bc1147c91255d941f350219db7197000a8d503 SHA512 5ca0285ffeeda456d04b80a44c8deaa0cd11ec79848192edb8fec88cb3f556ec96b92726c87cd21b68f95fa071bb62070d655acdc878f49c71d33ac8d8e3d0ca
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/wwwoffle/wwwoffle-0-r1.ebuild b/acct-user/wwwoffle/wwwoffle-0-r1.ebuild
new file mode 100644
index 000000000000..0af0edc9861f
--- /dev/null
+++ b/acct-user/wwwoffle/wwwoffle-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/wwwoffle"
+
+ACCT_USER_GROUPS=( "wwwoffle" )
+ACCT_USER_HOME="/var/spool/wwwoffle"
+ACCT_USER_ID="251"
+
+acct-user_add_deps
diff --git a/acct-user/wwwoffle/wwwoffle-0.ebuild b/acct-user/wwwoffle/wwwoffle-0.ebuild
deleted file mode 100644
index f5b8f4755b25..000000000000
--- a/acct-user/wwwoffle/wwwoffle-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/wwwoffle"
-
-ACCT_USER_GROUPS=( "wwwoffle" )
-ACCT_USER_HOME="/var/spool/wwwoffle"
-ACCT_USER_ID="251"
-
-acct-user_add_deps
diff --git a/acct-user/x2goprint/Manifest b/acct-user/x2goprint/Manifest
index e1bc13bea778..c7a713ae4287 100644
--- a/acct-user/x2goprint/Manifest
+++ b/acct-user/x2goprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2goprint-0-r1.ebuild 281 BLAKE2B 2f5bcc1f8161991fe5b3ace5ec4d9398dbb8f6e0643a220cc3458e1c6abfb43f8c6ba97bfbb0bde18b857a6ff744e3ec823f53f4046ee56bc2ae15528871918b SHA512 aa5048650a20bf37e349698d4c215d30f9961417b3a969db4309aceea2a1ffdbd31736e34344502c270cf7ffcc14551af2e9d363352b99198e4f44b7cf2c2a3e
+EBUILD x2goprint-0-r2.ebuild 281 BLAKE2B 26c8f9b438b0dbb2be2a01e9dc331e5f023f22bd25793ac829ae0fbefb73fceee45cc66af26dc3ccda0b1b53c30240be3c58e16e255eb709b45781781f98688b SHA512 8ea215ba40272238428be21dec49dcf8233a8a32383c6774b3fb821b0b0446f1421f80d4c5a92461f709eecf704efa84b5dbcbf12320fb68c0ca4ba992acd8b6
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-user/x2goprint/x2goprint-0-r1.ebuild b/acct-user/x2goprint/x2goprint-0-r1.ebuild
deleted file mode 100644
index 3f4463098a69..000000000000
--- a/acct-user/x2goprint/x2goprint-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/x2goserver"
-ACCT_USER_ID=292
-ACCT_USER_GROUPS=( x2goprint )
-ACCT_USER_HOME="/var/spool/x2goprint"
-
-acct-user_add_deps
diff --git a/acct-user/x2goprint/x2goprint-0-r2.ebuild b/acct-user/x2goprint/x2goprint-0-r2.ebuild
new file mode 100644
index 000000000000..adfa585f2ef9
--- /dev/null
+++ b/acct-user/x2goprint/x2goprint-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=292
+ACCT_USER_GROUPS=( x2goprint )
+ACCT_USER_HOME="/var/spool/x2goprint"
+
+acct-user_add_deps
diff --git a/acct-user/x2gouser/Manifest b/acct-user/x2gouser/Manifest
index aa62c58a6629..736ef3568c78 100644
--- a/acct-user/x2gouser/Manifest
+++ b/acct-user/x2gouser/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2gouser-0-r1.ebuild 273 BLAKE2B b5ef6f55e14461cd6e88603697b18b04469861c70d2b47ceaaf20ce7b7107cdca09f54ec50df26224d5a7cd8cb5d9f396107d2d273f7b69f90a1bcbb6aa54675 SHA512 0932580f26f4b870c7b6b0df62bed14ae7e7bbe401549bd3711eaf72c661ce77fa9085c1da4924fed732b4189c5115080375ce98f1f7b58aea7f654af7fcc6b2
+EBUILD x2gouser-0-r2.ebuild 273 BLAKE2B 19c4cc1654e4f54a60db2e9c142521e897712374d3111cd79ed80a929cee47bdcd172370927fa830aabc6b0db6c1e22257472c2e8805608418be668c47a401e5 SHA512 0b3e7a25a19a0021b48351b247406bbbee7d8caad6a48634c9ed7f42de592c5832ae0f24c982a85ebab1f2ce6b4db65e6279188d34337ba7d86fe95c5cb242f6
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/acct-user/x2gouser/x2gouser-0-r1.ebuild b/acct-user/x2gouser/x2gouser-0-r1.ebuild
deleted file mode 100644
index e386b7496085..000000000000
--- a/acct-user/x2gouser/x2gouser-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/x2goserver"
-ACCT_USER_ID=291
-ACCT_USER_GROUPS=( x2gouser )
-ACCT_USER_HOME="/var/lib/x2go"
-
-acct-user_add_deps
diff --git a/acct-user/x2gouser/x2gouser-0-r2.ebuild b/acct-user/x2gouser/x2gouser-0-r2.ebuild
new file mode 100644
index 000000000000..b510b563a401
--- /dev/null
+++ b/acct-user/x2gouser/x2gouser-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=291
+ACCT_USER_GROUPS=( x2gouser )
+ACCT_USER_HOME="/var/lib/x2go"
+
+acct-user_add_deps
diff --git a/acct-user/xrootd/Manifest b/acct-user/xrootd/Manifest
index 7ae80d4d96f2..1475a0ff186b 100644
--- a/acct-user/xrootd/Manifest
+++ b/acct-user/xrootd/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrootd-0-r1.ebuild 239 BLAKE2B 0487d209a3e2a3e379394743272b9e29f5622cfa67ca1622d457909ba7cc1fa515fbf87cd6832389b3165a98b0782fa56f29c7ca2b7e52b826edbc6f30209975 SHA512 a4705afa9d2a91f83b6b260e1f5d3a58680bfda51099420bbbd5c81cce4328ef7e523cd3f15a4346e43fc4abb18c5c8efa71a8deb9aeef896ecf7e9c9ec5f22a
+EBUILD xrootd-0-r2.ebuild 239 BLAKE2B cced29616d0bbb2da3fd22ea12f1ed52ed0f60bfe3512f86261d9b09686f6a5da959fff009b200be2cb4a175259862d05b61f19edcf0b2710d3e7059e9737e9e SHA512 7f3815cdd78e6ccac51848259624cdbd39a75c36696d7fe3d5394f90d38ab451327e601bb376a35a509399dbde286583925960919277d3d41db7cac5d5247af5
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
diff --git a/acct-user/xrootd/xrootd-0-r1.ebuild b/acct-user/xrootd/xrootd-0-r1.ebuild
deleted file mode 100644
index a0267ea66311..000000000000
--- a/acct-user/xrootd/xrootd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the XRootD server"
-ACCT_USER_ID=469
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/xrootd/xrootd-0-r2.ebuild b/acct-user/xrootd/xrootd-0-r2.ebuild
new file mode 100644
index 000000000000..3e5b2c648ea4
--- /dev/null
+++ b/acct-user/xrootd/xrootd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the XRootD server"
+ACCT_USER_ID=469
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/yubihsm-connector/Manifest b/acct-user/yubihsm-connector/Manifest
index a99efb10677d..af19956d4e24 100644
--- a/acct-user/yubihsm-connector/Manifest
+++ b/acct-user/yubihsm-connector/Manifest
@@ -1,2 +1,2 @@
-EBUILD yubihsm-connector-0.ebuild 256 BLAKE2B b9f4e71de2acfbfe8c69f3e229116f2f543beeee85f1bcff3bfac59931e2eccb7fc28b4bcf4fbda4ff038da6188e20e64a1b17cce9e5386b07ab0bd1094efb33 SHA512 fc6f05712f3eccf9b998ffab3cf2ef0a5f5c7e539ec54de9e740aba01c996ebdc19ff4a423768a95b41f062ee650e92f36b38c274190d90d2d7a355edb286f9e
+EBUILD yubihsm-connector-0-r1.ebuild 256 BLAKE2B b9f4e71de2acfbfe8c69f3e229116f2f543beeee85f1bcff3bfac59931e2eccb7fc28b4bcf4fbda4ff038da6188e20e64a1b17cce9e5386b07ab0bd1094efb33 SHA512 fc6f05712f3eccf9b998ffab3cf2ef0a5f5c7e539ec54de9e740aba01c996ebdc19ff4a423768a95b41f062ee650e92f36b38c274190d90d2d7a355edb286f9e
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-user/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
index 1997a39e2cc8..1997a39e2cc8 100644
--- a/acct-user/yubihsm-connector/yubihsm-connector-0.ebuild
+++ b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
diff --git a/acct-user/zabbix/Manifest b/acct-user/zabbix/Manifest
index cd8c65e1b24e..ac277f4e1a72 100644
--- a/acct-user/zabbix/Manifest
+++ b/acct-user/zabbix/Manifest
@@ -1,2 +1,2 @@
-EBUILD zabbix-0.ebuild 362 BLAKE2B 8672076196fcce609e42278bf4745b4c2d9dac7c1bb42a5c31c3da6808fa09765d682658132390a7fb8420d64a42539841f4c2de124fbb4e4164f36f2d518702 SHA512 78ead6c3cb34eab55461f95563c9fe6fa75570cac81ce6197fc5e7718ec2cdb72f130a372dca4f76d61dcce2462e6ab20975b6ef62bea545e471857d72c09785
+EBUILD zabbix-0-r1.ebuild 362 BLAKE2B 9aaf9bb25b83776d0359e98843b0137c08bc121a934aa6d30fa2ec06147ee8c9474b9f1d1ae6f013e8f8f76923b3dffe92c921a3f11bfc04a26df18567cae0ec SHA512 ec5c0045820d62694af75a22f5c5f09c3fed86d70093e8211db71d515aae7d297420e20063d883d7d1a0f2678b7420fbd23c1f2dc46c300ab2b6345c564bdd1b
MISC metadata.xml 250 BLAKE2B 2bd2a200020745da1f097ec123623682c370bf39f88991aed60c1682b0c18f56a698812a65e2f63699cf61fb6f433bcfc91de65b77290fe6053ac122a3ee21cd SHA512 bda67aad1f4c4e8949671e4a7a0e757359b53050f6873aca15fdaeea73064e1523143a8e5132e2f665770489442f0f6aca1d061577f6a5befbc59f2bb52ce62c
diff --git a/acct-user/zabbix/zabbix-0-r1.ebuild b/acct-user/zabbix/zabbix-0-r1.ebuild
new file mode 100644
index 000000000000..e446f599587e
--- /dev/null
+++ b/acct-user/zabbix/zabbix-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Zabbix"
+ACCT_USER_ID=329
+# see https://www.zabbix.com/documentation/current/manual/installation/install
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=770
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/zabbix/zabbix-0.ebuild b/acct-user/zabbix/zabbix-0.ebuild
deleted file mode 100644
index 35b1bc820d1e..000000000000
--- a/acct-user/zabbix/zabbix-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Zabbix"
-ACCT_USER_ID=329
-# see https://www.zabbix.com/documentation/current/manual/installation/install
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_PERMS=770
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/zeppelin/Manifest b/acct-user/zeppelin/Manifest
index 8473aea89d78..8ff27f3e9a51 100644
--- a/acct-user/zeppelin/Manifest
+++ b/acct-user/zeppelin/Manifest
@@ -1,2 +1,2 @@
-EBUILD zeppelin-0-r1.ebuild 309 BLAKE2B f42bd9dcbfcedfed857d7d67c44dc0e7087be0e5af06f2a3323d5c8fe0851ae61af3e1b5fe4c7ef08ea8019c8b2fd8b0a8410c28592dae20dc72264041df595f SHA512 d1a7209f640bfc8310f8d6fe83f80bdfd3b99890f95d4a06cfd15e8e106ad612e69107f8a7bb7aea994fab67555a56cd6112030a15adf8eda6b0eedf3999187f
+EBUILD zeppelin-0-r2.ebuild 309 BLAKE2B 561a8842ea282ae6bdc10919d96cf1419ad520712d8c30de12e7db651a419005938a1d36e5e94790e135dd07d8993995741b8088dcfa4cbf970f06fe96b05b50 SHA512 7cd898d5ee551a80fb5b72841ad1ecb3fa5dca9346e380ddafd583198d4bf104e23ad30c39d13df66c7edb196c2be61fb955aa49c4a6595c13da4d2c099da92c
MISC metadata.xml 342 BLAKE2B 1684316dabed0d0d2468052855244c3bb2504173b417c5b6f9ff9d2263ed3adf90d406201e19ca132d46ef7a5f072e571e8f16f9f5dc0a95ef0e0723c229ec5e SHA512 cb9dd8f18c328d49b61d1de97b20bebbd1261e944f7a56949e1ce72e7b62413716d83d77f72bce4387fa245d3414fe1b379f0d283487f7be55f2e2c256718a68
diff --git a/acct-user/zeppelin/zeppelin-0-r1.ebuild b/acct-user/zeppelin/zeppelin-0-r1.ebuild
deleted file mode 100644
index 22a7f3d7ceee..000000000000
--- a/acct-user/zeppelin/zeppelin-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for system-wide www-apps/zeppelin-bin"
-ACCT_USER_ID=224
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/home/zeppelin
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/zeppelin/zeppelin-0-r2.ebuild b/acct-user/zeppelin/zeppelin-0-r2.ebuild
new file mode 100644
index 000000000000..582d17bb219c
--- /dev/null
+++ b/acct-user/zeppelin/zeppelin-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for system-wide www-apps/zeppelin-bin"
+ACCT_USER_ID=224
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/home/zeppelin
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/zetcd/Manifest b/acct-user/zetcd/Manifest
index 7c577988f9be..59169b5b26d0 100644
--- a/acct-user/zetcd/Manifest
+++ b/acct-user/zetcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD zetcd-0.ebuild 242 BLAKE2B 7376603daaf30471ddead48659ee7e317a39b9a80c418854d23e456a29f578552b2f646491e9be7ffab457a418a3073b53e733bd5cef607785305a3c644e096b SHA512 b048a7944681b4de7917ef972be01b3f16e14baee92cb267b1bf1f1dda1380ac296e5ff288279019fef5a27f5f106665d6a99561f4cc72f11024f10425b3a11f
+EBUILD zetcd-0-r1.ebuild 242 BLAKE2B 3cc558fcdd32b9435caf230260c8ed37686536cd9547f5d4f1ee01530e4556b9124b8d21bd1d2cd23970dcd270f2231eb051e5a4e7a0648ef4200c962c766d80 SHA512 cc3a04cb36862b87eda1138b99a3d66c080812002183e5f99ee448739bdfd1ebc7dca2ca2096da367085aa0f6e9c451bd14b0b7d9a8d02b32d12d0063491a891
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/zetcd/zetcd-0-r1.ebuild b/acct-user/zetcd/zetcd-0-r1.ebuild
new file mode 100644
index 000000000000..1062f1a71837
--- /dev/null
+++ b/acct-user/zetcd/zetcd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for sys-cluster/zetcd"
+
+ACCT_USER_GROUPS=( "zetcd" )
+ACCT_USER_ID="253"
+
+acct-user_add_deps
diff --git a/acct-user/zetcd/zetcd-0.ebuild b/acct-user/zetcd/zetcd-0.ebuild
deleted file mode 100644
index 2570323db374..000000000000
--- a/acct-user/zetcd/zetcd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for sys-cluster/zetcd"
-
-ACCT_USER_GROUPS=( "zetcd" )
-ACCT_USER_ID="253"
-
-acct-user_add_deps
diff --git a/acct-user/ziproxy/Manifest b/acct-user/ziproxy/Manifest
index 497a3ec0b976..dc3df0772235 100644
--- a/acct-user/ziproxy/Manifest
+++ b/acct-user/ziproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ziproxy-0.ebuild 198 BLAKE2B c87c7027f6a209f3bc63222cbc919368163af6455e3be36592f9335f7f83c1db4159a42fd647ab15bbfe6ce1330e76086436b97c9235e39dca9a285dc5ad222c SHA512 174a0454c88a39b6c85885a876fa644fc969ec2baf3ad6ee787957cd717f2262d4a08cb4ba25de76c6d72995f1fcfd31f2cbf9cfe33acd2bd690f743dc2e59f2
+EBUILD ziproxy-0-r1.ebuild 198 BLAKE2B 3fa3f4a1728872a0944219f030fcaedcf4750410d53763be622c3280252a1b992ebb09181702a3cb8199997ced7925db1917c041f6b8862d3fa7848668c9ee8c SHA512 8d70b3a2e04825f3c25529fbecdde22391dec1b12aa8df32f152c01888e022c391ae31c5111118a1ec81d7605491b55bbc3f23a18c52ba62c6a4191cc7c6d091
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/ziproxy/ziproxy-0-r1.ebuild b/acct-user/ziproxy/ziproxy-0-r1.ebuild
new file mode 100644
index 000000000000..aa9df06ff0dc
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=367
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/ziproxy/ziproxy-0.ebuild b/acct-user/ziproxy/ziproxy-0.ebuild
deleted file mode 100644
index ea999861d750..000000000000
--- a/acct-user/ziproxy/ziproxy-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=367
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/znc/Manifest b/acct-user/znc/Manifest
index ca8c327fa576..b5d389d87a4c 100644
--- a/acct-user/znc/Manifest
+++ b/acct-user/znc/Manifest
@@ -1,2 +1,2 @@
-EBUILD znc-0-r1.ebuild 358 BLAKE2B ec1e6319f936e475ca1ada9e638aacf0c1894290b3981ffd3d04b62bec972ebaad2c35ce54e886dbbe2e1f2ee3d2a431ff626d5a7be69d18d1b1bb88f371b4a5 SHA512 7a77c6ff3b3c36c4960eb4df54b02d7f34dd661b1ca5c9f5e352bc993fb316d557c7cd9562911ef74f9c1cfa51db2637ad30239f87d73b050d3e76bfeb79aad1
+EBUILD znc-0-r2.ebuild 358 BLAKE2B be3f7674b1a30e7388da85ed69de0111b1ce3036b05355f801f6bfcada7161d287ffc8b0b42d196876dfb871660e8de44e5083940713d0868ea9166b1e06cbb4 SHA512 392c1d59dcdc86ca55fa468178747db1fd0b3552170919162efa20b822999eb6a48b7f24caa8f7d78464db869d9047394b2a3ba308d9ba47e2a9a149bd8a108b
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
diff --git a/acct-user/znc/znc-0-r1.ebuild b/acct-user/znc/znc-0-r1.ebuild
deleted file mode 100644
index 9848611f21f2..000000000000
--- a/acct-user/znc/znc-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-irc/znc"
-ACCT_USER_ID=421
-ACCT_USER_GROUPS=( ${PN} )
-# The systemd unit needs HOME to be set
-# https://bugs.gentoo.org/521916
-ACCT_USER_HOME=/var/lib/znc
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/znc/znc-0-r2.ebuild b/acct-user/znc/znc-0-r2.ebuild
new file mode 100644
index 000000000000..9381b0301b03
--- /dev/null
+++ b/acct-user/znc/znc-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-irc/znc"
+ACCT_USER_ID=421
+ACCT_USER_GROUPS=( ${PN} )
+# The systemd unit needs HOME to be set
+# https://bugs.gentoo.org/521916
+ACCT_USER_HOME=/var/lib/znc
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/zookeeper/Manifest b/acct-user/zookeeper/Manifest
index 21864383cfd5..d965cb8313a5 100644
--- a/acct-user/zookeeper/Manifest
+++ b/acct-user/zookeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD zookeeper-0.ebuild 292 BLAKE2B 9d0c12d3b3933334e377d152b8b4ef249af4f2837e97e59be2adabf57ee34b85784a37838af9103aca60cd566cbeea0138ed8b19e0a891b27a8813fe6b95e1e1 SHA512 e5c7f2b36a353b9855e87127bb666d4469a28ee087c9a934bdd06e538b34cf60ba2476bfb1ce111ddaf7d90385eb410df9bbc83039a65e9551eef1e7b7e3bb19
+EBUILD zookeeper-0-r1.ebuild 292 BLAKE2B 6a7d023d5fc8a77b0569b422d795c5a4f52e40ade691c5faa3e5740a6e72cd44c519d650bd54327fa496e53319eda39552295a3090acf55d4ab9a759468d1f1e SHA512 709f5230999007c555bc7114a872f10a0cd201142e329f844b714675fd0863aad54d5337cf948f13703525e3baee9b25bb9c2469c2b6321ab8948c5cc55291ac
MISC metadata.xml 366 BLAKE2B cade4c3fba00dbf1cb9357bf0fcb0347ed6f6162584250545c4c426a86c71cc82de6f7ae39571943d15e8ea32330e86b546c2135c265316ba5dd127472015451 SHA512 5fafae2b9877b5d46da31662ef3b76ed51604131f23548e945014c73431af0462f169b9dde330a2d3be1f079acdda204df351f3784bda51f14a089bdca2887d8
diff --git a/acct-user/zookeeper/zookeeper-0-r1.ebuild b/acct-user/zookeeper/zookeeper-0-r1.ebuild
new file mode 100644
index 000000000000..668e3452c457
--- /dev/null
+++ b/acct-user/zookeeper/zookeeper-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-cluster/zookeeper-bin"
+
+ACCT_USER_GROUPS=( "zookeeper" )
+ACCT_USER_HOME="/var/lib/zookeeper"
+ACCT_USER_ID="211"
+
+acct-user_add_deps
diff --git a/acct-user/zookeeper/zookeeper-0.ebuild b/acct-user/zookeeper/zookeeper-0.ebuild
deleted file mode 100644
index a1b678140d58..000000000000
--- a/acct-user/zookeeper/zookeeper-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-cluster/zookeeper-bin"
-
-ACCT_USER_GROUPS=( "zookeeper" )
-ACCT_USER_HOME="/var/lib/zookeeper"
-ACCT_USER_ID="211"
-
-acct-user_add_deps