summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'acct-user')
-rw-r--r--acct-user/_cron-failure/_cron-failure-0-r1.ebuild12
-rw-r--r--acct-user/_cron-failure/metadata.xml8
-rw-r--r--acct-user/abrt/abrt-0-r1.ebuild12
-rw-r--r--acct-user/abrt/metadata.xml8
-rw-r--r--acct-user/aerospike-amc/aerospike-amc-0-r2.ebuild13
-rw-r--r--acct-user/aerospike-amc/metadata.xml8
-rw-r--r--acct-user/airdcppd/airdcppd-0-r1.ebuild16
-rw-r--r--acct-user/airdcppd/airdcppd-0-r3.ebuild16
-rw-r--r--acct-user/airdcppd/metadata.xml2
-rw-r--r--acct-user/alertmanager/alertmanager-0-r2.ebuild12
-rw-r--r--acct-user/alertmanager/alertmanager-0.ebuild12
-rw-r--r--acct-user/alertmanager/metadata.xml7
-rw-r--r--acct-user/alias/alias-0-r1.ebuild18
-rw-r--r--acct-user/alias/alias-0-r3.ebuild18
-rw-r--r--acct-user/alias/metadata.xml2
-rw-r--r--acct-user/amanda/amanda-0-r2.ebuild12
-rw-r--r--acct-user/amanda/amanda-0.ebuild12
-rw-r--r--acct-user/amanda/metadata.xml6
-rw-r--r--acct-user/amavis/amavis-0-r1.ebuild13
-rw-r--r--acct-user/amavis/amavis-0-r3.ebuild13
-rw-r--r--acct-user/amavis/metadata.xml10
-rw-r--r--acct-user/amule/amule-0-r1.ebuild12
-rw-r--r--acct-user/amule/amule-0-r3.ebuild14
-rw-r--r--acct-user/amule/metadata.xml2
-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/anope/metadata.xml2
-rw-r--r--acct-user/apache/apache-0-r1.ebuild12
-rw-r--r--acct-user/apache/apache-0-r3.ebuild12
-rw-r--r--acct-user/apache/metadata.xml6
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/metadata.xml2
-rw-r--r--acct-user/argus/argus-0-r2.ebuild13
-rw-r--r--acct-user/argus/argus-0.ebuild13
-rw-r--r--acct-user/argus/metadata.xml2
-rw-r--r--acct-user/arpwatch/arpwatch-0-r2.ebuild13
-rw-r--r--acct-user/arpwatch/metadata.xml8
-rw-r--r--acct-user/artifactory/artifactory-0.ebuild14
-rw-r--r--acct-user/artifactory/metadata.xml5
-rw-r--r--acct-user/aspnet/aspnet-0-r2.ebuild13
-rw-r--r--acct-user/aspnet/metadata.xml5
-rw-r--r--acct-user/asterisk/asterisk-0-r1.ebuild12
-rw-r--r--acct-user/asterisk/asterisk-0-r3.ebuild12
-rw-r--r--acct-user/asterisk/metadata.xml2
-rw-r--r--acct-user/at/at-0-r2.ebuild12
-rw-r--r--acct-user/at/at-0.ebuild12
-rw-r--r--acct-user/at/metadata.xml14
-rw-r--r--acct-user/atheme-services/atheme-services-0-r1.ebuild12
-rw-r--r--acct-user/atheme-services/atheme-services-0-r3.ebuild12
-rw-r--r--acct-user/atheme-services/metadata.xml2
-rw-r--r--acct-user/atuin/atuin-0.ebuild11
-rw-r--r--acct-user/atuin/metadata.xml8
-rw-r--r--acct-user/automatic/automatic-0-r2.ebuild12
-rw-r--r--acct-user/automatic/automatic-0.ebuild13
-rw-r--r--acct-user/automatic/metadata.xml2
-rw-r--r--acct-user/automx2/automx2-0-r1.ebuild14
-rw-r--r--acct-user/automx2/automx2-0-r3.ebuild14
-rw-r--r--acct-user/automx2/metadata.xml11
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild12
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r3.ebuild12
-rw-r--r--acct-user/avahi-autoipd/metadata.xml7
-rw-r--r--acct-user/avahi/avahi-0-r1.ebuild12
-rw-r--r--acct-user/avahi/avahi-0-r3.ebuild12
-rw-r--r--acct-user/avahi/metadata.xml7
-rw-r--r--acct-user/axtls/axtls-0-r2.ebuild13
-rw-r--r--acct-user/axtls/metadata.xml5
-rw-r--r--acct-user/backuppc/backuppc-0-r2.ebuild15
-rw-r--r--acct-user/backuppc/backuppc-0.ebuild15
-rw-r--r--acct-user/backuppc/metadata.xml2
-rw-r--r--acct-user/bacula/bacula-0-r1.ebuild13
-rw-r--r--acct-user/bacula/bacula-0-r3.ebuild13
-rw-r--r--acct-user/bacula/metadata.xml2
-rw-r--r--acct-user/bareos/bareos-0-r1.ebuild13
-rw-r--r--acct-user/bareos/bareos-0-r3.ebuild13
-rw-r--r--acct-user/bareos/metadata.xml2
-rw-r--r--acct-user/beanstalk/beanstalk-0-r2.ebuild14
-rw-r--r--acct-user/beanstalk/metadata.xml5
-rw-r--r--acct-user/bedrock/bedrock-0-r1.ebuild13
-rw-r--r--acct-user/bedrock/bedrock-0-r3.ebuild13
-rw-r--r--acct-user/bedrock/metadata.xml2
-rw-r--r--acct-user/biboumi/biboumi-0-r1.ebuild12
-rw-r--r--acct-user/biboumi/metadata.xml8
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r1.ebuild12
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r3.ebuild12
-rw-r--r--acct-user/bind_exporter/metadata.xml2
-rw-r--r--acct-user/bird/bird-0-r2.ebuild13
-rw-r--r--acct-user/bird/bird-0.ebuild13
-rw-r--r--acct-user/bird/metadata.xml2
-rw-r--r--acct-user/bitcoin/bitcoin-0-r1.ebuild12
-rw-r--r--acct-user/bitcoin/bitcoin-0-r3.ebuild12
-rw-r--r--acct-user/bitcoin/metadata.xml2
-rw-r--r--acct-user/bitflu/bitflu-0-r2.ebuild14
-rw-r--r--acct-user/bitflu/metadata.xml5
-rw-r--r--acct-user/bitlbee/bitlbee-0-r1.ebuild12
-rw-r--r--acct-user/bitlbee/bitlbee-0-r3.ebuild12
-rw-r--r--acct-user/bitlbee/metadata.xml10
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0-r2.ebuild12
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0.ebuild12
-rw-r--r--acct-user/blackbox_exporter/metadata.xml7
-rw-r--r--acct-user/boinc/boinc-0-r2.ebuild14
-rw-r--r--acct-user/boinc/boinc-0.ebuild14
-rw-r--r--acct-user/boinc/metadata.xml2
-rw-r--r--acct-user/brltty/brltty-0-r2.ebuild13
-rw-r--r--acct-user/brltty/metadata.xml8
-rw-r--r--acct-user/buildbot/buildbot-0-r1.ebuild12
-rw-r--r--acct-user/buildbot/buildbot-0-r3.ebuild12
-rw-r--r--acct-user/buildbot/metadata.xml7
-rw-r--r--acct-user/burp/burp-0-r1.ebuild12
-rw-r--r--acct-user/burp/burp-0-r3.ebuild12
-rw-r--r--acct-user/burp/metadata.xml2
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r3.ebuild12
-rw-r--r--acct-user/burrow_exporter/metadata.xml8
-rw-r--r--acct-user/cadvisor/cadvisor-0-r1.ebuild12
-rw-r--r--acct-user/cadvisor/cadvisor-0-r3.ebuild12
-rw-r--r--acct-user/cadvisor/metadata.xml2
-rw-r--r--acct-user/cancd/cancd-0-r3.ebuild13
-rw-r--r--acct-user/cancd/metadata.xml8
-rw-r--r--acct-user/carbon/carbon-0-r1.ebuild12
-rw-r--r--acct-user/carbon/carbon-0-r3.ebuild12
-rw-r--r--acct-user/carbon/metadata.xml2
-rw-r--r--acct-user/ceph/ceph-0-r1.ebuild15
-rw-r--r--acct-user/ceph/ceph-0-r3.ebuild14
-rw-r--r--acct-user/ceph/metadata.xml2
-rw-r--r--acct-user/cgit/cgit-0-r2.ebuild13
-rw-r--r--acct-user/cgit/cgit-0.ebuild13
-rw-r--r--acct-user/cgit/metadata.xml2
-rw-r--r--acct-user/chronograf/chronograf-0-r1.ebuild13
-rw-r--r--acct-user/chronograf/chronograf-0-r3.ebuild13
-rw-r--r--acct-user/chronograf/metadata.xml2
-rw-r--r--acct-user/cinder/cinder-0-r1.ebuild14
-rw-r--r--acct-user/cinder/metadata.xml8
-rw-r--r--acct-user/clair/clair-0-r1.ebuild12
-rw-r--r--acct-user/clair/clair-0-r3.ebuild12
-rw-r--r--acct-user/clair/metadata.xml2
-rw-r--r--acct-user/clamav/clamav-0-r1.ebuild11
-rw-r--r--acct-user/clamav/clamav-0-r3.ebuild11
-rw-r--r--acct-user/clamav/metadata.xml2
-rw-r--r--acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild12
-rw-r--r--acct-user/cmd5checkpw/metadata.xml12
-rw-r--r--acct-user/cntlm/cntlm-0-r2.ebuild13
-rw-r--r--acct-user/cntlm/cntlm-0.ebuild13
-rw-r--r--acct-user/cntlm/metadata.xml2
-rw-r--r--acct-user/cockroach/cockroach-0-r2.ebuild15
-rw-r--r--acct-user/cockroach/metadata.xml8
-rw-r--r--acct-user/collectd/collectd-0-r2.ebuild14
-rw-r--r--acct-user/collectd/collectd-0.ebuild14
-rw-r--r--acct-user/collectd/metadata.xml6
-rw-r--r--acct-user/colord/colord-0-r2.ebuild13
-rw-r--r--acct-user/colord/colord-0.ebuild13
-rw-r--r--acct-user/colord/metadata.xml2
-rw-r--r--acct-user/consul-template/consul-template-0-r1.ebuild12
-rw-r--r--acct-user/consul-template/consul-template-0-r3.ebuild12
-rw-r--r--acct-user/consul-template/metadata.xml2
-rw-r--r--acct-user/consul/consul-0-r1.ebuild13
-rw-r--r--acct-user/consul/consul-0-r3.ebuild13
-rw-r--r--acct-user/consul/metadata.xml2
-rw-r--r--acct-user/consul_exporter/consul_exporter-0-r2.ebuild12
-rw-r--r--acct-user/consul_exporter/consul_exporter-0.ebuild12
-rw-r--r--acct-user/consul_exporter/metadata.xml2
-rw-r--r--acct-user/coredns/coredns-0-r2.ebuild14
-rw-r--r--acct-user/coredns/coredns-0.ebuild14
-rw-r--r--acct-user/coredns/metadata.xml2
-rw-r--r--acct-user/croc/croc-0-r2.ebuild12
-rw-r--r--acct-user/croc/croc-0.ebuild12
-rw-r--r--acct-user/croc/metadata.xml14
-rw-r--r--acct-user/cron/cron-0-r3.ebuild16
-rw-r--r--acct-user/cron/metadata.xml7
-rw-r--r--acct-user/cvmfs/cvmfs-0-r1.ebuild12
-rw-r--r--acct-user/cvmfs/cvmfs-0-r3.ebuild12
-rw-r--r--acct-user/cvmfs/metadata.xml2
-rw-r--r--acct-user/cyrus/cyrus-0-r2.ebuild12
-rw-r--r--acct-user/cyrus/cyrus-0-r4.ebuild12
-rw-r--r--acct-user/cyrus/metadata.xml2
-rw-r--r--acct-user/darkstat/darkstat-0-r2.ebuild12
-rw-r--r--acct-user/darkstat/darkstat-0.ebuild12
-rw-r--r--acct-user/darkstat/metadata.xml2
-rw-r--r--acct-user/davfs2/davfs2-0-r1.ebuild11
-rw-r--r--acct-user/davfs2/davfs2-0-r3.ebuild11
-rw-r--r--acct-user/davfs2/metadata.xml2
-rw-r--r--acct-user/dbmail/dbmail-0-r2.ebuild11
-rw-r--r--acct-user/dbmail/dbmail-0.ebuild11
-rw-r--r--acct-user/dbmail/metadata.xml2
-rw-r--r--acct-user/dbskkd/dbskkd-0-r2.ebuild13
-rw-r--r--acct-user/dbskkd/metadata.xml8
-rw-r--r--acct-user/ddclient/ddclient-0-r1.ebuild13
-rw-r--r--acct-user/ddclient/ddclient-0-r3.ebuild13
-rw-r--r--acct-user/ddclient/metadata.xml2
-rw-r--r--acct-user/defang/defang-0-r2.ebuild13
-rw-r--r--acct-user/defang/metadata.xml12
-rw-r--r--acct-user/dehydrated/dehydrated-0-r2.ebuild14
-rw-r--r--acct-user/dehydrated/dehydrated-0.ebuild14
-rw-r--r--acct-user/dehydrated/metadata.xml6
-rw-r--r--acct-user/deluge/deluge-0-r1.ebuild12
-rw-r--r--acct-user/deluge/deluge-0-r3.ebuild13
-rw-r--r--acct-user/deluge/metadata.xml2
-rw-r--r--acct-user/dhcp/dhcp-0-r1.ebuild12
-rw-r--r--acct-user/dhcp/dhcp-0-r3.ebuild12
-rw-r--r--acct-user/dhcp/metadata.xml2
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r1.ebuild13
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r3.ebuild13
-rw-r--r--acct-user/dhcpcd/metadata.xml2
-rw-r--r--acct-user/dictd/dictd-0-r2.ebuild12
-rw-r--r--acct-user/dictd/dictd-0.ebuild12
-rw-r--r--acct-user/dictd/metadata.xml2
-rw-r--r--acct-user/dirsrv/dirsrv-0-r2.ebuild12
-rw-r--r--acct-user/dirsrv/dirsrv-0.ebuild12
-rw-r--r--acct-user/dirsrv/metadata.xml2
-rw-r--r--acct-user/distcc/distcc-1-r2.ebuild12
-rw-r--r--acct-user/distcc/distcc-1.ebuild12
-rw-r--r--acct-user/distcc/metadata.xml2
-rw-r--r--acct-user/dnrd/dnrd-0-r2.ebuild13
-rw-r--r--acct-user/dnrd/dnrd-0.ebuild13
-rw-r--r--acct-user/dnrd/metadata.xml2
-rw-r--r--acct-user/dnscache/dnscache-0-r2.ebuild11
-rw-r--r--acct-user/dnscache/dnscache-0.ebuild11
-rw-r--r--acct-user/dnscache/metadata.xml2
-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/dnscrypt-proxy/metadata.xml2
-rw-r--r--acct-user/dnsdist/dnsdist-0-r1.ebuild13
-rw-r--r--acct-user/dnsdist/dnsdist-0-r3.ebuild13
-rw-r--r--acct-user/dnsdist/metadata.xml7
-rw-r--r--acct-user/dnslog/dnslog-0-r2.ebuild11
-rw-r--r--acct-user/dnslog/dnslog-0.ebuild11
-rw-r--r--acct-user/dnslog/metadata.xml2
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r1.ebuild13
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r3.ebuild13
-rw-r--r--acct-user/dnsmasq/metadata.xml2
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild12
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild12
-rw-r--r--acct-user/dnsmasq_exporter/metadata.xml2
-rw-r--r--acct-user/docker_auth/docker_auth-0-r1.ebuild12
-rw-r--r--acct-user/docker_auth/docker_auth-0-r3.ebuild12
-rw-r--r--acct-user/docker_auth/metadata.xml2
-rw-r--r--acct-user/dovecot/dovecot-0-r1.ebuild12
-rw-r--r--acct-user/dovecot/dovecot-0-r3.ebuild12
-rw-r--r--acct-user/dovecot/metadata.xml2
-rw-r--r--acct-user/dovenull/dovenull-0-r1.ebuild12
-rw-r--r--acct-user/dovenull/dovenull-0-r3.ebuild12
-rw-r--r--acct-user/dovenull/metadata.xml2
-rw-r--r--acct-user/drone/drone-0-r2.ebuild14
-rw-r--r--acct-user/drone/metadata.xml8
-rw-r--r--acct-user/duende/duende-0-r1.ebuild14
-rw-r--r--acct-user/duende/duende-0-r3.ebuild14
-rw-r--r--acct-user/duende/metadata.xml7
-rw-r--r--acct-user/ejabberd/ejabberd-2-r1.ebuild22
-rw-r--r--acct-user/ejabberd/metadata.xml11
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r1.ebuild13
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r3.ebuild13
-rw-r--r--acct-user/elasticsearch/metadata.xml2
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild12
-rw-r--r--acct-user/elasticsearch_exporter/metadata.xml8
-rw-r--r--acct-user/energi3/energi3-0-r2.ebuild12
-rw-r--r--acct-user/energi3/energi3-0.ebuild12
-rw-r--r--acct-user/energi3/metadata.xml2
-rw-r--r--acct-user/epmd/epmd-0-r1.ebuild12
-rw-r--r--acct-user/epmd/epmd-0-r3.ebuild12
-rw-r--r--acct-user/epmd/metadata.xml10
-rw-r--r--acct-user/err/err-0-r2.ebuild11
-rw-r--r--acct-user/err/err-0.ebuild11
-rw-r--r--acct-user/err/metadata.xml11
-rw-r--r--acct-user/etcd/etcd-0-r1.ebuild14
-rw-r--r--acct-user/etcd/etcd-0-r3.ebuild14
-rw-r--r--acct-user/etcd/metadata.xml2
-rw-r--r--acct-user/exabgp/exabgp-0-r1.ebuild13
-rw-r--r--acct-user/exabgp/exabgp-0-r3.ebuild13
-rw-r--r--acct-user/exabgp/metadata.xml2
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0-r2.ebuild14
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0.ebuild14
-rw-r--r--acct-user/ez-ipupd/metadata.xml2
-rw-r--r--acct-user/fax/fax-0-r2.ebuild13
-rw-r--r--acct-user/fax/fax-0.ebuild13
-rw-r--r--acct-user/fax/metadata.xml2
-rw-r--r--acct-user/fcron/fcron-0-r2.ebuild13
-rw-r--r--acct-user/fcron/metadata.xml5
-rw-r--r--acct-user/fdm/fdm-0-r2.ebuild13
-rw-r--r--acct-user/fdm/fdm-0.ebuild13
-rw-r--r--acct-user/fdm/metadata.xml2
-rw-r--r--acct-user/fetchmail/fetchmail-0-r1.ebuild14
-rw-r--r--acct-user/fetchmail/fetchmail-0-r3.ebuild14
-rw-r--r--acct-user/fetchmail/metadata.xml2
-rw-r--r--acct-user/fhem/fhem-0-r1.ebuild14
-rw-r--r--acct-user/fhem/fhem-0-r3.ebuild14
-rw-r--r--acct-user/fhem/metadata.xml2
-rw-r--r--acct-user/firebird/firebird-0-r3.ebuild18
-rw-r--r--acct-user/firebird/metadata.xml7
-rw-r--r--acct-user/flatpak/flatpak-0-r2.ebuild10
-rw-r--r--acct-user/flatpak/flatpak-0.ebuild10
-rw-r--r--acct-user/flatpak/metadata.xml2
-rw-r--r--acct-user/flows/flows-0-r2.ebuild13
-rw-r--r--acct-user/flows/flows-0.ebuild13
-rw-r--r--acct-user/flows/metadata.xml2
-rw-r--r--acct-user/fluentd/fluentd-0-r3.ebuild12
-rw-r--r--acct-user/fluentd/metadata.xml12
-rw-r--r--acct-user/fnord/fnord-0-r2.ebuild14
-rw-r--r--acct-user/fnord/fnord-0.ebuild14
-rw-r--r--acct-user/fnord/metadata.xml2
-rw-r--r--acct-user/fnordlog/fnordlog-0-r2.ebuild14
-rw-r--r--acct-user/fnordlog/fnordlog-0.ebuild14
-rw-r--r--acct-user/fnordlog/metadata.xml2
-rw-r--r--acct-user/foldingathome/foldingathome-0-r2.ebuild14
-rw-r--r--acct-user/foldingathome/metadata.xml8
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0-r2.ebuild14
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0.ebuild14
-rw-r--r--acct-user/fp-multiuser/metadata.xml2
-rw-r--r--acct-user/freenet/freenet-0-r2.ebuild14
-rw-r--r--acct-user/freenet/freenet-0.ebuild14
-rw-r--r--acct-user/freenet/metadata.xml7
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild13
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild13
-rw-r--r--acct-user/fritzbox_smarthome_exporter/metadata.xml7
-rw-r--r--acct-user/frr/frr-0-r2.ebuild11
-rw-r--r--acct-user/frr/frr-0.ebuild11
-rw-r--r--acct-user/frr/metadata.xml16
-rw-r--r--acct-user/ftp/ftp-0-r1.ebuild14
-rw-r--r--acct-user/ftp/ftp-0-r5.ebuild15
-rw-r--r--acct-user/ftp/metadata.xml8
-rw-r--r--acct-user/ftpproxy/ftpproxy-0-r2.ebuild15
-rw-r--r--acct-user/ftpproxy/metadata.xml12
-rw-r--r--acct-user/gatling/gatling-0-r1.ebuild12
-rw-r--r--acct-user/gatling/gatling-0-r3.ebuild12
-rw-r--r--acct-user/gatling/metadata.xml2
-rw-r--r--acct-user/gauth/gauth-0-r2.ebuild13
-rw-r--r--acct-user/gauth/metadata.xml8
-rw-r--r--acct-user/gdm/gdm-0-r2.ebuild13
-rw-r--r--acct-user/gdm/gdm-0.ebuild13
-rw-r--r--acct-user/gdm/metadata.xml2
-rw-r--r--acct-user/geneweb/geneweb-0-r1.ebuild14
-rw-r--r--acct-user/geneweb/geneweb-0-r3.ebuild14
-rw-r--r--acct-user/geneweb/metadata.xml2
-rw-r--r--acct-user/geoclue/geoclue-0-r2.ebuild13
-rw-r--r--acct-user/geoclue/geoclue-0.ebuild13
-rw-r--r--acct-user/geoclue/metadata.xml2
-rw-r--r--acct-user/gerbera/gerbera-0-r1.ebuild13
-rw-r--r--acct-user/gerbera/gerbera-0-r3.ebuild13
-rw-r--r--acct-user/gerbera/metadata.xml7
-rw-r--r--acct-user/git/git-0-r1.ebuild29
-rw-r--r--acct-user/git/git-0-r3.ebuild30
-rw-r--r--acct-user/git/metadata.xml2
-rw-r--r--acct-user/github-exporter/github-exporter-0-r2.ebuild12
-rw-r--r--acct-user/github-exporter/github-exporter-0.ebuild12
-rw-r--r--acct-user/github-exporter/metadata.xml2
-rw-r--r--acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild16
-rw-r--r--acct-user/gitlab-runner/metadata.xml8
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r1.ebuild12
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r3.ebuild12
-rw-r--r--acct-user/gkrellmd/metadata.xml6
-rw-r--r--acct-user/glance/glance-0-r1.ebuild14
-rw-r--r--acct-user/glance/metadata.xml8
-rw-r--r--acct-user/gluster/gluster-0-r1.ebuild14
-rw-r--r--acct-user/gluster/gluster-0-r3.ebuild14
-rw-r--r--acct-user/gluster/metadata.xml2
-rw-r--r--acct-user/gns3/gns3-0-r1.ebuild12
-rw-r--r--acct-user/gns3/metadata.xml12
-rw-r--r--acct-user/gnump3d/gnump3d-0-r2.ebuild13
-rw-r--r--acct-user/gnump3d/metadata.xml8
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/metadata.xml2
-rw-r--r--acct-user/goaccess/goaccess-0-r1.ebuild13
-rw-r--r--acct-user/goaccess/metadata.xml12
-rw-r--r--acct-user/gopher/gopher-0-r2.ebuild12
-rw-r--r--acct-user/gopher/gopher-0.ebuild12
-rw-r--r--acct-user/gopher/metadata.xml12
-rw-r--r--acct-user/gopherd/gopherd-0-r2.ebuild14
-rw-r--r--acct-user/gopherd/metadata.xml8
-rw-r--r--acct-user/gpsd/gpsd-0-r2.ebuild13
-rw-r--r--acct-user/gpsd/gpsd-0-r4.ebuild13
-rw-r--r--acct-user/gpsd/metadata.xml2
-rw-r--r--acct-user/grafana/grafana-0-r1.ebuild13
-rw-r--r--acct-user/grafana/grafana-0-r3.ebuild13
-rw-r--r--acct-user/grafana/metadata.xml2
-rw-r--r--acct-user/graylog/graylog-0-r1.ebuild11
-rw-r--r--acct-user/graylog/graylog-0-r3.ebuild11
-rw-r--r--acct-user/graylog/metadata.xml15
-rw-r--r--acct-user/greetd/greetd-0-r1.ebuild12
-rw-r--r--acct-user/greetd/greetd-0-r3.ebuild12
-rw-r--r--acct-user/greetd/metadata.xml12
-rw-r--r--acct-user/grok_exporter/grok_exporter-0-r2.ebuild12
-rw-r--r--acct-user/grok_exporter/metadata.xml8
-rw-r--r--acct-user/groonga/groonga-0-r2.ebuild13
-rw-r--r--acct-user/groonga/groonga-0.ebuild13
-rw-r--r--acct-user/groonga/metadata.xml2
-rw-r--r--acct-user/gvm/gvm-0-r1.ebuild13
-rw-r--r--acct-user/gvm/gvm-0-r3.ebuild13
-rw-r--r--acct-user/gvm/metadata.xml2
-rw-r--r--acct-user/h2o/h2o-0-r2.ebuild13
-rw-r--r--acct-user/h2o/metadata.xml8
-rw-r--r--acct-user/hacluster/hacluster-0-r2.ebuild14
-rw-r--r--acct-user/hacluster/metadata.xml8
-rw-r--r--acct-user/haproxy/haproxy-0-r1.ebuild11
-rw-r--r--acct-user/haproxy/haproxy-0-r3.ebuild11
-rw-r--r--acct-user/haproxy/metadata.xml2
-rw-r--r--acct-user/havp/havp-0-r2.ebuild13
-rw-r--r--acct-user/havp/havp-0.ebuild14
-rw-r--r--acct-user/havp/metadata.xml2
-rw-r--r--acct-user/headscale/headscale-0-r1.ebuild15
-rw-r--r--acct-user/headscale/metadata.xml16
-rw-r--r--acct-user/heat/heat-0-r1.ebuild14
-rw-r--r--acct-user/heat/metadata.xml8
-rw-r--r--acct-user/hsqldb/hsqldb-0-r2.ebuild12
-rw-r--r--acct-user/hsqldb/hsqldb-0.ebuild12
-rw-r--r--acct-user/hsqldb/metadata.xml2
-rw-r--r--acct-user/http/http-0-r2.ebuild14
-rw-r--r--acct-user/http/http-0.ebuild14
-rw-r--r--acct-user/http/metadata.xml2
-rw-r--r--acct-user/i2p/i2p-0-r1.ebuild13
-rw-r--r--acct-user/i2p/i2p-0-r3.ebuild13
-rw-r--r--acct-user/i2p/metadata.xml2
-rw-r--r--acct-user/i2pd/i2pd-0-r1.ebuild14
-rw-r--r--acct-user/i2pd/i2pd-0-r3.ebuild14
-rw-r--r--acct-user/i2pd/metadata.xml2
-rw-r--r--acct-user/icecast/icecast-0-r2.ebuild13
-rw-r--r--acct-user/icecast/metadata.xml5
-rw-r--r--acct-user/icecream/icecream-0-r2.ebuild14
-rw-r--r--acct-user/icecream/metadata.xml8
-rw-r--r--acct-user/ices/ices-0-r2.ebuild13
-rw-r--r--acct-user/ices/metadata.xml8
-rw-r--r--acct-user/icinga/icinga-0-r1.ebuild13
-rw-r--r--acct-user/icinga/icinga-0-r3.ebuild13
-rw-r--r--acct-user/icinga/metadata.xml2
-rw-r--r--acct-user/icingadirector/icingadirector-0-r1.ebuild13
-rw-r--r--acct-user/icingadirector/metadata.xml8
-rw-r--r--acct-user/inadyn/inadyn-0-r1.ebuild14
-rw-r--r--acct-user/inadyn/metadata.xml8
-rw-r--r--acct-user/influxdb/influxdb-0-r1.ebuild13
-rw-r--r--acct-user/influxdb/influxdb-0-r3.ebuild13
-rw-r--r--acct-user/influxdb/metadata.xml2
-rw-r--r--acct-user/inspircd/inspircd-0-r1.ebuild12
-rw-r--r--acct-user/inspircd/inspircd-0-r3.ebuild12
-rw-r--r--acct-user/inspircd/metadata.xml2
-rw-r--r--acct-user/ipfs/ipfs-0-r1.ebuild14
-rw-r--r--acct-user/ipfs/ipfs-0-r3.ebuild14
-rw-r--r--acct-user/ipfs/metadata.xml2
-rw-r--r--acct-user/ippl/ippl-0-r1.ebuild12
-rw-r--r--acct-user/ippl/ippl-0-r3.ebuild12
-rw-r--r--acct-user/ippl/metadata.xml2
-rw-r--r--acct-user/ipsec/ipsec-0-r2.ebuild13
-rw-r--r--acct-user/ipsec/ipsec-0.ebuild13
-rw-r--r--acct-user/ipsec/metadata.xml2
-rw-r--r--acct-user/ipsentinel/ipsentinel-0-r2.ebuild13
-rw-r--r--acct-user/ipsentinel/metadata.xml8
-rw-r--r--acct-user/iroffer/iroffer-0-r2.ebuild11
-rw-r--r--acct-user/iroffer/iroffer-0.ebuild11
-rw-r--r--acct-user/iroffer/metadata.xml11
-rw-r--r--acct-user/jabber/jabber-0.ebuild13
-rw-r--r--acct-user/jabber/metadata.xml8
-rw-r--r--acct-user/jackett/jackett-0-r1.ebuild13
-rw-r--r--acct-user/jackett/metadata.xml20
-rw-r--r--acct-user/jellyfin/jellyfin-0-r2.ebuild12
-rw-r--r--acct-user/jellyfin/metadata.xml20
-rw-r--r--acct-user/jenkins/jenkins-0-r2.ebuild14
-rw-r--r--acct-user/jenkins/jenkins-0.ebuild14
-rw-r--r--acct-user/jenkins/metadata.xml2
-rw-r--r--acct-user/kafka/kafka-0-r1.ebuild15
-rw-r--r--acct-user/kafka/kafka-0-r3.ebuild15
-rw-r--r--acct-user/kafka/metadata.xml2
-rw-r--r--acct-user/kapacitor/kapacitor-0-r1.ebuild13
-rw-r--r--acct-user/kapacitor/kapacitor-0-r3.ebuild13
-rw-r--r--acct-user/kapacitor/metadata.xml2
-rw-r--r--acct-user/karma/karma-0-r2.ebuild13
-rw-r--r--acct-user/karma/metadata.xml8
-rw-r--r--acct-user/keystone/keystone-0-r1.ebuild14
-rw-r--r--acct-user/keystone/metadata.xml8
-rw-r--r--acct-user/kibana/kibana-0-r1.ebuild13
-rw-r--r--acct-user/kibana/kibana-0-r3.ebuild13
-rw-r--r--acct-user/kibana/metadata.xml2
-rw-r--r--acct-user/kismet/kismet-0-r1.ebuild15
-rw-r--r--acct-user/kismet/kismet-0-r3.ebuild15
-rw-r--r--acct-user/kismet/metadata.xml2
-rw-r--r--acct-user/knot-resolver/knot-resolver-0-r1.ebuild12
-rw-r--r--acct-user/knot-resolver/metadata.xml8
-rw-r--r--acct-user/knot/knot-0-r1.ebuild13
-rw-r--r--acct-user/knot/knot-0-r3.ebuild13
-rw-r--r--acct-user/knot/metadata.xml2
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild12
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r3.ebuild12
-rw-r--r--acct-user/kube-apiserver/metadata.xml2
-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-r3.ebuild12
-rw-r--r--acct-user/kube-controller-manager/metadata.xml2
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild12
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r3.ebuild12
-rw-r--r--acct-user/kube-scheduler/metadata.xml2
-rw-r--r--acct-user/ldap/ldap-0-r2.ebuild16
-rw-r--r--acct-user/ldap/ldap-0.ebuild16
-rw-r--r--acct-user/ldap/metadata.xml7
-rw-r--r--acct-user/libreoffice/libreoffice-0-r1.ebuild14
-rw-r--r--acct-user/libreoffice/metadata.xml8
-rw-r--r--acct-user/lidarr/lidarr-0-r1.ebuild13
-rw-r--r--acct-user/lidarr/metadata.xml20
-rw-r--r--acct-user/lightdm/lightdm-0-r1.ebuild14
-rw-r--r--acct-user/lightdm/metadata.xml8
-rw-r--r--acct-user/lighttpd/lighttpd-0-r1.ebuild12
-rw-r--r--acct-user/lighttpd/lighttpd-0-r3.ebuild12
-rw-r--r--acct-user/lighttpd/metadata.xml7
-rw-r--r--acct-user/litecoin/litecoin-0.ebuild14
-rw-r--r--acct-user/litecoin/metadata.xml5
-rw-r--r--acct-user/lldpd/lldpd-0-r1.ebuild13
-rw-r--r--acct-user/lldpd/lldpd-0-r3.ebuild13
-rw-r--r--acct-user/lldpd/metadata.xml2
-rw-r--r--acct-user/logcheck/logcheck-0-r3.ebuild23
-rw-r--r--acct-user/logcheck/logcheck-0.ebuild13
-rw-r--r--acct-user/logcheck/metadata.xml11
-rw-r--r--acct-user/logstash/logstash-0-r1.ebuild13
-rw-r--r--acct-user/logstash/logstash-0-r3.ebuild13
-rw-r--r--acct-user/logstash/metadata.xml2
-rw-r--r--acct-user/logsurfer/logsurfer-0-r2.ebuild13
-rw-r--r--acct-user/logsurfer/logsurfer-0.ebuild13
-rw-r--r--acct-user/logsurfer/metadata.xml2
-rw-r--r--acct-user/lxc/lxc-0-r2.ebuild12
-rw-r--r--acct-user/lxc/lxc-0.ebuild12
-rw-r--r--acct-user/lxc/metadata.xml2
-rw-r--r--acct-user/mail/mail-0-r1.ebuild15
-rw-r--r--acct-user/mail/mail-0-r3.ebuild15
-rw-r--r--acct-user/mail/metadata.xml2
-rw-r--r--acct-user/man/man-1-r1.ebuild11
-rw-r--r--acct-user/man/man-1-r3.ebuild11
-rw-r--r--acct-user/man/metadata.xml2
-rw-r--r--acct-user/maradns/maradns-0-r1.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r3.ebuild11
-rw-r--r--acct-user/maradns/metadata.xml7
-rw-r--r--acct-user/memcached/memcached-0-r1.ebuild12
-rw-r--r--acct-user/memcached/memcached-0-r3.ebuild12
-rw-r--r--acct-user/memcached/metadata.xml2
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0-r2.ebuild12
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0.ebuild12
-rw-r--r--acct-user/memcached_exporter/metadata.xml2
-rw-r--r--acct-user/messagebus/messagebus-0-r1.ebuild11
-rw-r--r--acct-user/messagebus/messagebus-0-r3.ebuild11
-rw-r--r--acct-user/messagebus/metadata.xml2
-rw-r--r--acct-user/metadata.xml5
-rw-r--r--acct-user/mgraph/metadata.xml2
-rw-r--r--acct-user/mgraph/mgraph-0-r2.ebuild14
-rw-r--r--acct-user/mgraph/mgraph-0.ebuild14
-rw-r--r--acct-user/microsoft-identity-broker/metadata.xml8
-rw-r--r--acct-user/microsoft-identity-broker/microsoft-identity-broker-0.ebuild12
-rw-r--r--acct-user/milter-regex/metadata.xml11
-rw-r--r--acct-user/milter-regex/milter-regex-0-r1.ebuild13
-rw-r--r--acct-user/milter-regex/milter-regex-0-r3.ebuild13
-rw-r--r--acct-user/minbif/metadata.xml5
-rw-r--r--acct-user/minbif/minbif-0.ebuild14
-rw-r--r--acct-user/minecraft/metadata.xml2
-rw-r--r--acct-user/minecraft/minecraft-0-r1.ebuild14
-rw-r--r--acct-user/minecraft/minecraft-0-r3.ebuild14
-rw-r--r--acct-user/minetest/metadata.xml2
-rw-r--r--acct-user/minetest/minetest-1-r1.ebuild14
-rw-r--r--acct-user/minetest/minetest-1-r3.ebuild14
-rw-r--r--acct-user/minidlna/metadata.xml2
-rw-r--r--acct-user/minidlna/minidlna-0-r2.ebuild11
-rw-r--r--acct-user/minidlna/minidlna-0.ebuild11
-rw-r--r--acct-user/miniflux/metadata.xml8
-rw-r--r--acct-user/miniflux/miniflux-0-r1.ebuild12
-rw-r--r--acct-user/minio/metadata.xml8
-rw-r--r--acct-user/minio/minio-0.ebuild13
-rw-r--r--acct-user/mogile/metadata.xml2
-rw-r--r--acct-user/mogile/mogile-0-r2.ebuild13
-rw-r--r--acct-user/mogile/mogile-0.ebuild13
-rw-r--r--acct-user/mongodb/metadata.xml2
-rw-r--r--acct-user/mongodb/mongodb-0-r1.ebuild13
-rw-r--r--acct-user/mongodb/mongodb-0-r3.ebuild13
-rw-r--r--acct-user/mongodb_exporter/metadata.xml2
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0-r2.ebuild12
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0.ebuild12
-rw-r--r--acct-user/monitorix/metadata.xml2
-rw-r--r--acct-user/monitorix/monitorix-0-r1.ebuild12
-rw-r--r--acct-user/monitorix/monitorix-0-r3.ebuild12
-rw-r--r--acct-user/monkeyd/metadata.xml5
-rw-r--r--acct-user/monkeyd/monkeyd-0-r2.ebuild15
-rw-r--r--acct-user/monkeysphere/metadata.xml2
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r1.ebuild16
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r3.ebuild16
-rw-r--r--acct-user/mosquitto/metadata.xml2
-rw-r--r--acct-user/mosquitto/mosquitto-0-r1.ebuild12
-rw-r--r--acct-user/mosquitto/mosquitto-0-r3.ebuild12
-rw-r--r--acct-user/motion/metadata.xml2
-rw-r--r--acct-user/motion/motion-0-r1.ebuild12
-rw-r--r--acct-user/motion/motion-0-r3.ebuild12
-rw-r--r--acct-user/mpd/metadata.xml10
-rw-r--r--acct-user/mpd/mpd-0-r1.ebuild13
-rw-r--r--acct-user/mpd/mpd-0-r3.ebuild13
-rw-r--r--acct-user/msmtpd/metadata.xml2
-rw-r--r--acct-user/msmtpd/msmtpd-0-r1.ebuild12
-rw-r--r--acct-user/msmtpd/msmtpd-0-r3.ebuild12
-rw-r--r--acct-user/munge/metadata.xml8
-rw-r--r--acct-user/munge/munge-0-r2.ebuild14
-rw-r--r--acct-user/munin-async/metadata.xml2
-rw-r--r--acct-user/munin-async/munin-async-0-r1.ebuild16
-rw-r--r--acct-user/munin-async/munin-async-0-r3.ebuild15
-rw-r--r--acct-user/munin/metadata.xml2
-rw-r--r--acct-user/munin/munin-0-r1.ebuild15
-rw-r--r--acct-user/munin/munin-0-r3.ebuild14
-rw-r--r--acct-user/murmur/metadata.xml10
-rw-r--r--acct-user/murmur/murmur-0-r1.ebuild15
-rw-r--r--acct-user/murmur/murmur-0-r3.ebuild15
-rw-r--r--acct-user/mysql/metadata.xml2
-rw-r--r--acct-user/mysql/mysql-0-r1.ebuild12
-rw-r--r--acct-user/mysql/mysql-0-r3.ebuild12
-rw-r--r--acct-user/mysqld_exporter/metadata.xml7
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild14
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r3.ebuild14
-rw-r--r--acct-user/mythtv/metadata.xml2
-rw-r--r--acct-user/mythtv/mythtv-0-r1.ebuild14
-rw-r--r--acct-user/mythtv/mythtv-0-r3.ebuild14
-rw-r--r--acct-user/nagios/metadata.xml2
-rw-r--r--acct-user/nagios/nagios-0-r1.ebuild11
-rw-r--r--acct-user/nagios/nagios-0-r3.ebuild11
-rw-r--r--acct-user/named/metadata.xml10
-rw-r--r--acct-user/named/named-0-r1.ebuild15
-rw-r--r--acct-user/named/named-0-r3.ebuild14
-rw-r--r--acct-user/netbox/metadata.xml5
-rw-r--r--acct-user/netbox/netbox-0-r1.ebuild13
-rw-r--r--acct-user/netdata/metadata.xml2
-rw-r--r--acct-user/netdata/netdata-1-r2.ebuild13
-rw-r--r--acct-user/netdata/netdata-1.ebuild13
-rw-r--r--acct-user/netperf/metadata.xml8
-rw-r--r--acct-user/netperf/netperf-0-r2.ebuild13
-rw-r--r--acct-user/neutron/metadata.xml8
-rw-r--r--acct-user/neutron/neutron-0-r1.ebuild14
-rw-r--r--acct-user/nginx-unit/metadata.xml7
-rw-r--r--acct-user/nginx-unit/nginx-unit-0-r1.ebuild12
-rw-r--r--acct-user/nginx-vts-exporter/metadata.xml2
-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-r3.ebuild12
-rw-r--r--acct-user/nginx/metadata.xml5
-rw-r--r--acct-user/nginx/nginx-0-r1.ebuild12
-rw-r--r--acct-user/ngircd/metadata.xml2
-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/metadata.xml17
-rw-r--r--acct-user/ngrep/ngrep-0-r3.ebuild13
-rw-r--r--acct-user/nm-openconnect/metadata.xml8
-rw-r--r--acct-user/nm-openconnect/nm-openconnect-0-r2.ebuild13
-rw-r--r--acct-user/nm-openvpn/metadata.xml8
-rw-r--r--acct-user/nm-openvpn/nm-openvpn-0-r2.ebuild13
-rw-r--r--acct-user/nobody/metadata.xml2
-rw-r--r--acct-user/nobody/nobody-0-r2.ebuild17
-rw-r--r--acct-user/nobody/nobody-0.ebuild17
-rw-r--r--acct-user/node_exporter/metadata.xml2
-rw-r--r--acct-user/node_exporter/node_exporter-0-r1.ebuild12
-rw-r--r--acct-user/node_exporter/node_exporter-0-r3.ebuild12
-rw-r--r--acct-user/notary/metadata.xml2
-rw-r--r--acct-user/notary/notary-0-r2.ebuild13
-rw-r--r--acct-user/notary/notary-0.ebuild13
-rw-r--r--acct-user/nova/metadata.xml8
-rw-r--r--acct-user/nova/nova-0-r1.ebuild14
-rw-r--r--acct-user/nsd/metadata.xml6
-rw-r--r--acct-user/nsd/nsd-0-r1.ebuild12
-rw-r--r--acct-user/nsd/nsd-0-r3.ebuild12
-rw-r--r--acct-user/nslcd/metadata.xml2
-rw-r--r--acct-user/nslcd/nslcd-0-r1.ebuild13
-rw-r--r--acct-user/nslcd/nslcd-0-r3.ebuild13
-rw-r--r--acct-user/ntopng/metadata.xml2
-rw-r--r--acct-user/ntopng/ntopng-0-r2.ebuild12
-rw-r--r--acct-user/ntopng/ntopng-0.ebuild12
-rw-r--r--acct-user/ntp/metadata.xml2
-rw-r--r--acct-user/ntp/ntp-0-r1.ebuild12
-rw-r--r--acct-user/ntp/ntp-0-r3.ebuild12
-rw-r--r--acct-user/nullmail/metadata.xml8
-rw-r--r--acct-user/nullmail/nullmail-0-r2.ebuild14
-rw-r--r--acct-user/nut/metadata.xml8
-rw-r--r--acct-user/nut/nut-0-r3.ebuild14
-rw-r--r--acct-user/nvpd/metadata.xml2
-rw-r--r--acct-user/nvpd/nvpd-0-r2.ebuild12
-rw-r--r--acct-user/nvpd/nvpd-0.ebuild12
-rw-r--r--acct-user/nzbget/metadata.xml2
-rw-r--r--acct-user/nzbget/nzbget-0-r2.ebuild16
-rw-r--r--acct-user/nzbget/nzbget-0.ebuild16
-rw-r--r--acct-user/oidentd/metadata.xml2
-rw-r--r--acct-user/oidentd/oidentd-0-r1.ebuild11
-rw-r--r--acct-user/oidentd/oidentd-0-r3.ebuild11
-rw-r--r--acct-user/openctd/metadata.xml2
-rw-r--r--acct-user/openctd/openctd-0-r2.ebuild13
-rw-r--r--acct-user/openctd/openctd-0.ebuild13
-rw-r--r--acct-user/opendkim/metadata.xml6
-rw-r--r--acct-user/opendkim/opendkim-0-r1.ebuild13
-rw-r--r--acct-user/opendkim/opendkim-0-r3.ebuild13
-rw-r--r--acct-user/opendmarc/metadata.xml2
-rw-r--r--acct-user/opendmarc/opendmarc-0-r2.ebuild16
-rw-r--r--acct-user/opendmarc/opendmarc-0.ebuild16
-rw-r--r--acct-user/opendnssec/metadata.xml7
-rw-r--r--acct-user/opendnssec/opendnssec-0-r2.ebuild13
-rw-r--r--acct-user/openhab/metadata.xml8
-rw-r--r--acct-user/openhab/openhab-0.ebuild13
-rw-r--r--acct-user/openntpd/metadata.xml2
-rw-r--r--acct-user/openntpd/openntpd-0-r1.ebuild14
-rw-r--r--acct-user/openntpd/openntpd-0-r3.ebuild14
-rw-r--r--acct-user/openrct2/metadata.xml2
-rw-r--r--acct-user/openrct2/openrct2-0-r1.ebuild13
-rw-r--r--acct-user/openrct2/openrct2-0-r3.ebuild13
-rw-r--r--acct-user/openttd/metadata.xml8
-rw-r--r--acct-user/openttd/openttd-0-r1.ebuild14
-rw-r--r--acct-user/openvpn/metadata.xml2
-rw-r--r--acct-user/openvpn/openvpn-0-r1.ebuild13
-rw-r--r--acct-user/openvpn/openvpn-0-r3.ebuild13
-rw-r--r--acct-user/openvpn_exporter/metadata.xml2
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild13
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r3.ebuild13
-rw-r--r--acct-user/opm/metadata.xml8
-rw-r--r--acct-user/opm/opm-0-r2.ebuild12
-rw-r--r--acct-user/oprofile/metadata.xml7
-rw-r--r--acct-user/oprofile/oprofile-0-r1.ebuild12
-rw-r--r--acct-user/oprofile/oprofile-0-r3.ebuild12
-rw-r--r--acct-user/oragono/metadata.xml2
-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/metadata.xml11
-rw-r--r--acct-user/ossec/ossec-0-r1.ebuild13
-rw-r--r--acct-user/ossec/ossec-0-r3.ebuild13
-rw-r--r--acct-user/ossecm/metadata.xml11
-rw-r--r--acct-user/ossecm/ossecm-0-r1.ebuild12
-rw-r--r--acct-user/ossecm/ossecm-0-r3.ebuild12
-rw-r--r--acct-user/ossecr/metadata.xml11
-rw-r--r--acct-user/ossecr/ossecr-0-r1.ebuild12
-rw-r--r--acct-user/ossecr/ossecr-0-r3.ebuild12
-rw-r--r--acct-user/owntracks/metadata.xml8
-rw-r--r--acct-user/owntracks/owntracks-0-r1.ebuild12
-rw-r--r--acct-user/p2p/metadata.xml2
-rw-r--r--acct-user/p2p/p2p-0-r2.ebuild12
-rw-r--r--acct-user/p2p/p2p-0.ebuild12
-rw-r--r--acct-user/partimag/metadata.xml8
-rw-r--r--acct-user/partimag/partimag-0-r1.ebuild14
-rw-r--r--acct-user/pcap/metadata.xml10
-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/metadata.xml7
-rw-r--r--acct-user/pcscd/pcscd-0-r1.ebuild12
-rw-r--r--acct-user/pcscd/pcscd-0-r3.ebuild12
-rw-r--r--acct-user/pdns/metadata.xml2
-rw-r--r--acct-user/pdns/pdns-0-r1.ebuild11
-rw-r--r--acct-user/pdns/pdns-0-r3.ebuild11
-rw-r--r--acct-user/pdnsd/metadata.xml7
-rw-r--r--acct-user/pdnsd/pdnsd-0-r1.ebuild14
-rw-r--r--acct-user/pdnsd/pdnsd-0-r3.ebuild14
-rw-r--r--acct-user/pgagent/metadata.xml8
-rw-r--r--acct-user/pgagent/pgagent-0-r1.ebuild22
-rw-r--r--acct-user/pgbouncer/metadata.xml2
-rw-r--r--acct-user/pgbouncer/pgbouncer-0-r2.ebuild12
-rw-r--r--acct-user/pgbouncer/pgbouncer-0.ebuild12
-rw-r--r--acct-user/pgpool/metadata.xml8
-rw-r--r--acct-user/pgpool/pgpool-0-r1.ebuild13
-rw-r--r--acct-user/pipewire/metadata.xml12
-rw-r--r--acct-user/pipewire/pipewire-1-r2.ebuild13
-rw-r--r--acct-user/placement/metadata.xml8
-rw-r--r--acct-user/placement/placement-0-r1.ebuild14
-rw-r--r--acct-user/plex/metadata.xml2
-rw-r--r--acct-user/plex/plex-0-r1.ebuild13
-rw-r--r--acct-user/plex/plex-0-r3.ebuild13
-rw-r--r--acct-user/polkitd/metadata.xml2
-rw-r--r--acct-user/polkitd/polkitd-0-r1.ebuild12
-rw-r--r--acct-user/polkitd/polkitd-0-r3.ebuild12
-rw-r--r--acct-user/polw/metadata.xml2
-rw-r--r--acct-user/polw/polw-0-r2.ebuild13
-rw-r--r--acct-user/polw/polw-0.ebuild13
-rw-r--r--acct-user/popa3d/metadata.xml2
-rw-r--r--acct-user/popa3d/popa3d-0-r2.ebuild12
-rw-r--r--acct-user/popa3d/popa3d-0.ebuild12
-rw-r--r--acct-user/portage/metadata.xml2
-rw-r--r--acct-user/portage/portage-0-r3.ebuild12
-rw-r--r--acct-user/portage/portage-0.ebuild12
-rw-r--r--acct-user/postfix/metadata.xml2
-rw-r--r--acct-user/postfix/postfix-0-r1.ebuild12
-rw-r--r--acct-user/postfix/postfix-0-r3.ebuild12
-rw-r--r--acct-user/postfix_exporter/metadata.xml2
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild13
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r3.ebuild13
-rw-r--r--acct-user/postfwd/metadata.xml8
-rw-r--r--acct-user/postfwd/postfwd-0-r2.ebuild13
-rw-r--r--acct-user/postgres/metadata.xml2
-rw-r--r--acct-user/postgres/postgres-0-r1.ebuild15
-rw-r--r--acct-user/postgres/postgres-0-r3.ebuild15
-rw-r--r--acct-user/postgres_exporter/metadata.xml2
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0-r2.ebuild12
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0.ebuild12
-rw-r--r--acct-user/postgrey/metadata.xml2
-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/metadata.xml2
-rw-r--r--acct-user/postmaster/postmaster-0-r1.ebuild15
-rw-r--r--acct-user/postmaster/postmaster-0-r3.ebuild15
-rw-r--r--acct-user/privoxy/metadata.xml10
-rw-r--r--acct-user/privoxy/privoxy-0-r1.ebuild12
-rw-r--r--acct-user/privoxy/privoxy-0-r3.ebuild12
-rw-r--r--acct-user/prometheus/metadata.xml2
-rw-r--r--acct-user/prometheus/prometheus-0-r1.ebuild13
-rw-r--r--acct-user/prometheus/prometheus-0-r3.ebuild13
-rw-r--r--acct-user/prosody/metadata.xml8
-rw-r--r--acct-user/prosody/prosody-0-r1.ebuild13
-rw-r--r--acct-user/prowlarr/metadata.xml21
-rw-r--r--acct-user/prowlarr/prowlarr-0-r1.ebuild13
-rw-r--r--acct-user/psybnc/metadata.xml2
-rw-r--r--acct-user/psybnc/psybnc-0-r2.ebuild14
-rw-r--r--acct-user/psybnc/psybnc-0.ebuild14
-rw-r--r--acct-user/pulse/metadata.xml2
-rw-r--r--acct-user/pulse/pulse-0-r2.ebuild13
-rw-r--r--acct-user/pulse/pulse-0.ebuild13
-rw-r--r--acct-user/puppet/metadata.xml2
-rw-r--r--acct-user/puppet/puppet-0-r1.ebuild14
-rw-r--r--acct-user/puppet/puppet-0-r3.ebuild14
-rw-r--r--acct-user/puppetdb/metadata.xml2
-rw-r--r--acct-user/puppetdb/puppetdb-0-r1.ebuild14
-rw-r--r--acct-user/puppetdb/puppetdb-0-r3.ebuild14
-rw-r--r--acct-user/pushgateway/metadata.xml8
-rw-r--r--acct-user/pushgateway/pushgateway-0-r2.ebuild13
-rw-r--r--acct-user/pvpgn/metadata.xml2
-rw-r--r--acct-user/pvpgn/pvpgn-0-r2.ebuild12
-rw-r--r--acct-user/pvpgn/pvpgn-0.ebuild12
-rw-r--r--acct-user/qbittorrent/metadata.xml12
-rw-r--r--acct-user/qbittorrent/qbittorrent-0.ebuild14
-rw-r--r--acct-user/qemu/metadata.xml2
-rw-r--r--acct-user/qemu/qemu-0-r1.ebuild11
-rw-r--r--acct-user/qemu/qemu-0-r3.ebuild11
-rw-r--r--acct-user/qmaild/metadata.xml2
-rw-r--r--acct-user/qmaild/qmaild-0-r1.ebuild12
-rw-r--r--acct-user/qmaild/qmaild-0-r3.ebuild12
-rw-r--r--acct-user/qmaill/metadata.xml2
-rw-r--r--acct-user/qmaill/qmaill-0-r1.ebuild12
-rw-r--r--acct-user/qmaill/qmaill-0-r3.ebuild12
-rw-r--r--acct-user/qmailp/metadata.xml2
-rw-r--r--acct-user/qmailp/qmailp-0-r1.ebuild12
-rw-r--r--acct-user/qmailp/qmailp-0-r3.ebuild12
-rw-r--r--acct-user/qmailq/metadata.xml2
-rw-r--r--acct-user/qmailq/qmailq-0-r1.ebuild12
-rw-r--r--acct-user/qmailq/qmailq-0-r3.ebuild12
-rw-r--r--acct-user/qmailr/metadata.xml2
-rw-r--r--acct-user/qmailr/qmailr-0-r1.ebuild12
-rw-r--r--acct-user/qmailr/qmailr-0-r3.ebuild12
-rw-r--r--acct-user/qmails/metadata.xml2
-rw-r--r--acct-user/qmails/qmails-0-r1.ebuild12
-rw-r--r--acct-user/qmails/qmails-0-r3.ebuild12
-rw-r--r--acct-user/quagga/metadata.xml8
-rw-r--r--acct-user/quagga/quagga-0-r1.ebuild11
-rw-r--r--acct-user/quassel/metadata.xml2
-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/metadata.xml8
-rw-r--r--acct-user/rabbitmq/rabbitmq-0-r2.ebuild15
-rw-r--r--acct-user/rabbitmq_exporter/metadata.xml8
-rw-r--r--acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild12
-rw-r--r--acct-user/radarr/metadata.xml21
-rw-r--r--acct-user/radarr/radarr-0-r1.ebuild13
-rw-r--r--acct-user/radicale/metadata.xml6
-rw-r--r--acct-user/radicale/radicale-0-r1.ebuild12
-rw-r--r--acct-user/radicale/radicale-0-r4.ebuild13
-rw-r--r--acct-user/radius/metadata.xml13
-rw-r--r--acct-user/radius/radius-0-r1.ebuild11
-rw-r--r--acct-user/radius/radius-0-r3.ebuild11
-rw-r--r--acct-user/radvd/metadata.xml8
-rw-r--r--acct-user/radvd/radvd-0-r2.ebuild13
-rw-r--r--acct-user/rbldns/metadata.xml2
-rw-r--r--acct-user/rbldns/rbldns-0-r1.ebuild11
-rw-r--r--acct-user/rbldns/rbldns-0-r3.ebuild11
-rw-r--r--acct-user/rbot/metadata.xml8
-rw-r--r--acct-user/rbot/rbot-0-r2.ebuild14
-rw-r--r--acct-user/readarr/metadata.xml21
-rw-r--r--acct-user/readarr/readarr-0-r1.ebuild13
-rw-r--r--acct-user/redict/metadata.xml12
-rw-r--r--acct-user/redict/redict-0.ebuild11
-rw-r--r--acct-user/redis/metadata.xml9
-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/metadata.xml2
-rw-r--r--acct-user/redis_exporter/redis_exporter-0-r2.ebuild14
-rw-r--r--acct-user/redis_exporter/redis_exporter-0.ebuild14
-rw-r--r--acct-user/redmine/metadata.xml2
-rw-r--r--acct-user/redmine/redmine-0-r1.ebuild11
-rw-r--r--acct-user/redmine/redmine-0-r3.ebuild11
-rw-r--r--acct-user/redsocks/metadata.xml8
-rw-r--r--acct-user/redsocks/redsocks-0-r3.ebuild13
-rw-r--r--acct-user/reg/metadata.xml8
-rw-r--r--acct-user/reg/reg-0-r3.ebuild13
-rw-r--r--acct-user/registry/metadata.xml7
-rw-r--r--acct-user/registry/registry-0-r2.ebuild13
-rw-r--r--acct-user/root/metadata.xml2
-rw-r--r--acct-user/root/root-0-r1.ebuild20
-rw-r--r--acct-user/root/root-0-r3.ebuild24
-rw-r--r--acct-user/rrdcached/metadata.xml12
-rw-r--r--acct-user/rrdcached/rrdcached-0-r1.ebuild14
-rw-r--r--acct-user/rslsync/metadata.xml12
-rw-r--r--acct-user/rslsync/rslsync-0-r2.ebuild15
-rw-r--r--acct-user/rspamd/metadata.xml14
-rw-r--r--acct-user/rspamd/rspamd-0-r1.ebuild12
-rw-r--r--acct-user/rspamd/rspamd-0-r3.ebuild12
-rw-r--r--acct-user/rstudio-server/metadata.xml8
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r1.ebuild12
-rw-r--r--acct-user/rt/metadata.xml12
-rw-r--r--acct-user/rt/rt-0-r1.ebuild13
-rw-r--r--acct-user/rtkit/metadata.xml2
-rw-r--r--acct-user/rtkit/rtkit-0-r1.ebuild12
-rw-r--r--acct-user/rtkit/rtkit-0-r3.ebuild12
-rw-r--r--acct-user/rwhoisd/metadata.xml2
-rw-r--r--acct-user/rwhoisd/rwhoisd-0-r2.ebuild14
-rw-r--r--acct-user/rwhoisd/rwhoisd-0.ebuild14
-rw-r--r--acct-user/sabnzbd/metadata.xml7
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r1.ebuild15
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r3.ebuild15
-rw-r--r--acct-user/sagan/metadata.xml2
-rw-r--r--acct-user/sagan/sagan-0-r1.ebuild12
-rw-r--r--acct-user/sagan/sagan-0-r3.ebuild12
-rw-r--r--acct-user/samplicator/metadata.xml12
-rw-r--r--acct-user/samplicator/samplicator-0-r2.ebuild14
-rw-r--r--acct-user/sancp/metadata.xml2
-rw-r--r--acct-user/sancp/sancp-0-r2.ebuild12
-rw-r--r--acct-user/sancp/sancp-0.ebuild12
-rw-r--r--acct-user/sandmann/metadata.xml8
-rw-r--r--acct-user/sandmann/sandmann-0.ebuild12
-rw-r--r--acct-user/saned/metadata.xml2
-rw-r--r--acct-user/saned/saned-0-r2.ebuild13
-rw-r--r--acct-user/saned/saned-0.ebuild13
-rw-r--r--acct-user/sanlock/metadata.xml2
-rw-r--r--acct-user/sanlock/sanlock-0-r1.ebuild13
-rw-r--r--acct-user/sanlock/sanlock-0-r3.ebuild13
-rw-r--r--acct-user/sauerbraten/metadata.xml2
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r1.ebuild12
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r3.ebuild12
-rw-r--r--acct-user/scanlogd/metadata.xml8
-rw-r--r--acct-user/scanlogd/scanlogd-0-r2.ebuild13
-rw-r--r--acct-user/scponly/metadata.xml2
-rw-r--r--acct-user/scponly/scponly-0-r1.ebuild15
-rw-r--r--acct-user/scponly/scponly-0-r3.ebuild15
-rw-r--r--acct-user/sddm/metadata.xml12
-rw-r--r--acct-user/sddm/sddm-0-r1.ebuild14
-rw-r--r--acct-user/sendpage/metadata.xml2
-rw-r--r--acct-user/sendpage/sendpage-0-r2.ebuild13
-rw-r--r--acct-user/sendpage/sendpage-0.ebuild13
-rw-r--r--acct-user/serf/metadata.xml2
-rw-r--r--acct-user/serf/serf-0-r2.ebuild14
-rw-r--r--acct-user/serf/serf-0.ebuild14
-rw-r--r--acct-user/shellinaboxd/metadata.xml12
-rw-r--r--acct-user/shellinaboxd/shellinaboxd-0-r1.ebuild12
-rw-r--r--acct-user/sigh/metadata.xml16
-rw-r--r--acct-user/sigh/sigh-0.ebuild11
-rw-r--r--acct-user/sks/metadata.xml2
-rw-r--r--acct-user/sks/sks-0-r2.ebuild12
-rw-r--r--acct-user/sks/sks-0.ebuild12
-rw-r--r--acct-user/slurm/metadata.xml2
-rw-r--r--acct-user/slurm/slurm-0-r1.ebuild14
-rw-r--r--acct-user/slurm/slurm-0-r3.ebuild14
-rw-r--r--acct-user/smmsp/metadata.xml2
-rw-r--r--acct-user/smmsp/smmsp-0-r2.ebuild12
-rw-r--r--acct-user/smmsp/smmsp-0-r4.ebuild12
-rw-r--r--acct-user/smsd/metadata.xml2
-rw-r--r--acct-user/smsd/smsd-0-r2.ebuild12
-rw-r--r--acct-user/smsd/smsd-0.ebuild12
-rw-r--r--acct-user/smtpd/metadata.xml2
-rw-r--r--acct-user/smtpd/smtpd-0-r1.ebuild13
-rw-r--r--acct-user/smtpd/smtpd-0-r3.ebuild13
-rw-r--r--acct-user/smtpq/metadata.xml2
-rw-r--r--acct-user/smtpq/smtpq-0-r1.ebuild13
-rw-r--r--acct-user/smtpq/smtpq-0-r3.ebuild13
-rw-r--r--acct-user/snapclient/metadata.xml12
-rw-r--r--acct-user/snapclient/snapclient-0-r2.ebuild15
-rw-r--r--acct-user/snapclient/snapclient-0.ebuild15
-rw-r--r--acct-user/snapserver/metadata.xml12
-rw-r--r--acct-user/snapserver/snapserver-0-r2.ebuild14
-rw-r--r--acct-user/snapserver/snapserver-0.ebuild15
-rw-r--r--acct-user/sndiod/metadata.xml2
-rw-r--r--acct-user/sndiod/sndiod-0-r2.ebuild12
-rw-r--r--acct-user/sndiod/sndiod-0.ebuild12
-rw-r--r--acct-user/sniproxy/metadata.xml2
-rw-r--r--acct-user/sniproxy/sniproxy-0-r2.ebuild11
-rw-r--r--acct-user/sniproxy/sniproxy-0.ebuild11
-rw-r--r--acct-user/snmp_exporter/metadata.xml8
-rw-r--r--acct-user/snmp_exporter/snmp_exporter-0-r2.ebuild12
-rw-r--r--acct-user/snort/metadata.xml2
-rw-r--r--acct-user/snort/snort-0-r2.ebuild12
-rw-r--r--acct-user/snort/snort-0.ebuild12
-rw-r--r--acct-user/sobby/metadata.xml5
-rw-r--r--acct-user/sobby/sobby-0.ebuild14
-rw-r--r--acct-user/sobexsrv/metadata.xml7
-rw-r--r--acct-user/sobexsrv/sobexsrv-0-r2.ebuild13
-rw-r--r--acct-user/sobexsrv/sobexsrv-0.ebuild13
-rw-r--r--acct-user/sockd/metadata.xml8
-rw-r--r--acct-user/sockd/sockd-0-r3.ebuild13
-rw-r--r--acct-user/sogo/metadata.xml2
-rw-r--r--acct-user/sogo/sogo-0-r1.ebuild14
-rw-r--r--acct-user/sogo/sogo-0-r3.ebuild14
-rw-r--r--acct-user/soju/metadata.xml12
-rw-r--r--acct-user/soju/soju-0-r1.ebuild14
-rw-r--r--acct-user/sonarr/metadata.xml20
-rw-r--r--acct-user/sonarr/sonarr-0-r1.ebuild13
-rw-r--r--acct-user/spamd/metadata.xml2
-rw-r--r--acct-user/spamd/spamd-0-r1.ebuild25
-rw-r--r--acct-user/spamd/spamd-0-r3.ebuild25
-rw-r--r--acct-user/spectrum/metadata.xml2
-rw-r--r--acct-user/spectrum/spectrum-0-r1.ebuild14
-rw-r--r--acct-user/spectrum/spectrum-0-r3.ebuild14
-rw-r--r--acct-user/spire/metadata.xml2
-rw-r--r--acct-user/spire/spire-0-r1.ebuild12
-rw-r--r--acct-user/spire/spire-0-r3.ebuild12
-rw-r--r--acct-user/sqlgrey/metadata.xml2
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r1.ebuild14
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r3.ebuild14
-rw-r--r--acct-user/squid/metadata.xml12
-rw-r--r--acct-user/squid/squid-0-r1.ebuild13
-rw-r--r--acct-user/squid/squid-0-r3.ebuild13
-rw-r--r--acct-user/sshd/metadata.xml2
-rw-r--r--acct-user/sshd/sshd-0-r1.ebuild15
-rw-r--r--acct-user/sshd/sshd-0-r3.ebuild15
-rw-r--r--acct-user/sstpc/metadata.xml2
-rw-r--r--acct-user/sstpc/sstpc-0-r2.ebuild13
-rw-r--r--acct-user/sstpc/sstpc-0.ebuild13
-rw-r--r--acct-user/stdiscosrv/metadata.xml2
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-0-r1.ebuild14
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild27
-rw-r--r--acct-user/steamcmd/metadata.xml2
-rw-r--r--acct-user/steamcmd/steamcmd-0-r1.ebuild14
-rw-r--r--acct-user/steamcmd/steamcmd-0-r3.ebuild14
-rw-r--r--acct-user/strelaysrv/metadata.xml2
-rw-r--r--acct-user/strelaysrv/strelaysrv-0-r1.ebuild14
-rw-r--r--acct-user/strelaysrv/strelaysrv-1-r1.ebuild27
-rw-r--r--acct-user/stubby/metadata.xml7
-rw-r--r--acct-user/stubby/stubby-0-r1.ebuild12
-rw-r--r--acct-user/stubby/stubby-0-r3.ebuild12
-rw-r--r--acct-user/stunnel/metadata.xml7
-rw-r--r--acct-user/stunnel/stunnel-0-r1.ebuild12
-rw-r--r--acct-user/stunnel/stunnel-0-r3.ebuild12
-rw-r--r--acct-user/subsonic/metadata.xml8
-rw-r--r--acct-user/subsonic/subsonic-0-r3.ebuild14
-rw-r--r--acct-user/suricata/metadata.xml2
-rw-r--r--acct-user/suricata/suricata-0-r1.ebuild12
-rw-r--r--acct-user/suricata/suricata-0-r3.ebuild12
-rw-r--r--acct-user/svn/metadata.xml6
-rw-r--r--acct-user/svn/svn-0-r1.ebuild11
-rw-r--r--acct-user/svn/svn-0-r3.ebuild11
-rw-r--r--acct-user/svxlink/metadata.xml2
-rw-r--r--acct-user/svxlink/svxlink-0-r2.ebuild12
-rw-r--r--acct-user/svxlink/svxlink-0.ebuild12
-rw-r--r--acct-user/swift/metadata.xml8
-rw-r--r--acct-user/swift/swift-0-r1.ebuild12
-rw-r--r--acct-user/synapse/metadata.xml8
-rw-r--r--acct-user/synapse/synapse-0-r1.ebuild12
-rw-r--r--acct-user/syncthing/metadata.xml2
-rw-r--r--acct-user/syncthing/syncthing-0-r1.ebuild14
-rw-r--r--acct-user/syncthing/syncthing-0-r3.ebuild14
-rw-r--r--acct-user/systemd-coredump/metadata.xml2
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild11
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r3.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/metadata.xml2
-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-r3.ebuild11
-rw-r--r--acct-user/systemd-network/metadata.xml2
-rw-r--r--acct-user/systemd-network/systemd-network-0-r1.ebuild11
-rw-r--r--acct-user/systemd-network/systemd-network-0-r3.ebuild11
-rw-r--r--acct-user/systemd-oom/metadata.xml2
-rw-r--r--acct-user/systemd-oom/systemd-oom-0-r2.ebuild11
-rw-r--r--acct-user/systemd-oom/systemd-oom-0.ebuild11
-rw-r--r--acct-user/systemd-resolve/metadata.xml2
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild11
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r3.ebuild11
-rw-r--r--acct-user/systemd-timesync/metadata.xml2
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild11
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r3.ebuild11
-rw-r--r--acct-user/taskd/metadata.xml8
-rw-r--r--acct-user/taskd/taskd-0-r2.ebuild15
-rw-r--r--acct-user/teamspeak/metadata.xml2
-rw-r--r--acct-user/teamspeak/teamspeak-0-r1.ebuild14
-rw-r--r--acct-user/teamspeak/teamspeak-0-r3.ebuild14
-rw-r--r--acct-user/telegraf/metadata.xml2
-rw-r--r--acct-user/telegraf/telegraf-0-r1.ebuild12
-rw-r--r--acct-user/telegraf/telegraf-0-r3.ebuild12
-rw-r--r--acct-user/tenshi/metadata.xml2
-rw-r--r--acct-user/tenshi/tenshi-0-r2.ebuild14
-rw-r--r--acct-user/tenshi/tenshi-0.ebuild14
-rw-r--r--acct-user/timidity/metadata.xml8
-rw-r--r--acct-user/timidity/timidity-0-r2.ebuild15
-rw-r--r--acct-user/tinydns/metadata.xml2
-rw-r--r--acct-user/tinydns/tinydns-0-r2.ebuild11
-rw-r--r--acct-user/tinydns/tinydns-0.ebuild11
-rw-r--r--acct-user/tinyproxy/metadata.xml2
-rw-r--r--acct-user/tinyproxy/tinyproxy-0-r2.ebuild12
-rw-r--r--acct-user/tinyproxy/tinyproxy-0.ebuild12
-rw-r--r--acct-user/tomcat/metadata.xml2
-rw-r--r--acct-user/tomcat/tomcat-0-r2.ebuild12
-rw-r--r--acct-user/tomcat/tomcat-0.ebuild12
-rw-r--r--acct-user/tor/metadata.xml10
-rw-r--r--acct-user/tor/tor-0-r1.ebuild12
-rw-r--r--acct-user/tor/tor-0-r3.ebuild12
-rw-r--r--acct-user/tox/metadata.xml2
-rw-r--r--acct-user/tox/tox-0-r1.ebuild13
-rw-r--r--acct-user/tox/tox-0-r3.ebuild13
-rw-r--r--acct-user/tpm/metadata.xml5
-rw-r--r--acct-user/tpm/tpm-0.ebuild12
-rw-r--r--acct-user/transmission/metadata.xml2
-rw-r--r--acct-user/transmission/transmission-1-r1.ebuild11
-rw-r--r--acct-user/transmission/transmission-1-r3.ebuild11
-rw-r--r--acct-user/trickster/metadata.xml8
-rw-r--r--acct-user/trickster/trickster-0-r2.ebuild13
-rw-r--r--acct-user/trojan/metadata.xml2
-rw-r--r--acct-user/trojan/trojan-0-r2.ebuild12
-rw-r--r--acct-user/trojan/trojan-0.ebuild12
-rw-r--r--acct-user/tss/metadata.xml2
-rw-r--r--acct-user/tss/tss-0-r1.ebuild12
-rw-r--r--acct-user/tss/tss-0-r3.ebuild12
-rw-r--r--acct-user/ttrssd/metadata.xml2
-rw-r--r--acct-user/ttrssd/ttrssd-0-r2.ebuild12
-rw-r--r--acct-user/ttrssd/ttrssd-0.ebuild12
-rw-r--r--acct-user/turnserver/metadata.xml7
-rw-r--r--acct-user/turnserver/turnserver-0-r1.ebuild13
-rw-r--r--acct-user/turnserver/turnserver-0-r3.ebuild13
-rw-r--r--acct-user/tvheadend/metadata.xml2
-rw-r--r--acct-user/tvheadend/tvheadend-0-r1.ebuild14
-rw-r--r--acct-user/tvheadend/tvheadend-0-r3.ebuild14
-rw-r--r--acct-user/ulogd/metadata.xml11
-rw-r--r--acct-user/ulogd/ulogd-0-r2.ebuild12
-rw-r--r--acct-user/ulogd/ulogd-0.ebuild12
-rw-r--r--acct-user/ultimaker/metadata.xml8
-rw-r--r--acct-user/ultimaker/ultimaker-0-r1.ebuild12
-rw-r--r--acct-user/unbound-telemetry/metadata.xml2
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1-r2.ebuild12
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1.ebuild12
-rw-r--r--acct-user/unbound/metadata.xml6
-rw-r--r--acct-user/unbound/unbound-0-r1.ebuild16
-rw-r--r--acct-user/unbound/unbound-0-r3.ebuild16
-rw-r--r--acct-user/unifi-video/metadata.xml2
-rw-r--r--acct-user/unifi-video/unifi-video-0-r2.ebuild12
-rw-r--r--acct-user/unifi-video/unifi-video-0.ebuild12
-rw-r--r--acct-user/unifi/metadata.xml6
-rw-r--r--acct-user/unifi/unifi-0-r1.ebuild15
-rw-r--r--acct-user/unifi/unifi-0-r3.ebuild14
-rw-r--r--acct-user/unrealircd/metadata.xml5
-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/metadata.xml2
-rw-r--r--acct-user/upmpdcli/upmpdcli-0-r2.ebuild12
-rw-r--r--acct-user/upmpdcli/upmpdcli-0.ebuild12
-rw-r--r--acct-user/uptimed/metadata.xml10
-rw-r--r--acct-user/uptimed/uptimed-0-r1.ebuild12
-rw-r--r--acct-user/uptimed/uptimed-0-r3.ebuild13
-rw-r--r--acct-user/usbmux/metadata.xml2
-rw-r--r--acct-user/usbmux/usbmux-0-r1.ebuild12
-rw-r--r--acct-user/usbmux/usbmux-0-r3.ebuild12
-rw-r--r--acct-user/ushare/metadata.xml2
-rw-r--r--acct-user/ushare/ushare-0-r2.ebuild12
-rw-r--r--acct-user/ushare/ushare-0.ebuild12
-rw-r--r--acct-user/uwsgi_exporter/metadata.xml8
-rw-r--r--acct-user/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild13
-rw-r--r--acct-user/vacation/metadata.xml13
-rw-r--r--acct-user/vacation/vacation-0-r2.ebuild13
-rw-r--r--acct-user/varnish/metadata.xml7
-rw-r--r--acct-user/varnish/varnish-0-r1.ebuild14
-rw-r--r--acct-user/varnish/varnish-0-r3.ebuild14
-rw-r--r--acct-user/vault/metadata.xml2
-rw-r--r--acct-user/vault/vault-0-r1.ebuild12
-rw-r--r--acct-user/vault/vault-0-r3.ebuild12
-rw-r--r--acct-user/vault_exporter/metadata.xml2
-rw-r--r--acct-user/vault_exporter/vault_exporter-0-r2.ebuild13
-rw-r--r--acct-user/vault_exporter/vault_exporter-0.ebuild13
-rw-r--r--acct-user/vboxguest/metadata.xml7
-rw-r--r--acct-user/vboxguest/vboxguest-0-r1.ebuild13
-rw-r--r--acct-user/vboxguest/vboxguest-0-r3.ebuild13
-rw-r--r--acct-user/vdr/metadata.xml23
-rw-r--r--acct-user/vdr/vdr-0-r2.ebuild63
-rw-r--r--acct-user/vdradmin/metadata.xml6
-rw-r--r--acct-user/vdradmin/vdradmin-0-r1.ebuild16
-rw-r--r--acct-user/vdradmin/vdradmin-0-r3.ebuild16
-rw-r--r--acct-user/vnstat/metadata.xml2
-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/metadata.xml2
-rw-r--r--acct-user/vpopmail/vpopmail-0-r1.ebuild13
-rw-r--r--acct-user/vpopmail/vpopmail-0-r3.ebuild13
-rw-r--r--acct-user/wesnoth/metadata.xml2
-rw-r--r--acct-user/wesnoth/wesnoth-0-r1.ebuild13
-rw-r--r--acct-user/wesnoth/wesnoth-0-r3.ebuild13
-rw-r--r--acct-user/wwwoffle/metadata.xml2
-rw-r--r--acct-user/wwwoffle/wwwoffle-0-r2.ebuild14
-rw-r--r--acct-user/wwwoffle/wwwoffle-0.ebuild14
-rw-r--r--acct-user/x2goprint/metadata.xml2
-rw-r--r--acct-user/x2goprint/x2goprint-0-r1.ebuild13
-rw-r--r--acct-user/x2goprint/x2goprint-0-r3.ebuild13
-rw-r--r--acct-user/x2gouser/metadata.xml2
-rw-r--r--acct-user/x2gouser/x2gouser-0-r1.ebuild13
-rw-r--r--acct-user/x2gouser/x2gouser-0-r3.ebuild13
-rw-r--r--acct-user/xrootd/metadata.xml2
-rw-r--r--acct-user/xrootd/xrootd-0-r1.ebuild12
-rw-r--r--acct-user/xrootd/xrootd-0-r3.ebuild12
-rw-r--r--acct-user/yubihsm-connector/metadata.xml8
-rw-r--r--acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild12
-rw-r--r--acct-user/zabbix/metadata.xml2
-rw-r--r--acct-user/zabbix/zabbix-0-r2.ebuild15
-rw-r--r--acct-user/zabbix/zabbix-0.ebuild15
-rw-r--r--acct-user/zeppelin/metadata.xml7
-rw-r--r--acct-user/zeppelin/zeppelin-0-r1.ebuild14
-rw-r--r--acct-user/zeppelin/zeppelin-0-r3.ebuild14
-rw-r--r--acct-user/zetcd/metadata.xml2
-rw-r--r--acct-user/zetcd/zetcd-0-r2.ebuild13
-rw-r--r--acct-user/zetcd/zetcd-0.ebuild13
-rw-r--r--acct-user/ziproxy/metadata.xml2
-rw-r--r--acct-user/ziproxy/ziproxy-0-r2.ebuild11
-rw-r--r--acct-user/ziproxy/ziproxy-0.ebuild11
-rw-r--r--acct-user/znc/metadata.xml2
-rw-r--r--acct-user/znc/znc-0-r1.ebuild16
-rw-r--r--acct-user/znc/znc-0-r3.ebuild16
-rw-r--r--acct-user/zookeeper/metadata.xml12
-rw-r--r--acct-user/zookeeper/zookeeper-0-r2.ebuild14
1197 files changed, 6983 insertions, 5166 deletions
diff --git a/acct-user/_cron-failure/_cron-failure-0-r1.ebuild b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..d521c8d59f17
--- /dev/null
+++ b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/systemd-cron failure emails"
+ACCT_USER_ID="520"
+ACCT_USER_GROUPS=( _cron-failure )
+
+acct-user_add_deps
diff --git a/acct-user/_cron-failure/metadata.xml b/acct-user/_cron-failure/metadata.xml
new file mode 100644
index 000000000000..f12053059b44
--- /dev/null
+++ b/acct-user/_cron-failure/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>rich0@gentoo.org</email>
+ <name>Richard Freeman</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/abrt/abrt-0-r1.ebuild b/acct-user/abrt/abrt-0-r1.ebuild
deleted file mode 100644
index ca0f60d5930c..000000000000
--- a/acct-user/abrt/abrt-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the automatic bug detection and reporting tool"
-ACCT_USER_ID=422
-ACCT_USER_GROUPS=( abrt )
-
-acct-user_add_deps
diff --git a/acct-user/abrt/metadata.xml b/acct-user/abrt/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/acct-user/abrt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/aerospike-amc/aerospike-amc-0-r2.ebuild b/acct-user/aerospike-amc/aerospike-amc-0-r2.ebuild
new file mode 100644
index 000000000000..9bbf2445629d
--- /dev/null
+++ b/acct-user/aerospike-amc/aerospike-amc-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/aerospike-amc/metadata.xml
new file mode 100644
index 000000000000..2ce0e74f9864
--- /dev/null
+++ b/acct-user/aerospike-amc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/airdcppd/airdcppd-0-r3.ebuild
new file mode 100644
index 000000000000..595b5be3b93c
--- /dev/null
+++ b/acct-user/airdcppd/airdcppd-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/airdcppd/metadata.xml
index 44039e87f449..dc6381459374 100644
--- a/acct-user/airdcppd/metadata.xml
+++ b/acct-user/airdcppd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sbraz@gentoo.org</email>
diff --git a/acct-user/alertmanager/alertmanager-0-r2.ebuild b/acct-user/alertmanager/alertmanager-0-r2.ebuild
new file mode 100644
index 000000000000..ff85e1c7faa8
--- /dev/null
+++ b/acct-user/alertmanager/alertmanager-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/alertmanager/metadata.xml b/acct-user/alertmanager/metadata.xml
index 6698a4ab7883..115e9d64a669 100644
--- a/acct-user/alertmanager/metadata.xml
+++ b/acct-user/alertmanager/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/alias/alias-0-r3.ebuild
new file mode 100644
index 000000000000..cb182ce2d9d6
--- /dev/null
+++ b/acct-user/alias/alias-0-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/alias/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/alias/metadata.xml
+++ b/acct-user/alias/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
diff --git a/acct-user/amanda/amanda-0-r2.ebuild b/acct-user/amanda/amanda-0-r2.ebuild
new file mode 100644
index 000000000000..6ecb59f88e5d
--- /dev/null
+++ b/acct-user/amanda/amanda-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/amanda/metadata.xml b/acct-user/amanda/metadata.xml
index d5107f7573f0..3b9d35a888c5 100644
--- a/acct-user/amanda/metadata.xml
+++ b/acct-user/amanda/metadata.xml
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
- <maintainer type="person" proxied="yes">
- <email>lists@xunil.at</email>
- <name>Stefan G. Weichinger</name>
- </maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
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-r3.ebuild b/acct-user/amavis/amavis-0-r3.ebuild
new file mode 100644
index 000000000000..dbb4af5ee17d
--- /dev/null
+++ b/acct-user/amavis/amavis-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/amavis/metadata.xml
index 3126b599b19b..96f1bb82c856 100644
--- a/acct-user/amavis/metadata.xml
+++ b/acct-user/amavis/metadata.xml
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>antivirus@gentoo.org</email>
<name>Gentoo Antivirus Project</name>
</maintainer>
- <maintainer type="person" proxied="yes">
- <email>gentoo@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
</pkgmetadata>
diff --git a/acct-user/amule/amule-0-r1.ebuild b/acct-user/amule/amule-0-r1.ebuild
deleted file mode 100644
index 58d59281ccb4..000000000000
--- a/acct-user/amule/amule-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-p2p/amule"
-ACCT_USER_ID=468
-ACCT_USER_GROUPS=( amule )
-
-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/amule/metadata.xml b/acct-user/amule/metadata.xml
index 8ecc21d1608c..e546f23de8cf 100644
--- a/acct-user/amule/metadata.xml
+++ b/acct-user/amule/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>alexander@tsoy.me</email>
diff --git a/acct-user/anope/anope-0-r1.ebuild b/acct-user/anope/anope-0-r1.ebuild
deleted file mode 100644
index 8f821f24585d..000000000000
--- a/acct-user/anope/anope-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 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/anope/metadata.xml b/acct-user/anope/metadata.xml
index 979bcc7aec93..641cbd3703e7 100644
--- a/acct-user/anope/metadata.xml
+++ b/acct-user/anope/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
diff --git a/acct-user/apache/apache-0-r1.ebuild b/acct-user/apache/apache-0-r1.ebuild
deleted file mode 100644
index 00dcfb1ba52d..000000000000
--- a/acct-user/apache/apache-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=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/apache/metadata.xml b/acct-user/apache/metadata.xml
index f93dbc1e6256..bb8cff5eb952 100644
--- a/acct-user/apache/metadata.xml
+++ b/acct-user/apache/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
<maintainer type="project">
<email>apache-bugs@gentoo.org</email>
<name>Apache project</name>
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
new file mode 100644
index 000000000000..7f085d9f75dd
--- /dev/null
+++ b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/apt-cacher-ng/metadata.xml b/acct-user/apt-cacher-ng/metadata.xml
index 05b4e10bdc62..60374df2c110 100644
--- a/acct-user/apt-cacher-ng/metadata.xml
+++ b/acct-user/apt-cacher-ng/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ajak@gentoo.org</email>
diff --git a/acct-user/argus/argus-0-r2.ebuild b/acct-user/argus/argus-0-r2.ebuild
new file mode 100644
index 000000000000..a9154cf5a639
--- /dev/null
+++ b/acct-user/argus/argus-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/argus/metadata.xml b/acct-user/argus/metadata.xml
index 2c2a7923cfc8..d5af4bcfaf13 100644
--- a/acct-user/argus/metadata.xml
+++ b/acct-user/argus/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
diff --git a/acct-user/arpwatch/arpwatch-0-r2.ebuild b/acct-user/arpwatch/arpwatch-0-r2.ebuild
new file mode 100644
index 000000000000..18b782da390f
--- /dev/null
+++ b/acct-user/arpwatch/arpwatch-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/arpwatch/metadata.xml
new file mode 100644
index 000000000000..d5af4bcfaf13
--- /dev/null
+++ b/acct-user/arpwatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/artifactory/artifactory-0.ebuild b/acct-user/artifactory/artifactory-0.ebuild
deleted file mode 100644
index f1132d14b63c..000000000000
--- a/acct-user/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-util/artifactory-bin"
-
-ACCT_USER_GROUPS=( "artifactory" )
-ACCT_USER_ID="264"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/artifactory/metadata.xml b/acct-user/artifactory/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/acct-user/artifactory/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/aspnet/aspnet-0-r2.ebuild b/acct-user/aspnet/aspnet-0-r2.ebuild
new file mode 100644
index 000000000000..308a7f8b6aa6
--- /dev/null
+++ b/acct-user/aspnet/aspnet-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/aspnet/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/aspnet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/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-r3.ebuild b/acct-user/asterisk/asterisk-0-r3.ebuild
new file mode 100644
index 000000000000..ca4cbc36d55a
--- /dev/null
+++ b/acct-user/asterisk/asterisk-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/asterisk/metadata.xml
index d06f5db0340a..6aebbc46f559 100644
--- a/acct-user/asterisk/metadata.xml
+++ b/acct-user/asterisk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>jaco@uls.co.za</email>
diff --git a/acct-user/at/at-0-r2.ebuild b/acct-user/at/at-0-r2.ebuild
new file mode 100644
index 000000000000..a9c031480f43
--- /dev/null
+++ b/acct-user/at/at-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/at/metadata.xml b/acct-user/at/metadata.xml
index 234d64e014ff..ce5409a471fa 100644
--- a/acct-user/at/metadata.xml
+++ b/acct-user/at/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <maintainer type="person" proxied="yes">
+ <email>zoltan@sinustrom.info</email>
+ <name>Zoltan Puskas</name>
</maintainer>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/atheme-services/atheme-services-0-r3.ebuild
new file mode 100644
index 000000000000..e829bc73ca78
--- /dev/null
+++ b/acct-user/atheme-services/atheme-services-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/atheme-services/metadata.xml
index cccd8e9eeb02..22bd0a2cbb65 100644
--- a/acct-user/atheme-services/metadata.xml
+++ b/acct-user/atheme-services/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>wadecline@hotmail.com</email>
diff --git a/acct-user/atuin/atuin-0.ebuild b/acct-user/atuin/atuin-0.ebuild
new file mode 100644
index 000000000000..c88d29315aca
--- /dev/null
+++ b/acct-user/atuin/atuin-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=536
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/atuin/metadata.xml b/acct-user/atuin/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-user/atuin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/automatic/automatic-0-r2.ebuild b/acct-user/automatic/automatic-0-r2.ebuild
new file mode 100644
index 000000000000..d1cbcd3efbed
--- /dev/null
+++ b/acct-user/automatic/automatic-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=338
+ACCT_USER_GROUPS=( automatic )
+ACCT_USER_HOME="/var/lib/automatic"
+
+acct-user_add_deps
diff --git a/acct-user/automatic/automatic-0.ebuild b/acct-user/automatic/automatic-0.ebuild
deleted file mode 100644
index 4b8f27357849..000000000000
--- a/acct-user/automatic/automatic-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
-
-ACCT_USER_ID=338
-ACCT_USER_GROUPS=( automatic )
-ACCT_USER_HOME="/var/lib/automatic"
-ACCT_USER_HOME_OWNER="automatic:automatic"
-
-acct-user_add_deps
diff --git a/acct-user/automatic/metadata.xml b/acct-user/automatic/metadata.xml
index 0002e1a56764..7e33eb1e0776 100644
--- a/acct-user/automatic/metadata.xml
+++ b/acct-user/automatic/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>spiderx@spiderx.dp.ua</email>
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-r3.ebuild b/acct-user/automx2/automx2-0-r3.ebuild
new file mode 100644
index 000000000000..333c03217a32
--- /dev/null
+++ b/acct-user/automx2/automx2-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/automx2/metadata.xml
index 2c2d077c8524..115e9d64a669 100644
--- a/acct-user/automx2/metadata.xml
+++ b/acct-user/automx2/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r3.ebuild
new file mode 100644
index 000000000000..3948fac9c6f2
--- /dev/null
+++ b/acct-user/avahi-autoipd/avahi-autoipd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/avahi-autoipd/metadata.xml
index d920e3ba3e56..115e9d64a669 100644
--- a/acct-user/avahi-autoipd/metadata.xml
+++ b/acct-user/avahi-autoipd/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/avahi/avahi-0-r3.ebuild
new file mode 100644
index 000000000000..55f2dc0e63eb
--- /dev/null
+++ b/acct-user/avahi/avahi-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/avahi/metadata.xml
index d920e3ba3e56..115e9d64a669 100644
--- a/acct-user/avahi/metadata.xml
+++ b/acct-user/avahi/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/axtls/axtls-0-r2.ebuild b/acct-user/axtls/axtls-0-r2.ebuild
new file mode 100644
index 000000000000..1823074dacaf
--- /dev/null
+++ b/acct-user/axtls/axtls-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/axtls/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/axtls/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/backuppc/backuppc-0-r2.ebuild b/acct-user/backuppc/backuppc-0-r2.ebuild
new file mode 100644
index 000000000000..de230cf45518
--- /dev/null
+++ b/acct-user/backuppc/backuppc-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/backuppc/metadata.xml b/acct-user/backuppc/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/backuppc/metadata.xml
+++ b/acct-user/backuppc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/bacula/bacula-0-r3.ebuild
new file mode 100644
index 000000000000..56a6cf7b0da3
--- /dev/null
+++ b/acct-user/bacula/bacula-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/bacula/metadata.xml
index 4e80019694b1..001997549c54 100644
--- a/acct-user/bacula/metadata.xml
+++ b/acct-user/bacula/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tomjbe@gentoo.org</email>
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-r3.ebuild b/acct-user/bareos/bareos-0-r3.ebuild
new file mode 100644
index 000000000000..3071a988da67
--- /dev/null
+++ b/acct-user/bareos/bareos-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/bareos/metadata.xml
index ea6b59e79026..f63250c09310 100644
--- a/acct-user/bareos/metadata.xml
+++ b/acct-user/bareos/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/acct-user/beanstalk/beanstalk-0-r2.ebuild b/acct-user/beanstalk/beanstalk-0-r2.ebuild
new file mode 100644
index 000000000000..93e982b2ab46
--- /dev/null
+++ b/acct-user/beanstalk/beanstalk-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/beanstalk/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/beanstalk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/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-r3.ebuild b/acct-user/bedrock/bedrock-0-r3.ebuild
new file mode 100644
index 000000000000..3a64571e7623
--- /dev/null
+++ b/acct-user/bedrock/bedrock-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/bedrock/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/bedrock/metadata.xml
+++ b/acct-user/bedrock/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
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/metadata.xml b/acct-user/biboumi/metadata.xml
new file mode 100644
index 000000000000..a7fa285c7476
--- /dev/null
+++ b/acct-user/biboumi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/bind_exporter/bind_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..0d6dd3bb2e87
--- /dev/null
+++ b/acct-user/bind_exporter/bind_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/bind_exporter/metadata.xml
index 65da3dd78299..150ec8c0940a 100644
--- a/acct-user/bind_exporter/metadata.xml
+++ b/acct-user/bind_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/bird/bird-0-r2.ebuild b/acct-user/bird/bird-0-r2.ebuild
new file mode 100644
index 000000000000..1ce8458c6ec2
--- /dev/null
+++ b/acct-user/bird/bird-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/bird/metadata.xml b/acct-user/bird/metadata.xml
index 165cedc59743..5be55ce37f02 100644
--- a/acct-user/bird/metadata.xml
+++ b/acct-user/bird/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>alarig@swordarmor.fr</email>
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-r3.ebuild b/acct-user/bitcoin/bitcoin-0-r3.ebuild
new file mode 100644
index 000000000000..c9b0f036c573
--- /dev/null
+++ b/acct-user/bitcoin/bitcoin-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/bitcoin/metadata.xml
index 95e5c0e2b8fd..1793dda83a2d 100644
--- a/acct-user/bitcoin/metadata.xml
+++ b/acct-user/bitcoin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>luke-jr+gentoobugs@utopios.org</email>
diff --git a/acct-user/bitflu/bitflu-0-r2.ebuild b/acct-user/bitflu/bitflu-0-r2.ebuild
new file mode 100644
index 000000000000..d94cb81ba2c5
--- /dev/null
+++ b/acct-user/bitflu/bitflu-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/bitflu/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/bitflu/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/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-r3.ebuild b/acct-user/bitlbee/bitlbee-0-r3.ebuild
new file mode 100644
index 000000000000..a19ceed8b819
--- /dev/null
+++ b/acct-user/bitlbee/bitlbee-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/bitlbee/metadata.xml
index dbebda04b192..15cf2ff7a521 100644
--- a/acct-user/bitlbee/metadata.xml
+++ b/acct-user/bitlbee/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>arkamar@atlas.cz</email>
+ <maintainer type="person">
+ <email>arkamar@gentoo.org</email>
<name>Petr Vaněk</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
</pkgmetadata>
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0-r2.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..56973d4f1e9d
--- /dev/null
+++ b/acct-user/blackbox_exporter/blackbox_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/blackbox_exporter/metadata.xml b/acct-user/blackbox_exporter/metadata.xml
index 6698a4ab7883..115e9d64a669 100644
--- a/acct-user/blackbox_exporter/metadata.xml
+++ b/acct-user/blackbox_exporter/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/boinc/boinc-0-r2.ebuild b/acct-user/boinc/boinc-0-r2.ebuild
new file mode 100644
index 000000000000..9ddb6ae7ec09
--- /dev/null
+++ b/acct-user/boinc/boinc-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/boinc/metadata.xml b/acct-user/boinc/metadata.xml
index 18c27965271e..38d56f9e7497 100644
--- a/acct-user/boinc/metadata.xml
+++ b/acct-user/boinc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/acct-user/brltty/brltty-0-r2.ebuild b/acct-user/brltty/brltty-0-r2.ebuild
new file mode 100644
index 000000000000..0e55de6d70c9
--- /dev/null
+++ b/acct-user/brltty/brltty-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/brltty/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/brltty/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/buildbot/buildbot-0-r3.ebuild
new file mode 100644
index 000000000000..f12b5ef50cdf
--- /dev/null
+++ b/acct-user/buildbot/buildbot-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/buildbot/metadata.xml
index 7ec80da32c74..bef24d2c2337 100644
--- a/acct-user/buildbot/metadata.xml
+++ b/acct-user/buildbot/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>dolsen@gentoo.org</email>
- <name>Brian Dolbec</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/burp/burp-0-r3.ebuild
new file mode 100644
index 000000000000..743316673dff
--- /dev/null
+++ b/acct-user/burp/burp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/burp/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/burp/metadata.xml
+++ b/acct-user/burp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r3.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..a73b9505ad76
--- /dev/null
+++ b/acct-user/burrow_exporter/burrow_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/metadata.xml b/acct-user/burrow_exporter/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/burrow_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/cadvisor/cadvisor-0-r3.ebuild
new file mode 100644
index 000000000000..b35737136f19
--- /dev/null
+++ b/acct-user/cadvisor/cadvisor-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/cadvisor/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/cadvisor/metadata.xml
+++ b/acct-user/cadvisor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/cancd/cancd-0-r3.ebuild b/acct-user/cancd/cancd-0-r3.ebuild
new file mode 100644
index 000000000000..70eb5f81b16d
--- /dev/null
+++ b/acct-user/cancd/cancd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/cancd/metadata.xml
new file mode 100644
index 000000000000..a19661a8bd04
--- /dev/null
+++ b/acct-user/cancd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/carbon/carbon-0-r3.ebuild
new file mode 100644
index 000000000000..ad1b54f6209f
--- /dev/null
+++ b/acct-user/carbon/carbon-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/carbon/metadata.xml
index a53ffbea77d3..3d1a383e5d9d 100644
--- a/acct-user/carbon/metadata.xml
+++ b/acct-user/carbon/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grobian@gentoo.org</email>
diff --git a/acct-user/ceph/ceph-0-r1.ebuild b/acct-user/ceph/ceph-0-r1.ebuild
deleted file mode 100644
index 7d26493d0bb5..000000000000
--- a/acct-user/ceph/ceph-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 ceph"
-
-ACCT_USER_ID=267
-ACCT_USER_HOME=/var/lib/ceph
-ACCT_USER_HOME_OWNER=ceph:ceph
-ACCT_USER_GROUPS=( ceph )
-
-acct-user_add_deps
diff --git a/acct-user/ceph/ceph-0-r3.ebuild b/acct-user/ceph/ceph-0-r3.ebuild
new file mode 100644
index 000000000000..184428e6057f
--- /dev/null
+++ b/acct-user/ceph/ceph-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for ceph"
+
+ACCT_USER_ID=267
+ACCT_USER_HOME=/var/lib/ceph
+ACCT_USER_GROUPS=( ceph )
+
+acct-user_add_deps
diff --git a/acct-user/ceph/metadata.xml b/acct-user/ceph/metadata.xml
index cee379b15409..bd6443d4a375 100644
--- a/acct-user/ceph/metadata.xml
+++ b/acct-user/ceph/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
diff --git a/acct-user/cgit/cgit-0-r2.ebuild b/acct-user/cgit/cgit-0-r2.ebuild
new file mode 100644
index 000000000000..0c1eeda79c83
--- /dev/null
+++ b/acct-user/cgit/cgit-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/cgit/metadata.xml b/acct-user/cgit/metadata.xml
index 2b9b44f73497..4c68528accdf 100644
--- a/acct-user/cgit/metadata.xml
+++ b/acct-user/cgit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>web-apps@gentoo.org</email>
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-r3.ebuild b/acct-user/chronograf/chronograf-0-r3.ebuild
new file mode 100644
index 000000000000..05d56b84f770
--- /dev/null
+++ b/acct-user/chronograf/chronograf-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/chronograf/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/chronograf/metadata.xml
+++ b/acct-user/chronograf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/cinder/cinder-0-r1.ebuild b/acct-user/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index 3576a06cec02..000000000000
--- a/acct-user/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack cinder service"
-ACCT_USER_ID=442
-ACCT_USER_HOME=/var/lib/cinder
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( cinder )
-
-acct-user_add_deps
diff --git a/acct-user/cinder/metadata.xml b/acct-user/cinder/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/cinder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/clair/clair-0-r1.ebuild b/acct-user/clair/clair-0-r1.ebuild
deleted file mode 100644
index c8af2edf912f..000000000000
--- a/acct-user/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for clair"
-ACCT_USER_ID=307
-ACCT_USER_GROUPS=( clair )
-
-acct-user_add_deps
diff --git a/acct-user/clair/clair-0-r3.ebuild b/acct-user/clair/clair-0-r3.ebuild
new file mode 100644
index 000000000000..4ddc4165a34e
--- /dev/null
+++ b/acct-user/clair/clair-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/clair/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/clair/metadata.xml
+++ b/acct-user/clair/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/clamav/clamav-0-r3.ebuild
new file mode 100644
index 000000000000..a7d444c1a54d
--- /dev/null
+++ b/acct-user/clamav/clamav-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=435
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/clamav/metadata.xml b/acct-user/clamav/metadata.xml
index 45125b9b6e99..f2908ee10b59 100644
--- a/acct-user/clamav/metadata.xml
+++ b/acct-user/clamav/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild b/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild
deleted file mode 100644
index c4772b70850d..000000000000
--- a/acct-user/cmd5checkpw/cmd5checkpw-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 cmd5checkpw"
-ACCT_USER_ID=212
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/cmd5checkpw/metadata.xml b/acct-user/cmd5checkpw/metadata.xml
deleted file mode 100644
index 067e368964dc..000000000000
--- a/acct-user/cmd5checkpw/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>eike@sf-mail.de</email>
- <name>Rolf Eike Beer</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/cntlm/cntlm-0-r2.ebuild b/acct-user/cntlm/cntlm-0-r2.ebuild
new file mode 100644
index 000000000000..f37625a0ca75
--- /dev/null
+++ b/acct-user/cntlm/cntlm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/cntlm/metadata.xml b/acct-user/cntlm/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/cntlm/metadata.xml
+++ b/acct-user/cntlm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/cockroach/cockroach-0-r2.ebuild b/acct-user/cockroach/cockroach-0-r2.ebuild
new file mode 100644
index 000000000000..5e08d80314e4
--- /dev/null
+++ b/acct-user/cockroach/cockroach-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/cockroach/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/cockroach/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/collectd/collectd-0-r2.ebuild b/acct-user/collectd/collectd-0-r2.ebuild
new file mode 100644
index 000000000000..ee9b4385ef6c
--- /dev/null
+++ b/acct-user/collectd/collectd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/collectd/metadata.xml b/acct-user/collectd/metadata.xml
index a32d600f949d..c07e13d4a6bd 100644
--- a/acct-user/collectd/metadata.xml
+++ b/acct-user/collectd/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/colord/colord-0-r2.ebuild b/acct-user/colord/colord-0-r2.ebuild
new file mode 100644
index 000000000000..4b3326f3ae67
--- /dev/null
+++ b/acct-user/colord/colord-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/colord/metadata.xml b/acct-user/colord/metadata.xml
index 996e7cacd217..f453528b934f 100644
--- a/acct-user/colord/metadata.xml
+++ b/acct-user/colord/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
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-r3.ebuild b/acct-user/consul-template/consul-template-0-r3.ebuild
new file mode 100644
index 000000000000..c9f04f7a0f1e
--- /dev/null
+++ b/acct-user/consul-template/consul-template-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/consul-template/metadata.xml
index 9a7ba2ff3c46..763dfe770b61 100644
--- a/acct-user/consul-template/metadata.xml
+++ b/acct-user/consul-template/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
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-r3.ebuild b/acct-user/consul/consul-0-r3.ebuild
new file mode 100644
index 000000000000..675e14656621
--- /dev/null
+++ b/acct-user/consul/consul-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/consul/metadata.xml
index 9a7ba2ff3c46..763dfe770b61 100644
--- a/acct-user/consul/metadata.xml
+++ b/acct-user/consul/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/acct-user/consul_exporter/consul_exporter-0-r2.ebuild b/acct-user/consul_exporter/consul_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..f56e1927e72b
--- /dev/null
+++ b/acct-user/consul_exporter/consul_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/consul_exporter/metadata.xml b/acct-user/consul_exporter/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/consul_exporter/metadata.xml
+++ b/acct-user/consul_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/coredns/coredns-0-r2.ebuild b/acct-user/coredns/coredns-0-r2.ebuild
new file mode 100644
index 000000000000..61ab6d4d9952
--- /dev/null
+++ b/acct-user/coredns/coredns-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/coredns/metadata.xml b/acct-user/coredns/metadata.xml
index 9e1d47466c8d..3cbc205c55cb 100644
--- a/acct-user/coredns/metadata.xml
+++ b/acct-user/coredns/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/acct-user/croc/croc-0-r2.ebuild b/acct-user/croc/croc-0-r2.ebuild
new file mode 100644
index 000000000000..7d909e8678e1
--- /dev/null
+++ b/acct-user/croc/croc-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/croc"
+ACCT_USER_ID=310
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/croc/croc-0.ebuild b/acct-user/croc/croc-0.ebuild
deleted file mode 100644
index 84f75f78aac4..000000000000
--- a/acct-user/croc/croc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/croc"
-ACCT_USER_ID=310
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/croc/metadata.xml b/acct-user/croc/metadata.xml
index bb2b0922c7fa..1826d184c487 100644
--- a/acct-user/croc/metadata.xml
+++ b/acct-user/croc/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>sultan@gentoo.org</email>
- <name>Stephan Hartmann</name>
- </maintainer>
+ <maintainer type="person" proxied="yes">
+ <name>Armas Spann</name>
+ <email>zappel@simple-co.de</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-user/cron/cron-0-r3.ebuild b/acct-user/cron/cron-0-r3.ebuild
new file mode 100644
index 000000000000..44f715a89a0e
--- /dev/null
+++ b/acct-user/cron/cron-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/cronbase"
+
+ACCT_USER_GROUPS=( "cron" )
+ACCT_USER_HOME="/var/spool/cron"
+ACCT_USER_ID="16"
+ACCT_USER_HOME_OWNER="root:cron"
+ACCT_USER_HOME_PERMS="0750"
+
+acct-user_add_deps
diff --git a/acct-user/cron/metadata.xml b/acct-user/cron/metadata.xml
new file mode 100644
index 000000000000..65e1fc82d859
--- /dev/null
+++ b/acct-user/cron/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/cvmfs/cvmfs-0-r1.ebuild b/acct-user/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 9296d50fb9c1..000000000000
--- a/acct-user/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the CernVM-FS network file system"
-ACCT_USER_ID=268
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/cvmfs/cvmfs-0-r3.ebuild b/acct-user/cvmfs/cvmfs-0-r3.ebuild
new file mode 100644
index 000000000000..27e6fa206e37
--- /dev/null
+++ b/acct-user/cvmfs/cvmfs-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/cvmfs/metadata.xml
index 46a304a17de5..d6152ac1ec54 100644
--- a/acct-user/cvmfs/metadata.xml
+++ b/acct-user/cvmfs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-physics@gentoo.org</email>
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-r4.ebuild b/acct-user/cyrus/cyrus-0-r4.ebuild
new file mode 100644
index 000000000000..5e3cc0b87ddf
--- /dev/null
+++ b/acct-user/cyrus/cyrus-0-r4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/cyrus/metadata.xml
index e6f3bf582ab7..38ebffc8efa5 100644
--- a/acct-user/cyrus/metadata.xml
+++ b/acct-user/cyrus/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
diff --git a/acct-user/darkstat/darkstat-0-r2.ebuild b/acct-user/darkstat/darkstat-0-r2.ebuild
new file mode 100644
index 000000000000..36216f8a76f6
--- /dev/null
+++ b/acct-user/darkstat/darkstat-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/darkstat/metadata.xml b/acct-user/darkstat/metadata.xml
index 2c2a7923cfc8..d5af4bcfaf13 100644
--- a/acct-user/darkstat/metadata.xml
+++ b/acct-user/darkstat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
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-r3.ebuild b/acct-user/davfs2/davfs2-0-r3.ebuild
new file mode 100644
index 000000000000..647e36d54c4f
--- /dev/null
+++ b/acct-user/davfs2/davfs2-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=420
+ACCT_USER_GROUPS=( davfs2 )
+
+acct-user_add_deps
diff --git a/acct-user/davfs2/metadata.xml b/acct-user/davfs2/metadata.xml
index 7985a32de123..afc38f2da922 100644
--- a/acct-user/davfs2/metadata.xml
+++ b/acct-user/davfs2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gokturk@gentoo.org</email>
diff --git a/acct-user/dbmail/dbmail-0-r2.ebuild b/acct-user/dbmail/dbmail-0-r2.ebuild
new file mode 100644
index 000000000000..4e151d3db76d
--- /dev/null
+++ b/acct-user/dbmail/dbmail-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/dbmail/metadata.xml b/acct-user/dbmail/metadata.xml
index ff82108a6c99..6cab649acb8d 100644
--- a/acct-user/dbmail/metadata.xml
+++ b/acct-user/dbmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lordvan@gentoo.org</email>
diff --git a/acct-user/dbskkd/dbskkd-0-r2.ebuild b/acct-user/dbskkd/dbskkd-0-r2.ebuild
new file mode 100644
index 000000000000..d5ff6ddffb72
--- /dev/null
+++ b/acct-user/dbskkd/dbskkd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dbskkd/metadata.xml
new file mode 100644
index 000000000000..a94766977fa6
--- /dev/null
+++ b/acct-user/dbskkd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/ddclient/ddclient-0-r3.ebuild
new file mode 100644
index 000000000000..5d29cfa358e9
--- /dev/null
+++ b/acct-user/ddclient/ddclient-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ddclient/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/ddclient/metadata.xml
+++ b/acct-user/ddclient/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
diff --git a/acct-user/defang/defang-0-r2.ebuild b/acct-user/defang/defang-0-r2.ebuild
new file mode 100644
index 000000000000..974675638706
--- /dev/null
+++ b/acct-user/defang/defang-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/defang/metadata.xml
new file mode 100644
index 000000000000..f9667b3dee85
--- /dev/null
+++ b/acct-user/defang/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>rentorbuy@yahoo.com</email>
+ <name>Vieri Di Paola</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/dehydrated/dehydrated-0-r2.ebuild b/acct-user/dehydrated/dehydrated-0-r2.ebuild
new file mode 100644
index 000000000000..a8302844b851
--- /dev/null
+++ b/acct-user/dehydrated/dehydrated-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/dehydrated/metadata.xml b/acct-user/dehydrated/metadata.xml
index 3dcff5679365..0885e8a081b0 100644
--- a/acct-user/dehydrated/metadata.xml
+++ b/acct-user/dehydrated/metadata.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
</maintainer>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
</pkgmetadata>
diff --git a/acct-user/deluge/deluge-0-r1.ebuild b/acct-user/deluge/deluge-0-r1.ebuild
deleted file mode 100644
index 90041a5c4ee5..000000000000
--- a/acct-user/deluge/deluge-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for deluge"
-ACCT_USER_ID=454
-ACCT_USER_GROUPS=( deluge )
-
-acct-user_add_deps
diff --git a/acct-user/deluge/deluge-0-r3.ebuild b/acct-user/deluge/deluge-0-r3.ebuild
new file mode 100644
index 000000000000..081edc55aac0
--- /dev/null
+++ b/acct-user/deluge/deluge-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="user for deluge"
+ACCT_USER_ID=454
+ACCT_USER_GROUPS=( deluge )
+ACCT_USER_HOME=/var/lib/deluge
+
+acct-user_add_deps
diff --git a/acct-user/deluge/metadata.xml b/acct-user/deluge/metadata.xml
index ab0dde28d5a7..7e9b602a135c 100644
--- a/acct-user/deluge/metadata.xml
+++ b/acct-user/deluge/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>paolo.pedroni@iol.it</email>
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-r3.ebuild b/acct-user/dhcp/dhcp-0-r3.ebuild
new file mode 100644
index 000000000000..54413005c8a2
--- /dev/null
+++ b/acct-user/dhcp/dhcp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dhcp/metadata.xml
index f540000d5aab..65e1fc82d859 100644
--- a/acct-user/dhcp/metadata.xml
+++ b/acct-user/dhcp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
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-r3.ebuild b/acct-user/dhcpcd/dhcpcd-0-r3.ebuild
new file mode 100644
index 000000000000..bba0ae42ea25
--- /dev/null
+++ b/acct-user/dhcpcd/dhcpcd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dhcpcd/metadata.xml
index f540000d5aab..65e1fc82d859 100644
--- a/acct-user/dhcpcd/metadata.xml
+++ b/acct-user/dhcpcd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/acct-user/dictd/dictd-0-r2.ebuild b/acct-user/dictd/dictd-0-r2.ebuild
new file mode 100644
index 000000000000..f7e7d102737d
--- /dev/null
+++ b/acct-user/dictd/dictd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/dictd/metadata.xml b/acct-user/dictd/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/dictd/metadata.xml
+++ b/acct-user/dictd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/dirsrv/dirsrv-0-r2.ebuild b/acct-user/dirsrv/dirsrv-0-r2.ebuild
new file mode 100644
index 000000000000..9e0c7a03c694
--- /dev/null
+++ b/acct-user/dirsrv/dirsrv-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/dirsrv/metadata.xml b/acct-user/dirsrv/metadata.xml
index 64cfde49e6f9..7625648b1d83 100644
--- a/acct-user/dirsrv/metadata.xml
+++ b/acct-user/dirsrv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>Dessa@gmake.de</email>
diff --git a/acct-user/distcc/distcc-1-r2.ebuild b/acct-user/distcc/distcc-1-r2.ebuild
new file mode 100644
index 000000000000..2de2ac894570
--- /dev/null
+++ b/acct-user/distcc/distcc-1-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/distcc/metadata.xml b/acct-user/distcc/metadata.xml
index 0319eec4c8be..076793e3f54b 100644
--- a/acct-user/distcc/metadata.xml
+++ b/acct-user/distcc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/acct-user/dnrd/dnrd-0-r2.ebuild b/acct-user/dnrd/dnrd-0-r2.ebuild
new file mode 100644
index 000000000000..88dfa3e9a4d7
--- /dev/null
+++ b/acct-user/dnrd/dnrd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/dnrd/metadata.xml b/acct-user/dnrd/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/dnrd/metadata.xml
+++ b/acct-user/dnrd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/dnscache/dnscache-0-r2.ebuild b/acct-user/dnscache/dnscache-0-r2.ebuild
new file mode 100644
index 000000000000..4ff8de18dfde
--- /dev/null
+++ b/acct-user/dnscache/dnscache-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/dnscache/metadata.xml b/acct-user/dnscache/metadata.xml
index 45125b9b6e99..f2908ee10b59 100644
--- a/acct-user/dnscache/metadata.xml
+++ b/acct-user/dnscache/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
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 f0c1455f86c4..000000000000
--- a/acct-user/dnscrypt-proxy/dnscrypt-proxy-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 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/dnscrypt-proxy/metadata.xml b/acct-user/dnscrypt-proxy/metadata.xml
index 979bcc7aec93..641cbd3703e7 100644
--- a/acct-user/dnscrypt-proxy/metadata.xml
+++ b/acct-user/dnscrypt-proxy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
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-r3.ebuild b/acct-user/dnsdist/dnsdist-0-r3.ebuild
new file mode 100644
index 000000000000..d3e28b4f4d3d
--- /dev/null
+++ b/acct-user/dnsdist/dnsdist-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dnsdist/metadata.xml
index 7e0202747f36..115e9d64a669 100644
--- a/acct-user/dnsdist/metadata.xml
+++ b/acct-user/dnsdist/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>nativemad@gentoo.org</email>
- <name>Andreas Schuerch</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/dnslog/dnslog-0-r2.ebuild b/acct-user/dnslog/dnslog-0-r2.ebuild
new file mode 100644
index 000000000000..99d2481c26b2
--- /dev/null
+++ b/acct-user/dnslog/dnslog-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/dnslog/metadata.xml b/acct-user/dnslog/metadata.xml
index 45125b9b6e99..f2908ee10b59 100644
--- a/acct-user/dnslog/metadata.xml
+++ b/acct-user/dnslog/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
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-r3.ebuild b/acct-user/dnsmasq/dnsmasq-0-r3.ebuild
new file mode 100644
index 000000000000..4cd49ce844b7
--- /dev/null
+++ b/acct-user/dnsmasq/dnsmasq-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dnsmasq/metadata.xml
index cee379b15409..bd6443d4a375 100644
--- a/acct-user/dnsmasq/metadata.xml
+++ b/acct-user/dnsmasq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
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-r3.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..d140aed6eebe
--- /dev/null
+++ b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dnsmasq_exporter/metadata.xml
index 65da3dd78299..150ec8c0940a 100644
--- a/acct-user/dnsmasq_exporter/metadata.xml
+++ b/acct-user/dnsmasq_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/docker_auth/docker_auth-0-r3.ebuild
new file mode 100644
index 000000000000..04a36a0f6ede
--- /dev/null
+++ b/acct-user/docker_auth/docker_auth-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/docker_auth/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/docker_auth/metadata.xml
+++ b/acct-user/docker_auth/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/dovecot/dovecot-0-r3.ebuild
new file mode 100644
index 000000000000..702791a628fe
--- /dev/null
+++ b/acct-user/dovecot/dovecot-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dovecot/metadata.xml
index e6f3bf582ab7..38ebffc8efa5 100644
--- a/acct-user/dovecot/metadata.xml
+++ b/acct-user/dovecot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
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-r3.ebuild b/acct-user/dovenull/dovenull-0-r3.ebuild
new file mode 100644
index 000000000000..6aa6fc1668c2
--- /dev/null
+++ b/acct-user/dovenull/dovenull-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/dovenull/metadata.xml
index e6f3bf582ab7..38ebffc8efa5 100644
--- a/acct-user/dovenull/metadata.xml
+++ b/acct-user/dovenull/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
diff --git a/acct-user/drone/drone-0-r2.ebuild b/acct-user/drone/drone-0-r2.ebuild
new file mode 100644
index 000000000000..dfad3ff14c81
--- /dev/null
+++ b/acct-user/drone/drone-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/drone/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/drone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/duende/duende-0-r3.ebuild
new file mode 100644
index 000000000000..68d5b8c3c0de
--- /dev/null
+++ b/acct-user/duende/duende-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=66
+ACCT_USER_GROUPS=( "maradns" )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/maradns "
+RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/duende/metadata.xml b/acct-user/duende/metadata.xml
index 8072ef2372e4..115e9d64a669 100644
--- a/acct-user/duende/metadata.xml
+++ b/acct-user/duende/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slashbeast@gentoo.org</email>
- <name>Piotr Karbowski</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/ejabberd/ejabberd-2-r1.ebuild b/acct-user/ejabberd/ejabberd-2-r1.ebuild
new file mode 100644
index 000000000000..08408483d2ce
--- /dev/null
+++ b/acct-user/ejabberd/ejabberd-2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/ejabberd"
+
+ACCT_USER_ID=114
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+IUSE="pam"
+
+RDEPEND="pam? ( acct-group/epam )"
+
+acct-user_add_deps
+
+pkg_setup() {
+ use pam && ACCT_USER_GROUPS+=( epam )
+}
diff --git a/acct-user/ejabberd/metadata.xml b/acct-user/ejabberd/metadata.xml
new file mode 100644
index 000000000000..440941413756
--- /dev/null
+++ b/acct-user/ejabberd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>ejabberd@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/elasticsearch/elasticsearch-0-r3.ebuild
new file mode 100644
index 000000000000..6986bdcd0afb
--- /dev/null
+++ b/acct-user/elasticsearch/elasticsearch-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/elasticsearch/metadata.xml
index 96e8c9b26b25..f3ded0c75da8 100644
--- a/acct-user/elasticsearch/metadata.xml
+++ b/acct-user/elasticsearch/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hydrapolic@gmail.com</email>
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..be6260e5a5bc
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/metadata.xml b/acct-user/elasticsearch_exporter/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/energi3/energi3-0-r2.ebuild b/acct-user/energi3/energi3-0-r2.ebuild
new file mode 100644
index 000000000000..790e4fa03102
--- /dev/null
+++ b/acct-user/energi3/energi3-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/energi3/metadata.xml b/acct-user/energi3/metadata.xml
index 743fdc86e02d..e3230a88662b 100644
--- a/acct-user/energi3/metadata.xml
+++ b/acct-user/energi3/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>candrews@gentoo.org</email>
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-r3.ebuild b/acct-user/epmd/epmd-0-r3.ebuild
new file mode 100644
index 000000000000..aeacc7e3b8f9
--- /dev/null
+++ b/acct-user/epmd/epmd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/epmd/metadata.xml
index dbebda04b192..15cf2ff7a521 100644
--- a/acct-user/epmd/metadata.xml
+++ b/acct-user/epmd/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>arkamar@atlas.cz</email>
+ <maintainer type="person">
+ <email>arkamar@gentoo.org</email>
<name>Petr Vaněk</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
</pkgmetadata>
diff --git a/acct-user/err/err-0-r2.ebuild b/acct-user/err/err-0-r2.ebuild
new file mode 100644
index 000000000000..2d4075676038
--- /dev/null
+++ b/acct-user/err/err-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/err/metadata.xml b/acct-user/err/metadata.xml
index 7a38bb900964..762a4dec2c4e 100644
--- a/acct-user/err/metadata.xml
+++ b/acct-user/err/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>guyu2876@gmail.com</email>
+ <name>Yu Gu</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/etcd/etcd-0-r3.ebuild
new file mode 100644
index 000000000000..3e4df0653988
--- /dev/null
+++ b/acct-user/etcd/etcd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/etcd/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/etcd/metadata.xml
+++ b/acct-user/etcd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/exabgp/exabgp-0-r3.ebuild
new file mode 100644
index 000000000000..e012e9133b45
--- /dev/null
+++ b/acct-user/exabgp/exabgp-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/exabgp/metadata.xml
index cee379b15409..bd6443d4a375 100644
--- a/acct-user/exabgp/metadata.xml
+++ b/acct-user/exabgp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
diff --git a/acct-user/ez-ipupd/ez-ipupd-0-r2.ebuild b/acct-user/ez-ipupd/ez-ipupd-0-r2.ebuild
new file mode 100644
index 000000000000..239fc66b5784
--- /dev/null
+++ b/acct-user/ez-ipupd/ez-ipupd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/ez-ipupd/metadata.xml b/acct-user/ez-ipupd/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/ez-ipupd/metadata.xml
+++ b/acct-user/ez-ipupd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/fax/fax-0-r2.ebuild b/acct-user/fax/fax-0-r2.ebuild
new file mode 100644
index 000000000000..b43d81fa245f
--- /dev/null
+++ b/acct-user/fax/fax-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/fax/metadata.xml b/acct-user/fax/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/fax/metadata.xml
+++ b/acct-user/fax/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
diff --git a/acct-user/fcron/fcron-0-r2.ebuild b/acct-user/fcron/fcron-0-r2.ebuild
new file mode 100644
index 000000000000..32dc97d81148
--- /dev/null
+++ b/acct-user/fcron/fcron-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/fcron/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/fcron/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/fdm/fdm-0-r2.ebuild b/acct-user/fdm/fdm-0-r2.ebuild
new file mode 100644
index 000000000000..e3aa7386e119
--- /dev/null
+++ b/acct-user/fdm/fdm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/fdm/metadata.xml b/acct-user/fdm/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/fdm/metadata.xml
+++ b/acct-user/fdm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/fetchmail/fetchmail-0-r3.ebuild
new file mode 100644
index 000000000000..92a4b3b27741
--- /dev/null
+++ b/acct-user/fetchmail/fetchmail-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/fetchmail/metadata.xml
index e7a96b9df4ec..4314abde3ac7 100644
--- a/acct-user/fetchmail/metadata.xml
+++ b/acct-user/fetchmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
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-r3.ebuild b/acct-user/fhem/fhem-0-r3.ebuild
new file mode 100644
index 000000000000..39ac723bd210
--- /dev/null
+++ b/acct-user/fhem/fhem-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/fhem/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/fhem/metadata.xml
+++ b/acct-user/fhem/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
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/firebird/metadata.xml b/acct-user/firebird/metadata.xml
new file mode 100644
index 000000000000..38b823e1432d
--- /dev/null
+++ b/acct-user/firebird/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>office@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/flatpak/flatpak-0-r2.ebuild b/acct-user/flatpak/flatpak-0-r2.ebuild
new file mode 100644
index 000000000000..5fb77d230830
--- /dev/null
+++ b/acct-user/flatpak/flatpak-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/flatpak/metadata.xml b/acct-user/flatpak/metadata.xml
index 9e1d47466c8d..3cbc205c55cb 100644
--- a/acct-user/flatpak/metadata.xml
+++ b/acct-user/flatpak/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/acct-user/flows/flows-0-r2.ebuild b/acct-user/flows/flows-0-r2.ebuild
new file mode 100644
index 000000000000..18d21e541731
--- /dev/null
+++ b/acct-user/flows/flows-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/flows/metadata.xml b/acct-user/flows/metadata.xml
index 2c2a7923cfc8..d5af4bcfaf13 100644
--- a/acct-user/flows/metadata.xml
+++ b/acct-user/flows/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
diff --git a/acct-user/fluentd/fluentd-0-r3.ebuild b/acct-user/fluentd/fluentd-0-r3.ebuild
new file mode 100644
index 000000000000..a6318f9e389e
--- /dev/null
+++ b/acct-user/fluentd/fluentd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/metadata.xml b/acct-user/fluentd/metadata.xml
new file mode 100644
index 000000000000..6aebbc46f559
--- /dev/null
+++ b/acct-user/fluentd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/fnord/fnord-0-r2.ebuild b/acct-user/fnord/fnord-0-r2.ebuild
new file mode 100644
index 000000000000..b36098e11719
--- /dev/null
+++ b/acct-user/fnord/fnord-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/fnord/metadata.xml b/acct-user/fnord/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/fnord/metadata.xml
+++ b/acct-user/fnord/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/fnordlog/fnordlog-0-r2.ebuild b/acct-user/fnordlog/fnordlog-0-r2.ebuild
new file mode 100644
index 000000000000..4a3b0b591b46
--- /dev/null
+++ b/acct-user/fnordlog/fnordlog-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/fnordlog/metadata.xml b/acct-user/fnordlog/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/fnordlog/metadata.xml
+++ b/acct-user/fnordlog/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/foldingathome/foldingathome-0-r2.ebuild b/acct-user/foldingathome/foldingathome-0-r2.ebuild
new file mode 100644
index 000000000000..3922c168f6d5
--- /dev/null
+++ b/acct-user/foldingathome/foldingathome-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/foldingathome/metadata.xml
new file mode 100644
index 000000000000..bdabd1d83788
--- /dev/null
+++ b/acct-user/foldingathome/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci-biology@gentoo.org</email>
+ <name>Gentoo Biology Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/fp-multiuser/fp-multiuser-0-r2.ebuild b/acct-user/fp-multiuser/fp-multiuser-0-r2.ebuild
new file mode 100644
index 000000000000..5c6587b6dc08
--- /dev/null
+++ b/acct-user/fp-multiuser/fp-multiuser-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/fp-multiuser/metadata.xml b/acct-user/fp-multiuser/metadata.xml
index 9e1d47466c8d..3cbc205c55cb 100644
--- a/acct-user/fp-multiuser/metadata.xml
+++ b/acct-user/fp-multiuser/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/acct-user/freenet/freenet-0-r2.ebuild b/acct-user/freenet/freenet-0-r2.ebuild
new file mode 100644
index 000000000000..1426c35cd9fb
--- /dev/null
+++ b/acct-user/freenet/freenet-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/freenet"
+ACCT_USER_ID=105
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/freenet
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0.ebuild b/acct-user/freenet/freenet-0.ebuild
deleted file mode 100644
index 3f624fa01977..000000000000
--- a/acct-user/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/freenet"
-ACCT_USER_ID=105
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/freenet
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/freenet/metadata.xml b/acct-user/freenet/metadata.xml
index 3800f75787af..115e9d64a669 100644
--- a/acct-user/freenet/metadata.xml
+++ b/acct-user/freenet/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>tommy@gentoo.org</email>
- <name>Thomas Sachau (Tommy[D])</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..68f6d6b909c4
--- /dev/null
+++ b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/fritzbox_smarthome_exporter/metadata.xml b/acct-user/fritzbox_smarthome_exporter/metadata.xml
index a32d600f949d..115e9d64a669 100644
--- a/acct-user/fritzbox_smarthome_exporter/metadata.xml
+++ b/acct-user/fritzbox_smarthome_exporter/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/frr/frr-0-r2.ebuild b/acct-user/frr/frr-0-r2.ebuild
new file mode 100644
index 000000000000..cfcf3155a6e7
--- /dev/null
+++ b/acct-user/frr/frr-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=371
+ACCT_USER_GROUPS=( frr )
+
+acct-user_add_deps
diff --git a/acct-user/frr/frr-0.ebuild b/acct-user/frr/frr-0.ebuild
deleted file mode 100644
index ec7cc1f8d314..000000000000
--- a/acct-user/frr/frr-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=371
-ACCT_USER_GROUPS=( frr )
-
-acct-user_add_deps
diff --git a/acct-user/frr/metadata.xml b/acct-user/frr/metadata.xml
index 40cc8dce3b7c..2be263cf694d 100644
--- a/acct-user/frr/metadata.xml
+++ b/acct-user/frr/metadata.xml
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
+ <maintainer type="person" proxied="yes">
+ <name>Alarig Le Lay</name>
+ <email>alarig@swordarmor.fr</email>
+ </maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/ftp/ftp-0-r1.ebuild b/acct-user/ftp/ftp-0-r1.ebuild
deleted file mode 100644
index de40a1fdbe1d..000000000000
--- a/acct-user/ftp/ftp-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="File Transfer Protocol server user"
-ACCT_USER_ID=21
-ACCT_USER_HOME=/home/ftp
-ACCT_USER_HOME_OWNER=root:ftp
-ACCT_USER_GROUPS=( ftp )
-
-acct-user_add_deps
diff --git a/acct-user/ftp/ftp-0-r5.ebuild b/acct-user/ftp/ftp-0-r5.ebuild
new file mode 100644
index 000000000000..050aadd621c6
--- /dev/null
+++ b/acct-user/ftp/ftp-0-r5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ftp/metadata.xml
index 7a38bb900964..3e5441bd0e60 100644
--- a/acct-user/ftp/metadata.xml
+++ b/acct-user/ftp/metadata.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/acct-user/ftpproxy/ftpproxy-0-r2.ebuild b/acct-user/ftpproxy/ftpproxy-0-r2.ebuild
new file mode 100644
index 000000000000..7c956f17ab2f
--- /dev/null
+++ b/acct-user/ftpproxy/ftpproxy-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ftpproxy/metadata.xml
new file mode 100644
index 000000000000..fd68dfdc70a8
--- /dev/null
+++ b/acct-user/ftpproxy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>kabel@kernel.org</email>
+ <name>Marek Behún</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/gatling/gatling-0-r3.ebuild
new file mode 100644
index 000000000000..64c9d1c7e62e
--- /dev/null
+++ b/acct-user/gatling/gatling-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gatling/metadata.xml
index 6d2298876faa..6a22e9e318bb 100644
--- a/acct-user/gatling/metadata.xml
+++ b/acct-user/gatling/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
diff --git a/acct-user/gauth/gauth-0-r2.ebuild b/acct-user/gauth/gauth-0-r2.ebuild
new file mode 100644
index 000000000000..d35e66cb1dab
--- /dev/null
+++ b/acct-user/gauth/gauth-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gauth/metadata.xml
new file mode 100644
index 000000000000..076793e3f54b
--- /dev/null
+++ b/acct-user/gauth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/gdm/gdm-0-r2.ebuild b/acct-user/gdm/gdm-0-r2.ebuild
new file mode 100644
index 000000000000..eb47a8e5ba25
--- /dev/null
+++ b/acct-user/gdm/gdm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/gdm/metadata.xml b/acct-user/gdm/metadata.xml
index 996e7cacd217..f453528b934f 100644
--- a/acct-user/gdm/metadata.xml
+++ b/acct-user/gdm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
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-r3.ebuild b/acct-user/geneweb/geneweb-0-r3.ebuild
new file mode 100644
index 000000000000..f34e829bdffd
--- /dev/null
+++ b/acct-user/geneweb/geneweb-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/geneweb/metadata.xml
index aa3b99d0d68e..004ec7eb7c57 100644
--- a/acct-user/geneweb/metadata.xml
+++ b/acct-user/geneweb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tupone@gentoo.org</email>
diff --git a/acct-user/geoclue/geoclue-0-r2.ebuild b/acct-user/geoclue/geoclue-0-r2.ebuild
new file mode 100644
index 000000000000..4d754cf15dec
--- /dev/null
+++ b/acct-user/geoclue/geoclue-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/geoclue/metadata.xml b/acct-user/geoclue/metadata.xml
index 996e7cacd217..f453528b934f 100644
--- a/acct-user/geoclue/metadata.xml
+++ b/acct-user/geoclue/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
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-r3.ebuild b/acct-user/gerbera/gerbera-0-r3.ebuild
new file mode 100644
index 000000000000..6ffbfb29e98e
--- /dev/null
+++ b/acct-user/gerbera/gerbera-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gerbera/metadata.xml
index 7901a7caabc2..115e9d64a669 100644
--- a/acct-user/gerbera/metadata.xml
+++ b/acct-user/gerbera/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>thev00d00@gentoo.org</email>
- <name>Ian Whyman</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/git/git-0-r1.ebuild b/acct-user/git/git-0-r1.ebuild
deleted file mode 100644
index 0e86336ce40b..000000000000
--- a/acct-user/git/git-0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Git repository hosting user"
-
-IUSE="gitea gitolite"
-REQUIRED_USE="^^ ( gitea gitolite )"
-
-ACCT_USER_ID=196
-ACCT_USER_HOME_OWNER=git:git
-ACCT_USER_HOME_PERMS=750
-ACCT_USER_SHELL=/bin/sh
-ACCT_USER_GROUPS=( git )
-
-acct-user_add_deps
-
-pkg_setup() {
- if use gitea; then
- ACCT_USER_HOME=/var/lib/gitea
- elif use gitolite; then
- ACCT_USER_HOME=/var/lib/gitolite
- else
- die "Incorrect USE flag combination"
- fi
-}
diff --git a/acct-user/git/git-0-r3.ebuild b/acct-user/git/git-0-r3.ebuild
new file mode 100644
index 000000000000..d6388db32836
--- /dev/null
+++ b/acct-user/git/git-0-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Git repository hosting user"
+
+IUSE="git gitea gitolite"
+REQUIRED_USE="^^ ( git gitea gitolite )"
+
+ACCT_USER_ID=196
+ACCT_USER_HOME_PERMS=750
+ACCT_USER_SHELL=/bin/sh
+ACCT_USER_GROUPS=( git )
+
+acct-user_add_deps
+
+pkg_setup() {
+ if use git; then
+ ACCT_USER_HOME=/var/lib/git
+ elif use gitea; then
+ ACCT_USER_HOME=/var/lib/gitea
+ elif use gitolite; then
+ ACCT_USER_HOME=/var/lib/gitolite
+ else
+ die "Incorrect USE flag combination"
+ fi
+}
diff --git a/acct-user/git/metadata.xml b/acct-user/git/metadata.xml
index 159d766b8251..84facd4bf2d6 100644
--- a/acct-user/git/metadata.xml
+++ b/acct-user/git/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/acct-user/github-exporter/github-exporter-0-r2.ebuild b/acct-user/github-exporter/github-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..1643706a8fdb
--- /dev/null
+++ b/acct-user/github-exporter/github-exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/github-exporter/metadata.xml b/acct-user/github-exporter/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/github-exporter/metadata.xml
+++ b/acct-user/github-exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild b/acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild
new file mode 100644
index 000000000000..1ef6553cff04
--- /dev/null
+++ b/acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gitlab-runner/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/gitlab-runner/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/gkrellmd/gkrellmd-0-r3.ebuild
new file mode 100644
index 000000000000..7e3816411c9c
--- /dev/null
+++ b/acct-user/gkrellmd/gkrellmd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gkrellmd/metadata.xml
index 95aa13f6c5ef..641cbd3703e7 100644
--- a/acct-user/gkrellmd/metadata.xml
+++ b/acct-user/gkrellmd/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/glance/glance-0-r1.ebuild b/acct-user/glance/glance-0-r1.ebuild
deleted file mode 100644
index bf1992f35860..000000000000
--- a/acct-user/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the glance openstack service"
-ACCT_USER_ID=443
-ACCT_USER_HOME=/var/lib/glance
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( glance )
-
-acct-user_add_deps
diff --git a/acct-user/glance/metadata.xml b/acct-user/glance/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/glance/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/gluster/gluster-0-r1.ebuild b/acct-user/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index 7b4597c69810..000000000000
--- a/acct-user/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-# Needed for statedumps
-# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
-
-ACCT_USER_ID=416
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/gluster/gluster-0-r3.ebuild b/acct-user/gluster/gluster-0-r3.ebuild
new file mode 100644
index 000000000000..b925c41686db
--- /dev/null
+++ b/acct-user/gluster/gluster-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gluster/metadata.xml
index 8bf4b5f36954..f5fb83321f9e 100644
--- a/acct-user/gluster/metadata.xml
+++ b/acct-user/gluster/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cluster@gentoo.org</email>
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/metadata.xml b/acct-user/gns3/metadata.xml
new file mode 100644
index 000000000000..84aeb359eebd
--- /dev/null
+++ b/acct-user/gns3/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>mmk@levelnine.at</email>
+ <name>Michael Mair-Keimberger</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/gnump3d/gnump3d-0-r2.ebuild b/acct-user/gnump3d/gnump3d-0-r2.ebuild
new file mode 100644
index 000000000000..39468ab0ea95
--- /dev/null
+++ b/acct-user/gnump3d/gnump3d-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gnump3d/metadata.xml
new file mode 100644
index 000000000000..93423219a5bc
--- /dev/null
+++ b/acct-user/gnump3d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..a78fd256b45b
--- /dev/null
+++ b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/gnupg-pkcs11-scd-proxy/metadata.xml b/acct-user/gnupg-pkcs11-scd-proxy/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/gnupg-pkcs11-scd-proxy/metadata.xml
+++ b/acct-user/gnupg-pkcs11-scd-proxy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/goaccess/goaccess-0-r1.ebuild b/acct-user/goaccess/goaccess-0-r1.ebuild
new file mode 100644
index 000000000000..bc260252062a
--- /dev/null
+++ b/acct-user/goaccess/goaccess-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
+
+ACCT_USER_ID=523
+ACCT_USER_GROUPS=( goaccess )
+ACCT_USER_HOME="/var/lib/goaccess"
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/goaccess/metadata.xml b/acct-user/goaccess/metadata.xml
new file mode 100644
index 000000000000..7e33eb1e0776
--- /dev/null
+++ b/acct-user/goaccess/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>spiderx@spiderx.dp.ua</email>
+ <name>Vladimir Pavljuchenkov</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/gopher/gopher-0-r2.ebuild b/acct-user/gopher/gopher-0-r2.ebuild
new file mode 100644
index 000000000000..cec3aeb7b9ec
--- /dev/null
+++ b/acct-user/gopher/gopher-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/gopher/metadata.xml b/acct-user/gopher/metadata.xml
index 4257a4433b0d..e91ef31902f9 100644
--- a/acct-user/gopher/metadata.xml
+++ b/acct-user/gopher/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>matt@offtopica.uk</email>
- <name>Matt Smith</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <maintainer type="person">
+ <email>matthew@gentoo.org</email>
+ <name>Matthew Smith</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/gopherd/gopherd-0-r2.ebuild b/acct-user/gopherd/gopherd-0-r2.ebuild
new file mode 100644
index 000000000000..017df3787704
--- /dev/null
+++ b/acct-user/gopherd/gopherd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gopherd/metadata.xml
new file mode 100644
index 000000000000..a3862b8ec2fc
--- /dev/null
+++ b/acct-user/gopherd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+</pkgmetadata>
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-r4.ebuild b/acct-user/gpsd/gpsd-0-r4.ebuild
new file mode 100644
index 000000000000..1b0b328aeadc
--- /dev/null
+++ b/acct-user/gpsd/gpsd-0-r4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gpsd/metadata.xml
index d78f80981828..d3369ac77939 100644
--- a/acct-user/gpsd/metadata.xml
+++ b/acct-user/gpsd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
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-r3.ebuild b/acct-user/grafana/grafana-0-r3.ebuild
new file mode 100644
index 000000000000..2023cd307d5e
--- /dev/null
+++ b/acct-user/grafana/grafana-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/grafana/metadata.xml
index 8c5a5301197b..9dc24d2ae538 100644
--- a/acct-user/grafana/metadata.xml
+++ b/acct-user/grafana/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
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-r3.ebuild b/acct-user/graylog/graylog-0-r3.ebuild
new file mode 100644
index 000000000000..ee37cc6423ab
--- /dev/null
+++ b/acct-user/graylog/graylog-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/graylog/metadata.xml
index d5c2b8215a1d..bef24d2c2337 100644
--- a/acct-user/graylog/metadata.xml
+++ b/acct-user/graylog/metadata.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>chainsaw@gentoo.org</email>
- <name>Tony Vroon</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>hydrapolic@gmail.com</email>
- <name>Tomáš Mózes</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/greetd/greetd-0-r3.ebuild
new file mode 100644
index 000000000000..80bf0cf756d8
--- /dev/null
+++ b/acct-user/greetd/greetd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/greetd/metadata.xml
index 48fb9a962bbc..60374df2c110 100644
--- a/acct-user/greetd/metadata.xml
+++ b/acct-user/greetd/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@aisha.cc</email>
- <name>Aisha Tammy</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <maintainer type="person">
+ <email>ajak@gentoo.org</email>
+ <name>John Helmert III</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/grok_exporter/grok_exporter-0-r2.ebuild b/acct-user/grok_exporter/grok_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..505ecbad8ee0
--- /dev/null
+++ b/acct-user/grok_exporter/grok_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/metadata.xml b/acct-user/grok_exporter/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/grok_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/groonga/groonga-0-r2.ebuild b/acct-user/groonga/groonga-0-r2.ebuild
new file mode 100644
index 000000000000..620035cc1d0b
--- /dev/null
+++ b/acct-user/groonga/groonga-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/groonga/metadata.xml b/acct-user/groonga/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/groonga/metadata.xml
+++ b/acct-user/groonga/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/gvm/gvm-0-r3.ebuild
new file mode 100644
index 000000000000..298e6ffcb7ac
--- /dev/null
+++ b/acct-user/gvm/gvm-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/gvm/metadata.xml
index 4ddcf261071b..de76f9c0db93 100644
--- a/acct-user/gvm/metadata.xml
+++ b/acct-user/gvm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>jonas.licht@gmail.com</email>
diff --git a/acct-user/h2o/h2o-0-r2.ebuild b/acct-user/h2o/h2o-0-r2.ebuild
new file mode 100644
index 000000000000..942bc85ccd53
--- /dev/null
+++ b/acct-user/h2o/h2o-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/h2o/metadata.xml
new file mode 100644
index 000000000000..987ce1bc2ed6
--- /dev/null
+++ b/acct-user/h2o/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hattya@gentoo.org</email>
+ <name>Akinori Hattori</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/hacluster/hacluster-0-r2.ebuild b/acct-user/hacluster/hacluster-0-r2.ebuild
new file mode 100644
index 000000000000..8be9a92fa693
--- /dev/null
+++ b/acct-user/hacluster/hacluster-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/hacluster/metadata.xml
new file mode 100644
index 000000000000..f5fb83321f9e
--- /dev/null
+++ b/acct-user/hacluster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/haproxy/haproxy-0-r3.ebuild
new file mode 100644
index 000000000000..54760e7f59b4
--- /dev/null
+++ b/acct-user/haproxy/haproxy-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=188
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/haproxy/metadata.xml b/acct-user/haproxy/metadata.xml
index 5840601f180f..df90b41cf905 100644
--- a/acct-user/haproxy/metadata.xml
+++ b/acct-user/haproxy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>idl0r@gentoo.org</email>
diff --git a/acct-user/havp/havp-0-r2.ebuild b/acct-user/havp/havp-0-r2.ebuild
new file mode 100644
index 000000000000..9b8f3542221f
--- /dev/null
+++ b/acct-user/havp/havp-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/havp"
+
+ACCT_USER_GROUPS=( "havp" )
+ACCT_USER_ID="254"
+
+acct-user_add_deps
diff --git a/acct-user/havp/havp-0.ebuild b/acct-user/havp/havp-0.ebuild
deleted file mode 100644
index 60523308202c..000000000000
--- a/acct-user/havp/havp-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/havp"
-
-ACCT_USER_GROUPS=( "havp" )
-ACCT_HOME_USER="/etc/havp"
-ACCT_USER_ID="254"
-
-acct-user_add_deps
diff --git a/acct-user/havp/metadata.xml b/acct-user/havp/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/havp/metadata.xml
+++ b/acct-user/havp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/headscale/headscale-0-r1.ebuild b/acct-user/headscale/headscale-0-r1.ebuild
new file mode 100644
index 000000000000..23080db987f7
--- /dev/null
+++ b/acct-user/headscale/headscale-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Headscale Server hosting user"
+
+ACCT_USER_ID=514
+ACCT_USER_HOME_PERMS=750
+ACCT_USER_GROUPS=( headscale )
+ACCT_USER_HOME=/var/lib/headscale
+
+acct-user_add_deps
diff --git a/acct-user/headscale/metadata.xml b/acct-user/headscale/metadata.xml
new file mode 100644
index 000000000000..73d345656db7
--- /dev/null
+++ b/acct-user/headscale/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>chris@lesscrowds.org</email>
+ <name>Chris Su</name>
+ </maintainer>
+ <maintainer type="person" proxied="proxy">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
+ <maintainer type="person" proxied="proxy">
+ <email>jsmolic@gentoo.org</email>
+ <name>Jakov Smolić</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/heat/heat-0-r1.ebuild b/acct-user/heat/heat-0-r1.ebuild
deleted file mode 100644
index d721c2e9d042..000000000000
--- a/acct-user/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the heat openstack service"
-ACCT_USER_ID=444
-ACCT_USER_HOME=/var/lib/heat
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( heat )
-
-acct-user_add_deps
diff --git a/acct-user/heat/metadata.xml b/acct-user/heat/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/heat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/hsqldb/hsqldb-0-r2.ebuild b/acct-user/hsqldb/hsqldb-0-r2.ebuild
new file mode 100644
index 000000000000..de8b7609349c
--- /dev/null
+++ b/acct-user/hsqldb/hsqldb-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/hsqldb/metadata.xml b/acct-user/hsqldb/metadata.xml
index 0d49beafc75d..75321cfb5598 100644
--- a/acct-user/hsqldb/metadata.xml
+++ b/acct-user/hsqldb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
diff --git a/acct-user/http/http-0-r2.ebuild b/acct-user/http/http-0-r2.ebuild
new file mode 100644
index 000000000000..fba2e5256ed2
--- /dev/null
+++ b/acct-user/http/http-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/http/metadata.xml b/acct-user/http/metadata.xml
index 9e1d47466c8d..3cbc205c55cb 100644
--- a/acct-user/http/metadata.xml
+++ b/acct-user/http/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
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-r3.ebuild b/acct-user/i2p/i2p-0-r3.ebuild
new file mode 100644
index 000000000000..a9c926408e91
--- /dev/null
+++ b/acct-user/i2p/i2p-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/i2p/metadata.xml
index 400ec039fe65..3720a21d3c73 100644
--- a/acct-user/i2p/metadata.xml
+++ b/acct-user/i2p/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>tharvik@gmail.com</email>
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-r3.ebuild b/acct-user/i2pd/i2pd-0-r3.ebuild
new file mode 100644
index 000000000000..73bcd00a2fd7
--- /dev/null
+++ b/acct-user/i2pd/i2pd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/i2pd/metadata.xml
index 54ebb476112c..dacea5c716ec 100644
--- a/acct-user/i2pd/metadata.xml
+++ b/acct-user/i2pd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>kaikaikai@yandex.ru</email>
diff --git a/acct-user/icecast/icecast-0-r2.ebuild b/acct-user/icecast/icecast-0-r2.ebuild
new file mode 100644
index 000000000000..816c394728ac
--- /dev/null
+++ b/acct-user/icecast/icecast-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/icecast/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/icecast/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/icecream/icecream-0-r2.ebuild b/acct-user/icecream/icecream-0-r2.ebuild
new file mode 100644
index 000000000000..6fdff4a02d44
--- /dev/null
+++ b/acct-user/icecream/icecream-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/icecream/metadata.xml
new file mode 100644
index 000000000000..f5fb83321f9e
--- /dev/null
+++ b/acct-user/icecream/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/ices/ices-0-r2.ebuild b/acct-user/ices/ices-0-r2.ebuild
new file mode 100644
index 000000000000..7407267a28dc
--- /dev/null
+++ b/acct-user/ices/ices-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ices/metadata.xml
new file mode 100644
index 000000000000..93423219a5bc
--- /dev/null
+++ b/acct-user/ices/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/icinga/icinga-0-r3.ebuild
new file mode 100644
index 000000000000..1fbed9938997
--- /dev/null
+++ b/acct-user/icinga/icinga-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/icinga/metadata.xml
index 3ffdeb4af3b5..5c76f7a3fc67 100644
--- a/acct-user/icinga/metadata.xml
+++ b/acct-user/icinga/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
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/metadata.xml b/acct-user/icingadirector/metadata.xml
new file mode 100644
index 000000000000..5c76f7a3fc67
--- /dev/null
+++ b/acct-user/icingadirector/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/inadyn/inadyn-0-r1.ebuild b/acct-user/inadyn/inadyn-0-r1.ebuild
new file mode 100644
index 000000000000..62fcbf9f94b0
--- /dev/null
+++ b/acct-user/inadyn/inadyn-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/inadyn"
+
+ACCT_USER_HOME="/var/lib/inadyn"
+ACCT_USER_ID="529"
+ACCT_USER_GROUPS=( "inadyn" )
+
+acct-user_add_deps
diff --git a/acct-user/inadyn/metadata.xml b/acct-user/inadyn/metadata.xml
new file mode 100644
index 000000000000..c07e13d4a6bd
--- /dev/null
+++ b/acct-user/inadyn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/influxdb/influxdb-0-r1.ebuild b/acct-user/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 9f92875d2fdf..000000000000
--- a/acct-user/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for influxdb"
-ACCT_USER_ID=342
-ACCT_USER_GROUPS=( influxdb )
-ACCT_USER_HOME=/var/lib/influxdb
-
-acct-user_add_deps
diff --git a/acct-user/influxdb/influxdb-0-r3.ebuild b/acct-user/influxdb/influxdb-0-r3.ebuild
new file mode 100644
index 000000000000..b065f54ceed1
--- /dev/null
+++ b/acct-user/influxdb/influxdb-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/influxdb/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/influxdb/metadata.xml
+++ b/acct-user/influxdb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/inspircd/inspircd-0-r3.ebuild
new file mode 100644
index 000000000000..0af4ef72d8c7
--- /dev/null
+++ b/acct-user/inspircd/inspircd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/inspircd/metadata.xml
index cccd8e9eeb02..22bd0a2cbb65 100644
--- a/acct-user/inspircd/metadata.xml
+++ b/acct-user/inspircd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>wadecline@hotmail.com</email>
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-r3.ebuild b/acct-user/ipfs/ipfs-0-r3.ebuild
new file mode 100644
index 000000000000..dd1dd159b8a3
--- /dev/null
+++ b/acct-user/ipfs/ipfs-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ipfs/metadata.xml
index 79a2badc8455..4f0aff0ea84e 100644
--- a/acct-user/ipfs/metadata.xml
+++ b/acct-user/ipfs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hurikhan77+bgo@gmail.com</email>
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-r3.ebuild b/acct-user/ippl/ippl-0-r3.ebuild
new file mode 100644
index 000000000000..9db6acf88ab6
--- /dev/null
+++ b/acct-user/ippl/ippl-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ippl/metadata.xml
index 2c2a7923cfc8..d5af4bcfaf13 100644
--- a/acct-user/ippl/metadata.xml
+++ b/acct-user/ippl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
diff --git a/acct-user/ipsec/ipsec-0-r2.ebuild b/acct-user/ipsec/ipsec-0-r2.ebuild
new file mode 100644
index 000000000000..6cc2ffd24bcf
--- /dev/null
+++ b/acct-user/ipsec/ipsec-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/ipsec/metadata.xml b/acct-user/ipsec/metadata.xml
index 8c5a5301197b..9dc24d2ae538 100644
--- a/acct-user/ipsec/metadata.xml
+++ b/acct-user/ipsec/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
diff --git a/acct-user/ipsentinel/ipsentinel-0-r2.ebuild b/acct-user/ipsentinel/ipsentinel-0-r2.ebuild
new file mode 100644
index 000000000000..1ad78a15817a
--- /dev/null
+++ b/acct-user/ipsentinel/ipsentinel-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ipsentinel/metadata.xml
new file mode 100644
index 000000000000..d5af4bcfaf13
--- /dev/null
+++ b/acct-user/ipsentinel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/iroffer/iroffer-0-r2.ebuild b/acct-user/iroffer/iroffer-0-r2.ebuild
new file mode 100644
index 000000000000..c165de141f25
--- /dev/null
+++ b/acct-user/iroffer/iroffer-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=187
+ACCT_USER_GROUPS=( iroffer )
+
+acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0.ebuild b/acct-user/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 452a50f2f547..000000000000
--- a/acct-user/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=187
-ACCT_USER_GROUPS=( iroffer )
-
-acct-user_add_deps
diff --git a/acct-user/iroffer/metadata.xml b/acct-user/iroffer/metadata.xml
index 04513620c4df..115e9d64a669 100644
--- a/acct-user/iroffer/metadata.xml
+++ b/acct-user/iroffer/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Mikle Kolyada</name>
- <email>zlogene@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/jabber/jabber-0.ebuild b/acct-user/jabber/jabber-0.ebuild
deleted file mode 100644
index 1755616ce8bd..000000000000
--- a/acct-user/jabber/jabber-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="A user for various jabber services"
-
-ACCT_USER_GROUPS=( "jabber" )
-ACCT_USER_ID="379"
-
-acct-user_add_deps
diff --git a/acct-user/jabber/metadata.xml b/acct-user/jabber/metadata.xml
deleted file mode 100644
index 3e3880cf1051..000000000000
--- a/acct-user/jabber/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>conikost@gentoo.org</email>
- <name>Conrad Kostecki</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/jackett/jackett-0-r1.ebuild b/acct-user/jackett/jackett-0-r1.ebuild
new file mode 100644
index 000000000000..46f1c53bafa4
--- /dev/null
+++ b/acct-user/jackett/jackett-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for jackett"
+ACCT_USER_HOME=/var/lib/jackett
+ACCT_USER_ID=531
+ACCT_USER_GROUPS=( jackett )
+
+acct-user_add_deps
diff --git a/acct-user/jackett/metadata.xml b/acct-user/jackett/metadata.xml
new file mode 100644
index 000000000000..7b06c9eb2c55
--- /dev/null
+++ b/acct-user/jackett/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>PF4Public@mail.ru</email>
+ <name>PF4Public</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Jackett/Jackett</remote-id>
+ <bugs-to>https://github.com/Jackett/Jackett/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/acct-user/jellyfin/jellyfin-0-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/jellyfin/metadata.xml b/acct-user/jellyfin/metadata.xml
new file mode 100644
index 000000000000..8500bdb0844f
--- /dev/null
+++ b/acct-user/jellyfin/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>gentoo@wb9.se</email>
+ <name>Fredrik Eriksson</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jellyfin/jellyfin</remote-id>
+ <bugs-to>https://github.com/jellyfin/jellyfin/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/acct-user/jenkins/jenkins-0-r2.ebuild b/acct-user/jenkins/jenkins-0-r2.ebuild
new file mode 100644
index 000000000000..e63fa5bd077b
--- /dev/null
+++ b/acct-user/jenkins/jenkins-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/jenkins/metadata.xml b/acct-user/jenkins/metadata.xml
index 26b75d373ed4..ed5c2ef09eb8 100644
--- a/acct-user/jenkins/metadata.xml
+++ b/acct-user/jenkins/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
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-r3.ebuild b/acct-user/kafka/kafka-0-r3.ebuild
new file mode 100644
index 000000000000..655cc76352b6
--- /dev/null
+++ b/acct-user/kafka/kafka-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/kafka/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/kafka/metadata.xml
+++ b/acct-user/kafka/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/kapacitor/kapacitor-0-r3.ebuild
new file mode 100644
index 000000000000..344014683fe8
--- /dev/null
+++ b/acct-user/kapacitor/kapacitor-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/kapacitor/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/kapacitor/metadata.xml
+++ b/acct-user/kapacitor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/karma/karma-0-r2.ebuild b/acct-user/karma/karma-0-r2.ebuild
new file mode 100644
index 000000000000..dec282098992
--- /dev/null
+++ b/acct-user/karma/karma-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/karma/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/karma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/keystone/keystone-0-r1.ebuild b/acct-user/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 1519aa941e90..000000000000
--- a/acct-user/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the keystone openstack service"
-ACCT_USER_ID=445
-ACCT_USER_HOME=/var/lib/keystone
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( keystone )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/metadata.xml b/acct-user/keystone/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/keystone/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/kibana/kibana-0-r1.ebuild b/acct-user/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index b04ba4aacc1d..000000000000
--- a/acct-user/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Kibana program user"
-ACCT_USER_ID=269
-ACCT_USER_HOME=/var/lib/kibana
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( kibana )
-acct-user_add_deps
diff --git a/acct-user/kibana/kibana-0-r3.ebuild b/acct-user/kibana/kibana-0-r3.ebuild
new file mode 100644
index 000000000000..74667c4eb958
--- /dev/null
+++ b/acct-user/kibana/kibana-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/kibana/metadata.xml
index 96e8c9b26b25..f3ded0c75da8 100644
--- a/acct-user/kibana/metadata.xml
+++ b/acct-user/kibana/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hydrapolic@gmail.com</email>
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-r3.ebuild b/acct-user/kismet/kismet-0-r3.ebuild
new file mode 100644
index 000000000000..c725ddcc3986
--- /dev/null
+++ b/acct-user/kismet/kismet-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/kismet/metadata.xml
index 2b9b4266ca5b..97eff4632a18 100644
--- a/acct-user/kismet/metadata.xml
+++ b/acct-user/kismet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zerochaos@gentoo.org</email>
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/metadata.xml b/acct-user/knot-resolver/metadata.xml
new file mode 100644
index 000000000000..e91ef31902f9
--- /dev/null
+++ b/acct-user/knot-resolver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>matthew@gentoo.org</email>
+ <name>Matthew Smith</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/knot/knot-0-r3.ebuild
new file mode 100644
index 000000000000..cbcc3df30192
--- /dev/null
+++ b/acct-user/knot/knot-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/knot/metadata.xml
index 01b903b2b23b..0df6176b8edf 100644
--- a/acct-user/knot/metadata.xml
+++ b/acct-user/knot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>nemunaire@nemunai.re</email>
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-r3.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r3.ebuild
new file mode 100644
index 000000000000..2c79be72b9e5
--- /dev/null
+++ b/acct-user/kube-apiserver/kube-apiserver-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/kube-apiserver/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/kube-apiserver/metadata.xml
+++ b/acct-user/kube-apiserver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r3.ebuild
new file mode 100644
index 000000000000..4e2d9da65d99
--- /dev/null
+++ b/acct-user/kube-controller-manager/kube-controller-manager-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/kube-controller-manager/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/kube-controller-manager/metadata.xml
+++ b/acct-user/kube-controller-manager/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r3.ebuild
new file mode 100644
index 000000000000..0ac3bc1cb38c
--- /dev/null
+++ b/acct-user/kube-scheduler/kube-scheduler-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/kube-scheduler/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/kube-scheduler/metadata.xml
+++ b/acct-user/kube-scheduler/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/ldap/ldap-0-r2.ebuild b/acct-user/ldap/ldap-0-r2.ebuild
new file mode 100644
index 000000000000..7006040493f9
--- /dev/null
+++ b/acct-user/ldap/ldap-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/ldap/metadata.xml b/acct-user/ldap/metadata.xml
index 6698a4ab7883..115e9d64a669 100644
--- a/acct-user/ldap/metadata.xml
+++ b/acct-user/ldap/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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/metadata.xml b/acct-user/libreoffice/metadata.xml
new file mode 100644
index 000000000000..f632b40c7d8a
--- /dev/null
+++ b/acct-user/libreoffice/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/lidarr/lidarr-0-r1.ebuild b/acct-user/lidarr/lidarr-0-r1.ebuild
new file mode 100644
index 000000000000..3201247ce1dc
--- /dev/null
+++ b/acct-user/lidarr/lidarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for lidarr"
+ACCT_USER_HOME=/var/lib/lidarr
+ACCT_USER_ID=530
+ACCT_USER_GROUPS=( lidarr )
+
+acct-user_add_deps
diff --git a/acct-user/lidarr/metadata.xml b/acct-user/lidarr/metadata.xml
new file mode 100644
index 000000000000..65c6cb6b33aa
--- /dev/null
+++ b/acct-user/lidarr/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>PF4Public@mail.ru</email>
+ <name>PF4Public</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Lidarr/Lidarr</remote-id>
+ <bugs-to>https://github.com/Lidarr/Lidarr/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/acct-user/lightdm/lightdm-0-r1.ebuild b/acct-user/lightdm/lightdm-0-r1.ebuild
new file mode 100644
index 000000000000..25af3b9c7f54
--- /dev/null
+++ b/acct-user/lightdm/lightdm-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/lightdm"
+
+ACCT_USER_GROUPS=( "lightdm" "video" )
+ACCT_USER_HOME="/var/lib/lightdm"
+ACCT_USER_ID="134"
+
+acct-user_add_deps
diff --git a/acct-user/lightdm/metadata.xml b/acct-user/lightdm/metadata.xml
new file mode 100644
index 000000000000..beac02a9af14
--- /dev/null
+++ b/acct-user/lightdm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+</pkgmetadata>
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-r3.ebuild b/acct-user/lighttpd/lighttpd-0-r3.ebuild
new file mode 100644
index 000000000000..eece138b765a
--- /dev/null
+++ b/acct-user/lighttpd/lighttpd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/lighttpd/metadata.xml
index 7a38bb900964..38bfb729261e 100644
--- a/acct-user/lighttpd/metadata.xml
+++ b/acct-user/lighttpd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-user/litecoin/litecoin-0.ebuild b/acct-user/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 2a9cad12ecb1..000000000000
--- a/acct-user/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/litecoind"
-
-ACCT_USER_GROUPS=( "litecoin" )
-ACCT_USER_HOME="/var/lib/litecoin"
-ACCT_USER_ID="256"
-
-acct-user_add_deps
diff --git a/acct-user/litecoin/metadata.xml b/acct-user/litecoin/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/acct-user/litecoin/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/lldpd/lldpd-0-r1.ebuild b/acct-user/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 1b1593fc3a76..000000000000
--- a/acct-user/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/lldpd"
-
-ACCT_USER_ID=315
-ACCT_USER_GROUPS=( lldpd )
-
-acct-user_add_deps
diff --git a/acct-user/lldpd/lldpd-0-r3.ebuild b/acct-user/lldpd/lldpd-0-r3.ebuild
new file mode 100644
index 000000000000..5c6a40dd3908
--- /dev/null
+++ b/acct-user/lldpd/lldpd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/lldpd/metadata.xml
index cee379b15409..bd6443d4a375 100644
--- a/acct-user/lldpd/metadata.xml
+++ b/acct-user/lldpd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
diff --git a/acct-user/logcheck/logcheck-0-r3.ebuild b/acct-user/logcheck/logcheck-0-r3.ebuild
new file mode 100644
index 000000000000..17b949d61f95
--- /dev/null
+++ b/acct-user/logcheck/logcheck-0-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logcheck"
+IUSE="systemd"
+
+ACCT_USER_GROUPS=( "logcheck" )
+ACCT_USER_ID="284"
+
+RDEPEND="systemd? ( acct-group/systemd-journal )"
+
+acct-user_add_deps
+
+pkg_setup() {
+ # Allow the 'logcheck' user to view the systemd journal.
+ if use systemd; then
+ ACCT_USER_GROUPS+=( systemd-journal )
+ fi
+}
diff --git a/acct-user/logcheck/logcheck-0.ebuild b/acct-user/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 4dfb987a1636..000000000000
--- a/acct-user/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logcheck"
-
-ACCT_USER_GROUPS=( "logcheck" )
-ACCT_USER_ID="284"
-
-acct-user_add_deps
diff --git a/acct-user/logcheck/metadata.xml b/acct-user/logcheck/metadata.xml
index 7a38bb900964..7530d08266f4 100644
--- a/acct-user/logcheck/metadata.xml
+++ b/acct-user/logcheck/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>foti.giuseppe@gmail.com</email>
+ <name>Giuseppe Foti</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-user/logstash/logstash-0-r1.ebuild b/acct-user/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 748b9f907d0d..000000000000
--- a/acct-user/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Logstash program user"
-ACCT_USER_ID=270
-ACCT_USER_HOME=/var/lib/logstash
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( logstash )
-acct-user_add_deps
diff --git a/acct-user/logstash/logstash-0-r3.ebuild b/acct-user/logstash/logstash-0-r3.ebuild
new file mode 100644
index 000000000000..957d187e0b6b
--- /dev/null
+++ b/acct-user/logstash/logstash-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/logstash/metadata.xml
index 96e8c9b26b25..f3ded0c75da8 100644
--- a/acct-user/logstash/metadata.xml
+++ b/acct-user/logstash/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hydrapolic@gmail.com</email>
diff --git a/acct-user/logsurfer/logsurfer-0-r2.ebuild b/acct-user/logsurfer/logsurfer-0-r2.ebuild
new file mode 100644
index 000000000000..45cdf886cff4
--- /dev/null
+++ b/acct-user/logsurfer/logsurfer-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/logsurfer/metadata.xml b/acct-user/logsurfer/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/logsurfer/metadata.xml
+++ b/acct-user/logsurfer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/lxc/lxc-0-r2.ebuild b/acct-user/lxc/lxc-0-r2.ebuild
new file mode 100644
index 000000000000..7449e8ee3799
--- /dev/null
+++ b/acct-user/lxc/lxc-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 c0bf316bb091..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-emulation/lxc"
-ACCT_USER_ID=358
-ACCT_USER_GROUPS=( lxc )
-
-acct-user_add_deps
diff --git a/acct-user/lxc/metadata.xml b/acct-user/lxc/metadata.xml
index 36289aa361ce..5d32dd6c55b4 100644
--- a/acct-user/lxc/metadata.xml
+++ b/acct-user/lxc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
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-r3.ebuild b/acct-user/mail/mail-0-r3.ebuild
new file mode 100644
index 000000000000..b5cca0f3edc7
--- /dev/null
+++ b/acct-user/mail/mail-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mail/metadata.xml
index e6f3bf582ab7..38ebffc8efa5 100644
--- a/acct-user/mail/metadata.xml
+++ b/acct-user/mail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
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-r3.ebuild b/acct-user/man/man-1-r3.ebuild
new file mode 100644
index 000000000000..b3ffdc07f966
--- /dev/null
+++ b/acct-user/man/man-1-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=13
+ACCT_USER_GROUPS=( man )
+
+acct-user_add_deps
diff --git a/acct-user/man/metadata.xml b/acct-user/man/metadata.xml
index 7382c92ceae8..8f8127182cb1 100644
--- a/acct-user/man/metadata.xml
+++ b/acct-user/man/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
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-r3.ebuild b/acct-user/maradns/maradns-0-r3.ebuild
new file mode 100644
index 000000000000..fdb733b10ff6
--- /dev/null
+++ b/acct-user/maradns/maradns-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=99
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/maradns/metadata.xml b/acct-user/maradns/metadata.xml
index 8072ef2372e4..115e9d64a669 100644
--- a/acct-user/maradns/metadata.xml
+++ b/acct-user/maradns/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slashbeast@gentoo.org</email>
- <name>Piotr Karbowski</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/memcached/memcached-0-r1.ebuild b/acct-user/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 65ff4babf81f..000000000000
--- a/acct-user/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the memcached service"
-ACCT_USER_ID=441
-ACCT_USER_GROUPS=( memcached )
-
-acct-user_add_deps
diff --git a/acct-user/memcached/memcached-0-r3.ebuild b/acct-user/memcached/memcached-0-r3.ebuild
new file mode 100644
index 000000000000..14256ca31be4
--- /dev/null
+++ b/acct-user/memcached/memcached-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/memcached/metadata.xml
index 3ffdeb4af3b5..5c76f7a3fc67 100644
--- a/acct-user/memcached/metadata.xml
+++ b/acct-user/memcached/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
diff --git a/acct-user/memcached_exporter/memcached_exporter-0-r2.ebuild b/acct-user/memcached_exporter/memcached_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..a3aecacc5fa1
--- /dev/null
+++ b/acct-user/memcached_exporter/memcached_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/memcached_exporter/metadata.xml b/acct-user/memcached_exporter/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/memcached_exporter/metadata.xml
+++ b/acct-user/memcached_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/messagebus/messagebus-0-r3.ebuild
new file mode 100644
index 000000000000..f67e1f4f13a7
--- /dev/null
+++ b/acct-user/messagebus/messagebus-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=101
+ACCT_USER_GROUPS=( messagebus )
+
+acct-user_add_deps
diff --git a/acct-user/messagebus/metadata.xml b/acct-user/messagebus/metadata.xml
index 95e86c12108a..d4390c2eb58e 100644
--- a/acct-user/messagebus/metadata.xml
+++ b/acct-user/messagebus/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
diff --git a/acct-user/metadata.xml b/acct-user/metadata.xml
index 377c832369b8..ad7c75deeced 100644
--- a/acct-user/metadata.xml
+++ b/acct-user/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The acct-user category contains packages for system users.
</longdescription>
+ <longdescription lang="de">
+ Die Kategorie acct-user enthält Pakete für System-Benutzer.
+ </longdescription>
</catmetadata>
diff --git a/acct-user/mgraph/metadata.xml b/acct-user/mgraph/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/mgraph/metadata.xml
+++ b/acct-user/mgraph/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/mgraph/mgraph-0-r2.ebuild b/acct-user/mgraph/mgraph-0-r2.ebuild
new file mode 100644
index 000000000000..5e67d9b11ee2
--- /dev/null
+++ b/acct-user/mgraph/mgraph-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/microsoft-identity-broker/metadata.xml b/acct-user/microsoft-identity-broker/metadata.xml
new file mode 100644
index 000000000000..374cd4dedb33
--- /dev/null
+++ b/acct-user/microsoft-identity-broker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/microsoft-identity-broker/microsoft-identity-broker-0.ebuild b/acct-user/microsoft-identity-broker/microsoft-identity-broker-0.ebuild
new file mode 100644
index 000000000000..8a14fc725c1c
--- /dev/null
+++ b/acct-user/microsoft-identity-broker/microsoft-identity-broker-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for sys-auth/microsoft-identity-broker"
+ACCT_USER_ID=539
+ACCT_USER_GROUPS=( microsoft-identity-broker )
+
+acct-user_add_deps
diff --git a/acct-user/milter-regex/metadata.xml b/acct-user/milter-regex/metadata.xml
index 2c2d077c8524..115e9d64a669 100644
--- a/acct-user/milter-regex/metadata.xml
+++ b/acct-user/milter-regex/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/milter-regex/milter-regex-0-r3.ebuild
new file mode 100644
index 000000000000..388768981dbf
--- /dev/null
+++ b/acct-user/milter-regex/milter-regex-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/milter-regex"
+
+ACCT_USER_ID=438
+ACCT_USER_GROUPS=( milter-regex )
+
+acct-user_add_deps
diff --git a/acct-user/minbif/metadata.xml b/acct-user/minbif/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/acct-user/minbif/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/minbif/minbif-0.ebuild b/acct-user/minbif/minbif-0.ebuild
deleted file mode 100644
index e93ddf7c984a..000000000000
--- a/acct-user/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/minbif"
-
-ACCT_USER_GROUPS=( "minbif" )
-ACCT_USER_HOME="/var/lib/minbif"
-ACCT_USER_ID="260"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/metadata.xml b/acct-user/minecraft/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/minecraft/metadata.xml
+++ b/acct-user/minecraft/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
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-r3.ebuild b/acct-user/minecraft/minecraft-0-r3.ebuild
new file mode 100644
index 000000000000..450d5069a6af
--- /dev/null
+++ b/acct-user/minecraft/minecraft-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/minetest/metadata.xml
index 6eb83750896f..6691c1106844 100644
--- a/acct-user/minetest/metadata.xml
+++ b/acct-user/minetest/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
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-r3.ebuild b/acct-user/minetest/minetest-1-r3.ebuild
new file mode 100644
index 000000000000..94114295e5ba
--- /dev/null
+++ b/acct-user/minetest/minetest-1-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/minidlna/metadata.xml
index 0319eec4c8be..076793e3f54b 100644
--- a/acct-user/minidlna/metadata.xml
+++ b/acct-user/minidlna/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/acct-user/minidlna/minidlna-0-r2.ebuild b/acct-user/minidlna/minidlna-0-r2.ebuild
new file mode 100644
index 000000000000..2a7e91e616a7
--- /dev/null
+++ b/acct-user/minidlna/minidlna-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/miniflux/metadata.xml
new file mode 100644
index 000000000000..4b2f40cad64c
--- /dev/null
+++ b/acct-user/miniflux/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>concord@gentoo.org</email>
+ <name>Kenton Groombridge</name>
+ </maintainer>
+</pkgmetadata>
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/minio/metadata.xml b/acct-user/minio/metadata.xml
deleted file mode 100644
index 6698a4ab7883..000000000000
--- a/acct-user/minio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/minio/minio-0.ebuild b/acct-user/minio/minio-0.ebuild
deleted file mode 100644
index 1c8765edb840..000000000000
--- a/acct-user/minio/minio-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for minio"
-ACCT_USER_ID=309
-ACCT_USER_HOME=/var/lib/minio
-ACCT_USER_GROUPS=( minio )
-
-acct-user_add_deps
diff --git a/acct-user/mogile/metadata.xml b/acct-user/mogile/metadata.xml
index 5fb8aeb27d7a..b378ce08e213 100644
--- a/acct-user/mogile/metadata.xml
+++ b/acct-user/mogile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/acct-user/mogile/mogile-0-r2.ebuild b/acct-user/mogile/mogile-0-r2.ebuild
new file mode 100644
index 000000000000..93ec229a3193
--- /dev/null
+++ b/acct-user/mogile/mogile-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mongodb/metadata.xml
index c66a29d26a31..925332451610 100644
--- a/acct-user/mongodb/metadata.xml
+++ b/acct-user/mongodb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ultrabug@gentoo.org</email>
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-r3.ebuild b/acct-user/mongodb/mongodb-0-r3.ebuild
new file mode 100644
index 000000000000..f7e4288c17e8
--- /dev/null
+++ b/acct-user/mongodb/mongodb-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mongodb_exporter/metadata.xml
index 65da3dd78299..150ec8c0940a 100644
--- a/acct-user/mongodb_exporter/metadata.xml
+++ b/acct-user/mongodb_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0-r2.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..c99e0e6bf3d4
--- /dev/null
+++ b/acct-user/mongodb_exporter/mongodb_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/monitorix/metadata.xml
index 77c76f6a7d44..e9ef9067f479 100644
--- a/acct-user/monitorix/metadata.xml
+++ b/acct-user/monitorix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>dwosky@pm.me</email>
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-r3.ebuild b/acct-user/monitorix/monitorix-0-r3.ebuild
new file mode 100644
index 000000000000..f4a84a4a88de
--- /dev/null
+++ b/acct-user/monitorix/monitorix-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/monkeyd/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/monkeyd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/monkeyd/monkeyd-0-r2.ebuild b/acct-user/monkeyd/monkeyd-0-r2.ebuild
new file mode 100644
index 000000000000..f6b295037f36
--- /dev/null
+++ b/acct-user/monkeyd/monkeyd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/monkeysphere/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/monkeysphere/metadata.xml
+++ b/acct-user/monkeysphere/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/monkeysphere/monkeysphere-0-r3.ebuild
new file mode 100644
index 000000000000..307bfa5deb06
--- /dev/null
+++ b/acct-user/monkeysphere/monkeysphere-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mosquitto/metadata.xml
index b58e8386fcb2..1c6906f8795a 100644
--- a/acct-user/mosquitto/metadata.xml
+++ b/acct-user/mosquitto/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mattst88@gentoo.org</email>
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-r3.ebuild b/acct-user/mosquitto/mosquitto-0-r3.ebuild
new file mode 100644
index 000000000000..69d5fd5fbfc0
--- /dev/null
+++ b/acct-user/mosquitto/mosquitto-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/motion/metadata.xml
index c1a7e3dc4e08..d0240f8d68cc 100644
--- a/acct-user/motion/metadata.xml
+++ b/acct-user/motion/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hfern@fernhout.info</email>
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-r3.ebuild b/acct-user/motion/motion-0-r3.ebuild
new file mode 100644
index 000000000000..5ace75166a1c
--- /dev/null
+++ b/acct-user/motion/motion-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mpd/metadata.xml
index 6698a4ab7883..ece09d453dee 100644
--- a/acct-user/mpd/metadata.xml
+++ b/acct-user/mpd/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
+ <email>nex+b-g-o@nexadn.de</email>
+ <name>Adrian Schollmeyer</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/mpd/mpd-0-r3.ebuild
new file mode 100644
index 000000000000..1824bc03a21e
--- /dev/null
+++ b/acct-user/mpd/mpd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/msmtpd/metadata.xml
index 7382c92ceae8..8f8127182cb1 100644
--- a/acct-user/msmtpd/metadata.xml
+++ b/acct-user/msmtpd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
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-r3.ebuild b/acct-user/msmtpd/msmtpd-0-r3.ebuild
new file mode 100644
index 000000000000..e57f3c2708aa
--- /dev/null
+++ b/acct-user/msmtpd/msmtpd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/munge/metadata.xml
new file mode 100644
index 000000000000..f5fb83321f9e
--- /dev/null
+++ b/acct-user/munge/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/munge/munge-0-r2.ebuild b/acct-user/munge/munge-0-r2.ebuild
new file mode 100644
index 000000000000..d4387c1c7655
--- /dev/null
+++ b/acct-user/munge/munge-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/munin-async/metadata.xml
index 355836725eb2..0153b6b191e2 100644
--- a/acct-user/munin-async/metadata.xml
+++ b/acct-user/munin-async/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sysadmin@gentoo.org</email>
diff --git a/acct-user/munin-async/munin-async-0-r1.ebuild b/acct-user/munin-async/munin-async-0-r1.ebuild
deleted file mode 100644
index 813b903cb181..000000000000
--- a/acct-user/munin-async/munin-async-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 munin async proxy node"
-
-ACCT_USER_GROUPS=( munin )
-ACCT_USER_HOME="/var/spool/munin-async"
-ACCT_USER_HOME_OWNER="munin-async:munin"
-ACCT_USER_ID=178
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/munin-async/munin-async-0-r3.ebuild b/acct-user/munin-async/munin-async-0-r3.ebuild
new file mode 100644
index 000000000000..601e82b3518f
--- /dev/null
+++ b/acct-user/munin-async/munin-async-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="user for munin async proxy node"
+
+ACCT_USER_GROUPS=( munin )
+ACCT_USER_HOME="/var/spool/munin-async"
+ACCT_USER_ID=178
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/munin/metadata.xml b/acct-user/munin/metadata.xml
index 355836725eb2..0153b6b191e2 100644
--- a/acct-user/munin/metadata.xml
+++ b/acct-user/munin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sysadmin@gentoo.org</email>
diff --git a/acct-user/munin/munin-0-r1.ebuild b/acct-user/munin/munin-0-r1.ebuild
deleted file mode 100644
index 67505d6ce354..000000000000
--- a/acct-user/munin/munin-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 munin"
-
-ACCT_USER_GROUPS=( munin )
-ACCT_USER_HOME="/var/lib/munin"
-ACCT_USER_HOME_OWNER="munin:munin"
-ACCT_USER_ID=177
-
-acct-user_add_deps
diff --git a/acct-user/munin/munin-0-r3.ebuild b/acct-user/munin/munin-0-r3.ebuild
new file mode 100644
index 000000000000..a8735eb1d3b9
--- /dev/null
+++ b/acct-user/munin/munin-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="user for munin"
+
+ACCT_USER_GROUPS=( munin )
+ACCT_USER_HOME="/var/lib/munin"
+ACCT_USER_ID=177
+
+acct-user_add_deps
diff --git a/acct-user/murmur/metadata.xml b/acct-user/murmur/metadata.xml
index 95aa13f6c5ef..c96ddb2d7b77 100644
--- a/acct-user/murmur/metadata.xml
+++ b/acct-user/murmur/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <maintainer type="person">
+ <email>concord@gentoo.org</email>
+ <name>Kenton Groombridge</name>
+ </maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/murmur/murmur-0-r3.ebuild
new file mode 100644
index 000000000000..7932534b3969
--- /dev/null
+++ b/acct-user/murmur/murmur-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mysql/metadata.xml
index 24aafd06dba9..9344188d1825 100644
--- a/acct-user/mysql/metadata.xml
+++ b/acct-user/mysql/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>mysql-bugs@gentoo.org</email>
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-r3.ebuild b/acct-user/mysql/mysql-0-r3.ebuild
new file mode 100644
index 000000000000..b9c43eaa95fc
--- /dev/null
+++ b/acct-user/mysql/mysql-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mysqld_exporter/metadata.xml
index a32d600f949d..115e9d64a669 100644
--- a/acct-user/mysqld_exporter/metadata.xml
+++ b/acct-user/mysqld_exporter/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..8ede0f1258f7
--- /dev/null
+++ b/acct-user/mysqld_exporter/mysqld_exporter-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/mythtv/metadata.xml
index 7e23aa8c7dd3..f2cf5dba5462 100644
--- a/acct-user/mythtv/metadata.xml
+++ b/acct-user/mythtv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>thebitpit@austincustomerrands.com</email>
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-r3.ebuild b/acct-user/mythtv/mythtv-0-r3.ebuild
new file mode 100644
index 000000000000..f9fcb47cdfbc
--- /dev/null
+++ b/acct-user/mythtv/mythtv-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nagios/metadata.xml
index 45125b9b6e99..f2908ee10b59 100644
--- a/acct-user/nagios/metadata.xml
+++ b/acct-user/nagios/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
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-r3.ebuild b/acct-user/nagios/nagios-0-r3.ebuild
new file mode 100644
index 000000000000..8f00154576ce
--- /dev/null
+++ b/acct-user/nagios/nagios-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=436
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/named/metadata.xml b/acct-user/named/metadata.xml
index ba1f1d99d449..bd6443d4a375 100644
--- a/acct-user/named/metadata.xml
+++ b/acct-user/named/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>idl0r@gentoo.org</email>
- <name>Christian Ruppert</name>
- </maintainer>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/named/named-0-r1.ebuild b/acct-user/named/named-0-r1.ebuild
deleted file mode 100644
index 103b3149f63d..000000000000
--- a/acct-user/named/named-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 net-dns/bind"
-
-ACCT_USER_ID=40
-ACCT_USER_HOME=/etc/bind
-ACCT_USER_HOME_OWNER=named:named
-ACCT_USER_GROUPS=( named )
-
-acct-user_add_deps
diff --git a/acct-user/named/named-0-r3.ebuild b/acct-user/named/named-0-r3.ebuild
new file mode 100644
index 000000000000..471b7d103410
--- /dev/null
+++ b/acct-user/named/named-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/bind"
+
+ACCT_USER_ID=40
+ACCT_USER_HOME=/etc/bind
+ACCT_USER_GROUPS=( named )
+
+acct-user_add_deps
diff --git a/acct-user/netbox/metadata.xml b/acct-user/netbox/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/acct-user/netbox/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/netbox/netbox-0-r1.ebuild b/acct-user/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 1d47bf20c233..000000000000
--- a/acct-user/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netbox"
-ACCT_USER_ID=431
-ACCT_USER_GROUPS=( netbox )
-ACCT_USER_HOME=/var/lib/netbox
-
-acct-user_add_deps
diff --git a/acct-user/netdata/metadata.xml b/acct-user/netdata/metadata.xml
index 5a4b1cb6f68a..56f022c879d7 100644
--- a/acct-user/netdata/metadata.xml
+++ b/acct-user/netdata/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>candrews@gentoo.org</email>
diff --git a/acct-user/netdata/netdata-1-r2.ebuild b/acct-user/netdata/netdata-1-r2.ebuild
new file mode 100644
index 000000000000..ab8815313e02
--- /dev/null
+++ b/acct-user/netdata/netdata-1-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/netperf/metadata.xml
new file mode 100644
index 000000000000..d5af4bcfaf13
--- /dev/null
+++ b/acct-user/netperf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/netperf/netperf-0-r2.ebuild b/acct-user/netperf/netperf-0-r2.ebuild
new file mode 100644
index 000000000000..f80b0bb908b5
--- /dev/null
+++ b/acct-user/netperf/netperf-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/netperf"
+
+ACCT_USER_GROUPS=( "netperf" )
+ACCT_USER_ID="168"
+
+acct-user_add_deps
diff --git a/acct-user/neutron/metadata.xml b/acct-user/neutron/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/neutron/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/neutron/neutron-0-r1.ebuild b/acct-user/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 8f58ff4800e9..000000000000
--- a/acct-user/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack neutron service"
-ACCT_USER_ID=446
-ACCT_USER_HOME=/var/lib/neutron
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( neutron )
-
-acct-user_add_deps
diff --git a/acct-user/nginx-unit/metadata.xml b/acct-user/nginx-unit/metadata.xml
new file mode 100644
index 000000000000..694b1295412e
--- /dev/null
+++ b/acct-user/nginx-unit/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mpagano@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/nginx-unit/nginx-unit-0-r1.ebuild b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
new file mode 100644
index 000000000000..25bc84af7397
--- /dev/null
+++ b/acct-user/nginx-unit/nginx-unit-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="527"
+ACCT_USER_GROUPS=( "nginx-unit" )
+ACCT_USER_HOME="/var/lib/nginx-unit"
+
+acct-user_add_deps
diff --git a/acct-user/nginx-vts-exporter/metadata.xml b/acct-user/nginx-vts-exporter/metadata.xml
index 65da3dd78299..150ec8c0940a 100644
--- a/acct-user/nginx-vts-exporter/metadata.xml
+++ b/acct-user/nginx-vts-exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
new file mode 100644
index 000000000000..403832d29bc1
--- /dev/null
+++ b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nginx/metadata.xml
new file mode 100644
index 000000000000..115e9d64a669
--- /dev/null
+++ b/acct-user/nginx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/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/ngircd/metadata.xml b/acct-user/ngircd/metadata.xml
index 979bcc7aec93..641cbd3703e7 100644
--- a/acct-user/ngircd/metadata.xml
+++ b/acct-user/ngircd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
diff --git a/acct-user/ngircd/ngircd-0-r1.ebuild b/acct-user/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 27941496da17..000000000000
--- a/acct-user/ngircd/ngircd-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 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/metadata.xml b/acct-user/ngrep/metadata.xml
new file mode 100644
index 000000000000..503c95b064be
--- /dev/null
+++ b/acct-user/ngrep/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>jpr5+gentoo@darkridge.com</email>
+ <name>Jordan Ritter</name>
+ <description>Program author who would like to be notified of bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/ngrep/ngrep-0-r3.ebuild b/acct-user/ngrep/ngrep-0-r3.ebuild
new file mode 100644
index 000000000000..ec84445e6833
--- /dev/null
+++ b/acct-user/ngrep/ngrep-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nm-openconnect/metadata.xml
new file mode 100644
index 000000000000..f453528b934f
--- /dev/null
+++ b/acct-user/nm-openconnect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/nm-openconnect/nm-openconnect-0-r2.ebuild b/acct-user/nm-openconnect/nm-openconnect-0-r2.ebuild
new file mode 100644
index 000000000000..3f52391f879b
--- /dev/null
+++ b/acct-user/nm-openconnect/nm-openconnect-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nm-openvpn/metadata.xml
new file mode 100644
index 000000000000..f453528b934f
--- /dev/null
+++ b/acct-user/nm-openvpn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/nm-openvpn/nm-openvpn-0-r2.ebuild b/acct-user/nm-openvpn/nm-openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..be88f15aa7a3
--- /dev/null
+++ b/acct-user/nm-openvpn/nm-openvpn-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nobody/metadata.xml
index f540000d5aab..65e1fc82d859 100644
--- a/acct-user/nobody/metadata.xml
+++ b/acct-user/nobody/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/acct-user/nobody/nobody-0-r2.ebuild b/acct-user/nobody/nobody-0-r2.ebuild
new file mode 100644
index 000000000000..7b8132b4d816
--- /dev/null
+++ b/acct-user/nobody/nobody-0-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/node_exporter/metadata.xml
index 3ffdeb4af3b5..5c76f7a3fc67 100644
--- a/acct-user/node_exporter/metadata.xml
+++ b/acct-user/node_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
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-r3.ebuild b/acct-user/node_exporter/node_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..44d8f56e24fe
--- /dev/null
+++ b/acct-user/node_exporter/node_exporter-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/notary/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/notary/metadata.xml
+++ b/acct-user/notary/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/notary/notary-0-r2.ebuild b/acct-user/notary/notary-0-r2.ebuild
new file mode 100644
index 000000000000..a5456f9528cc
--- /dev/null
+++ b/acct-user/notary/notary-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for app-misc/notary"
+
+ACCT_USER_GROUPS=( "notary" )
+ACCT_USER_ID="280"
+
+acct-user_add_deps
diff --git a/acct-user/notary/notary-0.ebuild b/acct-user/notary/notary-0.ebuild
deleted file mode 100644
index 4b852c14c7f0..000000000000
--- a/acct-user/notary/notary-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-misc/notary"
-
-ACCT_USER_GROUPS=( "notary" )
-ACCT_USER_ID="280"
-
-acct-user_add_deps
diff --git a/acct-user/nova/metadata.xml b/acct-user/nova/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/nova/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/nova/nova-0-r1.ebuild b/acct-user/nova/nova-0-r1.ebuild
deleted file mode 100644
index 660f668cf623..000000000000
--- a/acct-user/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack nova service"
-ACCT_USER_ID=447
-ACCT_USER_HOME=/var/lib/nova
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( nova )
-
-acct-user_add_deps
diff --git a/acct-user/nsd/metadata.xml b/acct-user/nsd/metadata.xml
index 95aa13f6c5ef..7d193f313526 100644
--- a/acct-user/nsd/metadata.xml
+++ b/acct-user/nsd/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <email>kumba@gentoo.org</email>
+ <name>Joshua Kinard</name>
</maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/nsd/nsd-0-r3.ebuild
new file mode 100644
index 000000000000..502bc8784cf6
--- /dev/null
+++ b/acct-user/nsd/nsd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nslcd/metadata.xml
index a550c0267bcc..3bd41cb10a60 100644
--- a/acct-user/nslcd/metadata.xml
+++ b/acct-user/nslcd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
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-r3.ebuild b/acct-user/nslcd/nslcd-0-r3.ebuild
new file mode 100644
index 000000000000..5d775aca48e4
--- /dev/null
+++ b/acct-user/nslcd/nslcd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ntopng/metadata.xml
index 1e878c532c32..f40d277e6b81 100644
--- a/acct-user/ntopng/metadata.xml
+++ b/acct-user/ntopng/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
diff --git a/acct-user/ntopng/ntopng-0-r2.ebuild b/acct-user/ntopng/ntopng-0-r2.ebuild
new file mode 100644
index 000000000000..7f9ee48fed7e
--- /dev/null
+++ b/acct-user/ntopng/ntopng-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ntp/metadata.xml
index 3e60a9a347a4..bc93e527e23c 100644
--- a/acct-user/ntp/metadata.xml
+++ b/acct-user/ntp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
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-r3.ebuild b/acct-user/ntp/ntp-0-r3.ebuild
new file mode 100644
index 000000000000..bed2e5aea0ae
--- /dev/null
+++ b/acct-user/ntp/ntp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nullmail/metadata.xml
new file mode 100644
index 000000000000..a19661a8bd04
--- /dev/null
+++ b/acct-user/nullmail/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/nullmail/nullmail-0-r2.ebuild b/acct-user/nullmail/nullmail-0-r2.ebuild
new file mode 100644
index 000000000000..41d6b71223e1
--- /dev/null
+++ b/acct-user/nullmail/nullmail-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nut/metadata.xml
new file mode 100644
index 000000000000..a19661a8bd04
--- /dev/null
+++ b/acct-user/nut/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/nut/nut-0-r3.ebuild b/acct-user/nut/nut-0-r3.ebuild
new file mode 100644
index 000000000000..e5b651a468ae
--- /dev/null
+++ b/acct-user/nut/nut-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nvpd/metadata.xml
index 5350da507961..06d84e396dc3 100644
--- a/acct-user/nvpd/metadata.xml
+++ b/acct-user/nvpd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ionen@gentoo.org</email>
diff --git a/acct-user/nvpd/nvpd-0-r2.ebuild b/acct-user/nvpd/nvpd-0-r2.ebuild
new file mode 100644
index 000000000000..135ce9aee7ab
--- /dev/null
+++ b/acct-user/nvpd/nvpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/nzbget/metadata.xml
index 44039e87f449..dc6381459374 100644
--- a/acct-user/nzbget/metadata.xml
+++ b/acct-user/nzbget/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sbraz@gentoo.org</email>
diff --git a/acct-user/nzbget/nzbget-0-r2.ebuild b/acct-user/nzbget/nzbget-0-r2.ebuild
new file mode 100644
index 000000000000..615ea30308fd
--- /dev/null
+++ b/acct-user/nzbget/nzbget-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/oidentd/metadata.xml
index ea088a99f737..f4214aa6a51b 100644
--- a/acct-user/oidentd/metadata.xml
+++ b/acct-user/oidentd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>Dessa@gmake.de</email>
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-r3.ebuild b/acct-user/oidentd/oidentd-0-r3.ebuild
new file mode 100644
index 000000000000..37f3868f6f4f
--- /dev/null
+++ b/acct-user/oidentd/oidentd-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=493
+ACCT_USER_GROUPS=( oidentd )
+
+acct-user_add_deps
diff --git a/acct-user/openctd/metadata.xml b/acct-user/openctd/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/openctd/metadata.xml
+++ b/acct-user/openctd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/openctd/openctd-0-r2.ebuild b/acct-user/openctd/openctd-0-r2.ebuild
new file mode 100644
index 000000000000..fc19cbedf9a9
--- /dev/null
+++ b/acct-user/openctd/openctd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/opendkim/metadata.xml
index 1f6b32b95fd1..c85e8ec7c3b4 100644
--- a/acct-user/opendkim/metadata.xml
+++ b/acct-user/opendkim/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
<maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
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-r3.ebuild b/acct-user/opendkim/opendkim-0-r3.ebuild
new file mode 100644
index 000000000000..beba1adb3184
--- /dev/null
+++ b/acct-user/opendkim/opendkim-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/opendmarc/metadata.xml
index a53ffbea77d3..3d1a383e5d9d 100644
--- a/acct-user/opendmarc/metadata.xml
+++ b/acct-user/opendmarc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grobian@gentoo.org</email>
diff --git a/acct-user/opendmarc/opendmarc-0-r2.ebuild b/acct-user/opendmarc/opendmarc-0-r2.ebuild
new file mode 100644
index 000000000000..af70fe1240a5
--- /dev/null
+++ b/acct-user/opendmarc/opendmarc-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/opendnssec/metadata.xml
new file mode 100644
index 000000000000..0885e8a081b0
--- /dev/null
+++ b/acct-user/opendnssec/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mschiff@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/opendnssec/opendnssec-0-r2.ebuild b/acct-user/opendnssec/opendnssec-0-r2.ebuild
new file mode 100644
index 000000000000..9471919f6432
--- /dev/null
+++ b/acct-user/opendnssec/opendnssec-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/openhab/metadata.xml b/acct-user/openhab/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-user/openhab/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/openhab/openhab-0.ebuild b/acct-user/openhab/openhab-0.ebuild
new file mode 100644
index 000000000000..a89a999a694e
--- /dev/null
+++ b/acct-user/openhab/openhab-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=537
+ACCT_USER_GROUPS=( ${PN} dialout )
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=0750
+
+acct-user_add_deps
diff --git a/acct-user/openntpd/metadata.xml b/acct-user/openntpd/metadata.xml
index 40f8a7a4302e..4d570f91afc6 100644
--- a/acct-user/openntpd/metadata.xml
+++ b/acct-user/openntpd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>henson@acm.org</email>
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-r3.ebuild b/acct-user/openntpd/openntpd-0-r3.ebuild
new file mode 100644
index 000000000000..edcb8a40ea37
--- /dev/null
+++ b/acct-user/openntpd/openntpd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/openrct2/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/openrct2/metadata.xml
+++ b/acct-user/openrct2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
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-r3.ebuild b/acct-user/openrct2/openrct2-0-r3.ebuild
new file mode 100644
index 000000000000..8d1be68c87f7
--- /dev/null
+++ b/acct-user/openrct2/openrct2-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/openttd/metadata.xml
new file mode 100644
index 000000000000..7c730d47817a
--- /dev/null
+++ b/acct-user/openttd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+</pkgmetadata>
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/openvpn/metadata.xml b/acct-user/openvpn/metadata.xml
index cee379b15409..bd6443d4a375 100644
--- a/acct-user/openvpn/metadata.xml
+++ b/acct-user/openvpn/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
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-r3.ebuild b/acct-user/openvpn/openvpn-0-r3.ebuild
new file mode 100644
index 000000000000..e9e4c06ca7ff
--- /dev/null
+++ b/acct-user/openvpn/openvpn-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/openvpn_exporter/metadata.xml
index 55dc91b89eaa..f06c881a3626 100644
--- a/acct-user/openvpn_exporter/metadata.xml
+++ b/acct-user/openvpn_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..cf244c426e37
--- /dev/null
+++ b/acct-user/openvpn_exporter/openvpn_exporter-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/opm/metadata.xml
new file mode 100644
index 000000000000..641cbd3703e7
--- /dev/null
+++ b/acct-user/opm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+</pkgmetadata>
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/metadata.xml b/acct-user/oprofile/metadata.xml
index b4a27e94fc24..bef24d2c2337 100644
--- a/acct-user/oprofile/metadata.xml
+++ b/acct-user/oprofile/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/oprofile/oprofile-0-r3.ebuild
new file mode 100644
index 000000000000..f86e3a2d3220
--- /dev/null
+++ b/acct-user/oprofile/oprofile-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/oragono/metadata.xml
index 979bcc7aec93..641cbd3703e7 100644
--- a/acct-user/oragono/metadata.xml
+++ b/acct-user/oragono/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
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 d707c9d945be..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=7
-
-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/metadata.xml b/acct-user/ossec/metadata.xml
index 2c2d077c8524..115e9d64a669 100644
--- a/acct-user/ossec/metadata.xml
+++ b/acct-user/ossec/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/ossec/ossec-0-r3.ebuild
new file mode 100644
index 000000000000..ae956403a3ea
--- /dev/null
+++ b/acct-user/ossec/ossec-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ossecm/metadata.xml
index 2c2d077c8524..115e9d64a669 100644
--- a/acct-user/ossecm/metadata.xml
+++ b/acct-user/ossecm/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/ossecm/ossecm-0-r3.ebuild
new file mode 100644
index 000000000000..dc59d33382bf
--- /dev/null
+++ b/acct-user/ossecm/ossecm-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ossecr/metadata.xml
index 2c2d077c8524..115e9d64a669 100644
--- a/acct-user/ossecr/metadata.xml
+++ b/acct-user/ossecr/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/ossecr/ossecr-0-r3.ebuild
new file mode 100644
index 000000000000..4d4a6a2c5447
--- /dev/null
+++ b/acct-user/ossecr/ossecr-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/owntracks/metadata.xml
new file mode 100644
index 000000000000..374cd4dedb33
--- /dev/null
+++ b/acct-user/owntracks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+</pkgmetadata>
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/p2p/metadata.xml b/acct-user/p2p/metadata.xml
index 1f79b429358a..9ff5a6d31ba0 100644
--- a/acct-user/p2p/metadata.xml
+++ b/acct-user/p2p/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo@chuso.net</email>
diff --git a/acct-user/p2p/p2p-0-r2.ebuild b/acct-user/p2p/p2p-0-r2.ebuild
new file mode 100644
index 000000000000..4d9159dcd4ae
--- /dev/null
+++ b/acct-user/p2p/p2p-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/partimag/metadata.xml
new file mode 100644
index 000000000000..b0d83aa2e489
--- /dev/null
+++ b/acct-user/partimag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+</pkgmetadata>
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/pcap/metadata.xml b/acct-user/pcap/metadata.xml
index 481196634b10..641cbd3703e7 100644
--- a/acct-user/pcap/metadata.xml
+++ b/acct-user/pcap/metadata.xml
@@ -1,15 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
- <maintainer type="person">
- <email>bman@gentoo.org</email>
- <name>Aaron Bauman</name>
- </maintainer>
- <maintainer type="person">
<email>sam@gentoo.org</email>
<name>Sam James</name>
</maintainer>
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 c08a332ee451..000000000000
--- a/acct-user/pcap/pcap-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 capturing network traffic"
-ACCT_USER_ID=377
-ACCT_USER_GROUPS=( pcap )
-
-acct-user_add_deps
diff --git a/acct-user/pcscd/metadata.xml b/acct-user/pcscd/metadata.xml
index 6698a4ab7883..115e9d64a669 100644
--- a/acct-user/pcscd/metadata.xml
+++ b/acct-user/pcscd/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/pcscd/pcscd-0-r3.ebuild
new file mode 100644
index 000000000000..b3c8c9c43629
--- /dev/null
+++ b/acct-user/pcscd/pcscd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/pdns/metadata.xml
index fbc06acbb54f..9065f2cf00a3 100644
--- a/acct-user/pdns/metadata.xml
+++ b/acct-user/pdns/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<name>Sven Wegener</name>
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-r3.ebuild b/acct-user/pdns/pdns-0-r3.ebuild
new file mode 100644
index 000000000000..fe2c17f1345a
--- /dev/null
+++ b/acct-user/pdns/pdns-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=423
+ACCT_USER_GROUPS=( pdns )
+
+acct-user_add_deps
diff --git a/acct-user/pdnsd/metadata.xml b/acct-user/pdnsd/metadata.xml
index 95aa13f6c5ef..115e9d64a669 100644
--- a/acct-user/pdnsd/metadata.xml
+++ b/acct-user/pdnsd/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/pdnsd/pdnsd-0-r3.ebuild
new file mode 100644
index 000000000000..d03433dd884f
--- /dev/null
+++ b/acct-user/pdnsd/pdnsd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/pgagent/metadata.xml
new file mode 100644
index 000000000000..0f3250aaa4f0
--- /dev/null
+++ b/acct-user/pgagent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>pgsql-bugs@gentoo.org</email>
+ <name>PostgreSQL and Related Package Development</name>
+ </maintainer>
+</pkgmetadata>
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/pgbouncer/metadata.xml b/acct-user/pgbouncer/metadata.xml
index d6136db4ad3b..0f3250aaa4f0 100644
--- a/acct-user/pgbouncer/metadata.xml
+++ b/acct-user/pgbouncer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>pgsql-bugs@gentoo.org</email>
diff --git a/acct-user/pgbouncer/pgbouncer-0-r2.ebuild b/acct-user/pgbouncer/pgbouncer-0-r2.ebuild
new file mode 100644
index 000000000000..2458dfcf0653
--- /dev/null
+++ b/acct-user/pgbouncer/pgbouncer-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/pgpool/metadata.xml
new file mode 100644
index 000000000000..726969ed2748
--- /dev/null
+++ b/acct-user/pgpool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>pgsql-bugs@gentoo.org</email>
+ <name>PostgreSQL and Related Package Development</name>
+ </maintainer>
+</pkgmetadata>
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/pipewire/metadata.xml b/acct-user/pipewire/metadata.xml
new file mode 100644
index 000000000000..4c3f19b6393d
--- /dev/null
+++ b/acct-user/pipewire/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>leio@gentoo.org</email>
+ <name>Mart Raudsepp</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/pipewire/pipewire-1-r2.ebuild b/acct-user/pipewire/pipewire-1-r2.ebuild
new file mode 100644
index 000000000000..2825e42284c8
--- /dev/null
+++ b/acct-user/pipewire/pipewire-1-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=/dev/null
+
+acct-user_add_deps
diff --git a/acct-user/placement/metadata.xml b/acct-user/placement/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/placement/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/placement/placement-0-r1.ebuild b/acct-user/placement/placement-0-r1.ebuild
deleted file mode 100644
index 33bddfb4a00e..000000000000
--- a/acct-user/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the placement openstack service"
-ACCT_USER_ID=448
-ACCT_USER_HOME=/var/lib/placement
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( placement )
-
-acct-user_add_deps
diff --git a/acct-user/plex/metadata.xml b/acct-user/plex/metadata.xml
index 14af8f2a1b18..34228d5884ea 100644
--- a/acct-user/plex/metadata.xml
+++ b/acct-user/plex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>ss23@ss23.geek.nz</email>
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-r3.ebuild b/acct-user/plex/plex-0-r3.ebuild
new file mode 100644
index 000000000000..86ed08940429
--- /dev/null
+++ b/acct-user/plex/plex-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/polkitd/metadata.xml
index 95e86c12108a..d4390c2eb58e 100644
--- a/acct-user/polkitd/metadata.xml
+++ b/acct-user/polkitd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
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-r3.ebuild b/acct-user/polkitd/polkitd-0-r3.ebuild
new file mode 100644
index 000000000000..d81d207f7309
--- /dev/null
+++ b/acct-user/polkitd/polkitd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/polw/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/polw/metadata.xml
+++ b/acct-user/polw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/polw/polw-0-r2.ebuild b/acct-user/polw/polw-0-r2.ebuild
new file mode 100644
index 000000000000..5d8e2298dceb
--- /dev/null
+++ b/acct-user/polw/polw-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/popa3d/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/popa3d/metadata.xml
+++ b/acct-user/popa3d/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/popa3d/popa3d-0-r2.ebuild b/acct-user/popa3d/popa3d-0-r2.ebuild
new file mode 100644
index 000000000000..31e95c449a25
--- /dev/null
+++ b/acct-user/popa3d/popa3d-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/portage/metadata.xml
index d4af1f25146b..66da907ee84d 100644
--- a/acct-user/portage/metadata.xml
+++ b/acct-user/portage/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>dev-portage@gentoo.org</email>
diff --git a/acct-user/portage/portage-0-r3.ebuild b/acct-user/portage/portage-0-r3.ebuild
new file mode 100644
index 000000000000..678713be633b
--- /dev/null
+++ b/acct-user/portage/portage-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=250
+ACCT_USER_HOME="/var/lib/portage/home"
+ACCT_USER_GROUPS=( portage )
+
+acct-user_add_deps
diff --git a/acct-user/portage/portage-0.ebuild b/acct-user/portage/portage-0.ebuild
deleted file mode 100644
index 505c3f3b85f4..000000000000
--- a/acct-user/portage/portage-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=250
-ACCT_USER_HOME="/var/lib/portage/home"
-ACCT_USER_GROUPS=( portage )
-
-acct-user_add_deps
diff --git a/acct-user/postfix/metadata.xml b/acct-user/postfix/metadata.xml
index e6f3bf582ab7..38ebffc8efa5 100644
--- a/acct-user/postfix/metadata.xml
+++ b/acct-user/postfix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
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-r3.ebuild b/acct-user/postfix/postfix-0-r3.ebuild
new file mode 100644
index 000000000000..5670bc050558
--- /dev/null
+++ b/acct-user/postfix/postfix-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/postfix_exporter/metadata.xml
index 55dc91b89eaa..f06c881a3626 100644
--- a/acct-user/postfix_exporter/metadata.xml
+++ b/acct-user/postfix_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..662a6bfe57df
--- /dev/null
+++ b/acct-user/postfix_exporter/postfix_exporter-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/postfwd/metadata.xml
new file mode 100644
index 000000000000..f63250c09310
--- /dev/null
+++ b/acct-user/postfwd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/postfwd/postfwd-0-r2.ebuild b/acct-user/postfwd/postfwd-0-r2.ebuild
new file mode 100644
index 000000000000..9bf5a7e27252
--- /dev/null
+++ b/acct-user/postfwd/postfwd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/postgres/metadata.xml
index d6136db4ad3b..0f3250aaa4f0 100644
--- a/acct-user/postgres/metadata.xml
+++ b/acct-user/postgres/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>pgsql-bugs@gentoo.org</email>
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-r3.ebuild b/acct-user/postgres/postgres-0-r3.ebuild
new file mode 100644
index 000000000000..26a32fa3af3c
--- /dev/null
+++ b/acct-user/postgres/postgres-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/postgres_exporter/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/postgres_exporter/metadata.xml
+++ b/acct-user/postgres_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/postgres_exporter/postgres_exporter-0-r2.ebuild b/acct-user/postgres_exporter/postgres_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..b2878b604a0c
--- /dev/null
+++ b/acct-user/postgres_exporter/postgres_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/postgrey/metadata.xml
index 979bcc7aec93..641cbd3703e7 100644
--- a/acct-user/postgrey/metadata.xml
+++ b/acct-user/postgrey/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
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 635b6617c408..000000000000
--- a/acct-user/postgrey/postgrey-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 postgrey mail daemon"
-ACCT_USER_ID=360
-ACCT_USER_GROUPS=( postgrey )
-
-acct-user_add_deps
diff --git a/acct-user/postmaster/metadata.xml b/acct-user/postmaster/metadata.xml
index e6f3bf582ab7..38ebffc8efa5 100644
--- a/acct-user/postmaster/metadata.xml
+++ b/acct-user/postmaster/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
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-r3.ebuild b/acct-user/postmaster/postmaster-0-r3.ebuild
new file mode 100644
index 000000000000..30de8b34596e
--- /dev/null
+++ b/acct-user/postmaster/postmaster-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/privoxy/metadata.xml
index b4a27e94fc24..1ab427e8f0b6 100644
--- a/acct-user/privoxy/metadata.xml
+++ b/acct-user/privoxy/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <maintainer type="person">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/privoxy/privoxy-0-r3.ebuild
new file mode 100644
index 000000000000..dd53ad4ee679
--- /dev/null
+++ b/acct-user/privoxy/privoxy-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/prometheus/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/prometheus/metadata.xml
+++ b/acct-user/prometheus/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/prometheus/prometheus-0-r3.ebuild
new file mode 100644
index 000000000000..e185fd357c45
--- /dev/null
+++ b/acct-user/prometheus/prometheus-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/prosody/metadata.xml
new file mode 100644
index 000000000000..c07e13d4a6bd
--- /dev/null
+++ b/acct-user/prosody/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/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/prowlarr/metadata.xml b/acct-user/prowlarr/metadata.xml
new file mode 100644
index 000000000000..590d0e5c4cf8
--- /dev/null
+++ b/acct-user/prowlarr/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>mcrawford@eliteitminds.com</email>
+ <name>Mike Crawford</name>
+ <description>Primary maintainer</description>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Prowlarr/Prowlarr</remote-id>
+ <bugs-to>https://github.com/Prowlarr/Prowlarr/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
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/psybnc/metadata.xml b/acct-user/psybnc/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/psybnc/metadata.xml
+++ b/acct-user/psybnc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/psybnc/psybnc-0-r2.ebuild b/acct-user/psybnc/psybnc-0-r2.ebuild
new file mode 100644
index 000000000000..bf51cc9ab04b
--- /dev/null
+++ b/acct-user/psybnc/psybnc-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/pulse/metadata.xml
index 996e7cacd217..f453528b934f 100644
--- a/acct-user/pulse/metadata.xml
+++ b/acct-user/pulse/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/acct-user/pulse/pulse-0-r2.ebuild b/acct-user/pulse/pulse-0-r2.ebuild
new file mode 100644
index 000000000000..964bff103ad7
--- /dev/null
+++ b/acct-user/pulse/pulse-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/puppet/metadata.xml
index 3ffdeb4af3b5..5c76f7a3fc67 100644
--- a/acct-user/puppet/metadata.xml
+++ b/acct-user/puppet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
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-r3.ebuild b/acct-user/puppet/puppet-0-r3.ebuild
new file mode 100644
index 000000000000..b1e1138f13f2
--- /dev/null
+++ b/acct-user/puppet/puppet-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/puppetdb/metadata.xml
index 3ffdeb4af3b5..5c76f7a3fc67 100644
--- a/acct-user/puppetdb/metadata.xml
+++ b/acct-user/puppetdb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
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-r3.ebuild b/acct-user/puppetdb/puppetdb-0-r3.ebuild
new file mode 100644
index 000000000000..3f77d7bdafcb
--- /dev/null
+++ b/acct-user/puppetdb/puppetdb-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/pushgateway/metadata.xml
new file mode 100644
index 000000000000..3cbc205c55cb
--- /dev/null
+++ b/acct-user/pushgateway/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ <name>Zac Medico</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/pushgateway/pushgateway-0-r2.ebuild b/acct-user/pushgateway/pushgateway-0-r2.ebuild
new file mode 100644
index 000000000000..63861a8c87db
--- /dev/null
+++ b/acct-user/pushgateway/pushgateway-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/pvpgn/metadata.xml
index 26079e608bed..7c730d47817a 100644
--- a/acct-user/pvpgn/metadata.xml
+++ b/acct-user/pvpgn/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>games@gentoo.org</email>
diff --git a/acct-user/pvpgn/pvpgn-0-r2.ebuild b/acct-user/pvpgn/pvpgn-0-r2.ebuild
new file mode 100644
index 000000000000..acb989253b23
--- /dev/null
+++ b/acct-user/pvpgn/pvpgn-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/qbittorrent/metadata.xml b/acct-user/qbittorrent/metadata.xml
new file mode 100644
index 000000000000..82cc3c6e83ab
--- /dev/null
+++ b/acct-user/qbittorrent/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>cheembox573@gmail.com</email>
+ <name>Alexey Lunev</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/qbittorrent/qbittorrent-0.ebuild b/acct-user/qbittorrent/qbittorrent-0.ebuild
new file mode 100644
index 000000000000..925ccb26afc7
--- /dev/null
+++ b/acct-user/qbittorrent/qbittorrent-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the system wide net-p2p/qbittorrent server"
+ACCT_USER_ID=534
+ACCT_USER_HOME=/var/lib/qbittorrent
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( qbittorrent )
+
+acct-user_add_deps
diff --git a/acct-user/qemu/metadata.xml b/acct-user/qemu/metadata.xml
index 570db49a08f2..17067a8d609b 100644
--- a/acct-user/qemu/metadata.xml
+++ b/acct-user/qemu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
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-r3.ebuild b/acct-user/qemu/qemu-0-r3.ebuild
new file mode 100644
index 000000000000..74fecd50469d
--- /dev/null
+++ b/acct-user/qemu/qemu-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=77
+ACCT_USER_GROUPS=( qemu kvm )
+
+acct-user_add_deps
diff --git a/acct-user/qmaild/metadata.xml b/acct-user/qmaild/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/qmaild/metadata.xml
+++ b/acct-user/qmaild/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
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-r3.ebuild b/acct-user/qmaild/qmaild-0-r3.ebuild
new file mode 100644
index 000000000000..789169827814
--- /dev/null
+++ b/acct-user/qmaild/qmaild-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/qmaill/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/qmaill/metadata.xml
+++ b/acct-user/qmaill/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
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-r3.ebuild b/acct-user/qmaill/qmaill-0-r3.ebuild
new file mode 100644
index 000000000000..ba53d9de0517
--- /dev/null
+++ b/acct-user/qmaill/qmaill-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/qmailp/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/qmailp/metadata.xml
+++ b/acct-user/qmailp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
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-r3.ebuild b/acct-user/qmailp/qmailp-0-r3.ebuild
new file mode 100644
index 000000000000..f5c41cdb266e
--- /dev/null
+++ b/acct-user/qmailp/qmailp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/qmailq/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/qmailq/metadata.xml
+++ b/acct-user/qmailq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
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-r3.ebuild b/acct-user/qmailq/qmailq-0-r3.ebuild
new file mode 100644
index 000000000000..f5899c7e262b
--- /dev/null
+++ b/acct-user/qmailq/qmailq-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/qmailr/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/qmailr/metadata.xml
+++ b/acct-user/qmailr/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
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-r3.ebuild b/acct-user/qmailr/qmailr-0-r3.ebuild
new file mode 100644
index 000000000000..d90e4c178718
--- /dev/null
+++ b/acct-user/qmailr/qmailr-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/qmails/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/qmails/metadata.xml
+++ b/acct-user/qmails/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
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-r3.ebuild b/acct-user/qmails/qmails-0-r3.ebuild
new file mode 100644
index 000000000000..9ef8ed0506ce
--- /dev/null
+++ b/acct-user/qmails/qmails-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-smtpd"
+ACCT_USER_ID=206
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/quagga/metadata.xml b/acct-user/quagga/metadata.xml
deleted file mode 100644
index 40cc8dce3b7c..000000000000
--- a/acct-user/quagga/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/quagga/quagga-0-r1.ebuild b/acct-user/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index d40e6dace3fe..000000000000
--- a/acct-user/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=424
-ACCT_USER_GROUPS=( quagga )
-
-acct-user_add_deps
diff --git a/acct-user/quassel/metadata.xml b/acct-user/quassel/metadata.xml
index 979bcc7aec93..641cbd3703e7 100644
--- a/acct-user/quassel/metadata.xml
+++ b/acct-user/quassel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
diff --git a/acct-user/quassel/quassel-0-r1.ebuild b/acct-user/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index efdbbcff8559..000000000000
--- a/acct-user/quassel/quassel-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=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/metadata.xml b/acct-user/rabbitmq/metadata.xml
new file mode 100644
index 000000000000..40de168a4ac6
--- /dev/null
+++ b/acct-user/rabbitmq/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ultrabug@gentoo.org</email>
+ <name>Ultrabug</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/rabbitmq/rabbitmq-0-r2.ebuild b/acct-user/rabbitmq/rabbitmq-0-r2.ebuild
new file mode 100644
index 000000000000..f5fce0c26e29
--- /dev/null
+++ b/acct-user/rabbitmq/rabbitmq-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/rabbitmq_exporter/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/rabbitmq_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..c980a0356c8f
--- /dev/null
+++ b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/metadata.xml b/acct-user/radarr/metadata.xml
new file mode 100644
index 000000000000..dbf509ab34a8
--- /dev/null
+++ b/acct-user/radarr/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>mcrawford@eliteitminds.com</email>
+ <name>Michael Crawford</name>
+ <description>Primary maintainer</description>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Radarr/Radarr</remote-id>
+ <bugs-to>https://github.com/Radarr/Radarr/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
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/radicale/metadata.xml b/acct-user/radicale/metadata.xml
index f8ffe025bba5..d86008401e21 100644
--- a/acct-user/radicale/metadata.xml
+++ b/acct-user/radicale/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
- <email>marco@scardovi.com</email>
- <name>Marco Scardovi</name>
+ <email>henning@hennsch.de</email>
+ <name>Henning Schild</name>
</maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
diff --git a/acct-user/radicale/radicale-0-r1.ebuild b/acct-user/radicale/radicale-0-r1.ebuild
deleted file mode 100644
index b31bbb772190..000000000000
--- a/acct-user/radicale/radicale-0-r1.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 www-apps/radicale"
-ACCT_USER_ID=327
-ACCT_USER_GROUPS=( radicale )
-
-acct-user_add_deps
diff --git a/acct-user/radicale/radicale-0-r4.ebuild b/acct-user/radicale/radicale-0-r4.ebuild
new file mode 100644
index 000000000000..1e29e79f762d
--- /dev/null
+++ b/acct-user/radicale/radicale-0-r4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/radius/metadata.xml
index 6f3b3cfdf2a6..fcf1cd64f680 100644
--- a/acct-user/radius/metadata.xml
+++ b/acct-user/radius/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>geaaru@gmail.com</email>
- <name>Daniele Rondina</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
+ <!-- maintainer-needed -->
+ </pkgmetadata>
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-r3.ebuild b/acct-user/radius/radius-0-r3.ebuild
new file mode 100644
index 000000000000..a9384d65b967
--- /dev/null
+++ b/acct-user/radius/radius-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/radvd/metadata.xml
new file mode 100644
index 000000000000..5c76f7a3fc67
--- /dev/null
+++ b/acct-user/radvd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/radvd/radvd-0-r2.ebuild b/acct-user/radvd/radvd-0-r2.ebuild
new file mode 100644
index 000000000000..781a0f7284de
--- /dev/null
+++ b/acct-user/radvd/radvd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/rbldns/metadata.xml
index 45125b9b6e99..f2908ee10b59 100644
--- a/acct-user/rbldns/metadata.xml
+++ b/acct-user/rbldns/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
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-r3.ebuild b/acct-user/rbldns/rbldns-0-r3.ebuild
new file mode 100644
index 000000000000..5f05e9ec9685
--- /dev/null
+++ b/acct-user/rbldns/rbldns-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=153
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/rbot/metadata.xml b/acct-user/rbot/metadata.xml
new file mode 100644
index 000000000000..daac6fdb7252
--- /dev/null
+++ b/acct-user/rbot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/rbot/rbot-0-r2.ebuild b/acct-user/rbot/rbot-0-r2.ebuild
new file mode 100644
index 000000000000..a35ca0cb73fa
--- /dev/null
+++ b/acct-user/rbot/rbot-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/readarr/metadata.xml
new file mode 100644
index 000000000000..dbf509ab34a8
--- /dev/null
+++ b/acct-user/readarr/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>mcrawford@eliteitminds.com</email>
+ <name>Michael Crawford</name>
+ <description>Primary maintainer</description>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Radarr/Radarr</remote-id>
+ <bugs-to>https://github.com/Radarr/Radarr/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
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/redict/metadata.xml b/acct-user/redict/metadata.xml
new file mode 100644
index 000000000000..003c42ad41fa
--- /dev/null
+++ b/acct-user/redict/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>navi@vlhl.dev</email>
+ <name>Anna (navi) Figueiredo Gomes</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/redict/redict-0.ebuild b/acct-user/redict/redict-0.ebuild
new file mode 100644
index 000000000000..d8565a92a65d
--- /dev/null
+++ b/acct-user/redict/redict-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Redict program user"
+ACCT_USER_ID=538
+ACCT_USER_GROUPS=( redict )
+acct-user_add_deps
diff --git a/acct-user/redis/metadata.xml b/acct-user/redis/metadata.xml
index ee74e58c0375..641cbd3703e7 100644
--- a/acct-user/redis/metadata.xml
+++ b/acct-user/redis/metadata.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>robbat2@gentoo.org</email>
- </maintainer>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-user/redis/redis-0-r1.ebuild b/acct-user/redis/redis-0-r1.ebuild
deleted file mode 100644
index e3a1d25acd9f..000000000000
--- a/acct-user/redis/redis-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="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/metadata.xml b/acct-user/redis_exporter/metadata.xml
index 9e1d47466c8d..3cbc205c55cb 100644
--- a/acct-user/redis_exporter/metadata.xml
+++ b/acct-user/redis_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/acct-user/redis_exporter/redis_exporter-0-r2.ebuild b/acct-user/redis_exporter/redis_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..55d815b208c1
--- /dev/null
+++ b/acct-user/redis_exporter/redis_exporter-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/redmine/metadata.xml
index 71b8147b8ebb..0f83f72b5cd1 100644
--- a/acct-user/redmine/metadata.xml
+++ b/acct-user/redmine/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>azamat.hackimov@gmail.com</email>
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-r3.ebuild b/acct-user/redmine/redmine-0-r3.ebuild
new file mode 100644
index 000000000000..ad0a6f0c8c5a
--- /dev/null
+++ b/acct-user/redmine/redmine-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/redsocks/metadata.xml
new file mode 100644
index 000000000000..1c6906f8795a
--- /dev/null
+++ b/acct-user/redsocks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mattst88@gentoo.org</email>
+ <name>Matt Turner</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/redsocks/redsocks-0-r3.ebuild b/acct-user/redsocks/redsocks-0-r3.ebuild
new file mode 100644
index 000000000000..84742190bea1
--- /dev/null
+++ b/acct-user/redsocks/redsocks-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/reg/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/reg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/reg/reg-0-r3.ebuild b/acct-user/reg/reg-0-r3.ebuild
new file mode 100644
index 000000000000..56e0376f00d7
--- /dev/null
+++ b/acct-user/reg/reg-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/metadata.xml b/acct-user/registry/metadata.xml
new file mode 100644
index 000000000000..763dfe770b61
--- /dev/null
+++ b/acct-user/registry/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/registry/registry-0-r2.ebuild b/acct-user/registry/registry-0-r2.ebuild
new file mode 100644
index 000000000000..72ade46a4622
--- /dev/null
+++ b/acct-user/registry/registry-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/root/metadata.xml
index f540000d5aab..65e1fc82d859 100644
--- a/acct-user/root/metadata.xml
+++ b/acct-user/root/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/acct-user/root/root-0-r1.ebuild b/acct-user/root/root-0-r1.ebuild
deleted file mode 100644
index f85c77b4cd56..000000000000
--- a/acct-user/root/root-0-r1.ebuild
+++ /dev/null
@@ -1,20 +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=0
-ACCT_USER_ENFORCE_ID=yes
-ACCT_USER_SHELL="/bin/bash"
-ACCT_USER_HOME="/root"
-ACCT_USER_HOME_PERMS=0700
-ACCT_USER_GROUPS=( root )
-
-acct-user_add_deps
-
-pkg_prerm() {
- # Don't lock out the superuser
- :
-}
diff --git a/acct-user/root/root-0-r3.ebuild b/acct-user/root/root-0-r3.ebuild
new file mode 100644
index 000000000000..dcb37bf77d3e
--- /dev/null
+++ b/acct-user/root/root-0-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/rrdcached/metadata.xml b/acct-user/rrdcached/metadata.xml
new file mode 100644
index 000000000000..f26d0bee12ac
--- /dev/null
+++ b/acct-user/rrdcached/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+</pkgmetadata>
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/rslsync/metadata.xml b/acct-user/rslsync/metadata.xml
new file mode 100644
index 000000000000..7e33eb1e0776
--- /dev/null
+++ b/acct-user/rslsync/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>spiderx@spiderx.dp.ua</email>
+ <name>Vladimir Pavljuchenkov</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/rslsync/rslsync-0-r2.ebuild b/acct-user/rslsync/rslsync-0-r2.ebuild
new file mode 100644
index 000000000000..81f285e81384
--- /dev/null
+++ b/acct-user/rslsync/rslsync-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/rspamd/metadata.xml
index fddcd31e1a17..3128bc705301 100644
--- a/acct-user/rspamd/metadata.xml
+++ b/acct-user/rspamd/metadata.xml
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>c@roessner.co</email>
- <name>Christian Roessner</name>
- </maintainer>
<maintainer type="person">
- <email>djc@gentoo.org</email>
- <name>Dirkjan Ochtman</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>arkamar@gentoo.org</email>
+ <name>Petr Vaněk</name>
</maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/rspamd/rspamd-0-r3.ebuild
new file mode 100644
index 000000000000..eb74bab3440f
--- /dev/null
+++ b/acct-user/rspamd/rspamd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for rspamd - Rapid spam filtering system"
+ACCT_USER_ID=237
+ACCT_USER_GROUPS=( rspamd )
+
+acct-user_add_deps
diff --git a/acct-user/rstudio-server/metadata.xml b/acct-user/rstudio-server/metadata.xml
deleted file mode 100644
index a4f6be63adba..000000000000
--- a/acct-user/rstudio-server/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>gienah@gentoo.org</email>
- <name>Mark Wright</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild b/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index a77f8b72ddee..000000000000
--- a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sci-mathematics/rstudio"
-ACCT_USER_ID=466
-ACCT_USER_GROUPS=( rstudio-server )
-
-acct-user_add_deps
diff --git a/acct-user/rt/metadata.xml b/acct-user/rt/metadata.xml
new file mode 100644
index 000000000000..98055c326b8a
--- /dev/null
+++ b/acct-user/rt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>titanofold@gentoo.org</email>
+ <name>Aaron W. Swenson</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+</pkgmetadata>
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/rtkit/metadata.xml b/acct-user/rtkit/metadata.xml
index 3e5026ee3754..beac02a9af14 100644
--- a/acct-user/rtkit/metadata.xml
+++ b/acct-user/rtkit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
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-r3.ebuild b/acct-user/rtkit/rtkit-0-r3.ebuild
new file mode 100644
index 000000000000..c4c3f12bf9cf
--- /dev/null
+++ b/acct-user/rtkit/rtkit-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/rwhoisd/metadata.xml b/acct-user/rwhoisd/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/rwhoisd/metadata.xml
+++ b/acct-user/rwhoisd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/rwhoisd/rwhoisd-0-r2.ebuild b/acct-user/rwhoisd/rwhoisd-0-r2.ebuild
new file mode 100644
index 000000000000..5adab886c587
--- /dev/null
+++ b/acct-user/rwhoisd/rwhoisd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sabnzbd/metadata.xml
index a32d600f949d..115e9d64a669 100644
--- a/acct-user/sabnzbd/metadata.xml
+++ b/acct-user/sabnzbd/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/sabnzbd/sabnzbd-0-r3.ebuild
new file mode 100644
index 000000000000..e7ad08ee4b8e
--- /dev/null
+++ b/acct-user/sabnzbd/sabnzbd-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sagan/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/sagan/metadata.xml
+++ b/acct-user/sagan/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/sagan/sagan-0-r3.ebuild
new file mode 100644
index 000000000000..09f2c269789b
--- /dev/null
+++ b/acct-user/sagan/sagan-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/samplicator/metadata.xml
new file mode 100644
index 000000000000..7e33eb1e0776
--- /dev/null
+++ b/acct-user/samplicator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>spiderx@spiderx.dp.ua</email>
+ <name>Vladimir Pavljuchenkov</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/samplicator/samplicator-0-r2.ebuild b/acct-user/samplicator/samplicator-0-r2.ebuild
new file mode 100644
index 000000000000..004ba3fb1960
--- /dev/null
+++ b/acct-user/samplicator/samplicator-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sancp/metadata.xml
index 2c2a7923cfc8..d5af4bcfaf13 100644
--- a/acct-user/sancp/metadata.xml
+++ b/acct-user/sancp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
diff --git a/acct-user/sancp/sancp-0-r2.ebuild b/acct-user/sancp/sancp-0-r2.ebuild
new file mode 100644
index 000000000000..a5fcea1cff4e
--- /dev/null
+++ b/acct-user/sancp/sancp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/sandmann/metadata.xml b/acct-user/sandmann/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-user/sandmann/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/sandmann/sandmann-0.ebuild b/acct-user/sandmann/sandmann-0.ebuild
new file mode 100644
index 000000000000..03b61c15702e
--- /dev/null
+++ b/acct-user/sandmann/sandmann-0.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
+
+ACCT_USER_ID=535
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME="/var/lib/${PN}"
+
+acct-user_add_deps
diff --git a/acct-user/saned/metadata.xml b/acct-user/saned/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/saned/metadata.xml
+++ b/acct-user/saned/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/saned/saned-0-r2.ebuild b/acct-user/saned/saned-0-r2.ebuild
new file mode 100644
index 000000000000..4afc7dc0d809
--- /dev/null
+++ b/acct-user/saned/saned-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sanlock/metadata.xml
index ea6b59e79026..f63250c09310 100644
--- a/acct-user/sanlock/metadata.xml
+++ b/acct-user/sanlock/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
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-r3.ebuild b/acct-user/sanlock/sanlock-0-r3.ebuild
new file mode 100644
index 000000000000..a40a0b8437c5
--- /dev/null
+++ b/acct-user/sanlock/sanlock-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sauerbraten/metadata.xml
index 26079e608bed..7c730d47817a 100644
--- a/acct-user/sauerbraten/metadata.xml
+++ b/acct-user/sauerbraten/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>games@gentoo.org</email>
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-r3.ebuild b/acct-user/sauerbraten/sauerbraten-0-r3.ebuild
new file mode 100644
index 000000000000..3e1f90773129
--- /dev/null
+++ b/acct-user/sauerbraten/sauerbraten-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/scanlogd/metadata.xml
new file mode 100644
index 000000000000..d5af4bcfaf13
--- /dev/null
+++ b/acct-user/scanlogd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/scanlogd/scanlogd-0-r2.ebuild b/acct-user/scanlogd/scanlogd-0-r2.ebuild
new file mode 100644
index 000000000000..068258cbd803
--- /dev/null
+++ b/acct-user/scanlogd/scanlogd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/scponly/metadata.xml
index d095ed4b8f81..64b269faa688 100644
--- a/acct-user/scponly/metadata.xml
+++ b/acct-user/scponly/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hlein@korelogic.com</email>
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-r3.ebuild b/acct-user/scponly/scponly-0-r3.ebuild
new file mode 100644
index 000000000000..df7eac437e47
--- /dev/null
+++ b/acct-user/scponly/scponly-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sddm/metadata.xml
new file mode 100644
index 000000000000..954ddd94c951
--- /dev/null
+++ b/acct-user/sddm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+</pkgmetadata>
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/sendpage/metadata.xml b/acct-user/sendpage/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/sendpage/metadata.xml
+++ b/acct-user/sendpage/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/sendpage/sendpage-0-r2.ebuild b/acct-user/sendpage/sendpage-0-r2.ebuild
new file mode 100644
index 000000000000..e39039ff5286
--- /dev/null
+++ b/acct-user/sendpage/sendpage-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/serf/metadata.xml
index 9e1d47466c8d..3cbc205c55cb 100644
--- a/acct-user/serf/metadata.xml
+++ b/acct-user/serf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/acct-user/serf/serf-0-r2.ebuild b/acct-user/serf/serf-0-r2.ebuild
new file mode 100644
index 000000000000..05c10e1eef2d
--- /dev/null
+++ b/acct-user/serf/serf-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/shellinaboxd/metadata.xml b/acct-user/shellinaboxd/metadata.xml
deleted file mode 100644
index b09023bbc390..000000000000
--- a/acct-user/shellinaboxd/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
- <maintainer type="project">
- <email>shell-tools@gentoo.org</email>
- <name>Gentoo Shell Tools Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/shellinaboxd/shellinaboxd-0-r1.ebuild b/acct-user/shellinaboxd/shellinaboxd-0-r1.ebuild
deleted file mode 100644
index 49a32a426147..000000000000
--- a/acct-user/shellinaboxd/shellinaboxd-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="shellinabox user"
-ACCT_USER_ID=139
-ACCT_USER_GROUPS=( shellinaboxd )
-
-acct-user_add_deps
diff --git a/acct-user/sigh/metadata.xml b/acct-user/sigh/metadata.xml
deleted file mode 100644
index 758292245aa4..000000000000
--- a/acct-user/sigh/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>c@roessner.co</email>
- <name>Christian Roessner</name>
- </maintainer>
- <maintainer type="person">
- <email>mschiff@gentoo.org</email>
- <name>Marc Schiffbauer</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
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/metadata.xml b/acct-user/sks/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/sks/metadata.xml
+++ b/acct-user/sks/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/sks/sks-0-r2.ebuild b/acct-user/sks/sks-0-r2.ebuild
new file mode 100644
index 000000000000..ce4868c4fc2f
--- /dev/null
+++ b/acct-user/sks/sks-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/slurm/metadata.xml
index afbbd16e7d0d..e30e937ab03c 100644
--- a/acct-user/slurm/metadata.xml
+++ b/acct-user/slurm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>alexxy@gentoo.org</email>
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-r3.ebuild b/acct-user/slurm/slurm-0-r3.ebuild
new file mode 100644
index 000000000000..679f13ecd665
--- /dev/null
+++ b/acct-user/slurm/slurm-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/smmsp/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/smmsp/metadata.xml
+++ b/acct-user/smmsp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
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-r4.ebuild b/acct-user/smmsp/smmsp-0-r4.ebuild
new file mode 100644
index 000000000000..45d1ee94c798
--- /dev/null
+++ b/acct-user/smmsp/smmsp-0-r4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/smsd/metadata.xml b/acct-user/smsd/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/smsd/metadata.xml
+++ b/acct-user/smsd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/smsd/smsd-0-r2.ebuild b/acct-user/smsd/smsd-0-r2.ebuild
new file mode 100644
index 000000000000..fb12d4adb212
--- /dev/null
+++ b/acct-user/smsd/smsd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/smtpd/metadata.xml
index 915f00227065..4d1e1ea205c7 100644
--- a/acct-user/smtpd/metadata.xml
+++ b/acct-user/smtpd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zx2c4@gentoo.org</email>
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-r3.ebuild b/acct-user/smtpd/smtpd-0-r3.ebuild
new file mode 100644
index 000000000000..a6c80409e86c
--- /dev/null
+++ b/acct-user/smtpd/smtpd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/smtpq/metadata.xml
index 915f00227065..4d1e1ea205c7 100644
--- a/acct-user/smtpq/metadata.xml
+++ b/acct-user/smtpq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zx2c4@gentoo.org</email>
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-r3.ebuild b/acct-user/smtpq/smtpq-0-r3.ebuild
new file mode 100644
index 000000000000..cc0e0d6979ce
--- /dev/null
+++ b/acct-user/smtpq/smtpq-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/snapclient/metadata.xml
index 6d821181d635..4c1f213dd4ed 100644
--- a/acct-user/snapclient/metadata.xml
+++ b/acct-user/snapclient/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>jakov.smolic@sartura.hr</email>
- <name>Jakov Smolic</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <maintainer type="person">
+ <email>jsmolic@gentoo.org</email>
+ <name>Jakov Smolić</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/snapclient/snapclient-0-r2.ebuild b/acct-user/snapclient/snapclient-0-r2.ebuild
new file mode 100644
index 000000000000..34064469ea22
--- /dev/null
+++ b/acct-user/snapclient/snapclient-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/snapserver/metadata.xml
index 6d821181d635..4c1f213dd4ed 100644
--- a/acct-user/snapserver/metadata.xml
+++ b/acct-user/snapserver/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>jakov.smolic@sartura.hr</email>
- <name>Jakov Smolic</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <maintainer type="person">
+ <email>jsmolic@gentoo.org</email>
+ <name>Jakov Smolić</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-user/snapserver/snapserver-0-r2.ebuild b/acct-user/snapserver/snapserver-0-r2.ebuild
new file mode 100644
index 000000000000..0cb87f8ddbbb
--- /dev/null
+++ b/acct-user/snapserver/snapserver-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Server user for media-sound/snapcast"
+
+ACCT_USER_GROUPS=( "snapserver" )
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_ID=374
+
+acct-user_add_deps
diff --git a/acct-user/snapserver/snapserver-0.ebuild b/acct-user/snapserver/snapserver-0.ebuild
deleted file mode 100644
index daa84b06e5a0..000000000000
--- a/acct-user/snapserver/snapserver-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="Server user for media-sound/snapcast"
-
-ACCT_USER_GROUPS=( "snapserver" )
-ACCT_USER_HOME_OWNER="snapserver"
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_ID=374
-
-acct-user_add_deps
diff --git a/acct-user/sndiod/metadata.xml b/acct-user/sndiod/metadata.xml
index fc3c6c671309..bf5592871976 100644
--- a/acct-user/sndiod/metadata.xml
+++ b/acct-user/sndiod/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>contact@hacktivis.me</email>
diff --git a/acct-user/sndiod/sndiod-0-r2.ebuild b/acct-user/sndiod/sndiod-0-r2.ebuild
new file mode 100644
index 000000000000..17f9c991600e
--- /dev/null
+++ b/acct-user/sndiod/sndiod-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sniproxy/metadata.xml
index 01b903b2b23b..0df6176b8edf 100644
--- a/acct-user/sniproxy/metadata.xml
+++ b/acct-user/sniproxy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>nemunaire@nemunai.re</email>
diff --git a/acct-user/sniproxy/sniproxy-0-r2.ebuild b/acct-user/sniproxy/sniproxy-0-r2.ebuild
new file mode 100644
index 000000000000..6498ec6e4ac0
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/snmp_exporter/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/snmp_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/snmp_exporter/snmp_exporter-0-r2.ebuild b/acct-user/snmp_exporter/snmp_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..e43643a993f0
--- /dev/null
+++ b/acct-user/snmp_exporter/snmp_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/metadata.xml b/acct-user/snort/metadata.xml
index 07dc13988f2a..e345aace0756 100644
--- a/acct-user/snort/metadata.xml
+++ b/acct-user/snort/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
diff --git a/acct-user/snort/snort-0-r2.ebuild b/acct-user/snort/snort-0-r2.ebuild
new file mode 100644
index 000000000000..8e3865298c46
--- /dev/null
+++ b/acct-user/snort/snort-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sobby/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/acct-user/sobby/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
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/metadata.xml b/acct-user/sobexsrv/metadata.xml
index b4a27e94fc24..bef24d2c2337 100644
--- a/acct-user/sobexsrv/metadata.xml
+++ b/acct-user/sobexsrv/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/sobexsrv/sobexsrv-0-r2.ebuild b/acct-user/sobexsrv/sobexsrv-0-r2.ebuild
new file mode 100644
index 000000000000..7ef23092dd50
--- /dev/null
+++ b/acct-user/sobexsrv/sobexsrv-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sockd/metadata.xml
new file mode 100644
index 000000000000..a19661a8bd04
--- /dev/null
+++ b/acct-user/sockd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/sockd/sockd-0-r3.ebuild b/acct-user/sockd/sockd-0-r3.ebuild
new file mode 100644
index 000000000000..401ead808e3b
--- /dev/null
+++ b/acct-user/sockd/sockd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sogo/metadata.xml
index 0cda0292b585..c316781c404c 100644
--- a/acct-user/sogo/metadata.xml
+++ b/acct-user/sogo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnustep@gentoo.org</email>
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-r3.ebuild b/acct-user/sogo/sogo-0-r3.ebuild
new file mode 100644
index 000000000000..10c451fd3333
--- /dev/null
+++ b/acct-user/sogo/sogo-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/soju/metadata.xml
new file mode 100644
index 000000000000..d8299f5a010f
--- /dev/null
+++ b/acct-user/soju/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>cat@catcream.org</email>
+ <name>Alfred Persson</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
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/sonarr/metadata.xml b/acct-user/sonarr/metadata.xml
new file mode 100644
index 000000000000..d078c44c4d29
--- /dev/null
+++ b/acct-user/sonarr/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person" proxied="yes">
+ <email>mcrawford@eliteitminds.com</email>
+ <name>Michael Crawford</name>
+</maintainer>
+<maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+</maintainer>
+ <upstream>
+ <remote-id type="github">Sonarr/Sonarr</remote-id>
+ <bugs-to>https://github.com/Sonarr/Sonarr/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
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/spamd/metadata.xml b/acct-user/spamd/metadata.xml
index ea85f6051a4a..5f91881e0464 100644
--- a/acct-user/spamd/metadata.xml
+++ b/acct-user/spamd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo_bugs_peep@parallaxshift.com</email>
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-r3.ebuild b/acct-user/spamd/spamd-0-r3.ebuild
new file mode 100644
index 000000000000..ae49dd16b61f
--- /dev/null
+++ b/acct-user/spamd/spamd-0-r3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/spectrum/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/spectrum/metadata.xml
+++ b/acct-user/spectrum/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
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-r3.ebuild b/acct-user/spectrum/spectrum-0-r3.ebuild
new file mode 100644
index 000000000000..781029a8ebfd
--- /dev/null
+++ b/acct-user/spectrum/spectrum-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/spire/metadata.xml
index 65da3dd78299..150ec8c0940a 100644
--- a/acct-user/spire/metadata.xml
+++ b/acct-user/spire/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/spire/spire-0-r3.ebuild
new file mode 100644
index 000000000000..ec05ca13f1d9
--- /dev/null
+++ b/acct-user/spire/spire-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/sqlgrey/metadata.xml b/acct-user/sqlgrey/metadata.xml
index ea85f6051a4a..5f91881e0464 100644
--- a/acct-user/sqlgrey/metadata.xml
+++ b/acct-user/sqlgrey/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo_bugs_peep@parallaxshift.com</email>
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-r3.ebuild b/acct-user/sqlgrey/sqlgrey-0-r3.ebuild
new file mode 100644
index 000000000000..d44c86908115
--- /dev/null
+++ b/acct-user/sqlgrey/sqlgrey-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/squid/metadata.xml
index 6698a4ab7883..64b269faa688 100644
--- a/acct-user/squid/metadata.xml
+++ b/acct-user/squid/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
+ <maintainer type="person" proxied="yes">
+ <email>hlein@korelogic.com</email>
+ <name>Hank Leininger</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/squid/squid-0-r3.ebuild
new file mode 100644
index 000000000000..6035229a46b6
--- /dev/null
+++ b/acct-user/squid/squid-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sshd/metadata.xml
index 3e60a9a347a4..bc93e527e23c 100644
--- a/acct-user/sshd/metadata.xml
+++ b/acct-user/sshd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
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-r3.ebuild b/acct-user/sshd/sshd-0-r3.ebuild
new file mode 100644
index 000000000000..530fc5008994
--- /dev/null
+++ b/acct-user/sshd/sshd-0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/sstpc/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/sstpc/metadata.xml
+++ b/acct-user/sstpc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/sstpc/sstpc-0-r2.ebuild b/acct-user/sstpc/sstpc-0-r2.ebuild
new file mode 100644
index 000000000000..0404d22ec3f8
--- /dev/null
+++ b/acct-user/sstpc/sstpc-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/stdiscosrv/metadata.xml
index 3e5026ee3754..beac02a9af14 100644
--- a/acct-user/stdiscosrv/metadata.xml
+++ b/acct-user/stdiscosrv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/acct-user/stdiscosrv/stdiscosrv-0-r1.ebuild b/acct-user/stdiscosrv/stdiscosrv-0-r1.ebuild
deleted file mode 100644
index e59a5c207d4f..000000000000
--- a/acct-user/stdiscosrv/stdiscosrv-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 Syncthing discovery server"
-ACCT_USER_ID=497
-ACCT_USER_HOME=/var/lib/stdiscosrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( stdiscosrv )
-
-acct-user_add_deps
diff --git a/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
new file mode 100644
index 000000000000..7ec9267bc6f2
--- /dev/null
+++ b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing discovery server"
+ACCT_USER_ID=497
+ACCT_USER_HOME=/var/lib/syncthing-discosrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt 1; then
+ ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
+ ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+ break
+ fi
+ done
+ fi
+}
diff --git a/acct-user/steamcmd/metadata.xml b/acct-user/steamcmd/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/steamcmd/metadata.xml
+++ b/acct-user/steamcmd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
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-r3.ebuild b/acct-user/steamcmd/steamcmd-0-r3.ebuild
new file mode 100644
index 000000000000..69c2c4175c08
--- /dev/null
+++ b/acct-user/steamcmd/steamcmd-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/strelaysrv/metadata.xml b/acct-user/strelaysrv/metadata.xml
index 3e5026ee3754..beac02a9af14 100644
--- a/acct-user/strelaysrv/metadata.xml
+++ b/acct-user/strelaysrv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/acct-user/strelaysrv/strelaysrv-0-r1.ebuild b/acct-user/strelaysrv/strelaysrv-0-r1.ebuild
deleted file mode 100644
index d0926f0165b0..000000000000
--- a/acct-user/strelaysrv/strelaysrv-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 Syncthing relay server"
-ACCT_USER_ID=496
-ACCT_USER_HOME=/var/lib/strelaysrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( strelaysrv )
-
-acct-user_add_deps
diff --git a/acct-user/strelaysrv/strelaysrv-1-r1.ebuild b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
new file mode 100644
index 000000000000..57f5a650afb1
--- /dev/null
+++ b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing relay server"
+ACCT_USER_ID=496
+ACCT_USER_HOME=/var/lib/syncthing-relaysrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt 1; then
+ ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
+ ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+ break
+ fi
+ done
+ fi
+}
diff --git a/acct-user/stubby/metadata.xml b/acct-user/stubby/metadata.xml
index d920e3ba3e56..115e9d64a669 100644
--- a/acct-user/stubby/metadata.xml
+++ b/acct-user/stubby/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/stubby/stubby-0-r3.ebuild
new file mode 100644
index 000000000000..594820538ed5
--- /dev/null
+++ b/acct-user/stubby/stubby-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/stunnel/metadata.xml
index d920e3ba3e56..115e9d64a669 100644
--- a/acct-user/stunnel/metadata.xml
+++ b/acct-user/stunnel/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/stunnel/stunnel-0-r3.ebuild
new file mode 100644
index 000000000000..fbf8406047bc
--- /dev/null
+++ b/acct-user/stunnel/stunnel-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/subsonic/metadata.xml
new file mode 100644
index 000000000000..e85252a96df1
--- /dev/null
+++ b/acct-user/subsonic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>perfinion@gentoo.org</email>
+ <name>Jason Zaman</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/subsonic/subsonic-0-r3.ebuild b/acct-user/subsonic/subsonic-0-r3.ebuild
new file mode 100644
index 000000000000..3a4a427a569a
--- /dev/null
+++ b/acct-user/subsonic/subsonic-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/suricata/metadata.xml
index 3e5026ee3754..beac02a9af14 100644
--- a/acct-user/suricata/metadata.xml
+++ b/acct-user/suricata/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
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-r3.ebuild b/acct-user/suricata/suricata-0-r3.ebuild
new file mode 100644
index 000000000000..e8977c57fd53
--- /dev/null
+++ b/acct-user/suricata/suricata-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/svn/metadata.xml
index 31fa45c18224..aea3dcbecde2 100644
--- a/acct-user/svn/metadata.xml
+++ b/acct-user/svn/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Hüttel</name>
</maintainer>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/svn/svn-0-r3.ebuild
new file mode 100644
index 000000000000..cee36d84dae9
--- /dev/null
+++ b/acct-user/svn/svn-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=399
+ACCT_USER_GROUPS=( svnusers )
+
+acct-user_add_deps
diff --git a/acct-user/svxlink/metadata.xml b/acct-user/svxlink/metadata.xml
index 4e80019694b1..001997549c54 100644
--- a/acct-user/svxlink/metadata.xml
+++ b/acct-user/svxlink/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tomjbe@gentoo.org</email>
diff --git a/acct-user/svxlink/svxlink-0-r2.ebuild b/acct-user/svxlink/svxlink-0-r2.ebuild
new file mode 100644
index 000000000000..f551a8149776
--- /dev/null
+++ b/acct-user/svxlink/svxlink-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/swift/metadata.xml
deleted file mode 100644
index 3ffdeb4af3b5..000000000000
--- a/acct-user/swift/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-user/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/synapse/metadata.xml b/acct-user/synapse/metadata.xml
new file mode 100644
index 000000000000..15cf2ff7a521
--- /dev/null
+++ b/acct-user/synapse/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>arkamar@gentoo.org</email>
+ <name>Petr Vaněk</name>
+ </maintainer>
+</pkgmetadata>
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/syncthing/metadata.xml b/acct-user/syncthing/metadata.xml
index 3e5026ee3754..beac02a9af14 100644
--- a/acct-user/syncthing/metadata.xml
+++ b/acct-user/syncthing/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
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-r3.ebuild b/acct-user/syncthing/syncthing-0-r3.ebuild
new file mode 100644
index 000000000000..4a930fccd4ed
--- /dev/null
+++ b/acct-user/syncthing/syncthing-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/systemd-coredump/metadata.xml
index 8e7007e5a467..31123d01cb4d 100644
--- a/acct-user/systemd-coredump/metadata.xml
+++ b/acct-user/systemd-coredump/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>systemd@gentoo.org</email>
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-r3.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r3.ebuild
new file mode 100644
index 000000000000..cf0dc9c2972b
--- /dev/null
+++ b/acct-user/systemd-coredump/systemd-coredump-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=194
+ACCT_USER_GROUPS=( systemd-coredump )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-journal-remote/metadata.xml b/acct-user/systemd-journal-remote/metadata.xml
index 8e7007e5a467..31123d01cb4d 100644
--- a/acct-user/systemd-journal-remote/metadata.xml
+++ b/acct-user/systemd-journal-remote/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>systemd@gentoo.org</email>
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-r3.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
new file mode 100644
index 000000000000..39d3d14ebb3d
--- /dev/null
+++ b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=191
+ACCT_USER_GROUPS=( systemd-journal-remote )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-network/metadata.xml b/acct-user/systemd-network/metadata.xml
index 8e7007e5a467..31123d01cb4d 100644
--- a/acct-user/systemd-network/metadata.xml
+++ b/acct-user/systemd-network/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>systemd@gentoo.org</email>
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-r3.ebuild b/acct-user/systemd-network/systemd-network-0-r3.ebuild
new file mode 100644
index 000000000000..3b105de1f14f
--- /dev/null
+++ b/acct-user/systemd-network/systemd-network-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=192
+ACCT_USER_GROUPS=( systemd-network )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-oom/metadata.xml b/acct-user/systemd-oom/metadata.xml
index 8e7007e5a467..31123d01cb4d 100644
--- a/acct-user/systemd-oom/metadata.xml
+++ b/acct-user/systemd-oom/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>systemd@gentoo.org</email>
diff --git a/acct-user/systemd-oom/systemd-oom-0-r2.ebuild b/acct-user/systemd-oom/systemd-oom-0-r2.ebuild
new file mode 100644
index 000000000000..e4954962fbe7
--- /dev/null
+++ b/acct-user/systemd-oom/systemd-oom-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/systemd-resolve/metadata.xml
index 8e7007e5a467..31123d01cb4d 100644
--- a/acct-user/systemd-resolve/metadata.xml
+++ b/acct-user/systemd-resolve/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>systemd@gentoo.org</email>
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-r3.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r3.ebuild
new file mode 100644
index 000000000000..f70a9b2d3715
--- /dev/null
+++ b/acct-user/systemd-resolve/systemd-resolve-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=193
+ACCT_USER_GROUPS=( systemd-resolve )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-timesync/metadata.xml b/acct-user/systemd-timesync/metadata.xml
index 8e7007e5a467..31123d01cb4d 100644
--- a/acct-user/systemd-timesync/metadata.xml
+++ b/acct-user/systemd-timesync/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>systemd@gentoo.org</email>
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-r3.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r3.ebuild
new file mode 100644
index 000000000000..e2a4d84a40b1
--- /dev/null
+++ b/acct-user/systemd-timesync/systemd-timesync-0-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=195
+ACCT_USER_GROUPS=( systemd-timesync )
+
+acct-user_add_deps
diff --git a/acct-user/taskd/metadata.xml b/acct-user/taskd/metadata.xml
new file mode 100644
index 000000000000..f63250c09310
--- /dev/null
+++ b/acct-user/taskd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/taskd/taskd-0-r2.ebuild b/acct-user/taskd/taskd-0-r2.ebuild
new file mode 100644
index 000000000000..00e4dbabc48f
--- /dev/null
+++ b/acct-user/taskd/taskd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/teamspeak/metadata.xml
index 3e3880cf1051..c07e13d4a6bd 100644
--- a/acct-user/teamspeak/metadata.xml
+++ b/acct-user/teamspeak/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
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-r3.ebuild b/acct-user/teamspeak/teamspeak-0-r3.ebuild
new file mode 100644
index 000000000000..fe43320c6ea0
--- /dev/null
+++ b/acct-user/teamspeak/teamspeak-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/telegraf/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/telegraf/metadata.xml
+++ b/acct-user/telegraf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
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-r3.ebuild b/acct-user/telegraf/telegraf-0-r3.ebuild
new file mode 100644
index 000000000000..49fdbe3b0027
--- /dev/null
+++ b/acct-user/telegraf/telegraf-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tenshi/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/tenshi/metadata.xml
+++ b/acct-user/tenshi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/tenshi/tenshi-0-r2.ebuild b/acct-user/tenshi/tenshi-0-r2.ebuild
new file mode 100644
index 000000000000..6c01b7955c9b
--- /dev/null
+++ b/acct-user/tenshi/tenshi-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/timidity/metadata.xml b/acct-user/timidity/metadata.xml
new file mode 100644
index 000000000000..93423219a5bc
--- /dev/null
+++ b/acct-user/timidity/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/timidity/timidity-0-r2.ebuild b/acct-user/timidity/timidity-0-r2.ebuild
new file mode 100644
index 000000000000..1628b749bab6
--- /dev/null
+++ b/acct-user/timidity/timidity-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tinydns/metadata.xml
index 45125b9b6e99..f2908ee10b59 100644
--- a/acct-user/tinydns/metadata.xml
+++ b/acct-user/tinydns/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/acct-user/tinydns/tinydns-0-r2.ebuild b/acct-user/tinydns/tinydns-0-r2.ebuild
new file mode 100644
index 000000000000..3fce8ac02c6d
--- /dev/null
+++ b/acct-user/tinydns/tinydns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tinyproxy/metadata.xml
index c67d4dcaca5b..aa20bff17b1d 100644
--- a/acct-user/tinyproxy/metadata.xml
+++ b/acct-user/tinyproxy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
diff --git a/acct-user/tinyproxy/tinyproxy-0-r2.ebuild b/acct-user/tinyproxy/tinyproxy-0-r2.ebuild
new file mode 100644
index 000000000000..d8f082bbd702
--- /dev/null
+++ b/acct-user/tinyproxy/tinyproxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tomcat/metadata.xml
index 0fa782095498..00be324112da 100644
--- a/acct-user/tomcat/metadata.xml
+++ b/acct-user/tomcat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
diff --git a/acct-user/tomcat/tomcat-0-r2.ebuild b/acct-user/tomcat/tomcat-0-r2.ebuild
new file mode 100644
index 000000000000..733fd3b41a49
--- /dev/null
+++ b/acct-user/tomcat/tomcat-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tor/metadata.xml
index d920e3ba3e56..d59234f9f101 100644
--- a/acct-user/tor/metadata.xml
+++ b/acct-user/tor/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
+ <email>ajak@gentoo.org</email>
+ <name>John Helmert III</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
</maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/tor/tor-0-r3.ebuild
new file mode 100644
index 000000000000..20d561a3be2a
--- /dev/null
+++ b/acct-user/tor/tor-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tox/metadata.xml
index c07bc073ffb2..e710548c2842 100644
--- a/acct-user/tox/metadata.xml
+++ b/acct-user/tox/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>JoMull01@protonmail.com</email>
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-r3.ebuild b/acct-user/tox/tox-0-r3.ebuild
new file mode 100644
index 000000000000..7f5210837ed6
--- /dev/null
+++ b/acct-user/tox/tox-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tpm/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/acct-user/tpm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
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/metadata.xml b/acct-user/transmission/metadata.xml
index de09ffd8b089..077cdb6aa203 100644
--- a/acct-user/transmission/metadata.xml
+++ b/acct-user/transmission/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>floppym@gentoo.org</email>
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-r3.ebuild b/acct-user/transmission/transmission-1-r3.ebuild
new file mode 100644
index 000000000000..a774ee577b5a
--- /dev/null
+++ b/acct-user/transmission/transmission-1-r3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=169
+ACCT_USER_GROUPS=( transmission )
+
+acct-user_add_deps
diff --git a/acct-user/trickster/metadata.xml b/acct-user/trickster/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/acct-user/trickster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/trickster/trickster-0-r2.ebuild b/acct-user/trickster/trickster-0-r2.ebuild
new file mode 100644
index 000000000000..0eba0d3422a0
--- /dev/null
+++ b/acct-user/trickster/trickster-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/trojan/metadata.xml
index 00de4862fc2b..9f3d14b3eb25 100644
--- a/acct-user/trojan/metadata.xml
+++ b/acct-user/trojan/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dlan@gentoo.org</email>
diff --git a/acct-user/trojan/trojan-0-r2.ebuild b/acct-user/trojan/trojan-0-r2.ebuild
new file mode 100644
index 000000000000..0a667e2cdc09
--- /dev/null
+++ b/acct-user/trojan/trojan-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tss/metadata.xml
index 69ca4c8149b6..fdd29c016aa0 100644
--- a/acct-user/tss/metadata.xml
+++ b/acct-user/tss/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>salah.coronya@gmail.com</email>
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-r3.ebuild b/acct-user/tss/tss-0-r3.ebuild
new file mode 100644
index 000000000000..5b08fdf351eb
--- /dev/null
+++ b/acct-user/tss/tss-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ttrssd/metadata.xml
index 54be7ff7e5d6..374cd4dedb33 100644
--- a/acct-user/ttrssd/metadata.xml
+++ b/acct-user/ttrssd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chewi@gentoo.org</email>
diff --git a/acct-user/ttrssd/ttrssd-0-r2.ebuild b/acct-user/ttrssd/ttrssd-0-r2.ebuild
new file mode 100644
index 000000000000..a3340172d10d
--- /dev/null
+++ b/acct-user/ttrssd/ttrssd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/turnserver/metadata.xml
index 7e0202747f36..115e9d64a669 100644
--- a/acct-user/turnserver/metadata.xml
+++ b/acct-user/turnserver/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>nativemad@gentoo.org</email>
- <name>Andreas Schuerch</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/turnserver/turnserver-0-r3.ebuild
new file mode 100644
index 000000000000..f7083fa752c3
--- /dev/null
+++ b/acct-user/turnserver/turnserver-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/tvheadend/metadata.xml
index 54be7ff7e5d6..374cd4dedb33 100644
--- a/acct-user/tvheadend/metadata.xml
+++ b/acct-user/tvheadend/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chewi@gentoo.org</email>
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-r3.ebuild b/acct-user/tvheadend/tvheadend-0-r3.ebuild
new file mode 100644
index 000000000000..24a4ab8d463e
--- /dev/null
+++ b/acct-user/tvheadend/tvheadend-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ulogd/metadata.xml
index f8ffe025bba5..115e9d64a669 100644
--- a/acct-user/ulogd/metadata.xml
+++ b/acct-user/ulogd/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>marco@scardovi.com</email>
- <name>Marco Scardovi</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/ulogd/ulogd-0-r2.ebuild b/acct-user/ulogd/ulogd-0-r2.ebuild
new file mode 100644
index 000000000000..82017138e5ca
--- /dev/null
+++ b/acct-user/ulogd/ulogd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ultimaker/metadata.xml
deleted file mode 100644
index ffe9ae031fb1..000000000000
--- a/acct-user/ultimaker/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>3dprint@gentoo.org</email>
- <name>Gentoo 3D Printer Project</name>
- </maintainer>
-</pkgmetadata>
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/unbound-telemetry/metadata.xml b/acct-user/unbound-telemetry/metadata.xml
index cee379b15409..bd6443d4a375 100644
--- a/acct-user/unbound-telemetry/metadata.xml
+++ b/acct-user/unbound-telemetry/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
diff --git a/acct-user/unbound-telemetry/unbound-telemetry-1-r2.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1-r2.ebuild
new file mode 100644
index 000000000000..c2ff7fef89a4
--- /dev/null
+++ b/acct-user/unbound-telemetry/unbound-telemetry-1-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/unbound/metadata.xml
index c9701593d29d..f63250c09310 100644
--- a/acct-user/unbound/metadata.xml
+++ b/acct-user/unbound/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
<name>Marc Schiffbauer</name>
</maintainer>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
</pkgmetadata>
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-r3.ebuild b/acct-user/unbound/unbound-0-r3.ebuild
new file mode 100644
index 000000000000..f522b170c46e
--- /dev/null
+++ b/acct-user/unbound/unbound-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/unifi-video/metadata.xml
index c67d4dcaca5b..aa20bff17b1d 100644
--- a/acct-user/unifi-video/metadata.xml
+++ b/acct-user/unifi-video/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
diff --git a/acct-user/unifi-video/unifi-video-0-r2.ebuild b/acct-user/unifi-video/unifi-video-0-r2.ebuild
new file mode 100644
index 000000000000..6b57a514dca5
--- /dev/null
+++ b/acct-user/unifi-video/unifi-video-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/unifi/metadata.xml
index c916e7f6cfeb..caeb3a8449dc 100644
--- a/acct-user/unifi/metadata.xml
+++ b/acct-user/unifi/metadata.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>bkohler@gentoo.org</email>
- <name>Ben Kohler</name>
- </maintainer>
- <maintainer type="person">
<email>conikost@gentoo.org</email>
<name>Conrad Kostecki</name>
</maintainer>
diff --git a/acct-user/unifi/unifi-0-r1.ebuild b/acct-user/unifi/unifi-0-r1.ebuild
deleted file mode 100644
index b5370b3f510d..000000000000
--- a/acct-user/unifi/unifi-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="A user for the UniFi Controller"
-
-ACCT_USER_GROUPS=( "unifi" )
-ACCT_USER_HOME="/var/lib/unifi"
-ACCT_USER_HOME_OWNER="unifi:unifi"
-ACCT_USER_ID="113"
-
-acct-user_add_deps
diff --git a/acct-user/unifi/unifi-0-r3.ebuild b/acct-user/unifi/unifi-0-r3.ebuild
new file mode 100644
index 000000000000..4358cd4ae20e
--- /dev/null
+++ b/acct-user/unifi/unifi-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for the UniFi Controller"
+
+ACCT_USER_GROUPS=( "unifi" )
+ACCT_USER_HOME="/var/lib/unifi"
+ACCT_USER_ID="113"
+
+acct-user_add_deps
diff --git a/acct-user/unrealircd/metadata.xml b/acct-user/unrealircd/metadata.xml
index 0d1d529b35b7..641cbd3703e7 100644
--- a/acct-user/unrealircd/metadata.xml
+++ b/acct-user/unrealircd/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>kensington@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
<email>sam@gentoo.org</email>
<name>Sam James</name>
</maintainer>
diff --git a/acct-user/unrealircd/unrealircd-0-r1.ebuild b/acct-user/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index d7556578c610..000000000000
--- a/acct-user/unrealircd/unrealircd-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=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/metadata.xml b/acct-user/upmpdcli/metadata.xml
index 8d87f8851317..3d3fa9bc11d7 100644
--- a/acct-user/upmpdcli/metadata.xml
+++ b/acct-user/upmpdcli/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>stasibear@gentoo.org</email>
diff --git a/acct-user/upmpdcli/upmpdcli-0-r2.ebuild b/acct-user/upmpdcli/upmpdcli-0-r2.ebuild
new file mode 100644
index 000000000000..1f18010a6e45
--- /dev/null
+++ b/acct-user/upmpdcli/upmpdcli-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/uptimed/metadata.xml
index c7be278b6458..c07e13d4a6bd 100644
--- a/acct-user/uptimed/metadata.xml
+++ b/acct-user/uptimed/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-user/uptimed/uptimed-0-r1.ebuild b/acct-user/uptimed/uptimed-0-r1.ebuild
deleted file mode 100644
index 2d7ea9eb61cc..000000000000
--- a/acct-user/uptimed/uptimed-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 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/metadata.xml b/acct-user/usbmux/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/usbmux/metadata.xml
+++ b/acct-user/usbmux/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/usbmux/usbmux-0-r3.ebuild
new file mode 100644
index 000000000000..83834396c9e3
--- /dev/null
+++ b/acct-user/usbmux/usbmux-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ushare/metadata.xml
index c67d4dcaca5b..aa20bff17b1d 100644
--- a/acct-user/ushare/metadata.xml
+++ b/acct-user/ushare/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
diff --git a/acct-user/ushare/ushare-0-r2.ebuild b/acct-user/ushare/ushare-0-r2.ebuild
new file mode 100644
index 000000000000..7c37b771e16f
--- /dev/null
+++ b/acct-user/ushare/ushare-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/uwsgi_exporter/metadata.xml
new file mode 100644
index 000000000000..3cbc205c55cb
--- /dev/null
+++ b/acct-user/uwsgi_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ <name>Zac Medico</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4a2ced1bb45d
--- /dev/null
+++ b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/vacation/metadata.xml
new file mode 100644
index 000000000000..8ddfb9fbf0cd
--- /dev/null
+++ b/acct-user/vacation/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>titanofold@gentoo.org</email>
+ <name>Aaron W. Swenson</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/acct-user/vacation/vacation-0-r2.ebuild b/acct-user/vacation/vacation-0-r2.ebuild
new file mode 100644
index 000000000000..cb4f3fe38638
--- /dev/null
+++ b/acct-user/vacation/vacation-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/varnish/metadata.xml
index d920e3ba3e56..115e9d64a669 100644
--- a/acct-user/varnish/metadata.xml
+++ b/acct-user/varnish/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/varnish/varnish-0-r3.ebuild
new file mode 100644
index 000000000000..8b3a7a0bbc12
--- /dev/null
+++ b/acct-user/varnish/varnish-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/vault/metadata.xml
index 9a7ba2ff3c46..763dfe770b61 100644
--- a/acct-user/vault/metadata.xml
+++ b/acct-user/vault/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
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-r3.ebuild b/acct-user/vault/vault-0-r3.ebuild
new file mode 100644
index 000000000000..bf6a93e519b8
--- /dev/null
+++ b/acct-user/vault/vault-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/vault_exporter/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/acct-user/vault_exporter/metadata.xml
+++ b/acct-user/vault_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/acct-user/vault_exporter/vault_exporter-0-r2.ebuild b/acct-user/vault_exporter/vault_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2123506e29c9
--- /dev/null
+++ b/acct-user/vault_exporter/vault_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/vboxguest/metadata.xml
index 95aa13f6c5ef..115e9d64a669 100644
--- a/acct-user/vboxguest/metadata.xml
+++ b/acct-user/vboxguest/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
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-r3.ebuild b/acct-user/vboxguest/vboxguest-0-r3.ebuild
new file mode 100644
index 000000000000..08a3dc5f7809
--- /dev/null
+++ b/acct-user/vboxguest/vboxguest-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/vdr/metadata.xml
new file mode 100644
index 000000000000..26d85c6ca977
--- /dev/null
+++ b/acct-user/vdr/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>martin.dummer@gmx.net</email>
+ <name>Martin Dummer</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
+ </maintainer>
+ <use>
+ <flag name="graphlcd">Prepare group membership for <pkg>media-plugins/vdr-graphlcd</pkg>.</flag>
+ <flag name="legacy-homedir">Keep old home directory /var/vdr of an existing installation. When
+ this useflag is cleared, the home directory is switched to FHS conformant /var/lib/vdr</flag>
+ <flag name="remote">Prepare group membership for <pkg>media-plugins/vdr-remote</pkg>.</flag>
+ <flag name="serial">Prepare group membership for <pkg>media-plugins/vdr-serial</pkg>.</flag>
+ </use>
+</pkgmetadata>
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/metadata.xml b/acct-user/vdradmin/metadata.xml
index bae98b27e641..5f81da78fde8 100644
--- a/acct-user/vdradmin/metadata.xml
+++ b/acct-user/vdradmin/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>hd_brummy@gentoo.org</email>
- <name>Joerg Bornkessel</name>
-</maintainer>
<maintainer type="project">
<email>vdr@gentoo.org</email>
<name>Gentoo Vdr Project</name>
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-r3.ebuild b/acct-user/vdradmin/vdradmin-0-r3.ebuild
new file mode 100644
index 000000000000..c16cb6cea5b1
--- /dev/null
+++ b/acct-user/vdradmin/vdradmin-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/vnstat/metadata.xml
index 979bcc7aec93..641cbd3703e7 100644
--- a/acct-user/vnstat/metadata.xml
+++ b/acct-user/vnstat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
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 f3c15bcd12e5..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=7
-
-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/metadata.xml b/acct-user/vpopmail/metadata.xml
index 067e368964dc..630f5673b82e 100644
--- a/acct-user/vpopmail/metadata.xml
+++ b/acct-user/vpopmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
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-r3.ebuild b/acct-user/vpopmail/vpopmail-0-r3.ebuild
new file mode 100644
index 000000000000..ef63f68fa5a6
--- /dev/null
+++ b/acct-user/vpopmail/vpopmail-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/wesnoth/metadata.xml
index 26079e608bed..7c730d47817a 100644
--- a/acct-user/wesnoth/metadata.xml
+++ b/acct-user/wesnoth/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>games@gentoo.org</email>
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-r3.ebuild b/acct-user/wesnoth/wesnoth-0-r3.ebuild
new file mode 100644
index 000000000000..4486fa1af919
--- /dev/null
+++ b/acct-user/wesnoth/wesnoth-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/wwwoffle/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/wwwoffle/metadata.xml
+++ b/acct-user/wwwoffle/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/wwwoffle/wwwoffle-0-r2.ebuild b/acct-user/wwwoffle/wwwoffle-0-r2.ebuild
new file mode 100644
index 000000000000..cd5903ffd8f3
--- /dev/null
+++ b/acct-user/wwwoffle/wwwoffle-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/x2goprint/metadata.xml
index e7a96b9df4ec..4314abde3ac7 100644
--- a/acct-user/x2goprint/metadata.xml
+++ b/acct-user/x2goprint/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
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-r3.ebuild b/acct-user/x2goprint/x2goprint-0-r3.ebuild
new file mode 100644
index 000000000000..a3e6f2817ec7
--- /dev/null
+++ b/acct-user/x2goprint/x2goprint-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/x2gouser/metadata.xml
index e7a96b9df4ec..4314abde3ac7 100644
--- a/acct-user/x2gouser/metadata.xml
+++ b/acct-user/x2gouser/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
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-r3.ebuild b/acct-user/x2gouser/x2gouser-0-r3.ebuild
new file mode 100644
index 000000000000..790555e5b54f
--- /dev/null
+++ b/acct-user/x2gouser/x2gouser-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/xrootd/metadata.xml
index 46a304a17de5..d6152ac1ec54 100644
--- a/acct-user/xrootd/metadata.xml
+++ b/acct-user/xrootd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-physics@gentoo.org</email>
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-r3.ebuild b/acct-user/xrootd/xrootd-0-r3.ebuild
new file mode 100644
index 000000000000..e4a4f24ae3d2
--- /dev/null
+++ b/acct-user/xrootd/xrootd-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/yubihsm-connector/metadata.xml
new file mode 100644
index 000000000000..4d1e1ea205c7
--- /dev/null
+++ b/acct-user/yubihsm-connector/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zx2c4@gentoo.org</email>
+ <name>Jason A. Donenfeld</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
new file mode 100644
index 000000000000..1997a39e2cc8
--- /dev/null
+++ b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the yubihsm-connector service"
+ACCT_USER_ID=528
+ACCT_USER_GROUPS=( yubihsm-connector )
+
+acct-user_add_deps
diff --git a/acct-user/zabbix/metadata.xml b/acct-user/zabbix/metadata.xml
index 11287d1296cc..c03456561456 100644
--- a/acct-user/zabbix/metadata.xml
+++ b/acct-user/zabbix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>fordfrog@gentoo.org</email>
diff --git a/acct-user/zabbix/zabbix-0-r2.ebuild b/acct-user/zabbix/zabbix-0-r2.ebuild
new file mode 100644
index 000000000000..5841624d6998
--- /dev/null
+++ b/acct-user/zabbix/zabbix-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/zeppelin/metadata.xml
index c72dae5a22e5..e0caff1748fa 100644
--- a/acct-user/zeppelin/metadata.xml
+++ b/acct-user/zeppelin/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">apache/zeppelin</remote-id>
</upstream>
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-r3.ebuild b/acct-user/zeppelin/zeppelin-0-r3.ebuild
new file mode 100644
index 000000000000..15d2f615fe0e
--- /dev/null
+++ b/acct-user/zeppelin/zeppelin-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/zetcd/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/zetcd/metadata.xml
+++ b/acct-user/zetcd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/zetcd/zetcd-0-r2.ebuild b/acct-user/zetcd/zetcd-0-r2.ebuild
new file mode 100644
index 000000000000..960d718dca30
--- /dev/null
+++ b/acct-user/zetcd/zetcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/ziproxy/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/acct-user/ziproxy/metadata.xml
+++ b/acct-user/ziproxy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-user/ziproxy/ziproxy-0-r2.ebuild b/acct-user/ziproxy/ziproxy-0-r2.ebuild
new file mode 100644
index 000000000000..22a019769a95
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/znc/metadata.xml
index 44039e87f449..dc6381459374 100644
--- a/acct-user/znc/metadata.xml
+++ b/acct-user/znc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sbraz@gentoo.org</email>
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-r3.ebuild b/acct-user/znc/znc-0-r3.ebuild
new file mode 100644
index 000000000000..045ff97ee989
--- /dev/null
+++ b/acct-user/znc/znc-0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/acct-user/zookeeper/metadata.xml
new file mode 100644
index 000000000000..f7075851003f
--- /dev/null
+++ b/acct-user/zookeeper/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-user/zookeeper/zookeeper-0-r2.ebuild b/acct-user/zookeeper/zookeeper-0-r2.ebuild
new file mode 100644
index 000000000000..ab674235230f
--- /dev/null
+++ b/acct-user/zookeeper/zookeeper-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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