summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'acct-group')
-rw-r--r--acct-group/_cron-failure/_cron-failure-0-r1.ebuild10
-rw-r--r--acct-group/_cron-failure/_cron-failure-0.ebuild10
-rw-r--r--acct-group/abrt/abrt-0-r1.ebuild9
-rw-r--r--acct-group/abrt/metadata.xml8
-rw-r--r--acct-group/adm/adm-0-r1.ebuild8
-rw-r--r--acct-group/adm/adm-0-r3.ebuild8
-rw-r--r--acct-group/aerospike-amc/aerospike-amc-0-r2.ebuild10
-rw-r--r--acct-group/aerospike-amc/aerospike-amc-0.ebuild10
-rw-r--r--acct-group/airdcppd/airdcppd-0-r1.ebuild9
-rw-r--r--acct-group/airdcppd/airdcppd-0-r3.ebuild9
-rw-r--r--acct-group/alertmanager/alertmanager-0-r2.ebuild8
-rw-r--r--acct-group/alertmanager/alertmanager-0.ebuild8
-rw-r--r--acct-group/alertmanager/metadata.xml5
-rw-r--r--acct-group/amanda/amanda-0-r2.ebuild8
-rw-r--r--acct-group/amanda/amanda-0.ebuild8
-rw-r--r--acct-group/amanda/metadata.xml4
-rw-r--r--acct-group/amavis/amavis-0-r1.ebuild9
-rw-r--r--acct-group/amavis/amavis-0-r3.ebuild9
-rw-r--r--acct-group/amavis/metadata.xml8
-rw-r--r--acct-group/amule/amule-0-r1.ebuild9
-rw-r--r--acct-group/amule/amule-0-r3.ebuild9
-rw-r--r--acct-group/android/android-0-r2.ebuild10
-rw-r--r--acct-group/android/android-0.ebuild10
-rw-r--r--acct-group/anope/anope-0-r1.ebuild9
-rw-r--r--acct-group/anope/anope-0-r2.ebuild9
-rw-r--r--acct-group/apache/apache-0-r2.ebuild8
-rw-r--r--acct-group/apache/apache-0-r3.ebuild8
-rw-r--r--acct-group/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild8
-rw-r--r--acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild8
-rw-r--r--acct-group/argus/argus-0-r2.ebuild10
-rw-r--r--acct-group/argus/argus-0.ebuild10
-rw-r--r--acct-group/arpwatch/arpwatch-0-r2.ebuild10
-rw-r--r--acct-group/arpwatch/arpwatch-0.ebuild10
-rw-r--r--acct-group/artifactory/artifactory-0.ebuild10
-rw-r--r--acct-group/artifactory/metadata.xml5
-rw-r--r--acct-group/aspnet/aspnet-0-r2.ebuild8
-rw-r--r--acct-group/aspnet/aspnet-0.ebuild8
-rw-r--r--acct-group/asterisk/asterisk-0-r1.ebuild9
-rw-r--r--acct-group/asterisk/asterisk-0-r3.ebuild9
-rw-r--r--acct-group/at/at-0-r2.ebuild8
-rw-r--r--acct-group/at/at-0.ebuild8
-rw-r--r--acct-group/at/metadata.xml10
-rw-r--r--acct-group/atheme-services/atheme-services-0-r1.ebuild9
-rw-r--r--acct-group/atheme-services/atheme-services-0-r3.ebuild9
-rw-r--r--acct-group/atuin/atuin-0.ebuild8
-rw-r--r--acct-group/atuin/metadata.xml8
-rw-r--r--acct-group/audio/audio-0-r1.ebuild8
-rw-r--r--acct-group/audio/audio-0-r3.ebuild8
-rw-r--r--acct-group/automatic/automatic-0-r2.ebuild8
-rw-r--r--acct-group/automatic/automatic-0.ebuild8
-rw-r--r--acct-group/automx2/automx2-0-r1.ebuild9
-rw-r--r--acct-group/automx2/automx2-0-r3.ebuild9
-rw-r--r--acct-group/automx2/metadata.xml9
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild9
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r3.ebuild9
-rw-r--r--acct-group/avahi-autoipd/metadata.xml5
-rw-r--r--acct-group/avahi/avahi-0-r1.ebuild9
-rw-r--r--acct-group/avahi/avahi-0-r3.ebuild9
-rw-r--r--acct-group/avahi/metadata.xml5
-rw-r--r--acct-group/axtls/axtls-0-r2.ebuild10
-rw-r--r--acct-group/axtls/axtls-0.ebuild10
-rw-r--r--acct-group/axtls/metadata.xml5
-rw-r--r--acct-group/backuppc/backuppc-0-r2.ebuild10
-rw-r--r--acct-group/backuppc/backuppc-0.ebuild10
-rw-r--r--acct-group/bacula/bacula-0-r1.ebuild9
-rw-r--r--acct-group/bacula/bacula-0-r3.ebuild9
-rw-r--r--acct-group/bareos/bareos-0-r1.ebuild9
-rw-r--r--acct-group/bareos/bareos-0-r3.ebuild9
-rw-r--r--acct-group/beanstalk/beanstalk-0-r2.ebuild10
-rw-r--r--acct-group/beanstalk/beanstalk-0.ebuild10
-rw-r--r--acct-group/bedrock/bedrock-0-r1.ebuild10
-rw-r--r--acct-group/bedrock/bedrock-0-r3.ebuild10
-rw-r--r--acct-group/biboumi/biboumi-0-r1.ebuild8
-rw-r--r--acct-group/biboumi/biboumi-0.ebuild8
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r1.ebuild8
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r3.ebuild8
-rw-r--r--acct-group/bird/bird-0-r2.ebuild9
-rw-r--r--acct-group/bird/bird-0.ebuild9
-rw-r--r--acct-group/bitcoin/bitcoin-0-r1.ebuild9
-rw-r--r--acct-group/bitcoin/bitcoin-0-r3.ebuild9
-rw-r--r--acct-group/bitflu/bitflu-0-r2.ebuild10
-rw-r--r--acct-group/bitflu/bitflu-0.ebuild10
-rw-r--r--acct-group/bitflu/metadata.xml5
-rw-r--r--acct-group/bitlbee/bitlbee-0-r1.ebuild8
-rw-r--r--acct-group/bitlbee/bitlbee-0-r3.ebuild8
-rw-r--r--acct-group/bitlbee/metadata.xml8
-rw-r--r--acct-group/blackbox_exporter/blackbox_exporter-0-r2.ebuild8
-rw-r--r--acct-group/blackbox_exporter/blackbox_exporter-0.ebuild8
-rw-r--r--acct-group/blackbox_exporter/metadata.xml5
-rw-r--r--acct-group/boinc/boinc-0-r2.ebuild9
-rw-r--r--acct-group/boinc/boinc-0.ebuild9
-rw-r--r--acct-group/brlapi/brlapi-0-r2.ebuild8
-rw-r--r--acct-group/brlapi/brlapi-0.ebuild8
-rw-r--r--acct-group/brltty/brltty-0-r2.ebuild8
-rw-r--r--acct-group/brltty/brltty-0.ebuild8
-rw-r--r--acct-group/buildbot/buildbot-0-r1.ebuild10
-rw-r--r--acct-group/buildbot/buildbot-0-r3.ebuild10
-rw-r--r--acct-group/buildbot/metadata.xml5
-rw-r--r--acct-group/bumblebee/bumblebee-0-r2.ebuild8
-rw-r--r--acct-group/bumblebee/bumblebee-0.ebuild8
-rw-r--r--acct-group/burp/burp-0-r1.ebuild9
-rw-r--r--acct-group/burp/burp-0-r3.ebuild9
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild10
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r3.ebuild10
-rw-r--r--acct-group/cadvisor/cadvisor-0-r1.ebuild8
-rw-r--r--acct-group/cadvisor/cadvisor-0-r3.ebuild8
-rw-r--r--acct-group/cancd/cancd-0-r2.ebuild10
-rw-r--r--acct-group/cancd/cancd-0.ebuild10
-rw-r--r--acct-group/carbon/carbon-0-r1.ebuild8
-rw-r--r--acct-group/carbon/carbon-0-r3.ebuild8
-rw-r--r--acct-group/cdrom/cdrom-0-r1.ebuild8
-rw-r--r--acct-group/cdrom/cdrom-0-r3.ebuild8
-rw-r--r--acct-group/ceph/ceph-0-r1.ebuild8
-rw-r--r--acct-group/ceph/ceph-0-r3.ebuild8
-rw-r--r--acct-group/cgit/cgit-0-r2.ebuild8
-rw-r--r--acct-group/cgit/cgit-0.ebuild8
-rw-r--r--acct-group/chronograf/chronograf-0-r1.ebuild8
-rw-r--r--acct-group/chronograf/chronograf-0-r3.ebuild8
-rw-r--r--acct-group/cinder/cinder-0-r1.ebuild8
-rw-r--r--acct-group/cinder/metadata.xml8
-rw-r--r--acct-group/clair/clair-0-r1.ebuild8
-rw-r--r--acct-group/clair/clair-0-r3.ebuild8
-rw-r--r--acct-group/clamav/clamav-0-r1.ebuild8
-rw-r--r--acct-group/clamav/clamav-0-r3.ebuild8
-rw-r--r--acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild8
-rw-r--r--acct-group/cmd5checkpw/metadata.xml12
-rw-r--r--acct-group/cntlm/cntlm-0-r2.ebuild10
-rw-r--r--acct-group/cntlm/cntlm-0.ebuild10
-rw-r--r--acct-group/cockroach/cockroach-0-r2.ebuild10
-rw-r--r--acct-group/cockroach/cockroach-0.ebuild10
-rw-r--r--acct-group/collectd/collectd-0-r2.ebuild10
-rw-r--r--acct-group/collectd/collectd-0.ebuild10
-rw-r--r--acct-group/colord/colord-0-r2.ebuild8
-rw-r--r--acct-group/colord/colord-0.ebuild8
-rw-r--r--acct-group/consul-template/consul-template-0-r1.ebuild8
-rw-r--r--acct-group/consul-template/consul-template-0-r3.ebuild8
-rw-r--r--acct-group/consul/consul-0-r1.ebuild8
-rw-r--r--acct-group/consul/consul-0-r3.ebuild8
-rw-r--r--acct-group/consul_exporter/consul_exporter-0-r2.ebuild8
-rw-r--r--acct-group/consul_exporter/consul_exporter-0.ebuild8
-rw-r--r--acct-group/coredns/coredns-0-r2.ebuild10
-rw-r--r--acct-group/coredns/coredns-0.ebuild10
-rw-r--r--acct-group/croc/croc-0-r2.ebuild9
-rw-r--r--acct-group/croc/croc-0.ebuild9
-rw-r--r--acct-group/croc/metadata.xml12
-rw-r--r--acct-group/cron/cron-0-r2.ebuild10
-rw-r--r--acct-group/cron/cron-0.ebuild10
-rw-r--r--acct-group/cron/metadata.xml5
-rw-r--r--acct-group/crontab/crontab-0-r2.ebuild8
-rw-r--r--acct-group/crontab/crontab-0.ebuild8
-rw-r--r--acct-group/cvmfs/cvmfs-0-r1.ebuild9
-rw-r--r--acct-group/cvmfs/cvmfs-0-r3.ebuild9
-rw-r--r--acct-group/davfs2/davfs2-0-r1.ebuild8
-rw-r--r--acct-group/davfs2/davfs2-0-r3.ebuild8
-rw-r--r--acct-group/dbmail/dbmail-0-r2.ebuild8
-rw-r--r--acct-group/dbmail/dbmail-0.ebuild8
-rw-r--r--acct-group/dbskkd/dbskkd-0-r2.ebuild10
-rw-r--r--acct-group/dbskkd/dbskkd-0.ebuild10
-rw-r--r--acct-group/ddclient/ddclient-0-r1.ebuild10
-rw-r--r--acct-group/ddclient/ddclient-0-r3.ebuild10
-rw-r--r--acct-group/defang/defang-0-r2.ebuild10
-rw-r--r--acct-group/defang/defang-0.ebuild10
-rw-r--r--acct-group/dehydrated/dehydrated-0-r2.ebuild10
-rw-r--r--acct-group/dehydrated/dehydrated-0.ebuild10
-rw-r--r--acct-group/deluge/deluge-0-r1.ebuild8
-rw-r--r--acct-group/deluge/deluge-0-r3.ebuild8
-rw-r--r--acct-group/dhcp/dhcp-0-r1.ebuild8
-rw-r--r--acct-group/dhcp/dhcp-0-r3.ebuild8
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r1.ebuild8
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r3.ebuild8
-rw-r--r--acct-group/dialout/dialout-0-r1.ebuild8
-rw-r--r--acct-group/dialout/dialout-0-r3.ebuild8
-rw-r--r--acct-group/dictd/dictd-0-r2.ebuild10
-rw-r--r--acct-group/dictd/dictd-0.ebuild10
-rw-r--r--acct-group/dirsrv/dirsrv-0-r2.ebuild9
-rw-r--r--acct-group/dirsrv/dirsrv-0.ebuild9
-rw-r--r--acct-group/disk/disk-0-r1.ebuild8
-rw-r--r--acct-group/disk/disk-0-r3.ebuild8
-rw-r--r--acct-group/distcc/distcc-1-r2.ebuild8
-rw-r--r--acct-group/distcc/distcc-1.ebuild8
-rw-r--r--acct-group/dnrd/dnrd-0-r2.ebuild10
-rw-r--r--acct-group/dnrd/dnrd-0.ebuild10
-rw-r--r--acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild9
-rw-r--r--acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild9
-rw-r--r--acct-group/dnsdist/dnsdist-0-r1.ebuild10
-rw-r--r--acct-group/dnsdist/dnsdist-0-r3.ebuild10
-rw-r--r--acct-group/dnsdist/metadata.xml5
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r1.ebuild8
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r3.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild8
-rw-r--r--acct-group/docker/docker-0-r1.ebuild8
-rw-r--r--acct-group/docker/docker-0-r3.ebuild8
-rw-r--r--acct-group/docker/metadata.xml4
-rw-r--r--acct-group/docker_auth/docker_auth-0-r1.ebuild8
-rw-r--r--acct-group/docker_auth/docker_auth-0-r3.ebuild8
-rw-r--r--acct-group/dovecot/dovecot-0-r1.ebuild8
-rw-r--r--acct-group/dovecot/dovecot-0-r3.ebuild8
-rw-r--r--acct-group/dovenull/dovenull-0-r1.ebuild8
-rw-r--r--acct-group/dovenull/dovenull-0-r3.ebuild8
-rw-r--r--acct-group/drone/drone-0-r2.ebuild10
-rw-r--r--acct-group/drone/drone-0.ebuild10
-rw-r--r--acct-group/ejabberd/ejabberd-0-r2.ebuild10
-rw-r--r--acct-group/ejabberd/ejabberd-0.ebuild10
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r1.ebuild9
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r3.ebuild9
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild10
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild10
-rw-r--r--acct-group/energi3/energi3-0-r2.ebuild9
-rw-r--r--acct-group/energi3/energi3-0.ebuild9
-rw-r--r--acct-group/epam/epam-0-r2.ebuild9
-rw-r--r--acct-group/epam/epam-0.ebuild9
-rw-r--r--acct-group/epmd/epmd-0-r1.ebuild9
-rw-r--r--acct-group/epmd/epmd-0-r3.ebuild9
-rw-r--r--acct-group/epmd/metadata.xml8
-rw-r--r--acct-group/err/err-0-r2.ebuild8
-rw-r--r--acct-group/err/err-0.ebuild8
-rw-r--r--acct-group/etcd/etcd-0-r1.ebuild8
-rw-r--r--acct-group/etcd/etcd-0-r3.ebuild8
-rw-r--r--acct-group/exabgp/exabgp-0-r1.ebuild8
-rw-r--r--acct-group/exabgp/exabgp-0-r3.ebuild8
-rw-r--r--acct-group/ez-ipupd/ez-ipupd-0-r2.ebuild10
-rw-r--r--acct-group/ez-ipupd/ez-ipupd-0.ebuild10
-rw-r--r--acct-group/fax/fax-0-r2.ebuild10
-rw-r--r--acct-group/fax/fax-0.ebuild10
-rw-r--r--acct-group/fcron/fcron-0-r2.ebuild10
-rw-r--r--acct-group/fcron/fcron-0.ebuild10
-rw-r--r--acct-group/fcron/metadata.xml5
-rw-r--r--acct-group/fdm/fdm-0-r2.ebuild10
-rw-r--r--acct-group/fdm/fdm-0.ebuild10
-rw-r--r--acct-group/fetchmail/fetchmail-0-r1.ebuild9
-rw-r--r--acct-group/fetchmail/fetchmail-0-r3.ebuild9
-rw-r--r--acct-group/fhem/fhem-0-r1.ebuild10
-rw-r--r--acct-group/fhem/fhem-0-r3.ebuild10
-rw-r--r--acct-group/fingerprint/fingerprint-0-r1.ebuild8
-rw-r--r--acct-group/fingerprint/fingerprint-0-r3.ebuild8
-rw-r--r--acct-group/firebird/firebird-0-r1.ebuild10
-rw-r--r--acct-group/firebird/firebird-0-r2.ebuild10
-rw-r--r--acct-group/flatpak/flatpak-0-r2.ebuild8
-rw-r--r--acct-group/flatpak/flatpak-0.ebuild8
-rw-r--r--acct-group/floppy/floppy-0-r1.ebuild8
-rw-r--r--acct-group/floppy/metadata.xml7
-rw-r--r--acct-group/flows/flows-0-r2.ebuild10
-rw-r--r--acct-group/flows/flows-0.ebuild10
-rw-r--r--acct-group/fluentd/fluentd-0-r1.ebuild10
-rw-r--r--acct-group/fluentd/fluentd-0-r3.ebuild10
-rw-r--r--acct-group/fluentd/metadata.xml12
-rw-r--r--acct-group/foldingathome/foldingathome-0-r2.ebuild10
-rw-r--r--acct-group/foldingathome/foldingathome-0.ebuild10
-rw-r--r--acct-group/fp-multiuser/fp-multiuser-0-r2.ebuild10
-rw-r--r--acct-group/fp-multiuser/fp-multiuser-0.ebuild10
-rw-r--r--acct-group/freenet/freenet-0-r2.ebuild9
-rw-r--r--acct-group/freenet/freenet-0.ebuild9
-rw-r--r--acct-group/freenet/metadata.xml5
-rw-r--r--acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild8
-rw-r--r--acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild8
-rw-r--r--acct-group/frr/frr-0-r2.ebuild8
-rw-r--r--acct-group/frr/frr-0.ebuild8
-rw-r--r--acct-group/frr/metadata.xml14
-rw-r--r--acct-group/ftp/ftp-0-r1.ebuild9
-rw-r--r--acct-group/ftp/ftp-0-r3.ebuild9
-rw-r--r--acct-group/ftpproxy/ftpproxy-0-r2.ebuild10
-rw-r--r--acct-group/ftpproxy/ftpproxy-0.ebuild10
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild8
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r3.ebuild8
-rw-r--r--acct-group/gamemode/gamemode-0-r2.ebuild9
-rw-r--r--acct-group/gamemode/gamemode-0.ebuild9
-rw-r--r--acct-group/gamestat/gamestat-0-r1.ebuild9
-rw-r--r--acct-group/gamestat/gamestat-0-r3.ebuild9
-rw-r--r--acct-group/gatling/gatling-0-r1.ebuild8
-rw-r--r--acct-group/gatling/gatling-0-r3.ebuild8
-rw-r--r--acct-group/gauth/gauth-0-r2.ebuild10
-rw-r--r--acct-group/gauth/gauth-0.ebuild10
-rw-r--r--acct-group/gdm/gdm-0-r2.ebuild8
-rw-r--r--acct-group/gdm/gdm-0.ebuild8
-rw-r--r--acct-group/geneweb/geneweb-0-r1.ebuild10
-rw-r--r--acct-group/geneweb/geneweb-0-r3.ebuild10
-rw-r--r--acct-group/geoclue/geoclue-0-r2.ebuild8
-rw-r--r--acct-group/geoclue/geoclue-0.ebuild8
-rw-r--r--acct-group/gerbera/gerbera-0-r1.ebuild9
-rw-r--r--acct-group/gerbera/gerbera-0-r3.ebuild9
-rw-r--r--acct-group/gerbera/metadata.xml9
-rw-r--r--acct-group/git/git-0-r1.ebuild8
-rw-r--r--acct-group/git/git-0-r3.ebuild8
-rw-r--r--acct-group/github-exporter/github-exporter-0-r2.ebuild8
-rw-r--r--acct-group/github-exporter/github-exporter-0.ebuild8
-rw-r--r--acct-group/gitlab-runner/gitlab-runner-1-r2.ebuild8
-rw-r--r--acct-group/gitlab-runner/gitlab-runner-1.ebuild8
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r1.ebuild8
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r3.ebuild8
-rw-r--r--acct-group/gkrellmd/metadata.xml5
-rw-r--r--acct-group/glance/glance-0-r1.ebuild8
-rw-r--r--acct-group/glance/metadata.xml8
-rw-r--r--acct-group/gluster/gluster-0-r1.ebuild8
-rw-r--r--acct-group/gluster/gluster-0-r3.ebuild8
-rw-r--r--acct-group/gns3/gns3-0-r1.ebuild8
-rw-r--r--acct-group/gns3/gns3-0.ebuild8
-rw-r--r--acct-group/gnump3d/gnump3d-0-r2.ebuild10
-rw-r--r--acct-group/gnump3d/gnump3d-0.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r2.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild10
-rw-r--r--acct-group/goaccess/goaccess-0-r1.ebuild8
-rw-r--r--acct-group/goaccess/goaccess-0.ebuild8
-rw-r--r--acct-group/gopher/gopher-0-r2.ebuild8
-rw-r--r--acct-group/gopher/gopher-0.ebuild8
-rw-r--r--acct-group/gopherd/gopherd-0-r2.ebuild10
-rw-r--r--acct-group/gopherd/gopherd-0.ebuild10
-rw-r--r--acct-group/gpib/gpib-0-r1.ebuild8
-rw-r--r--acct-group/gpib/gpib-0-r3.ebuild8
-rw-r--r--acct-group/gpio/gpio-0.ebuild8
-rw-r--r--acct-group/gpio/metadata.xml12
-rw-r--r--acct-group/grafana/grafana-0-r1.ebuild10
-rw-r--r--acct-group/grafana/grafana-0-r3.ebuild10
-rw-r--r--acct-group/graylog/graylog-0-r1.ebuild9
-rw-r--r--acct-group/graylog/graylog-0-r3.ebuild9
-rw-r--r--acct-group/greetd/greetd-0-r1.ebuild9
-rw-r--r--acct-group/greetd/greetd-0-r3.ebuild9
-rw-r--r--acct-group/grok_exporter/grok_exporter-0-r2.ebuild10
-rw-r--r--acct-group/grok_exporter/grok_exporter-0.ebuild10
-rw-r--r--acct-group/groonga/groonga-0-r2.ebuild10
-rw-r--r--acct-group/groonga/groonga-0.ebuild10
-rw-r--r--acct-group/gvm/gvm-0-r1.ebuild9
-rw-r--r--acct-group/gvm/gvm-0-r3.ebuild9
-rw-r--r--acct-group/h2o/h2o-0-r2.ebuild10
-rw-r--r--acct-group/h2o/h2o-0.ebuild10
-rw-r--r--acct-group/haclient/haclient-0-r2.ebuild10
-rw-r--r--acct-group/haclient/haclient-0.ebuild10
-rw-r--r--acct-group/haproxy/haproxy-0-r1.ebuild8
-rw-r--r--acct-group/haproxy/haproxy-0-r3.ebuild8
-rw-r--r--acct-group/havp/havp-0-r2.ebuild10
-rw-r--r--acct-group/havp/havp-0.ebuild10
-rw-r--r--acct-group/headscale/headscale-0-r1.ebuild8
-rw-r--r--acct-group/headscale/headscale-0.ebuild8
-rw-r--r--acct-group/heat/heat-0-r1.ebuild8
-rw-r--r--acct-group/heat/metadata.xml8
-rw-r--r--acct-group/hsqldb/hsqldb-0-r2.ebuild9
-rw-r--r--acct-group/hsqldb/hsqldb-0.ebuild9
-rw-r--r--acct-group/http/http-0-r2.ebuild8
-rw-r--r--acct-group/http/http-0.ebuild8
-rw-r--r--acct-group/i2c/i2c-0-r2.ebuild8
-rw-r--r--acct-group/i2c/i2c-0.ebuild8
-rw-r--r--acct-group/i2p/i2p-0-r1.ebuild9
-rw-r--r--acct-group/i2p/i2p-0-r3.ebuild9
-rw-r--r--acct-group/i2pd/i2pd-0-r1.ebuild9
-rw-r--r--acct-group/i2pd/i2pd-0-r3.ebuild9
-rw-r--r--acct-group/icecast/icecast-0-r2.ebuild10
-rw-r--r--acct-group/icecast/icecast-0.ebuild10
-rw-r--r--acct-group/icecream/icecream-0-r2.ebuild10
-rw-r--r--acct-group/icecream/icecream-0.ebuild10
-rw-r--r--acct-group/ices/ices-0-r2.ebuild10
-rw-r--r--acct-group/ices/ices-0.ebuild10
-rw-r--r--acct-group/icinga/icinga-0-r1.ebuild8
-rw-r--r--acct-group/icinga/icinga-0-r3.ebuild8
-rw-r--r--acct-group/icingacmd/icingacmd-0-r1.ebuild8
-rw-r--r--acct-group/icingacmd/icingacmd-0-r3.ebuild8
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r1.ebuild8
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r3.ebuild8
-rw-r--r--acct-group/inadyn/inadyn-0-r1.ebuild8
-rw-r--r--acct-group/inadyn/metadata.xml (renamed from acct-group/jabber/metadata.xml)0
-rw-r--r--acct-group/incus-admin/incus-admin-0.ebuild9
-rw-r--r--acct-group/incus-admin/metadata.xml8
-rw-r--r--acct-group/incus/incus-0.ebuild9
-rw-r--r--acct-group/incus/metadata.xml8
-rw-r--r--acct-group/influxdb/influxdb-0-r1.ebuild8
-rw-r--r--acct-group/influxdb/influxdb-0-r3.ebuild8
-rw-r--r--acct-group/input/input-0-r1.ebuild8
-rw-r--r--acct-group/input/input-0-r3.ebuild8
-rw-r--r--acct-group/inspircd/inspircd-0-r1.ebuild9
-rw-r--r--acct-group/inspircd/inspircd-0-r3.ebuild9
-rw-r--r--acct-group/ipfs/ipfs-0-r1.ebuild9
-rw-r--r--acct-group/ipfs/ipfs-0-r3.ebuild9
-rw-r--r--acct-group/ipsec/ipsec-0-r2.ebuild10
-rw-r--r--acct-group/ipsec/ipsec-0.ebuild10
-rw-r--r--acct-group/ipsentinel/ipsentinel-0-r2.ebuild10
-rw-r--r--acct-group/ipsentinel/ipsentinel-0.ebuild10
-rw-r--r--acct-group/iroffer/iroffer-0-r2.ebuild8
-rw-r--r--acct-group/iroffer/iroffer-0.ebuild8
-rw-r--r--acct-group/iroffer/metadata.xml9
-rw-r--r--acct-group/jabber/jabber-0.ebuild10
-rw-r--r--acct-group/jackett/jackett-0-r1.ebuild8
-rw-r--r--acct-group/jackett/metadata.xml20
-rw-r--r--acct-group/jellyfin/jellyfin-0-r1.ebuild8
-rw-r--r--acct-group/jellyfin/jellyfin-0.ebuild8
-rw-r--r--acct-group/jenkins/jenkins-0-r2.ebuild10
-rw-r--r--acct-group/jenkins/jenkins-0.ebuild10
-rw-r--r--acct-group/kafka/kafka-0-r1.ebuild8
-rw-r--r--acct-group/kafka/kafka-0-r3.ebuild8
-rw-r--r--acct-group/kapacitor/kapacitor-0-r1.ebuild8
-rw-r--r--acct-group/kapacitor/kapacitor-0-r3.ebuild8
-rw-r--r--acct-group/karma/karma-0-r2.ebuild10
-rw-r--r--acct-group/karma/karma-0.ebuild10
-rw-r--r--acct-group/keystone/keystone-0-r1.ebuild8
-rw-r--r--acct-group/keystone/metadata.xml8
-rw-r--r--acct-group/kibana/kibana-0-r1.ebuild9
-rw-r--r--acct-group/kibana/kibana-0-r3.ebuild9
-rw-r--r--acct-group/kismet/kismet-0-r1.ebuild9
-rw-r--r--acct-group/kismet/kismet-0-r3.ebuild9
-rw-r--r--acct-group/kmem/kmem-0-r1.ebuild8
-rw-r--r--acct-group/kmem/kmem-0-r3.ebuild8
-rw-r--r--acct-group/knot-resolver/knot-resolver-0-r1.ebuild8
-rw-r--r--acct-group/knot-resolver/metadata.xml8
-rw-r--r--acct-group/knot/knot-0-r1.ebuild8
-rw-r--r--acct-group/knot/knot-0-r3.ebuild8
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild8
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r3.ebuild8
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild8
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r3.ebuild8
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild8
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r3.ebuild8
-rw-r--r--acct-group/kvm/kvm-0-r1.ebuild8
-rw-r--r--acct-group/kvm/kvm-0-r3.ebuild8
-rw-r--r--acct-group/ldap/ldap-0-r2.ebuild8
-rw-r--r--acct-group/ldap/ldap-0.ebuild8
-rw-r--r--acct-group/ldap/metadata.xml5
-rw-r--r--acct-group/libreoffice/libreoffice-0-r1.ebuild8
-rw-r--r--acct-group/libreoffice/libreoffice-0.ebuild8
-rw-r--r--acct-group/libvirt/libvirt-0-r1.ebuild8
-rw-r--r--acct-group/libvirt/libvirt-0-r3.ebuild8
-rw-r--r--acct-group/lidarr/lidarr-0-r1.ebuild8
-rw-r--r--acct-group/lidarr/metadata.xml20
-rw-r--r--acct-group/lightdm/lightdm-0-r1.ebuild10
-rw-r--r--acct-group/lightdm/lightdm-0-r2.ebuild10
-rw-r--r--acct-group/lighttpd/lighttpd-0-r1.ebuild8
-rw-r--r--acct-group/lighttpd/lighttpd-0-r3.ebuild8
-rw-r--r--acct-group/lighttpd/metadata.xml5
-rw-r--r--acct-group/litecoin/litecoin-0.ebuild10
-rw-r--r--acct-group/litecoin/metadata.xml5
-rw-r--r--acct-group/lldpd/lldpd-0-r1.ebuild8
-rw-r--r--acct-group/lldpd/lldpd-0-r3.ebuild8
-rw-r--r--acct-group/locate/locate-0-r1.ebuild8
-rw-r--r--acct-group/locate/locate-0-r3.ebuild8
-rw-r--r--acct-group/logcheck/logcheck-0-r2.ebuild10
-rw-r--r--acct-group/logcheck/logcheck-0.ebuild10
-rw-r--r--acct-group/logcheck/metadata.xml9
-rw-r--r--acct-group/logstash/logstash-0-r1.ebuild9
-rw-r--r--acct-group/logstash/logstash-0-r3.ebuild9
-rw-r--r--acct-group/logsurfer/logsurfer-0-r2.ebuild10
-rw-r--r--acct-group/logsurfer/logsurfer-0.ebuild10
-rw-r--r--acct-group/lp/lp-0-r1.ebuild8
-rw-r--r--acct-group/lp/lp-0-r3.ebuild8
-rw-r--r--acct-group/lpadmin/lpadmin-0-r1.ebuild8
-rw-r--r--acct-group/lpadmin/lpadmin-0-r3.ebuild8
-rw-r--r--acct-group/lxc/lxc-0-r2.ebuild9
-rw-r--r--acct-group/lxc/lxc-0.ebuild9
-rw-r--r--acct-group/lxd/lxd-0-r1.ebuild9
-rw-r--r--acct-group/lxd/lxd-0-r3.ebuild9
-rw-r--r--acct-group/mail/mail-0-r1.ebuild9
-rw-r--r--acct-group/mail/mail-0-r3.ebuild9
-rw-r--r--acct-group/man/man-0-r1.ebuild8
-rw-r--r--acct-group/man/man-0-r3.ebuild8
-rw-r--r--acct-group/maradns/maradns-0-r1.ebuild8
-rw-r--r--acct-group/maradns/maradns-0-r3.ebuild8
-rw-r--r--acct-group/maradns/metadata.xml5
-rw-r--r--acct-group/memcached/memcached-0-r1.ebuild8
-rw-r--r--acct-group/memcached/memcached-0-r3.ebuild8
-rw-r--r--acct-group/memcached_exporter/memcached_exporter-0-r2.ebuild8
-rw-r--r--acct-group/memcached_exporter/memcached_exporter-0.ebuild8
-rw-r--r--acct-group/messagebus/messagebus-0-r1.ebuild8
-rw-r--r--acct-group/messagebus/messagebus-0-r3.ebuild8
-rw-r--r--acct-group/metadata.xml3
-rw-r--r--acct-group/mgraph/mgraph-0-r2.ebuild9
-rw-r--r--acct-group/mgraph/mgraph-0.ebuild9
-rw-r--r--acct-group/milter-regex/metadata.xml9
-rw-r--r--acct-group/milter-regex/milter-regex-0-r1.ebuild9
-rw-r--r--acct-group/milter-regex/milter-regex-0-r3.ebuild9
-rw-r--r--acct-group/minbif/metadata.xml5
-rw-r--r--acct-group/minbif/minbif-0.ebuild10
-rw-r--r--acct-group/minecraft/minecraft-0-r1.ebuild10
-rw-r--r--acct-group/minecraft/minecraft-0-r3.ebuild10
-rw-r--r--acct-group/minetest/minetest-0-r1.ebuild10
-rw-r--r--acct-group/minetest/minetest-0-r3.ebuild10
-rw-r--r--acct-group/minidlna/minidlna-0-r2.ebuild8
-rw-r--r--acct-group/minidlna/minidlna-0.ebuild8
-rw-r--r--acct-group/minio/metadata.xml8
-rw-r--r--acct-group/minio/minio-0.ebuild8
-rw-r--r--acct-group/mogile/mogile-0-r2.ebuild9
-rw-r--r--acct-group/mogile/mogile-0.ebuild9
-rw-r--r--acct-group/mongodb/mongodb-0-r1.ebuild9
-rw-r--r--acct-group/mongodb/mongodb-0-r3.ebuild9
-rw-r--r--acct-group/mongodb_exporter/mongodb_exporter-0-r2.ebuild8
-rw-r--r--acct-group/mongodb_exporter/mongodb_exporter-0.ebuild8
-rw-r--r--acct-group/monitorix/monitorix-0-r1.ebuild9
-rw-r--r--acct-group/monitorix/monitorix-0-r3.ebuild9
-rw-r--r--acct-group/monkeyd/metadata.xml5
-rw-r--r--acct-group/monkeyd/monkeyd-0-r2.ebuild10
-rw-r--r--acct-group/monkeyd/monkeyd-0.ebuild10
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r1.ebuild10
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r3.ebuild10
-rw-r--r--acct-group/mosquitto/mosquitto-0-r1.ebuild9
-rw-r--r--acct-group/mosquitto/mosquitto-0-r3.ebuild9
-rw-r--r--acct-group/motion/motion-0-r1.ebuild8
-rw-r--r--acct-group/motion/motion-0-r3.ebuild8
-rw-r--r--acct-group/msmtpd/msmtpd-0-r1.ebuild8
-rw-r--r--acct-group/msmtpd/msmtpd-0-r3.ebuild8
-rw-r--r--acct-group/munge/munge-0-r2.ebuild10
-rw-r--r--acct-group/munge/munge-0.ebuild10
-rw-r--r--acct-group/munin/munin-0-r1.ebuild8
-rw-r--r--acct-group/munin/munin-0-r3.ebuild8
-rw-r--r--acct-group/murmur/murmur-0-r1.ebuild8
-rw-r--r--acct-group/murmur/murmur-0-r3.ebuild8
-rw-r--r--acct-group/mysql/mysql-0-r1.ebuild10
-rw-r--r--acct-group/mysql/mysql-0-r3.ebuild10
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild8
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r3.ebuild8
-rw-r--r--acct-group/mythtv/mythtv-0-r1.ebuild10
-rw-r--r--acct-group/mythtv/mythtv-0-r3.ebuild10
-rw-r--r--acct-group/nagios/nagios-0-r1.ebuild8
-rw-r--r--acct-group/nagios/nagios-0-r3.ebuild8
-rw-r--r--acct-group/named/metadata.xml4
-rw-r--r--acct-group/named/named-0-r1.ebuild8
-rw-r--r--acct-group/named/named-0-r3.ebuild8
-rw-r--r--acct-group/netbox/metadata.xml5
-rw-r--r--acct-group/netbox/netbox-0-r1.ebuild8
-rw-r--r--acct-group/netdata/netdata-0-r1.ebuild8
-rw-r--r--acct-group/netdata/netdata-0-r3.ebuild8
-rw-r--r--acct-group/netdev/metadata.xml5
-rw-r--r--acct-group/netdev/netdev-0-r1.ebuild9
-rw-r--r--acct-group/netdev/netdev-0-r3.ebuild9
-rw-r--r--acct-group/netperf/netperf-0-r2.ebuild10
-rw-r--r--acct-group/netperf/netperf-0.ebuild10
-rw-r--r--acct-group/neutron/metadata.xml8
-rw-r--r--acct-group/neutron/neutron-0-r1.ebuild8
-rw-r--r--acct-group/nginx-unit/metadata.xml7
-rw-r--r--acct-group/nginx-unit/nginx-unit-0-r1.ebuild10
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild8
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild8
-rw-r--r--acct-group/nginx/nginx-0-r1.ebuild10
-rw-r--r--acct-group/nginx/nginx-0-r2.ebuild10
-rw-r--r--acct-group/ngircd/ngircd-0-r1.ebuild9
-rw-r--r--acct-group/ngircd/ngircd-0-r2.ebuild9
-rw-r--r--acct-group/ngrep/ngrep-0-r1.ebuild10
-rw-r--r--acct-group/ngrep/ngrep-0-r3.ebuild10
-rw-r--r--acct-group/nm-openconnect/nm-openconnect-0-r2.ebuild10
-rw-r--r--acct-group/nm-openconnect/nm-openconnect-0.ebuild10
-rw-r--r--acct-group/nm-openvpn/nm-openvpn-0-r2.ebuild10
-rw-r--r--acct-group/nm-openvpn/nm-openvpn-0.ebuild10
-rw-r--r--acct-group/nobody/nobody-0-r2.ebuild9
-rw-r--r--acct-group/nobody/nobody-0.ebuild9
-rw-r--r--acct-group/node_exporter/node_exporter-0-r1.ebuild8
-rw-r--r--acct-group/node_exporter/node_exporter-0-r3.ebuild8
-rw-r--r--acct-group/nofiles/nofiles-0-r1.ebuild8
-rw-r--r--acct-group/nofiles/nofiles-0-r3.ebuild8
-rw-r--r--acct-group/notary/notary-0-r2.ebuild10
-rw-r--r--acct-group/notary/notary-0.ebuild10
-rw-r--r--acct-group/nova/metadata.xml8
-rw-r--r--acct-group/nova/nova-0-r1.ebuild8
-rw-r--r--acct-group/nsd/metadata.xml5
-rw-r--r--acct-group/nsd/nsd-0-r1.ebuild8
-rw-r--r--acct-group/nsd/nsd-0-r3.ebuild8
-rw-r--r--acct-group/nslcd/nslcd-0-r1.ebuild8
-rw-r--r--acct-group/nslcd/nslcd-0-r3.ebuild8
-rw-r--r--acct-group/ntopng/ntopng-0-r2.ebuild8
-rw-r--r--acct-group/ntopng/ntopng-0.ebuild8
-rw-r--r--acct-group/ntp/ntp-0-r1.ebuild8
-rw-r--r--acct-group/ntp/ntp-0-r3.ebuild8
-rw-r--r--acct-group/nullmail/nullmail-0-r2.ebuild10
-rw-r--r--acct-group/nullmail/nullmail-0.ebuild10
-rw-r--r--acct-group/nut/nut-0-r2.ebuild10
-rw-r--r--acct-group/nut/nut-0.ebuild10
-rw-r--r--acct-group/nzbget/nzbget-0-r2.ebuild9
-rw-r--r--acct-group/nzbget/nzbget-0.ebuild9
-rw-r--r--acct-group/oidentd/oidentd-0-r1.ebuild8
-rw-r--r--acct-group/oidentd/oidentd-0-r3.ebuild8
-rw-r--r--acct-group/openct/metadata.xml5
-rw-r--r--acct-group/openct/openct-0-r1.ebuild8
-rw-r--r--acct-group/openct/openct-0-r3.ebuild8
-rw-r--r--acct-group/opendkim/metadata.xml4
-rw-r--r--acct-group/opendkim/opendkim-0-r1.ebuild9
-rw-r--r--acct-group/opendkim/opendkim-0-r3.ebuild9
-rw-r--r--acct-group/opendmarc/opendmarc-1-r1.ebuild9
-rw-r--r--acct-group/opendmarc/opendmarc-1.ebuild9
-rw-r--r--acct-group/opendnssec/opendnssec-0-r2.ebuild10
-rw-r--r--acct-group/opendnssec/opendnssec-0.ebuild10
-rw-r--r--acct-group/openhab/metadata.xml8
-rw-r--r--acct-group/openhab/openhab-0.ebuild8
-rw-r--r--acct-group/openntpd/openntpd-0-r1.ebuild8
-rw-r--r--acct-group/openntpd/openntpd-0-r3.ebuild8
-rw-r--r--acct-group/openrct2/openrct2-0-r1.ebuild10
-rw-r--r--acct-group/openrct2/openrct2-0-r3.ebuild10
-rw-r--r--acct-group/openttd/openttd-0-r1.ebuild10
-rw-r--r--acct-group/openttd/openttd-0.ebuild10
-rw-r--r--acct-group/openvpn/openvpn-0-r1.ebuild8
-rw-r--r--acct-group/openvpn/openvpn-0-r3.ebuild8
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild8
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r3.ebuild8
-rw-r--r--acct-group/opm/opm-0-r1.ebuild9
-rw-r--r--acct-group/opm/opm-0.ebuild9
-rw-r--r--acct-group/oprofile/metadata.xml5
-rw-r--r--acct-group/oprofile/oprofile-0-r1.ebuild9
-rw-r--r--acct-group/oprofile/oprofile-0-r3.ebuild9
-rw-r--r--acct-group/oragono/oragono-0-r1.ebuild9
-rw-r--r--acct-group/oragono/oragono-0.ebuild9
-rw-r--r--acct-group/ossec/metadata.xml9
-rw-r--r--acct-group/ossec/ossec-0-r1.ebuild9
-rw-r--r--acct-group/ossec/ossec-0-r3.ebuild9
-rw-r--r--acct-group/owntracks/owntracks-0-r1.ebuild9
-rw-r--r--acct-group/owntracks/owntracks-0.ebuild9
-rw-r--r--acct-group/p2p/p2p-0-r2.ebuild9
-rw-r--r--acct-group/p2p/p2p-0.ebuild9
-rw-r--r--acct-group/partimag/partimag-0-r1.ebuild10
-rw-r--r--acct-group/partimag/partimag-0-r2.ebuild10
-rw-r--r--acct-group/pcap/metadata.xml4
-rw-r--r--acct-group/pcap/pcap-0-r1.ebuild9
-rw-r--r--acct-group/pcap/pcap-0.ebuild9
-rw-r--r--acct-group/pcscd/metadata.xml5
-rw-r--r--acct-group/pcscd/pcscd-0-r1.ebuild8
-rw-r--r--acct-group/pcscd/pcscd-0-r3.ebuild8
-rw-r--r--acct-group/pdns/pdns-0-r1.ebuild8
-rw-r--r--acct-group/pdns/pdns-0-r3.ebuild8
-rw-r--r--acct-group/pdnsd/pdnsd-0-r1.ebuild8
-rw-r--r--acct-group/pdnsd/pdnsd-0-r3.ebuild8
-rw-r--r--acct-group/pgagent/pgagent-0-r2.ebuild10
-rw-r--r--acct-group/pgagent/pgagent-0.ebuild10
-rw-r--r--acct-group/pipewire/metadata.xml8
-rw-r--r--acct-group/pipewire/pipewire-0-r2.ebuild8
-rw-r--r--acct-group/pipewire/pipewire-0.ebuild8
-rw-r--r--acct-group/pkcs11/pkcs11-0-r2.ebuild10
-rw-r--r--acct-group/pkcs11/pkcs11-0.ebuild10
-rw-r--r--acct-group/placement/metadata.xml8
-rw-r--r--acct-group/placement/placement-0-r1.ebuild8
-rw-r--r--acct-group/plex/plex-0-r1.ebuild9
-rw-r--r--acct-group/plex/plex-0-r3.ebuild9
-rw-r--r--acct-group/plugdev/plugdev-0-r1.ebuild9
-rw-r--r--acct-group/plugdev/plugdev-0-r3.ebuild9
-rw-r--r--acct-group/polkitd/polkitd-0-r1.ebuild8
-rw-r--r--acct-group/polkitd/polkitd-0-r3.ebuild8
-rw-r--r--acct-group/polw/polw-0-r2.ebuild10
-rw-r--r--acct-group/polw/polw-0.ebuild10
-rw-r--r--acct-group/popa3d/popa3d-0-r2.ebuild9
-rw-r--r--acct-group/popa3d/popa3d-0.ebuild9
-rw-r--r--acct-group/portage/portage-0-r2.ebuild8
-rw-r--r--acct-group/portage/portage-0.ebuild8
-rw-r--r--acct-group/postdrop/postdrop-0-r1.ebuild8
-rw-r--r--acct-group/postdrop/postdrop-0-r3.ebuild8
-rw-r--r--acct-group/postfix/postfix-0-r1.ebuild8
-rw-r--r--acct-group/postfix/postfix-0-r3.ebuild8
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild8
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r3.ebuild8
-rw-r--r--acct-group/postfwd/postfwd-0-r2.ebuild10
-rw-r--r--acct-group/postfwd/postfwd-0.ebuild10
-rw-r--r--acct-group/postgres/postgres-0-r1.ebuild10
-rw-r--r--acct-group/postgres/postgres-0-r3.ebuild10
-rw-r--r--acct-group/postgres_exporter/postgres_exporter-0-r2.ebuild8
-rw-r--r--acct-group/postgres_exporter/postgres_exporter-0.ebuild8
-rw-r--r--acct-group/postgrey/postgrey-0-r1.ebuild9
-rw-r--r--acct-group/postgrey/postgrey-0.ebuild9
-rw-r--r--acct-group/privoxy/metadata.xml8
-rw-r--r--acct-group/privoxy/privoxy-0-r1.ebuild9
-rw-r--r--acct-group/privoxy/privoxy-0-r3.ebuild9
-rw-r--r--acct-group/prometheus/prometheus-0-r1.ebuild8
-rw-r--r--acct-group/prometheus/prometheus-0-r3.ebuild8
-rw-r--r--acct-group/prosody/prosody-0-r1.ebuild10
-rw-r--r--acct-group/prosody/prosody-0.ebuild10
-rw-r--r--acct-group/prowlarr/prowlarr-0-r1.ebuild8
-rw-r--r--acct-group/prowlarr/prowlarr-0.ebuild8
-rw-r--r--acct-group/psybnc/psybnc-0-r2.ebuild10
-rw-r--r--acct-group/psybnc/psybnc-0.ebuild10
-rw-r--r--acct-group/pulse-access/pulse-access-0-r2.ebuild8
-rw-r--r--acct-group/pulse-access/pulse-access-0.ebuild8
-rw-r--r--acct-group/pulse/pulse-0-r2.ebuild8
-rw-r--r--acct-group/pulse/pulse-0.ebuild8
-rw-r--r--acct-group/puppet/puppet-0-r1.ebuild8
-rw-r--r--acct-group/puppet/puppet-0-r3.ebuild8
-rw-r--r--acct-group/puppetdb/puppetdb-0-r1.ebuild8
-rw-r--r--acct-group/puppetdb/puppetdb-0-r3.ebuild8
-rw-r--r--acct-group/pushgateway/pushgateway-0-r2.ebuild10
-rw-r--r--acct-group/pushgateway/pushgateway-0.ebuild10
-rw-r--r--acct-group/pvpgn/pvpgn-0-r2.ebuild9
-rw-r--r--acct-group/pvpgn/pvpgn-0.ebuild9
-rw-r--r--acct-group/qbittorrent/metadata.xml12
-rw-r--r--acct-group/qbittorrent/qbittorrent-0.ebuild9
-rw-r--r--acct-group/qemu/qemu-0-r1.ebuild8
-rw-r--r--acct-group/qemu/qemu-0-r3.ebuild8
-rw-r--r--acct-group/qmail/qmail-0-r1.ebuild8
-rw-r--r--acct-group/qmail/qmail-0-r3.ebuild8
-rw-r--r--acct-group/quagga/metadata.xml8
-rw-r--r--acct-group/quagga/quagga-0-r1.ebuild8
-rw-r--r--acct-group/quassel/quassel-0-r1.ebuild8
-rw-r--r--acct-group/quassel/quassel-0-r2.ebuild8
-rw-r--r--acct-group/rabbitmq/rabbitmq-0-r2.ebuild10
-rw-r--r--acct-group/rabbitmq/rabbitmq-0.ebuild10
-rw-r--r--acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild10
-rw-r--r--acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild10
-rw-r--r--acct-group/radarr/radarr-0-r1.ebuild8
-rw-r--r--acct-group/radarr/radarr-0.ebuild8
-rw-r--r--acct-group/radicale/radicale-0-r1.ebuild9
-rw-r--r--acct-group/radicale/radicale-0-r3.ebuild9
-rw-r--r--acct-group/radius/radius-0-r1.ebuild9
-rw-r--r--acct-group/radius/radius-0-r3.ebuild9
-rw-r--r--acct-group/radvd/radvd-0-r2.ebuild10
-rw-r--r--acct-group/radvd/radvd-0.ebuild10
-rw-r--r--acct-group/rbldns/rbldns-0-r1.ebuild8
-rw-r--r--acct-group/rbldns/rbldns-0-r3.ebuild8
-rw-r--r--acct-group/rbot/rbot-0-r2.ebuild10
-rw-r--r--acct-group/rbot/rbot-0.ebuild10
-rw-r--r--acct-group/readarr/readarr-0-r1.ebuild8
-rw-r--r--acct-group/readarr/readarr-0.ebuild8
-rw-r--r--acct-group/realtime/realtime-0-r2.ebuild10
-rw-r--r--acct-group/realtime/realtime-0.ebuild10
-rw-r--r--acct-group/redis/redis-0-r1.ebuild9
-rw-r--r--acct-group/redis/redis-0-r2.ebuild9
-rw-r--r--acct-group/redis_exporter/redis_exporter-0-r2.ebuild8
-rw-r--r--acct-group/redis_exporter/redis_exporter-0.ebuild8
-rw-r--r--acct-group/redmine/redmine-0-r1.ebuild8
-rw-r--r--acct-group/redmine/redmine-0-r3.ebuild8
-rw-r--r--acct-group/redsocks/redsocks-0-r1.ebuild10
-rw-r--r--acct-group/redsocks/redsocks-0-r3.ebuild10
-rw-r--r--acct-group/reg/reg-0-r1.ebuild10
-rw-r--r--acct-group/reg/reg-0-r3.ebuild10
-rw-r--r--acct-group/registry/registry-0-r2.ebuild10
-rw-r--r--acct-group/registry/registry-0.ebuild10
-rw-r--r--acct-group/render/render-0-r1.ebuild8
-rw-r--r--acct-group/render/render-0-r3.ebuild8
-rw-r--r--acct-group/resin/metadata.xml8
-rw-r--r--acct-group/resin/resin-0.ebuild10
-rw-r--r--acct-group/roccat/roccat-0-r2.ebuild10
-rw-r--r--acct-group/roccat/roccat-0.ebuild10
-rw-r--r--acct-group/root/root-0-r2.ebuild9
-rw-r--r--acct-group/root/root-0.ebuild9
-rw-r--r--acct-group/ros/metadata.xml8
-rw-r--r--acct-group/ros/ros-0.ebuild10
-rw-r--r--acct-group/rplayd/metadata.xml8
-rw-r--r--acct-group/rplayd/rplayd-0.ebuild10
-rw-r--r--acct-group/rrdcached/rrdcached-0-r1.ebuild8
-rw-r--r--acct-group/rrdcached/rrdcached-0.ebuild8
-rw-r--r--acct-group/rslsync/rslsync-0-r2.ebuild10
-rw-r--r--acct-group/rslsync/rslsync-0.ebuild10
-rw-r--r--acct-group/rspamd/metadata.xml8
-rw-r--r--acct-group/rspamd/rspamd-0-r1.ebuild9
-rw-r--r--acct-group/rspamd/rspamd-0-r3.ebuild9
-rw-r--r--acct-group/rstudio-server/metadata.xml8
-rw-r--r--acct-group/rstudio-server/rstudio-server-0-r1.ebuild9
-rw-r--r--acct-group/rt/rt-0-r1.ebuild10
-rw-r--r--acct-group/rt/rt-0-r2.ebuild10
-rw-r--r--acct-group/rtkit/rtkit-0-r1.ebuild9
-rw-r--r--acct-group/rtkit/rtkit-0-r3.ebuild9
-rw-r--r--acct-group/rundeck/metadata.xml12
-rw-r--r--acct-group/rundeck/rundeck-0.ebuild10
-rw-r--r--acct-group/rwhoisd/rwhoisd-0-r2.ebuild10
-rw-r--r--acct-group/rwhoisd/rwhoisd-0.ebuild10
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r1.ebuild10
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r3.ebuild10
-rw-r--r--acct-group/sagan/sagan-0-r2.ebuild9
-rw-r--r--acct-group/sagan/sagan-0.ebuild9
-rw-r--r--acct-group/samplicator/samplicator-0-r2.ebuild10
-rw-r--r--acct-group/samplicator/samplicator-0.ebuild10
-rw-r--r--acct-group/sancp/sancp-0-r2.ebuild10
-rw-r--r--acct-group/sancp/sancp-0.ebuild10
-rw-r--r--acct-group/sandmann/metadata.xml8
-rw-r--r--acct-group/sandmann/sandmann-0.ebuild8
-rw-r--r--acct-group/sanlock/sanlock-0-r1.ebuild9
-rw-r--r--acct-group/sanlock/sanlock-0-r3.ebuild9
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r1.ebuild9
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r3.ebuild9
-rw-r--r--acct-group/scanlogd/scanlogd-0-r2.ebuild10
-rw-r--r--acct-group/scanlogd/scanlogd-0.ebuild10
-rw-r--r--acct-group/scanner/scanner-0-r2.ebuild10
-rw-r--r--acct-group/scanner/scanner-0.ebuild10
-rw-r--r--acct-group/scponly/scponly-0-r1.ebuild9
-rw-r--r--acct-group/scponly/scponly-0-r3.ebuild9
-rw-r--r--acct-group/scsi/scsi-0-r2.ebuild8
-rw-r--r--acct-group/scsi/scsi-0.ebuild8
-rw-r--r--acct-group/sddm/sddm-0-r1.ebuild10
-rw-r--r--acct-group/sddm/sddm-0.ebuild10
-rw-r--r--acct-group/seat/seat-0-r1.ebuild9
-rw-r--r--acct-group/seat/seat-0.ebuild9
-rw-r--r--acct-group/serf/serf-0-r2.ebuild10
-rw-r--r--acct-group/serf/serf-0.ebuild10
-rw-r--r--acct-group/sguil/metadata.xml8
-rw-r--r--acct-group/sguil/sguil-0.ebuild10
-rw-r--r--acct-group/sgx/sgx-0-r2.ebuild10
-rw-r--r--acct-group/sgx/sgx-0.ebuild10
-rw-r--r--acct-group/shellinaboxd/metadata.xml12
-rw-r--r--acct-group/shellinaboxd/shellinaboxd-0-r1.ebuild9
-rw-r--r--acct-group/sigh/metadata.xml8
-rw-r--r--acct-group/sigh/sigh-0.ebuild8
-rw-r--r--acct-group/simplevirt/metadata.xml5
-rw-r--r--acct-group/simplevirt/simplevirt-0-r1.ebuild8
-rw-r--r--acct-group/sispmctl/sispmctl-0-r2.ebuild10
-rw-r--r--acct-group/sispmctl/sispmctl-0.ebuild10
-rw-r--r--acct-group/sks/sks-0-r2.ebuild9
-rw-r--r--acct-group/sks/sks-0.ebuild9
-rw-r--r--acct-group/slurm/slurm-0-r1.ebuild9
-rw-r--r--acct-group/slurm/slurm-0-r3.ebuild9
-rw-r--r--acct-group/smmsp/smmsp-0-r1.ebuild8
-rw-r--r--acct-group/smmsp/smmsp-0-r3.ebuild8
-rw-r--r--acct-group/smokeping/metadata.xml8
-rw-r--r--acct-group/smokeping/smokeping-0.ebuild10
-rw-r--r--acct-group/sms/sms-0-r2.ebuild8
-rw-r--r--acct-group/sms/sms-0.ebuild8
-rw-r--r--acct-group/smtpd/smtpd-0-r1.ebuild9
-rw-r--r--acct-group/smtpd/smtpd-0-r3.ebuild9
-rw-r--r--acct-group/smtpq/smtpq-0-r1.ebuild9
-rw-r--r--acct-group/smtpq/smtpq-0-r3.ebuild9
-rw-r--r--acct-group/snapserver/snapserver-0-r2.ebuild9
-rw-r--r--acct-group/snapserver/snapserver-0.ebuild9
-rw-r--r--acct-group/sniproxy/sniproxy-0-r2.ebuild8
-rw-r--r--acct-group/sniproxy/sniproxy-0.ebuild8
-rw-r--r--acct-group/snmp_exporter/snmp_exporter-0-r2.ebuild10
-rw-r--r--acct-group/snmp_exporter/snmp_exporter-0.ebuild10
-rw-r--r--acct-group/snort/snort-0-r2.ebuild8
-rw-r--r--acct-group/snort/snort-0.ebuild8
-rw-r--r--acct-group/sobby/metadata.xml5
-rw-r--r--acct-group/sobby/sobby-0.ebuild8
-rw-r--r--acct-group/sobexsrv/metadata.xml5
-rw-r--r--acct-group/sobexsrv/sobexsrv-0-r2.ebuild9
-rw-r--r--acct-group/sobexsrv/sobexsrv-0.ebuild9
-rw-r--r--acct-group/sockd/sockd-0-r2.ebuild10
-rw-r--r--acct-group/sockd/sockd-0.ebuild10
-rw-r--r--acct-group/sogo/sogo-0-r1.ebuild9
-rw-r--r--acct-group/sogo/sogo-0-r3.ebuild9
-rw-r--r--acct-group/soju/metadata.xml12
-rw-r--r--acct-group/soju/soju-0-r1.ebuild9
-rw-r--r--acct-group/sonarr/sonarr-0-r1.ebuild8
-rw-r--r--acct-group/sonarr/sonarr-0.ebuild8
-rw-r--r--acct-group/spamd/spamd-0-r1.ebuild9
-rw-r--r--acct-group/spamd/spamd-0-r3.ebuild9
-rw-r--r--acct-group/spectrum/spectrum-0-r1.ebuild10
-rw-r--r--acct-group/spectrum/spectrum-0-r3.ebuild10
-rw-r--r--acct-group/spi/metadata.xml12
-rw-r--r--acct-group/spi/spi-0.ebuild8
-rw-r--r--acct-group/spire/spire-0-r1.ebuild8
-rw-r--r--acct-group/spire/spire-0-r3.ebuild8
-rw-r--r--acct-group/spread/metadata.xml8
-rw-r--r--acct-group/spread/spread-0.ebuild10
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r1.ebuild9
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r3.ebuild9
-rw-r--r--acct-group/squid/metadata.xml10
-rw-r--r--acct-group/squid/squid-0-r1.ebuild8
-rw-r--r--acct-group/squid/squid-0-r3.ebuild8
-rw-r--r--acct-group/sshd/sshd-0-r1.ebuild8
-rw-r--r--acct-group/sshd/sshd-0-r3.ebuild8
-rw-r--r--acct-group/ssmtp/ssmtp-0-r2.ebuild10
-rw-r--r--acct-group/ssmtp/ssmtp-0.ebuild10
-rw-r--r--acct-group/sstpc/sstpc-0-r2.ebuild10
-rw-r--r--acct-group/sstpc/sstpc-0.ebuild10
-rw-r--r--acct-group/stapdev/stapdev-0-r2.ebuild8
-rw-r--r--acct-group/stapdev/stapdev-0.ebuild8
-rw-r--r--acct-group/stapsys/stapsys-0-r2.ebuild8
-rw-r--r--acct-group/stapsys/stapsys-0.ebuild8
-rw-r--r--acct-group/stapusr/stapusr-0-r2.ebuild8
-rw-r--r--acct-group/stapusr/stapusr-0.ebuild8
-rw-r--r--acct-group/steamcmd/steamcmd-0-r1.ebuild10
-rw-r--r--acct-group/steamcmd/steamcmd-0-r3.ebuild10
-rw-r--r--acct-group/stg/metadata.xml12
-rw-r--r--acct-group/stg/stg-0.ebuild10
-rw-r--r--acct-group/stubby/metadata.xml5
-rw-r--r--acct-group/stubby/stubby-0-r1.ebuild9
-rw-r--r--acct-group/stubby/stubby-0-r3.ebuild9
-rw-r--r--acct-group/stunnel/metadata.xml5
-rw-r--r--acct-group/stunnel/stunnel-0-r1.ebuild9
-rw-r--r--acct-group/stunnel/stunnel-0-r3.ebuild9
-rw-r--r--acct-group/subsonic/subsonic-0-r2.ebuild10
-rw-r--r--acct-group/subsonic/subsonic-0.ebuild10
-rw-r--r--acct-group/supervisor/supervisor-0-r1.ebuild9
-rw-r--r--acct-group/supervisor/supervisor-0-r3.ebuild9
-rw-r--r--acct-group/suricata/suricata-0-r1.ebuild9
-rw-r--r--acct-group/suricata/suricata-0-r3.ebuild9
-rw-r--r--acct-group/svnusers/metadata.xml4
-rw-r--r--acct-group/svnusers/svnusers-0-r1.ebuild8
-rw-r--r--acct-group/svnusers/svnusers-0-r3.ebuild8
-rw-r--r--acct-group/svxlink/svxlink-0-r2.ebuild9
-rw-r--r--acct-group/svxlink/svxlink-0.ebuild9
-rw-r--r--acct-group/swift/metadata.xml8
-rw-r--r--acct-group/swift/swift-0-r1.ebuild8
-rw-r--r--acct-group/synapse/metadata.xml8
-rw-r--r--acct-group/synapse/synapse-0-r1.ebuild9
-rw-r--r--acct-group/synapse/synapse-0.ebuild9
-rw-r--r--acct-group/syncthing/syncthing-0-r1.ebuild9
-rw-r--r--acct-group/syncthing/syncthing-0-r3.ebuild9
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild8
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r3.ebuild8
-rw-r--r--acct-group/systemd-hostname/metadata.xml7
-rw-r--r--acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild8
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r3.ebuild8
-rw-r--r--acct-group/systemd-network/systemd-network-0-r1.ebuild8
-rw-r--r--acct-group/systemd-network/systemd-network-0-r3.ebuild8
-rw-r--r--acct-group/systemd-oom/systemd-oom-0-r2.ebuild8
-rw-r--r--acct-group/systemd-oom/systemd-oom-0.ebuild8
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild8
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r3.ebuild8
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild8
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r3.ebuild8
-rw-r--r--acct-group/tape/tape-0-r1.ebuild8
-rw-r--r--acct-group/tape/tape-0-r3.ebuild8
-rw-r--r--acct-group/taskd/taskd-0-r2.ebuild10
-rw-r--r--acct-group/taskd/taskd-0.ebuild10
-rw-r--r--acct-group/teamspeak/teamspeak-0-r1.ebuild10
-rw-r--r--acct-group/teamspeak/teamspeak-0-r3.ebuild10
-rw-r--r--acct-group/telegraf/telegraf-0-r1.ebuild8
-rw-r--r--acct-group/telegraf/telegraf-0-r3.ebuild8
-rw-r--r--acct-group/tenshi/tenshi-0-r2.ebuild10
-rw-r--r--acct-group/tenshi/tenshi-0.ebuild10
-rw-r--r--acct-group/thttpd/metadata.xml8
-rw-r--r--acct-group/thttpd/thttpd-0.ebuild10
-rw-r--r--acct-group/tinyproxy/tinyproxy-0-r2.ebuild10
-rw-r--r--acct-group/tinyproxy/tinyproxy-0.ebuild10
-rw-r--r--acct-group/tomcat/tomcat-0-r2.ebuild9
-rw-r--r--acct-group/tomcat/tomcat-0.ebuild9
-rw-r--r--acct-group/tor/metadata.xml8
-rw-r--r--acct-group/tor/tor-0-r1.ebuild9
-rw-r--r--acct-group/tor/tor-0-r3.ebuild9
-rw-r--r--acct-group/tox/tox-0-r1.ebuild7
-rw-r--r--acct-group/tox/tox-0-r3.ebuild7
-rw-r--r--acct-group/tpm/metadata.xml5
-rw-r--r--acct-group/tpm/tpm-0.ebuild8
-rw-r--r--acct-group/transmission/transmission-0-r1.ebuild8
-rw-r--r--acct-group/transmission/transmission-0-r3.ebuild8
-rw-r--r--acct-group/trickster/trickster-0-r2.ebuild10
-rw-r--r--acct-group/trickster/trickster-0.ebuild10
-rw-r--r--acct-group/trojan/trojan-0-r2.ebuild8
-rw-r--r--acct-group/trojan/trojan-0.ebuild8
-rw-r--r--acct-group/tsm/tsm-0-r1.ebuild8
-rw-r--r--acct-group/tsm/tsm-0-r3.ebuild8
-rw-r--r--acct-group/tss/tss-0-r1.ebuild9
-rw-r--r--acct-group/tss/tss-0-r3.ebuild9
-rw-r--r--acct-group/ttrssd/ttrssd-0-r2.ebuild9
-rw-r--r--acct-group/ttrssd/ttrssd-0.ebuild9
-rw-r--r--acct-group/tty/tty-0-r1.ebuild8
-rw-r--r--acct-group/tty/tty-0-r3.ebuild8
-rw-r--r--acct-group/turnserver/metadata.xml5
-rw-r--r--acct-group/turnserver/turnserver-0-r1.ebuild10
-rw-r--r--acct-group/turnserver/turnserver-0-r3.ebuild10
-rw-r--r--acct-group/ubridge/ubridge-0-r1.ebuild9
-rw-r--r--acct-group/ubridge/ubridge-0-r3.ebuild9
-rw-r--r--acct-group/ulogd/ulogd-0-r2.ebuild9
-rw-r--r--acct-group/ulogd/ulogd-0.ebuild9
-rw-r--r--acct-group/ultimaker/metadata.xml8
-rw-r--r--acct-group/ultimaker/ultimaker-0-r1.ebuild9
-rw-r--r--acct-group/unbound-telemetry/unbound-telemetry-0-r2.ebuild8
-rw-r--r--acct-group/unbound-telemetry/unbound-telemetry-0.ebuild8
-rw-r--r--acct-group/unbound/unbound-0-r1.ebuild10
-rw-r--r--acct-group/unbound/unbound-0-r3.ebuild10
-rw-r--r--acct-group/unifi-video/unifi-video-0-r2.ebuild9
-rw-r--r--acct-group/unifi-video/unifi-video-0.ebuild9
-rw-r--r--acct-group/unifi/metadata.xml4
-rw-r--r--acct-group/unifi/unifi-0-r1.ebuild10
-rw-r--r--acct-group/unifi/unifi-0-r3.ebuild10
-rw-r--r--acct-group/unrealircd/metadata.xml4
-rw-r--r--acct-group/unrealircd/unrealircd-0-r1.ebuild8
-rw-r--r--acct-group/unrealircd/unrealircd-0-r2.ebuild8
-rw-r--r--acct-group/upmpdcli/upmpdcli-0-r2.ebuild9
-rw-r--r--acct-group/upmpdcli/upmpdcli-0.ebuild9
-rw-r--r--acct-group/uptimed/uptimed-0-r2.ebuild8
-rw-r--r--acct-group/uptimed/uptimed-0-r3.ebuild8
-rw-r--r--acct-group/usb/metadata.xml5
-rw-r--r--acct-group/usb/usb-0-r1.ebuild8
-rw-r--r--acct-group/usb/usb-0-r3.ebuild8
-rw-r--r--acct-group/users/users-0-r2.ebuild8
-rw-r--r--acct-group/users/users-0.ebuild8
-rw-r--r--acct-group/ushare/ushare-0-r2.ebuild9
-rw-r--r--acct-group/ushare/ushare-0.ebuild9
-rw-r--r--acct-group/utmp/utmp-0-r1.ebuild8
-rw-r--r--acct-group/utmp/utmp-0-r3.ebuild8
-rw-r--r--acct-group/uucp/uucp-0-r1.ebuild8
-rw-r--r--acct-group/uucp/uucp-0-r3.ebuild8
-rw-r--r--acct-group/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild10
-rw-r--r--acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild10
-rw-r--r--acct-group/vacation/vacation-0-r2.ebuild10
-rw-r--r--acct-group/vacation/vacation-0.ebuild10
-rw-r--r--acct-group/varnish/metadata.xml5
-rw-r--r--acct-group/varnish/varnish-0-r1.ebuild9
-rw-r--r--acct-group/varnish/varnish-0-r3.ebuild9
-rw-r--r--acct-group/vault/vault-0-r1.ebuild8
-rw-r--r--acct-group/vault/vault-0-r3.ebuild8
-rw-r--r--acct-group/vault_exporter/vault_exporter-0-r2.ebuild10
-rw-r--r--acct-group/vault_exporter/vault_exporter-0.ebuild10
-rw-r--r--acct-group/vboxguest/vboxguest-0-r1.ebuild8
-rw-r--r--acct-group/vboxguest/vboxguest-0-r3.ebuild8
-rw-r--r--acct-group/vboxsf/vboxsf-0-r1.ebuild8
-rw-r--r--acct-group/vboxsf/vboxsf-0-r3.ebuild8
-rw-r--r--acct-group/vboxusers/vboxusers-0-r1.ebuild8
-rw-r--r--acct-group/vboxusers/vboxusers-0-r3.ebuild8
-rw-r--r--acct-group/vdr/vdr-0-r1.ebuild10
-rw-r--r--acct-group/vdr/vdr-0-r3.ebuild10
-rw-r--r--acct-group/vdradmin/vdradmin-0-r1.ebuild10
-rw-r--r--acct-group/vdradmin/vdradmin-0-r3.ebuild10
-rw-r--r--acct-group/video/video-0-r1.ebuild8
-rw-r--r--acct-group/video/video-0-r3.ebuild8
-rw-r--r--acct-group/vlock/vlock-0-r2.ebuild10
-rw-r--r--acct-group/vlock/vlock-0.ebuild10
-rw-r--r--acct-group/vnstat/vnstat-0-r1.ebuild9
-rw-r--r--acct-group/vnstat/vnstat-0.ebuild9
-rw-r--r--acct-group/vpopmail/vpopmail-0-r1.ebuild8
-rw-r--r--acct-group/vpopmail/vpopmail-0-r3.ebuild8
-rw-r--r--acct-group/wesnoth/wesnoth-0-r1.ebuild8
-rw-r--r--acct-group/wesnoth/wesnoth-0-r3.ebuild8
-rw-r--r--acct-group/wheel/wheel-0-r1.ebuild8
-rw-r--r--acct-group/wheel/wheel-0-r3.ebuild8
-rw-r--r--acct-group/wwwoffle/wwwoffle-0-r2.ebuild10
-rw-r--r--acct-group/wwwoffle/wwwoffle-0.ebuild10
-rw-r--r--acct-group/x2goprint/x2goprint-0-r1.ebuild9
-rw-r--r--acct-group/x2goprint/x2goprint-0-r3.ebuild9
-rw-r--r--acct-group/x2gouser/x2gouser-0-r1.ebuild9
-rw-r--r--acct-group/x2gouser/x2gouser-0-r3.ebuild9
-rw-r--r--acct-group/xpra/xpra-0-r2.ebuild9
-rw-r--r--acct-group/xpra/xpra-0.ebuild9
-rw-r--r--acct-group/xrootd/xrootd-0-r1.ebuild9
-rw-r--r--acct-group/xrootd/xrootd-0-r3.ebuild9
-rw-r--r--acct-group/xwax/xwax-0-r2.ebuild10
-rw-r--r--acct-group/xwax/xwax-0.ebuild10
-rw-r--r--acct-group/yubihsm-connector/metadata.xml8
-rw-r--r--acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild8
-rw-r--r--acct-group/zabbix/zabbix-0-r2.ebuild9
-rw-r--r--acct-group/zabbix/zabbix-0.ebuild9
-rw-r--r--acct-group/zeppelin/metadata.xml5
-rw-r--r--acct-group/zeppelin/zeppelin-0-r1.ebuild9
-rw-r--r--acct-group/zeppelin/zeppelin-0-r3.ebuild9
-rw-r--r--acct-group/zetcd/zetcd-0-r2.ebuild10
-rw-r--r--acct-group/zetcd/zetcd-0.ebuild10
-rw-r--r--acct-group/ziproxy/ziproxy-0-r2.ebuild8
-rw-r--r--acct-group/ziproxy/ziproxy-0.ebuild8
-rw-r--r--acct-group/znc/znc-0-r1.ebuild9
-rw-r--r--acct-group/znc/znc-0-r3.ebuild9
-rw-r--r--acct-group/zookeeper/zookeeper-0-r2.ebuild10
-rw-r--r--acct-group/zookeeper/zookeeper-0.ebuild10
1021 files changed, 4211 insertions, 4680 deletions
diff --git a/acct-group/_cron-failure/_cron-failure-0-r1.ebuild b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..037c180ae1e4
--- /dev/null
+++ b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/systemd-cron failure emails"
+
+ACCT_GROUP_ID="520"
diff --git a/acct-group/_cron-failure/_cron-failure-0.ebuild b/acct-group/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index b453d5218442..000000000000
--- a/acct-group/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/systemd-cron failure emails"
-
-ACCT_GROUP_ID="520"
diff --git a/acct-group/abrt/abrt-0-r1.ebuild b/acct-group/abrt/abrt-0-r1.ebuild
deleted file mode 100644
index ab6310011a09..000000000000
--- a/acct-group/abrt/abrt-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the automatic bug detection and reporting tool"
-ACCT_GROUP_ID=422
diff --git a/acct-group/abrt/metadata.xml b/acct-group/abrt/metadata.xml
deleted file mode 100644
index c300b31b6a76..000000000000
--- a/acct-group/abrt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/adm/adm-0-r1.ebuild b/acct-group/adm/adm-0-r1.ebuild
deleted file mode 100644
index 7aecab7fd00e..000000000000
--- a/acct-group/adm/adm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=4
diff --git a/acct-group/adm/adm-0-r3.ebuild b/acct-group/adm/adm-0-r3.ebuild
new file mode 100644
index 000000000000..d6d40f4001fc
--- /dev/null
+++ b/acct-group/adm/adm-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=4
diff --git a/acct-group/aerospike-amc/aerospike-amc-0-r2.ebuild b/acct-group/aerospike-amc/aerospike-amc-0-r2.ebuild
new file mode 100644
index 000000000000..5c098ba0dfc9
--- /dev/null
+++ b/acct-group/aerospike-amc/aerospike-amc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/aerospike-amc-community"
+
+ACCT_GROUP_ID="210"
diff --git a/acct-group/aerospike-amc/aerospike-amc-0.ebuild b/acct-group/aerospike-amc/aerospike-amc-0.ebuild
deleted file mode 100644
index a3028d0e5a2a..000000000000
--- a/acct-group/aerospike-amc/aerospike-amc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/aerospike-amc-community"
-
-ACCT_GROUP_ID="210"
diff --git a/acct-group/airdcppd/airdcppd-0-r1.ebuild b/acct-group/airdcppd/airdcppd-0-r1.ebuild
deleted file mode 100644
index a88d85d58cfb..000000000000
--- a/acct-group/airdcppd/airdcppd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/airdcpp-webclient"
-ACCT_GROUP_ID=464
diff --git a/acct-group/airdcppd/airdcppd-0-r3.ebuild b/acct-group/airdcppd/airdcppd-0-r3.ebuild
new file mode 100644
index 000000000000..ddec456e2efa
--- /dev/null
+++ b/acct-group/airdcppd/airdcppd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/airdcpp-webclient"
+ACCT_GROUP_ID=464
diff --git a/acct-group/alertmanager/alertmanager-0-r2.ebuild b/acct-group/alertmanager/alertmanager-0-r2.ebuild
new file mode 100644
index 000000000000..318651cadb9b
--- /dev/null
+++ b/acct-group/alertmanager/alertmanager-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=294
diff --git a/acct-group/alertmanager/alertmanager-0.ebuild b/acct-group/alertmanager/alertmanager-0.ebuild
deleted file mode 100644
index 4530d830ec25..000000000000
--- a/acct-group/alertmanager/alertmanager-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=294
diff --git a/acct-group/alertmanager/metadata.xml b/acct-group/alertmanager/metadata.xml
index 2c47fcf00594..115e9d64a669 100644
--- a/acct-group/alertmanager/metadata.xml
+++ b/acct-group/alertmanager/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/amanda/amanda-0-r2.ebuild b/acct-group/amanda/amanda-0-r2.ebuild
new file mode 100644
index 000000000000..74902fa20e5a
--- /dev/null
+++ b/acct-group/amanda/amanda-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=362
diff --git a/acct-group/amanda/amanda-0.ebuild b/acct-group/amanda/amanda-0.ebuild
deleted file mode 100644
index d8599a25ff3f..000000000000
--- a/acct-group/amanda/amanda-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=362
diff --git a/acct-group/amanda/metadata.xml b/acct-group/amanda/metadata.xml
index 6e403a40a2d0..3b9d35a888c5 100644
--- a/acct-group/amanda/metadata.xml
+++ b/acct-group/amanda/metadata.xml
@@ -5,10 +5,6 @@
<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-group/amavis/amavis-0-r1.ebuild b/acct-group/amavis/amavis-0-r1.ebuild
deleted file mode 100644
index cd30c60aee3e..000000000000
--- a/acct-group/amavis/amavis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=333
-DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amavis/amavis-0-r3.ebuild b/acct-group/amavis/amavis-0-r3.ebuild
new file mode 100644
index 000000000000..810670d42a33
--- /dev/null
+++ b/acct-group/amavis/amavis-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=333
+DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amavis/metadata.xml b/acct-group/amavis/metadata.xml
index 06ae26283e2c..96f1bb82c856 100644
--- a/acct-group/amavis/metadata.xml
+++ b/acct-group/amavis/metadata.xml
@@ -5,12 +5,4 @@
<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-group/amule/amule-0-r1.ebuild b/acct-group/amule/amule-0-r1.ebuild
deleted file mode 100644
index 354dc87a1194..000000000000
--- a/acct-group/amule/amule-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/amule"
-ACCT_GROUP_ID=468
diff --git a/acct-group/amule/amule-0-r3.ebuild b/acct-group/amule/amule-0-r3.ebuild
new file mode 100644
index 000000000000..1901f86bd58a
--- /dev/null
+++ b/acct-group/amule/amule-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/amule"
+ACCT_GROUP_ID=468
diff --git a/acct-group/android/android-0-r2.ebuild b/acct-group/android/android-0-r2.ebuild
new file mode 100644
index 000000000000..f77482745537
--- /dev/null
+++ b/acct-group/android/android-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
+
+ACCT_GROUP_ID="174"
diff --git a/acct-group/android/android-0.ebuild b/acct-group/android/android-0.ebuild
deleted file mode 100644
index 5730672b8d65..000000000000
--- a/acct-group/android/android-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
-
-ACCT_GROUP_ID="174"
diff --git a/acct-group/anope/anope-0-r1.ebuild b/acct-group/anope/anope-0-r1.ebuild
deleted file mode 100644
index 4249c83403d3..000000000000
--- a/acct-group/anope/anope-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for Anope IRC services"
-ACCT_GROUP_ID=417
diff --git a/acct-group/anope/anope-0-r2.ebuild b/acct-group/anope/anope-0-r2.ebuild
new file mode 100644
index 000000000000..42de5736718e
--- /dev/null
+++ b/acct-group/anope/anope-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Anope IRC services"
+ACCT_GROUP_ID=417
diff --git a/acct-group/apache/apache-0-r2.ebuild b/acct-group/apache/apache-0-r2.ebuild
deleted file mode 100644
index 90328f8c2836..000000000000
--- a/acct-group/apache/apache-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=81
diff --git a/acct-group/apache/apache-0-r3.ebuild b/acct-group/apache/apache-0-r3.ebuild
new file mode 100644
index 000000000000..1f54198838fd
--- /dev/null
+++ b/acct-group/apache/apache-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=81
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
new file mode 100644
index 000000000000..4943ebeadb7d
--- /dev/null
+++ b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=319
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
deleted file mode 100644
index ef6e2c653c52..000000000000
--- a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=319
diff --git a/acct-group/argus/argus-0-r2.ebuild b/acct-group/argus/argus-0-r2.ebuild
new file mode 100644
index 000000000000..00f85456f034
--- /dev/null
+++ b/acct-group/argus/argus-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-group
+
+DESCRIPTION="gid for net-analyzer/argus"
+
+ACCT_GROUP_ID=383
diff --git a/acct-group/argus/argus-0.ebuild b/acct-group/argus/argus-0.ebuild
deleted file mode 100644
index 0d846593c0f3..000000000000
--- a/acct-group/argus/argus-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/argus"
-
-ACCT_GROUP_ID=383
diff --git a/acct-group/arpwatch/arpwatch-0-r2.ebuild b/acct-group/arpwatch/arpwatch-0-r2.ebuild
new file mode 100644
index 000000000000..1a21b1a09e1e
--- /dev/null
+++ b/acct-group/arpwatch/arpwatch-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/arpwatch"
+
+ACCT_GROUP_ID="170"
diff --git a/acct-group/arpwatch/arpwatch-0.ebuild b/acct-group/arpwatch/arpwatch-0.ebuild
deleted file mode 100644
index c232fe3a362c..000000000000
--- a/acct-group/arpwatch/arpwatch-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/arpwatch"
-
-ACCT_GROUP_ID="170"
diff --git a/acct-group/artifactory/artifactory-0.ebuild b/acct-group/artifactory/artifactory-0.ebuild
deleted file mode 100644
index 6f1227123b88..000000000000
--- a/acct-group/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/artifactory-bin"
-
-ACCT_GROUP_ID="264"
diff --git a/acct-group/artifactory/metadata.xml b/acct-group/artifactory/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/artifactory/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-group/aspnet/aspnet-0-r2.ebuild b/acct-group/aspnet/aspnet-0-r2.ebuild
new file mode 100644
index 000000000000..251b49c23f49
--- /dev/null
+++ b/acct-group/aspnet/aspnet-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=216
diff --git a/acct-group/aspnet/aspnet-0.ebuild b/acct-group/aspnet/aspnet-0.ebuild
deleted file mode 100644
index 58a850a8bb9c..000000000000
--- a/acct-group/aspnet/aspnet-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=216
diff --git a/acct-group/asterisk/asterisk-0-r1.ebuild b/acct-group/asterisk/asterisk-0-r1.ebuild
deleted file mode 100644
index 62ec5a2f5b02..000000000000
--- a/acct-group/asterisk/asterisk-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for asterisk"
-ACCT_GROUP_ID=242
diff --git a/acct-group/asterisk/asterisk-0-r3.ebuild b/acct-group/asterisk/asterisk-0-r3.ebuild
new file mode 100644
index 000000000000..ec0dd73afdbe
--- /dev/null
+++ b/acct-group/asterisk/asterisk-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for asterisk"
+ACCT_GROUP_ID=242
diff --git a/acct-group/at/at-0-r2.ebuild b/acct-group/at/at-0-r2.ebuild
new file mode 100644
index 000000000000..61d88222ad7b
--- /dev/null
+++ b/acct-group/at/at-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=246
diff --git a/acct-group/at/at-0.ebuild b/acct-group/at/at-0.ebuild
deleted file mode 100644
index 1dc36b11c23b..000000000000
--- a/acct-group/at/at-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=246
diff --git a/acct-group/at/metadata.xml b/acct-group/at/metadata.xml
index 489e730c1c90..ce5409a471fa 100644
--- a/acct-group/at/metadata.xml
+++ b/acct-group/at/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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 type="person" proxied="yes">
+ <email>zoltan@sinustrom.info</email>
+ <name>Zoltan Puskas</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-group/atheme-services/atheme-services-0-r1.ebuild b/acct-group/atheme-services/atheme-services-0-r1.ebuild
deleted file mode 100644
index 75014bfbb485..000000000000
--- a/acct-group/atheme-services/atheme-services-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Atheme IRC services"
-ACCT_GROUP_ID=412
diff --git a/acct-group/atheme-services/atheme-services-0-r3.ebuild b/acct-group/atheme-services/atheme-services-0-r3.ebuild
new file mode 100644
index 000000000000..6fe83c79b938
--- /dev/null
+++ b/acct-group/atheme-services/atheme-services-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Atheme IRC services"
+ACCT_GROUP_ID=412
diff --git a/acct-group/atuin/atuin-0.ebuild b/acct-group/atuin/atuin-0.ebuild
new file mode 100644
index 000000000000..2c19fb1d822a
--- /dev/null
+++ b/acct-group/atuin/atuin-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=536
diff --git a/acct-group/atuin/metadata.xml b/acct-group/atuin/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-group/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-group/audio/audio-0-r1.ebuild b/acct-group/audio/audio-0-r1.ebuild
deleted file mode 100644
index ee027720bf31..000000000000
--- a/acct-group/audio/audio-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=18
diff --git a/acct-group/audio/audio-0-r3.ebuild b/acct-group/audio/audio-0-r3.ebuild
new file mode 100644
index 000000000000..eb826ff375df
--- /dev/null
+++ b/acct-group/audio/audio-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=18
diff --git a/acct-group/automatic/automatic-0-r2.ebuild b/acct-group/automatic/automatic-0-r2.ebuild
new file mode 100644
index 000000000000..12b9af797e8f
--- /dev/null
+++ b/acct-group/automatic/automatic-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=338
diff --git a/acct-group/automatic/automatic-0.ebuild b/acct-group/automatic/automatic-0.ebuild
deleted file mode 100644
index c8e6c5c405c5..000000000000
--- a/acct-group/automatic/automatic-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=338
diff --git a/acct-group/automx2/automx2-0-r1.ebuild b/acct-group/automx2/automx2-0-r1.ebuild
deleted file mode 100644
index 59c8977b5fe7..000000000000
--- a/acct-group/automx2/automx2-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/automx2"
-ACCT_GROUP_ID=437
diff --git a/acct-group/automx2/automx2-0-r3.ebuild b/acct-group/automx2/automx2-0-r3.ebuild
new file mode 100644
index 000000000000..c3f844dce715
--- /dev/null
+++ b/acct-group/automx2/automx2-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/automx2"
+ACCT_GROUP_ID=437
diff --git a/acct-group/automx2/metadata.xml b/acct-group/automx2/metadata.xml
index c654517b25d5..115e9d64a669 100644
--- a/acct-group/automx2/metadata.xml
+++ b/acct-group/automx2/metadata.xml
@@ -1,12 +1,5 @@
<?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@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-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
deleted file mode 100644
index 6d912cd47ce4..000000000000
--- a/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi-autoipd"
-ACCT_GROUP_ID=62
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r3.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r3.ebuild
new file mode 100644
index 000000000000..5284a434019e
--- /dev/null
+++ b/acct-group/avahi-autoipd/avahi-autoipd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for avahi-autoipd"
+ACCT_GROUP_ID=62
diff --git a/acct-group/avahi-autoipd/metadata.xml b/acct-group/avahi-autoipd/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/avahi-autoipd/metadata.xml
+++ b/acct-group/avahi-autoipd/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/avahi/avahi-0-r1.ebuild b/acct-group/avahi/avahi-0-r1.ebuild
deleted file mode 100644
index 6602136b24a2..000000000000
--- a/acct-group/avahi/avahi-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi"
-ACCT_GROUP_ID=61
diff --git a/acct-group/avahi/avahi-0-r3.ebuild b/acct-group/avahi/avahi-0-r3.ebuild
new file mode 100644
index 000000000000..675f8ac2fc06
--- /dev/null
+++ b/acct-group/avahi/avahi-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for avahi"
+ACCT_GROUP_ID=61
diff --git a/acct-group/avahi/metadata.xml b/acct-group/avahi/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/avahi/metadata.xml
+++ b/acct-group/avahi/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/axtls/axtls-0-r2.ebuild b/acct-group/axtls/axtls-0-r2.ebuild
new file mode 100644
index 000000000000..b5a6ac11331f
--- /dev/null
+++ b/acct-group/axtls/axtls-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-libs/axtls"
+
+ACCT_GROUP_ID="147"
diff --git a/acct-group/axtls/axtls-0.ebuild b/acct-group/axtls/axtls-0.ebuild
deleted file mode 100644
index 4534ecf5b634..000000000000
--- a/acct-group/axtls/axtls-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-libs/axtls"
-
-ACCT_GROUP_ID="147"
diff --git a/acct-group/axtls/metadata.xml b/acct-group/axtls/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/axtls/metadata.xml
+++ b/acct-group/axtls/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/backuppc/backuppc-0-r2.ebuild b/acct-group/backuppc/backuppc-0-r2.ebuild
new file mode 100644
index 000000000000..5a1109026408
--- /dev/null
+++ b/acct-group/backuppc/backuppc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-backup/backuppc"
+
+ACCT_GROUP_ID="282"
diff --git a/acct-group/backuppc/backuppc-0.ebuild b/acct-group/backuppc/backuppc-0.ebuild
deleted file mode 100644
index 8adafc19f9be..000000000000
--- a/acct-group/backuppc/backuppc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-backup/backuppc"
-
-ACCT_GROUP_ID="282"
diff --git a/acct-group/bacula/bacula-0-r1.ebuild b/acct-group/bacula/bacula-0-r1.ebuild
deleted file mode 100644
index 399d999796de..000000000000
--- a/acct-group/bacula/bacula-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the bacula backup system"
-ACCT_GROUP_ID=273
diff --git a/acct-group/bacula/bacula-0-r3.ebuild b/acct-group/bacula/bacula-0-r3.ebuild
new file mode 100644
index 000000000000..d7714e98fe19
--- /dev/null
+++ b/acct-group/bacula/bacula-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the bacula backup system"
+ACCT_GROUP_ID=273
diff --git a/acct-group/bareos/bareos-0-r1.ebuild b/acct-group/bareos/bareos-0-r1.ebuild
deleted file mode 100644
index f839b3044908..000000000000
--- a/acct-group/bareos/bareos-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the bareos network backup suite"
-ACCT_GROUP_ID=403
diff --git a/acct-group/bareos/bareos-0-r3.ebuild b/acct-group/bareos/bareos-0-r3.ebuild
new file mode 100644
index 000000000000..cc82ce372c4b
--- /dev/null
+++ b/acct-group/bareos/bareos-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the bareos network backup suite"
+ACCT_GROUP_ID=403
diff --git a/acct-group/beanstalk/beanstalk-0-r2.ebuild b/acct-group/beanstalk/beanstalk-0-r2.ebuild
new file mode 100644
index 000000000000..c95260922366
--- /dev/null
+++ b/acct-group/beanstalk/beanstalk-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/beanstalkd"
+
+ACCT_GROUP_ID="137"
diff --git a/acct-group/beanstalk/beanstalk-0.ebuild b/acct-group/beanstalk/beanstalk-0.ebuild
deleted file mode 100644
index 2fd201660183..000000000000
--- a/acct-group/beanstalk/beanstalk-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/beanstalkd"
-
-ACCT_GROUP_ID="137"
diff --git a/acct-group/bedrock/bedrock-0-r1.ebuild b/acct-group/bedrock/bedrock-0-r1.ebuild
deleted file mode 100644
index 409365438231..000000000000
--- a/acct-group/bedrock/bedrock-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft Bedrock server"
-
-ACCT_GROUP_ID="485"
diff --git a/acct-group/bedrock/bedrock-0-r3.ebuild b/acct-group/bedrock/bedrock-0-r3.ebuild
new file mode 100644
index 000000000000..60af38f945a8
--- /dev/null
+++ b/acct-group/bedrock/bedrock-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft Bedrock server"
+
+ACCT_GROUP_ID="485"
diff --git a/acct-group/biboumi/biboumi-0-r1.ebuild b/acct-group/biboumi/biboumi-0-r1.ebuild
new file mode 100644
index 000000000000..2696a03b0ceb
--- /dev/null
+++ b/acct-group/biboumi/biboumi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=508
diff --git a/acct-group/biboumi/biboumi-0.ebuild b/acct-group/biboumi/biboumi-0.ebuild
deleted file mode 100644
index 14c409597792..000000000000
--- a/acct-group/biboumi/biboumi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=508
diff --git a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild b/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
deleted file mode 100644
index 94f94a51727a..000000000000
--- a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=276
diff --git a/acct-group/bind_exporter/bind_exporter-0-r3.ebuild b/acct-group/bind_exporter/bind_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..ff68ea954d3f
--- /dev/null
+++ b/acct-group/bind_exporter/bind_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=276
diff --git a/acct-group/bird/bird-0-r2.ebuild b/acct-group/bird/bird-0-r2.ebuild
new file mode 100644
index 000000000000..a01a80d52368
--- /dev/null
+++ b/acct-group/bird/bird-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+# TCP port 179, but 179 is already used by acct-group/_bgpd
+ACCT_GROUP_ID=180
diff --git a/acct-group/bird/bird-0.ebuild b/acct-group/bird/bird-0.ebuild
deleted file mode 100644
index 174e87b87bf9..000000000000
--- a/acct-group/bird/bird-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# TCP port 179, but 179 is already used by acct-group/_bgpd
-ACCT_GROUP_ID=180
diff --git a/acct-group/bitcoin/bitcoin-0-r1.ebuild b/acct-group/bitcoin/bitcoin-0-r1.ebuild
deleted file mode 100644
index cc0bf22ffe01..000000000000
--- a/acct-group/bitcoin/bitcoin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for users with access to system-wide Bitcoin services"
-ACCT_GROUP_ID=483
diff --git a/acct-group/bitcoin/bitcoin-0-r3.ebuild b/acct-group/bitcoin/bitcoin-0-r3.ebuild
new file mode 100644
index 000000000000..5b6a1717ba9b
--- /dev/null
+++ b/acct-group/bitcoin/bitcoin-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for users with access to system-wide Bitcoin services"
+ACCT_GROUP_ID=483
diff --git a/acct-group/bitflu/bitflu-0-r2.ebuild b/acct-group/bitflu/bitflu-0-r2.ebuild
new file mode 100644
index 000000000000..932da2ca6ce7
--- /dev/null
+++ b/acct-group/bitflu/bitflu-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/bitflu"
+
+ACCT_GROUP_ID="148"
diff --git a/acct-group/bitflu/bitflu-0.ebuild b/acct-group/bitflu/bitflu-0.ebuild
deleted file mode 100644
index b0544d2346e2..000000000000
--- a/acct-group/bitflu/bitflu-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-p2p/bitflu"
-
-ACCT_GROUP_ID="148"
diff --git a/acct-group/bitflu/metadata.xml b/acct-group/bitflu/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/bitflu/metadata.xml
+++ b/acct-group/bitflu/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/bitlbee/bitlbee-0-r1.ebuild b/acct-group/bitlbee/bitlbee-0-r1.ebuild
deleted file mode 100644
index cfecdbf5c9ff..000000000000
--- a/acct-group/bitlbee/bitlbee-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=407
diff --git a/acct-group/bitlbee/bitlbee-0-r3.ebuild b/acct-group/bitlbee/bitlbee-0-r3.ebuild
new file mode 100644
index 000000000000..4ec68115e3c0
--- /dev/null
+++ b/acct-group/bitlbee/bitlbee-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=407
diff --git a/acct-group/bitlbee/metadata.xml b/acct-group/bitlbee/metadata.xml
index c74515d20dbe..15cf2ff7a521 100644
--- a/acct-group/bitlbee/metadata.xml
+++ b/acct-group/bitlbee/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/blackbox_exporter/blackbox_exporter-0-r2.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..e1543bff5700
--- /dev/null
+++ b/acct-group/blackbox_exporter/blackbox_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=293
diff --git a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
deleted file mode 100644
index 71d2888a2d22..000000000000
--- a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=293
diff --git a/acct-group/blackbox_exporter/metadata.xml b/acct-group/blackbox_exporter/metadata.xml
index 2c47fcf00594..115e9d64a669 100644
--- a/acct-group/blackbox_exporter/metadata.xml
+++ b/acct-group/blackbox_exporter/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/boinc/boinc-0-r2.ebuild b/acct-group/boinc/boinc-0-r2.ebuild
new file mode 100644
index 000000000000..7c7facdbdd76
--- /dev/null
+++ b/acct-group/boinc/boinc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-misc/boinc"
+ACCT_GROUP_ID=352
diff --git a/acct-group/boinc/boinc-0.ebuild b/acct-group/boinc/boinc-0.ebuild
deleted file mode 100644
index dc46c8eba7b2..000000000000
--- a/acct-group/boinc/boinc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-misc/boinc"
-ACCT_GROUP_ID=352
diff --git a/acct-group/brlapi/brlapi-0-r2.ebuild b/acct-group/brlapi/brlapi-0-r2.ebuild
new file mode 100644
index 000000000000..c1221abbe8cd
--- /dev/null
+++ b/acct-group/brlapi/brlapi-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=507
diff --git a/acct-group/brlapi/brlapi-0.ebuild b/acct-group/brlapi/brlapi-0.ebuild
deleted file mode 100644
index 07af6c150bd9..000000000000
--- a/acct-group/brlapi/brlapi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=507
diff --git a/acct-group/brltty/brltty-0-r2.ebuild b/acct-group/brltty/brltty-0-r2.ebuild
new file mode 100644
index 000000000000..306e103359df
--- /dev/null
+++ b/acct-group/brltty/brltty-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=506
diff --git a/acct-group/brltty/brltty-0.ebuild b/acct-group/brltty/brltty-0.ebuild
deleted file mode 100644
index 5cc5694d6f9c..000000000000
--- a/acct-group/brltty/brltty-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=506
diff --git a/acct-group/buildbot/buildbot-0-r1.ebuild b/acct-group/buildbot/buildbot-0-r1.ebuild
deleted file mode 100644
index 850f789f93b5..000000000000
--- a/acct-group/buildbot/buildbot-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Buildbot program group"
-ACCT_GROUP_ID=393
-SLOT="0"
diff --git a/acct-group/buildbot/buildbot-0-r3.ebuild b/acct-group/buildbot/buildbot-0-r3.ebuild
new file mode 100644
index 000000000000..bff1474aef01
--- /dev/null
+++ b/acct-group/buildbot/buildbot-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Buildbot program group"
+ACCT_GROUP_ID=393
+SLOT="0"
diff --git a/acct-group/buildbot/metadata.xml b/acct-group/buildbot/metadata.xml
index b8975287d644..bef24d2c2337 100644
--- a/acct-group/buildbot/metadata.xml
+++ b/acct-group/buildbot/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>dolsen@gentoo.org</email>
- <name>Brian Dolbec</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/bumblebee/bumblebee-0-r2.ebuild b/acct-group/bumblebee/bumblebee-0-r2.ebuild
new file mode 100644
index 000000000000..2bde643a8b45
--- /dev/null
+++ b/acct-group/bumblebee/bumblebee-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=380
diff --git a/acct-group/bumblebee/bumblebee-0.ebuild b/acct-group/bumblebee/bumblebee-0.ebuild
deleted file mode 100644
index 03a72dbe9273..000000000000
--- a/acct-group/bumblebee/bumblebee-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=380
diff --git a/acct-group/burp/burp-0-r1.ebuild b/acct-group/burp/burp-0-r1.ebuild
deleted file mode 100644
index bd9aeb045577..000000000000
--- a/acct-group/burp/burp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the app-backup/burp server"
-ACCT_GROUP_ID=498
diff --git a/acct-group/burp/burp-0-r3.ebuild b/acct-group/burp/burp-0-r3.ebuild
new file mode 100644
index 000000000000..4285dba481b2
--- /dev/null
+++ b/acct-group/burp/burp-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the app-backup/burp server"
+ACCT_GROUP_ID=498
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
deleted file mode 100644
index 07d9e98d095e..000000000000
--- a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/burrow_exporter"
-
-ACCT_GROUP_ID="502"
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r3.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..112dfb718da2
--- /dev/null
+++ b/acct-group/burrow_exporter/burrow_exporter-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/burrow_exporter"
+
+ACCT_GROUP_ID="502"
diff --git a/acct-group/cadvisor/cadvisor-0-r1.ebuild b/acct-group/cadvisor/cadvisor-0-r1.ebuild
deleted file mode 100644
index c44d82f6164a..000000000000
--- a/acct-group/cadvisor/cadvisor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=427
diff --git a/acct-group/cadvisor/cadvisor-0-r3.ebuild b/acct-group/cadvisor/cadvisor-0-r3.ebuild
new file mode 100644
index 000000000000..71e3a5e0420c
--- /dev/null
+++ b/acct-group/cadvisor/cadvisor-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=427
diff --git a/acct-group/cancd/cancd-0-r2.ebuild b/acct-group/cancd/cancd-0-r2.ebuild
new file mode 100644
index 000000000000..8d9b8230ff93
--- /dev/null
+++ b/acct-group/cancd/cancd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the CA NetConsole Daemon"
+
+ACCT_GROUP_ID="213"
diff --git a/acct-group/cancd/cancd-0.ebuild b/acct-group/cancd/cancd-0.ebuild
deleted file mode 100644
index cb378da029ab..000000000000
--- a/acct-group/cancd/cancd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the CA NetConsole Daemon"
-
-ACCT_GROUP_ID="213"
diff --git a/acct-group/carbon/carbon-0-r1.ebuild b/acct-group/carbon/carbon-0-r1.ebuild
deleted file mode 100644
index 09ccc3c9f002..000000000000
--- a/acct-group/carbon/carbon-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=230
diff --git a/acct-group/carbon/carbon-0-r3.ebuild b/acct-group/carbon/carbon-0-r3.ebuild
new file mode 100644
index 000000000000..894ba9738107
--- /dev/null
+++ b/acct-group/carbon/carbon-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=230
diff --git a/acct-group/cdrom/cdrom-0-r1.ebuild b/acct-group/cdrom/cdrom-0-r1.ebuild
deleted file mode 100644
index 8d402a923a38..000000000000
--- a/acct-group/cdrom/cdrom-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=19
diff --git a/acct-group/cdrom/cdrom-0-r3.ebuild b/acct-group/cdrom/cdrom-0-r3.ebuild
new file mode 100644
index 000000000000..5c3b0daadb5d
--- /dev/null
+++ b/acct-group/cdrom/cdrom-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=19
diff --git a/acct-group/ceph/ceph-0-r1.ebuild b/acct-group/ceph/ceph-0-r1.ebuild
deleted file mode 100644
index de5898482a6f..000000000000
--- a/acct-group/ceph/ceph-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=267
diff --git a/acct-group/ceph/ceph-0-r3.ebuild b/acct-group/ceph/ceph-0-r3.ebuild
new file mode 100644
index 000000000000..2513b2d369ed
--- /dev/null
+++ b/acct-group/ceph/ceph-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=267
diff --git a/acct-group/cgit/cgit-0-r2.ebuild b/acct-group/cgit/cgit-0-r2.ebuild
new file mode 100644
index 000000000000..7394e9b61367
--- /dev/null
+++ b/acct-group/cgit/cgit-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=197
diff --git a/acct-group/cgit/cgit-0.ebuild b/acct-group/cgit/cgit-0.ebuild
deleted file mode 100644
index 750e7188cdb7..000000000000
--- a/acct-group/cgit/cgit-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=197
diff --git a/acct-group/chronograf/chronograf-0-r1.ebuild b/acct-group/chronograf/chronograf-0-r1.ebuild
deleted file mode 100644
index 38259347814a..000000000000
--- a/acct-group/chronograf/chronograf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=344
diff --git a/acct-group/chronograf/chronograf-0-r3.ebuild b/acct-group/chronograf/chronograf-0-r3.ebuild
new file mode 100644
index 000000000000..0da1e77a1201
--- /dev/null
+++ b/acct-group/chronograf/chronograf-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=344
diff --git a/acct-group/cinder/cinder-0-r1.ebuild b/acct-group/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index d57b97378c77..000000000000
--- a/acct-group/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=442
diff --git a/acct-group/cinder/metadata.xml b/acct-group/cinder/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/cinder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/clair/clair-0-r1.ebuild b/acct-group/clair/clair-0-r1.ebuild
deleted file mode 100644
index 8a34e5dbb5d1..000000000000
--- a/acct-group/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=307
diff --git a/acct-group/clair/clair-0-r3.ebuild b/acct-group/clair/clair-0-r3.ebuild
new file mode 100644
index 000000000000..9e167da9815c
--- /dev/null
+++ b/acct-group/clair/clair-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=307
diff --git a/acct-group/clamav/clamav-0-r1.ebuild b/acct-group/clamav/clamav-0-r1.ebuild
deleted file mode 100644
index 30e86e6753f4..000000000000
--- a/acct-group/clamav/clamav-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=435
diff --git a/acct-group/clamav/clamav-0-r3.ebuild b/acct-group/clamav/clamav-0-r3.ebuild
new file mode 100644
index 000000000000..faa7535de917
--- /dev/null
+++ b/acct-group/clamav/clamav-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=435
diff --git a/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild b/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild
deleted file mode 100644
index 6873ca559f38..000000000000
--- a/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=212
diff --git a/acct-group/cmd5checkpw/metadata.xml b/acct-group/cmd5checkpw/metadata.xml
deleted file mode 100644
index 630f5673b82e..000000000000
--- a/acct-group/cmd5checkpw/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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-group/cntlm/cntlm-0-r2.ebuild b/acct-group/cntlm/cntlm-0-r2.ebuild
new file mode 100644
index 000000000000..d39b348c23a9
--- /dev/null
+++ b/acct-group/cntlm/cntlm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/cntlm"
+
+ACCT_GROUP_ID="255"
diff --git a/acct-group/cntlm/cntlm-0.ebuild b/acct-group/cntlm/cntlm-0.ebuild
deleted file mode 100644
index 38671db40f18..000000000000
--- a/acct-group/cntlm/cntlm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/cntlm"
-
-ACCT_GROUP_ID="255"
diff --git a/acct-group/cockroach/cockroach-0-r2.ebuild b/acct-group/cockroach/cockroach-0-r2.ebuild
new file mode 100644
index 000000000000..392b734250d7
--- /dev/null
+++ b/acct-group/cockroach/cockroach-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/cockroach"
+
+ACCT_GROUP_ID="110"
diff --git a/acct-group/cockroach/cockroach-0.ebuild b/acct-group/cockroach/cockroach-0.ebuild
deleted file mode 100644
index 7f9e3bf019d1..000000000000
--- a/acct-group/cockroach/cockroach-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/cockroach"
-
-ACCT_GROUP_ID="110"
diff --git a/acct-group/collectd/collectd-0-r2.ebuild b/acct-group/collectd/collectd-0-r2.ebuild
new file mode 100644
index 000000000000..bebcb0b996b0
--- /dev/null
+++ b/acct-group/collectd/collectd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="collectd program group"
+
+ACCT_GROUP_ID=440
diff --git a/acct-group/collectd/collectd-0.ebuild b/acct-group/collectd/collectd-0.ebuild
deleted file mode 100644
index 273a23b32ea2..000000000000
--- a/acct-group/collectd/collectd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="collectd program group"
-
-ACCT_GROUP_ID=440
diff --git a/acct-group/colord/colord-0-r2.ebuild b/acct-group/colord/colord-0-r2.ebuild
new file mode 100644
index 000000000000..5b86269b7934
--- /dev/null
+++ b/acct-group/colord/colord-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=350
diff --git a/acct-group/colord/colord-0.ebuild b/acct-group/colord/colord-0.ebuild
deleted file mode 100644
index da6555c53bfa..000000000000
--- a/acct-group/colord/colord-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=350
diff --git a/acct-group/consul-template/consul-template-0-r1.ebuild b/acct-group/consul-template/consul-template-0-r1.ebuild
deleted file mode 100644
index 45bea6e5f696..000000000000
--- a/acct-group/consul-template/consul-template-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=408
diff --git a/acct-group/consul-template/consul-template-0-r3.ebuild b/acct-group/consul-template/consul-template-0-r3.ebuild
new file mode 100644
index 000000000000..ecde26a12c8e
--- /dev/null
+++ b/acct-group/consul-template/consul-template-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=408
diff --git a/acct-group/consul/consul-0-r1.ebuild b/acct-group/consul/consul-0-r1.ebuild
deleted file mode 100644
index 615defa305de..000000000000
--- a/acct-group/consul/consul-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=411
diff --git a/acct-group/consul/consul-0-r3.ebuild b/acct-group/consul/consul-0-r3.ebuild
new file mode 100644
index 000000000000..ea8438e2c740
--- /dev/null
+++ b/acct-group/consul/consul-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=411
diff --git a/acct-group/consul_exporter/consul_exporter-0-r2.ebuild b/acct-group/consul_exporter/consul_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..6c606828890f
--- /dev/null
+++ b/acct-group/consul_exporter/consul_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=278
diff --git a/acct-group/consul_exporter/consul_exporter-0.ebuild b/acct-group/consul_exporter/consul_exporter-0.ebuild
deleted file mode 100644
index b9e245ce5510..000000000000
--- a/acct-group/consul_exporter/consul_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=278
diff --git a/acct-group/coredns/coredns-0-r2.ebuild b/acct-group/coredns/coredns-0-r2.ebuild
new file mode 100644
index 000000000000..88552487a150
--- /dev/null
+++ b/acct-group/coredns/coredns-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/coredns"
+
+ACCT_GROUP_ID="312"
diff --git a/acct-group/coredns/coredns-0.ebuild b/acct-group/coredns/coredns-0.ebuild
deleted file mode 100644
index 9d29330416d4..000000000000
--- a/acct-group/coredns/coredns-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/coredns"
-
-ACCT_GROUP_ID="312"
diff --git a/acct-group/croc/croc-0-r2.ebuild b/acct-group/croc/croc-0-r2.ebuild
new file mode 100644
index 000000000000..a78d2f260cf0
--- /dev/null
+++ b/acct-group/croc/croc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/croc"
+ACCT_GROUP_ID=310
diff --git a/acct-group/croc/croc-0.ebuild b/acct-group/croc/croc-0.ebuild
deleted file mode 100644
index 544469aa859c..000000000000
--- a/acct-group/croc/croc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/croc"
-ACCT_GROUP_ID=310
diff --git a/acct-group/croc/metadata.xml b/acct-group/croc/metadata.xml
index 866d79c79519..1826d184c487 100644
--- a/acct-group/croc/metadata.xml
+++ b/acct-group/croc/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>sultan@gentoo.org</email>
- <name>Stephan Hartmann</name>
- </maintainer>
+ <maintainer 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-group/cron/cron-0-r2.ebuild b/acct-group/cron/cron-0-r2.ebuild
new file mode 100644
index 000000000000..c373c2b6f2ae
--- /dev/null
+++ b/acct-group/cron/cron-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/cronbase"
+
+ACCT_GROUP_ID="16"
diff --git a/acct-group/cron/cron-0.ebuild b/acct-group/cron/cron-0.ebuild
deleted file mode 100644
index 84116177ac0d..000000000000
--- a/acct-group/cron/cron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/cronbase"
-
-ACCT_GROUP_ID="16"
diff --git a/acct-group/cron/metadata.xml b/acct-group/cron/metadata.xml
index 489e730c1c90..65e1fc82d859 100644
--- a/acct-group/cron/metadata.xml
+++ b/acct-group/cron/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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 type="project">
+ <email>base-system@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/acct-group/crontab/crontab-0-r2.ebuild b/acct-group/crontab/crontab-0-r2.ebuild
new file mode 100644
index 000000000000..ba0d0f2c8958
--- /dev/null
+++ b/acct-group/crontab/crontab-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=460
diff --git a/acct-group/crontab/crontab-0.ebuild b/acct-group/crontab/crontab-0.ebuild
deleted file mode 100644
index d8765962fb79..000000000000
--- a/acct-group/crontab/crontab-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=460
diff --git a/acct-group/cvmfs/cvmfs-0-r1.ebuild b/acct-group/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 1fcae7e51f98..000000000000
--- a/acct-group/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the CernVM-FS network file system"
-ACCT_GROUP_ID=268
diff --git a/acct-group/cvmfs/cvmfs-0-r3.ebuild b/acct-group/cvmfs/cvmfs-0-r3.ebuild
new file mode 100644
index 000000000000..d8300bcc342f
--- /dev/null
+++ b/acct-group/cvmfs/cvmfs-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the CernVM-FS network file system"
+ACCT_GROUP_ID=268
diff --git a/acct-group/davfs2/davfs2-0-r1.ebuild b/acct-group/davfs2/davfs2-0-r1.ebuild
deleted file mode 100644
index c7a375eb1319..000000000000
--- a/acct-group/davfs2/davfs2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=420
diff --git a/acct-group/davfs2/davfs2-0-r3.ebuild b/acct-group/davfs2/davfs2-0-r3.ebuild
new file mode 100644
index 000000000000..5125906dd427
--- /dev/null
+++ b/acct-group/davfs2/davfs2-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=420
diff --git a/acct-group/dbmail/dbmail-0-r2.ebuild b/acct-group/dbmail/dbmail-0-r2.ebuild
new file mode 100644
index 000000000000..61d37c5cfa52
--- /dev/null
+++ b/acct-group/dbmail/dbmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=365
diff --git a/acct-group/dbmail/dbmail-0.ebuild b/acct-group/dbmail/dbmail-0.ebuild
deleted file mode 100644
index 761317e9bd0e..000000000000
--- a/acct-group/dbmail/dbmail-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=365
diff --git a/acct-group/dbskkd/dbskkd-0-r2.ebuild b/acct-group/dbskkd/dbskkd-0-r2.ebuild
new file mode 100644
index 000000000000..2aad41c0179e
--- /dev/null
+++ b/acct-group/dbskkd/dbskkd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-i18n/dbskkd-cdb"
+
+ACCT_GROUP_ID="146"
diff --git a/acct-group/dbskkd/dbskkd-0.ebuild b/acct-group/dbskkd/dbskkd-0.ebuild
deleted file mode 100644
index 84040068089f..000000000000
--- a/acct-group/dbskkd/dbskkd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-i18n/dbskkd-cdb"
-
-ACCT_GROUP_ID="146"
diff --git a/acct-group/ddclient/ddclient-0-r1.ebuild b/acct-group/ddclient/ddclient-0-r1.ebuild
deleted file mode 100644
index 778bf4cbe572..000000000000
--- a/acct-group/ddclient/ddclient-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the dynamic DNS client"
-
-ACCT_GROUP_ID="487"
diff --git a/acct-group/ddclient/ddclient-0-r3.ebuild b/acct-group/ddclient/ddclient-0-r3.ebuild
new file mode 100644
index 000000000000..42f28bf80adb
--- /dev/null
+++ b/acct-group/ddclient/ddclient-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the dynamic DNS client"
+
+ACCT_GROUP_ID="487"
diff --git a/acct-group/defang/defang-0-r2.ebuild b/acct-group/defang/defang-0-r2.ebuild
new file mode 100644
index 000000000000..384624e62bbf
--- /dev/null
+++ b/acct-group/defang/defang-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/mimedefang"
+
+ACCT_GROUP_ID="181"
diff --git a/acct-group/defang/defang-0.ebuild b/acct-group/defang/defang-0.ebuild
deleted file mode 100644
index aab0765fabfa..000000000000
--- a/acct-group/defang/defang-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for mail-filter/mimedefang"
-
-ACCT_GROUP_ID="181"
diff --git a/acct-group/dehydrated/dehydrated-0-r2.ebuild b/acct-group/dehydrated/dehydrated-0-r2.ebuild
new file mode 100644
index 000000000000..0f77876a8ed5
--- /dev/null
+++ b/acct-group/dehydrated/dehydrated-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-group
+
+DESCRIPTION="dehydrated program group"
+
+ACCT_GROUP_ID=361
diff --git a/acct-group/dehydrated/dehydrated-0.ebuild b/acct-group/dehydrated/dehydrated-0.ebuild
deleted file mode 100644
index 4edd9bf28a24..000000000000
--- a/acct-group/dehydrated/dehydrated-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="dehydrated program group"
-
-ACCT_GROUP_ID=361
diff --git a/acct-group/deluge/deluge-0-r1.ebuild b/acct-group/deluge/deluge-0-r1.ebuild
deleted file mode 100644
index 7f9e1bf27888..000000000000
--- a/acct-group/deluge/deluge-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=454
diff --git a/acct-group/deluge/deluge-0-r3.ebuild b/acct-group/deluge/deluge-0-r3.ebuild
new file mode 100644
index 000000000000..1ec0f73ef909
--- /dev/null
+++ b/acct-group/deluge/deluge-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=454
diff --git a/acct-group/dhcp/dhcp-0-r1.ebuild b/acct-group/dhcp/dhcp-0-r1.ebuild
deleted file mode 100644
index 5b54d2ecdd85..000000000000
--- a/acct-group/dhcp/dhcp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=300
diff --git a/acct-group/dhcp/dhcp-0-r3.ebuild b/acct-group/dhcp/dhcp-0-r3.ebuild
new file mode 100644
index 000000000000..c04eb2d3609a
--- /dev/null
+++ b/acct-group/dhcp/dhcp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=300
diff --git a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild b/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
deleted file mode 100644
index 47af5f206833..000000000000
--- a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=303
diff --git a/acct-group/dhcpcd/dhcpcd-0-r3.ebuild b/acct-group/dhcpcd/dhcpcd-0-r3.ebuild
new file mode 100644
index 000000000000..acbc42d14dc1
--- /dev/null
+++ b/acct-group/dhcpcd/dhcpcd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=303
diff --git a/acct-group/dialout/dialout-0-r1.ebuild b/acct-group/dialout/dialout-0-r1.ebuild
deleted file mode 100644
index 3c1316aa585a..000000000000
--- a/acct-group/dialout/dialout-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=20
diff --git a/acct-group/dialout/dialout-0-r3.ebuild b/acct-group/dialout/dialout-0-r3.ebuild
new file mode 100644
index 000000000000..114baf79a77e
--- /dev/null
+++ b/acct-group/dialout/dialout-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=20
diff --git a/acct-group/dictd/dictd-0-r2.ebuild b/acct-group/dictd/dictd-0-r2.ebuild
new file mode 100644
index 000000000000..645bf40bdaff
--- /dev/null
+++ b/acct-group/dictd/dictd-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-group
+
+DESCRIPTION="gid for app-text/dictd"
+
+ACCT_GROUP_ID=381
diff --git a/acct-group/dictd/dictd-0.ebuild b/acct-group/dictd/dictd-0.ebuild
deleted file mode 100644
index e20464ee6fd1..000000000000
--- a/acct-group/dictd/dictd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for app-text/dictd"
-
-ACCT_GROUP_ID=381
diff --git a/acct-group/dirsrv/dirsrv-0-r2.ebuild b/acct-group/dirsrv/dirsrv-0-r2.ebuild
new file mode 100644
index 000000000000..b304b16343e8
--- /dev/null
+++ b/acct-group/dirsrv/dirsrv-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nds/389-ds-base"
+ACCT_GROUP_ID=346
diff --git a/acct-group/dirsrv/dirsrv-0.ebuild b/acct-group/dirsrv/dirsrv-0.ebuild
deleted file mode 100644
index 14eb4d7fac5b..000000000000
--- a/acct-group/dirsrv/dirsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nds/389-ds-base"
-ACCT_GROUP_ID=346
diff --git a/acct-group/disk/disk-0-r1.ebuild b/acct-group/disk/disk-0-r1.ebuild
deleted file mode 100644
index a5568d65c049..000000000000
--- a/acct-group/disk/disk-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=6
diff --git a/acct-group/disk/disk-0-r3.ebuild b/acct-group/disk/disk-0-r3.ebuild
new file mode 100644
index 000000000000..1ac5e355e384
--- /dev/null
+++ b/acct-group/disk/disk-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=6
diff --git a/acct-group/distcc/distcc-1-r2.ebuild b/acct-group/distcc/distcc-1-r2.ebuild
new file mode 100644
index 000000000000..90989412e3fa
--- /dev/null
+++ b/acct-group/distcc/distcc-1-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=240
diff --git a/acct-group/distcc/distcc-1.ebuild b/acct-group/distcc/distcc-1.ebuild
deleted file mode 100644
index d26894412994..000000000000
--- a/acct-group/distcc/distcc-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=240
diff --git a/acct-group/dnrd/dnrd-0-r2.ebuild b/acct-group/dnrd/dnrd-0-r2.ebuild
new file mode 100644
index 000000000000..2092c1f01f5e
--- /dev/null
+++ b/acct-group/dnrd/dnrd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnrd"
+
+ACCT_GROUP_ID="262"
diff --git a/acct-group/dnrd/dnrd-0.ebuild b/acct-group/dnrd/dnrd-0.ebuild
deleted file mode 100644
index bba06a48da25..000000000000
--- a/acct-group/dnrd/dnrd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnrd"
-
-ACCT_GROUP_ID="262"
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
deleted file mode 100644
index afd6951e3873..000000000000
--- a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnscrypt-proxy"
-ACCT_GROUP_ID=353
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..0d10d9fd64b4
--- /dev/null
+++ b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnscrypt-proxy"
+ACCT_GROUP_ID=353
diff --git a/acct-group/dnsdist/dnsdist-0-r1.ebuild b/acct-group/dnsdist/dnsdist-0-r1.ebuild
deleted file mode 100644
index df9b403bed38..000000000000
--- a/acct-group/dnsdist/dnsdist-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/dnsdist"
-
-ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsdist/dnsdist-0-r3.ebuild b/acct-group/dnsdist/dnsdist-0-r3.ebuild
new file mode 100644
index 000000000000..dcce820fb2ef
--- /dev/null
+++ b/acct-group/dnsdist/dnsdist-0-r3.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-group
+
+DESCRIPTION="A group for net-dns/dnsdist"
+
+ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsdist/metadata.xml b/acct-group/dnsdist/metadata.xml
index e8de1c56b30f..115e9d64a669 100644
--- a/acct-group/dnsdist/metadata.xml
+++ b/acct-group/dnsdist/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>nativemad@gentoo.org</email>
- <name>Andreas Schuerch</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild b/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
deleted file mode 100644
index d765927def05..000000000000
--- a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq/dnsmasq-0-r3.ebuild b/acct-group/dnsmasq/dnsmasq-0-r3.ebuild
new file mode 100644
index 000000000000..ac5a4eeaf6dd
--- /dev/null
+++ b/acct-group/dnsmasq/dnsmasq-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
deleted file mode 100644
index e075766a9c4e..000000000000
--- a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=274
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..be7e96162722
--- /dev/null
+++ b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=274
diff --git a/acct-group/docker/docker-0-r1.ebuild b/acct-group/docker/docker-0-r1.ebuild
deleted file mode 100644
index a448b78e40fb..000000000000
--- a/acct-group/docker/docker-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=48
diff --git a/acct-group/docker/docker-0-r3.ebuild b/acct-group/docker/docker-0-r3.ebuild
new file mode 100644
index 000000000000..38dc0db2635b
--- /dev/null
+++ b/acct-group/docker/docker-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=48
diff --git a/acct-group/docker/metadata.xml b/acct-group/docker/metadata.xml
index f4ccc7996fc0..db463f3eeb66 100644
--- a/acct-group/docker/metadata.xml
+++ b/acct-group/docker/metadata.xml
@@ -5,8 +5,4 @@
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
</pkgmetadata>
diff --git a/acct-group/docker_auth/docker_auth-0-r1.ebuild b/acct-group/docker_auth/docker_auth-0-r1.ebuild
deleted file mode 100644
index 15cb331e003c..000000000000
--- a/acct-group/docker_auth/docker_auth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=345
diff --git a/acct-group/docker_auth/docker_auth-0-r3.ebuild b/acct-group/docker_auth/docker_auth-0-r3.ebuild
new file mode 100644
index 000000000000..68fe0c04145b
--- /dev/null
+++ b/acct-group/docker_auth/docker_auth-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=345
diff --git a/acct-group/dovecot/dovecot-0-r1.ebuild b/acct-group/dovecot/dovecot-0-r1.ebuild
deleted file mode 100644
index 3b37f1a2ebd6..000000000000
--- a/acct-group/dovecot/dovecot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=76
diff --git a/acct-group/dovecot/dovecot-0-r3.ebuild b/acct-group/dovecot/dovecot-0-r3.ebuild
new file mode 100644
index 000000000000..27dd6b6faa1b
--- /dev/null
+++ b/acct-group/dovecot/dovecot-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=76
diff --git a/acct-group/dovenull/dovenull-0-r1.ebuild b/acct-group/dovenull/dovenull-0-r1.ebuild
deleted file mode 100644
index f6c9f1011d06..000000000000
--- a/acct-group/dovenull/dovenull-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=74
diff --git a/acct-group/dovenull/dovenull-0-r3.ebuild b/acct-group/dovenull/dovenull-0-r3.ebuild
new file mode 100644
index 000000000000..b5f5c6d41082
--- /dev/null
+++ b/acct-group/dovenull/dovenull-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=74
diff --git a/acct-group/drone/drone-0-r2.ebuild b/acct-group/drone/drone-0-r2.ebuild
new file mode 100644
index 000000000000..4cac9359c209
--- /dev/null
+++ b/acct-group/drone/drone-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/drone"
+
+ACCT_GROUP_ID="112"
diff --git a/acct-group/drone/drone-0.ebuild b/acct-group/drone/drone-0.ebuild
deleted file mode 100644
index 7e4e2c35ad8b..000000000000
--- a/acct-group/drone/drone-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-util/drone"
-
-ACCT_GROUP_ID="112"
diff --git a/acct-group/ejabberd/ejabberd-0-r2.ebuild b/acct-group/ejabberd/ejabberd-0-r2.ebuild
new file mode 100644
index 000000000000..a8267075d134
--- /dev/null
+++ b/acct-group/ejabberd/ejabberd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/ejabberd"
+
+ACCT_GROUP_ID=114
diff --git a/acct-group/ejabberd/ejabberd-0.ebuild b/acct-group/ejabberd/ejabberd-0.ebuild
deleted file mode 100644
index 7d4a216908f8..000000000000
--- a/acct-group/ejabberd/ejabberd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/ejabberd"
-
-ACCT_GROUP_ID=114
diff --git a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild b/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
deleted file mode 100644
index 7232aa799576..000000000000
--- a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Elasticsearch program group"
-ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch/elasticsearch-0-r3.ebuild b/acct-group/elasticsearch/elasticsearch-0-r3.ebuild
new file mode 100644
index 000000000000..4d94cf7d0ade
--- /dev/null
+++ b/acct-group/elasticsearch/elasticsearch-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Elasticsearch program group"
+ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
deleted file mode 100644
index 65fdefebaf47..000000000000
--- a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
-
-ACCT_GROUP_ID="501"
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..830715dadfee
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
+
+ACCT_GROUP_ID="501"
diff --git a/acct-group/energi3/energi3-0-r2.ebuild b/acct-group/energi3/energi3-0-r2.ebuild
new file mode 100644
index 000000000000..85b0d4f52e36
--- /dev/null
+++ b/acct-group/energi3/energi3-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-p2p/energi3"
+ACCT_GROUP_ID=218
diff --git a/acct-group/energi3/energi3-0.ebuild b/acct-group/energi3/energi3-0.ebuild
deleted file mode 100644
index d844c7679002..000000000000
--- a/acct-group/energi3/energi3-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-p2p/energi3"
-ACCT_GROUP_ID=218
diff --git a/acct-group/epam/epam-0-r2.ebuild b/acct-group/epam/epam-0-r2.ebuild
new file mode 100644
index 000000000000..4056104b79fc
--- /dev/null
+++ b/acct-group/epam/epam-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for ejabberd's epam functionality"
+ACCT_GROUP_ID=418
diff --git a/acct-group/epam/epam-0.ebuild b/acct-group/epam/epam-0.ebuild
deleted file mode 100644
index 7909cc2a4393..000000000000
--- a/acct-group/epam/epam-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ejabberd's epam functionality"
-ACCT_GROUP_ID=418
diff --git a/acct-group/epmd/epmd-0-r1.ebuild b/acct-group/epmd/epmd-0-r1.ebuild
deleted file mode 100644
index 69ad9f1cad2b..000000000000
--- a/acct-group/epmd/epmd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Erlang Portmapper Daemon"
-ACCT_GROUP_ID=335
diff --git a/acct-group/epmd/epmd-0-r3.ebuild b/acct-group/epmd/epmd-0-r3.ebuild
new file mode 100644
index 000000000000..9297c42d88c4
--- /dev/null
+++ b/acct-group/epmd/epmd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Erlang Portmapper Daemon"
+ACCT_GROUP_ID=335
diff --git a/acct-group/epmd/metadata.xml b/acct-group/epmd/metadata.xml
index c74515d20dbe..15cf2ff7a521 100644
--- a/acct-group/epmd/metadata.xml
+++ b/acct-group/epmd/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/err/err-0-r2.ebuild b/acct-group/err/err-0-r2.ebuild
new file mode 100644
index 000000000000..b3e590d72db8
--- /dev/null
+++ b/acct-group/err/err-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=325
diff --git a/acct-group/err/err-0.ebuild b/acct-group/err/err-0.ebuild
deleted file mode 100644
index c1dcd9ca10c8..000000000000
--- a/acct-group/err/err-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=325
diff --git a/acct-group/etcd/etcd-0-r1.ebuild b/acct-group/etcd/etcd-0-r1.ebuild
deleted file mode 100644
index 841bf1ab43ea..000000000000
--- a/acct-group/etcd/etcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=426
diff --git a/acct-group/etcd/etcd-0-r3.ebuild b/acct-group/etcd/etcd-0-r3.ebuild
new file mode 100644
index 000000000000..d6d653e3ad9a
--- /dev/null
+++ b/acct-group/etcd/etcd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=426
diff --git a/acct-group/exabgp/exabgp-0-r1.ebuild b/acct-group/exabgp/exabgp-0-r1.ebuild
deleted file mode 100644
index ef1948f17efa..000000000000
--- a/acct-group/exabgp/exabgp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=316
diff --git a/acct-group/exabgp/exabgp-0-r3.ebuild b/acct-group/exabgp/exabgp-0-r3.ebuild
new file mode 100644
index 000000000000..cf25acee38ee
--- /dev/null
+++ b/acct-group/exabgp/exabgp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=316
diff --git a/acct-group/ez-ipupd/ez-ipupd-0-r2.ebuild b/acct-group/ez-ipupd/ez-ipupd-0-r2.ebuild
new file mode 100644
index 000000000000..5838a20180da
--- /dev/null
+++ b/acct-group/ez-ipupd/ez-ipupd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/ez-ipupdate"
+
+ACCT_GROUP_ID="261"
diff --git a/acct-group/ez-ipupd/ez-ipupd-0.ebuild b/acct-group/ez-ipupd/ez-ipupd-0.ebuild
deleted file mode 100644
index d37dce72a2cc..000000000000
--- a/acct-group/ez-ipupd/ez-ipupd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/ez-ipupdate"
-
-ACCT_GROUP_ID="261"
diff --git a/acct-group/fax/fax-0-r2.ebuild b/acct-group/fax/fax-0-r2.ebuild
new file mode 100644
index 000000000000..5beff6f5e3cd
--- /dev/null
+++ b/acct-group/fax/fax-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dialup/mgetty"
+
+ACCT_GROUP_ID="320"
diff --git a/acct-group/fax/fax-0.ebuild b/acct-group/fax/fax-0.ebuild
deleted file mode 100644
index 2e9923179f3e..000000000000
--- a/acct-group/fax/fax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dialup/mgetty"
-
-ACCT_GROUP_ID="320"
diff --git a/acct-group/fcron/fcron-0-r2.ebuild b/acct-group/fcron/fcron-0-r2.ebuild
new file mode 100644
index 000000000000..6668f8aca0f4
--- /dev/null
+++ b/acct-group/fcron/fcron-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/fcron"
+
+ACCT_GROUP_ID="120"
diff --git a/acct-group/fcron/fcron-0.ebuild b/acct-group/fcron/fcron-0.ebuild
deleted file mode 100644
index 2eb3684b77bf..000000000000
--- a/acct-group/fcron/fcron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/fcron"
-
-ACCT_GROUP_ID="120"
diff --git a/acct-group/fcron/metadata.xml b/acct-group/fcron/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/fcron/metadata.xml
+++ b/acct-group/fcron/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/fdm/fdm-0-r2.ebuild b/acct-group/fdm/fdm-0-r2.ebuild
new file mode 100644
index 000000000000..b954a73a67d8
--- /dev/null
+++ b/acct-group/fdm/fdm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fdm"
+
+ACCT_GROUP_ID="248"
diff --git a/acct-group/fdm/fdm-0.ebuild b/acct-group/fdm/fdm-0.ebuild
deleted file mode 100644
index 135f04656589..000000000000
--- a/acct-group/fdm/fdm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fdm"
-
-ACCT_GROUP_ID="248"
diff --git a/acct-group/fetchmail/fetchmail-0-r1.ebuild b/acct-group/fetchmail/fetchmail-0-r1.ebuild
deleted file mode 100644
index 03f13d37300d..000000000000
--- a/acct-group/fetchmail/fetchmail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fetchmail"
-ACCT_GROUP_ID=124
diff --git a/acct-group/fetchmail/fetchmail-0-r3.ebuild b/acct-group/fetchmail/fetchmail-0-r3.ebuild
new file mode 100644
index 000000000000..931f71ce145e
--- /dev/null
+++ b/acct-group/fetchmail/fetchmail-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fetchmail"
+ACCT_GROUP_ID=124
diff --git a/acct-group/fhem/fhem-0-r1.ebuild b/acct-group/fhem/fhem-0-r1.ebuild
deleted file mode 100644
index 166e07ec2cf1..000000000000
--- a/acct-group/fhem/fhem-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the FHEM perl server for house automation"
-
-ACCT_GROUP_ID="491"
diff --git a/acct-group/fhem/fhem-0-r3.ebuild b/acct-group/fhem/fhem-0-r3.ebuild
new file mode 100644
index 000000000000..d6e1d819748a
--- /dev/null
+++ b/acct-group/fhem/fhem-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the FHEM perl server for house automation"
+
+ACCT_GROUP_ID="491"
diff --git a/acct-group/fingerprint/fingerprint-0-r1.ebuild b/acct-group/fingerprint/fingerprint-0-r1.ebuild
deleted file mode 100644
index 0df6a20dbd2b..000000000000
--- a/acct-group/fingerprint/fingerprint-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=243
diff --git a/acct-group/fingerprint/fingerprint-0-r3.ebuild b/acct-group/fingerprint/fingerprint-0-r3.ebuild
new file mode 100644
index 000000000000..7068e6296612
--- /dev/null
+++ b/acct-group/fingerprint/fingerprint-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=243
diff --git a/acct-group/firebird/firebird-0-r1.ebuild b/acct-group/firebird/firebird-0-r1.ebuild
deleted file mode 100644
index b2d2f28d7ea3..000000000000
--- a/acct-group/firebird/firebird-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/firebird"
-
-ACCT_GROUP_ID="450"
diff --git a/acct-group/firebird/firebird-0-r2.ebuild b/acct-group/firebird/firebird-0-r2.ebuild
new file mode 100644
index 000000000000..e107349d26d0
--- /dev/null
+++ b/acct-group/firebird/firebird-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/firebird"
+
+ACCT_GROUP_ID="450"
diff --git a/acct-group/flatpak/flatpak-0-r2.ebuild b/acct-group/flatpak/flatpak-0-r2.ebuild
new file mode 100644
index 000000000000..4493add5c925
--- /dev/null
+++ b/acct-group/flatpak/flatpak-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=313
diff --git a/acct-group/flatpak/flatpak-0.ebuild b/acct-group/flatpak/flatpak-0.ebuild
deleted file mode 100644
index 4b028c888d26..000000000000
--- a/acct-group/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=313
diff --git a/acct-group/floppy/floppy-0-r1.ebuild b/acct-group/floppy/floppy-0-r1.ebuild
new file mode 100644
index 000000000000..3386a166e7b7
--- /dev/null
+++ b/acct-group/floppy/floppy-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=11
diff --git a/acct-group/floppy/metadata.xml b/acct-group/floppy/metadata.xml
new file mode 100644
index 000000000000..65e1fc82d859
--- /dev/null
+++ b/acct-group/floppy/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-group/flows/flows-0-r2.ebuild b/acct-group/flows/flows-0-r2.ebuild
new file mode 100644
index 000000000000..d6c35f06b881
--- /dev/null
+++ b/acct-group/flows/flows-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-group
+
+DESCRIPTION="gid for net-analyzer/flow-tools"
+
+ACCT_GROUP_ID=384
diff --git a/acct-group/flows/flows-0.ebuild b/acct-group/flows/flows-0.ebuild
deleted file mode 100644
index 50f9c311d004..000000000000
--- a/acct-group/flows/flows-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/flow-tools"
-
-ACCT_GROUP_ID=384
diff --git a/acct-group/fluentd/fluentd-0-r1.ebuild b/acct-group/fluentd/fluentd-0-r1.ebuild
deleted file mode 100644
index 0f86473d11b6..000000000000
--- a/acct-group/fluentd/fluentd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/fluentd"
-
-ACCT_GROUP_ID="504"
diff --git a/acct-group/fluentd/fluentd-0-r3.ebuild b/acct-group/fluentd/fluentd-0-r3.ebuild
new file mode 100644
index 000000000000..529d7e4befea
--- /dev/null
+++ b/acct-group/fluentd/fluentd-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/fluentd"
+
+ACCT_GROUP_ID="504"
diff --git a/acct-group/fluentd/metadata.xml b/acct-group/fluentd/metadata.xml
index 2a3ffb6ce4be..6aebbc46f559 100644
--- a/acct-group/fluentd/metadata.xml
+++ b/acct-group/fluentd/metadata.xml
@@ -1,12 +1,12 @@
<?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 type="person" proxied="yes">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
</maintainer>
- <maintainer type="project">
- <email>ruby@gentoo.org</email>
- <name>Gentoo Ruby Project</name>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
diff --git a/acct-group/foldingathome/foldingathome-0-r2.ebuild b/acct-group/foldingathome/foldingathome-0-r2.ebuild
new file mode 100644
index 000000000000..b983ae8f33d0
--- /dev/null
+++ b/acct-group/foldingathome/foldingathome-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sci-biology/foldingathome"
+
+ACCT_GROUP_ID="128"
diff --git a/acct-group/foldingathome/foldingathome-0.ebuild b/acct-group/foldingathome/foldingathome-0.ebuild
deleted file mode 100644
index 216461c86938..000000000000
--- a/acct-group/foldingathome/foldingathome-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sci-biology/foldingathome"
-
-ACCT_GROUP_ID="128"
diff --git a/acct-group/fp-multiuser/fp-multiuser-0-r2.ebuild b/acct-group/fp-multiuser/fp-multiuser-0-r2.ebuild
new file mode 100644
index 000000000000..cf8d0e690827
--- /dev/null
+++ b/acct-group/fp-multiuser/fp-multiuser-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/fp-multiuser"
+
+ACCT_GROUP_ID="318"
diff --git a/acct-group/fp-multiuser/fp-multiuser-0.ebuild b/acct-group/fp-multiuser/fp-multiuser-0.ebuild
deleted file mode 100644
index a7bd7bb71f26..000000000000
--- a/acct-group/fp-multiuser/fp-multiuser-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/fp-multiuser"
-
-ACCT_GROUP_ID="318"
diff --git a/acct-group/freenet/freenet-0-r2.ebuild b/acct-group/freenet/freenet-0-r2.ebuild
new file mode 100644
index 000000000000..fee69741aa6b
--- /dev/null
+++ b/acct-group/freenet/freenet-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/freenet"
+ACCT_GROUP_ID=105
diff --git a/acct-group/freenet/freenet-0.ebuild b/acct-group/freenet/freenet-0.ebuild
deleted file mode 100644
index c09fe1ee67e3..000000000000
--- a/acct-group/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/freenet"
-ACCT_GROUP_ID=105
diff --git a/acct-group/freenet/metadata.xml b/acct-group/freenet/metadata.xml
index 8e4916babcbf..115e9d64a669 100644
--- a/acct-group/freenet/metadata.xml
+++ b/acct-group/freenet/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>tommy@gentoo.org</email>
- <name>Thomas Sachau (Tommy[D])</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4d3ef69f819d
--- /dev/null
+++ b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=228
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
deleted file mode 100644
index 1ecaeb6a6b08..000000000000
--- a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=228
diff --git a/acct-group/frr/frr-0-r2.ebuild b/acct-group/frr/frr-0-r2.ebuild
new file mode 100644
index 000000000000..aa95a9dce08c
--- /dev/null
+++ b/acct-group/frr/frr-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=371
diff --git a/acct-group/frr/frr-0.ebuild b/acct-group/frr/frr-0.ebuild
deleted file mode 100644
index 42177f13c3a9..000000000000
--- a/acct-group/frr/frr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=371
diff --git a/acct-group/frr/metadata.xml b/acct-group/frr/metadata.xml
index b3726e9bf59e..2be263cf694d 100644
--- a/acct-group/frr/metadata.xml
+++ b/acct-group/frr/metadata.xml
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
+ <maintainer 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-group/ftp/ftp-0-r1.ebuild b/acct-group/ftp/ftp-0-r1.ebuild
deleted file mode 100644
index 9c11d486fc4a..000000000000
--- a/acct-group/ftp/ftp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="File Transfer Protocol server user"
-ACCT_GROUP_ID=21
diff --git a/acct-group/ftp/ftp-0-r3.ebuild b/acct-group/ftp/ftp-0-r3.ebuild
new file mode 100644
index 000000000000..068503a744e0
--- /dev/null
+++ b/acct-group/ftp/ftp-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="File Transfer Protocol server user"
+ACCT_GROUP_ID=21
diff --git a/acct-group/ftpproxy/ftpproxy-0-r2.ebuild b/acct-group/ftpproxy/ftpproxy-0-r2.ebuild
new file mode 100644
index 000000000000..69c326fe4bdb
--- /dev/null
+++ b/acct-group/ftpproxy/ftpproxy-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-ftp/frox"
+
+ACCT_GROUP_ID="182"
diff --git a/acct-group/ftpproxy/ftpproxy-0.ebuild b/acct-group/ftpproxy/ftpproxy-0.ebuild
deleted file mode 100644
index 66b993575afe..000000000000
--- a/acct-group/ftpproxy/ftpproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-ftp/frox"
-
-ACCT_GROUP_ID="182"
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
deleted file mode 100644
index d6fc81af1798..000000000000
--- a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=232
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r3.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r3.ebuild
new file mode 100644
index 000000000000..4aa7209a1576
--- /dev/null
+++ b/acct-group/fvwm-crystal/fvwm-crystal-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=232
diff --git a/acct-group/gamemode/gamemode-0-r2.ebuild b/acct-group/gamemode/gamemode-0-r2.ebuild
new file mode 100644
index 000000000000..98bf84515bd5
--- /dev/null
+++ b/acct-group/gamemode/gamemode-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
+ACCT_GROUP_ID=385
diff --git a/acct-group/gamemode/gamemode-0.ebuild b/acct-group/gamemode/gamemode-0.ebuild
deleted file mode 100644
index addb5e4d722e..000000000000
--- a/acct-group/gamemode/gamemode-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
-ACCT_GROUP_ID=385
diff --git a/acct-group/gamestat/gamestat-0-r1.ebuild b/acct-group/gamestat/gamestat-0-r1.ebuild
deleted file mode 100644
index 8b641548584a..000000000000
--- a/acct-group/gamestat/gamestat-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for shared high-score and game state files"
-ACCT_GROUP_ID=36
diff --git a/acct-group/gamestat/gamestat-0-r3.ebuild b/acct-group/gamestat/gamestat-0-r3.ebuild
new file mode 100644
index 000000000000..f4200208e26c
--- /dev/null
+++ b/acct-group/gamestat/gamestat-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for shared high-score and game state files"
+ACCT_GROUP_ID=36
diff --git a/acct-group/gatling/gatling-0-r1.ebuild b/acct-group/gatling/gatling-0-r1.ebuild
deleted file mode 100644
index 54710451d35d..000000000000
--- a/acct-group/gatling/gatling-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=364 # matches acct-user/gatling
diff --git a/acct-group/gatling/gatling-0-r3.ebuild b/acct-group/gatling/gatling-0-r3.ebuild
new file mode 100644
index 000000000000..3320bd8c385a
--- /dev/null
+++ b/acct-group/gatling/gatling-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=364 # matches acct-user/gatling
diff --git a/acct-group/gauth/gauth-0-r2.ebuild b/acct-group/gauth/gauth-0-r2.ebuild
new file mode 100644
index 000000000000..47ec0528f881
--- /dev/null
+++ b/acct-group/gauth/gauth-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
+
+ACCT_GROUP_ID="138"
diff --git a/acct-group/gauth/gauth-0.ebuild b/acct-group/gauth/gauth-0.ebuild
deleted file mode 100644
index 31dc4549fa33..000000000000
--- a/acct-group/gauth/gauth-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
-
-ACCT_GROUP_ID="138"
diff --git a/acct-group/gdm/gdm-0-r2.ebuild b/acct-group/gdm/gdm-0-r2.ebuild
new file mode 100644
index 000000000000..fd2a703fe1c0
--- /dev/null
+++ b/acct-group/gdm/gdm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=32
diff --git a/acct-group/gdm/gdm-0.ebuild b/acct-group/gdm/gdm-0.ebuild
deleted file mode 100644
index 2d82aac6f39d..000000000000
--- a/acct-group/gdm/gdm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=32
diff --git a/acct-group/geneweb/geneweb-0-r1.ebuild b/acct-group/geneweb/geneweb-0-r1.ebuild
deleted file mode 100644
index e68d95f8c291..000000000000
--- a/acct-group/geneweb/geneweb-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for geneweb daemon"
-
-ACCT_GROUP_ID=467
diff --git a/acct-group/geneweb/geneweb-0-r3.ebuild b/acct-group/geneweb/geneweb-0-r3.ebuild
new file mode 100644
index 000000000000..e1b05ab6792e
--- /dev/null
+++ b/acct-group/geneweb/geneweb-0-r3.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-group
+
+DESCRIPTION="Group for geneweb daemon"
+
+ACCT_GROUP_ID=467
diff --git a/acct-group/geoclue/geoclue-0-r2.ebuild b/acct-group/geoclue/geoclue-0-r2.ebuild
new file mode 100644
index 000000000000..f7bfa17b2759
--- /dev/null
+++ b/acct-group/geoclue/geoclue-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=351
diff --git a/acct-group/geoclue/geoclue-0.ebuild b/acct-group/geoclue/geoclue-0.ebuild
deleted file mode 100644
index 7f96f9de46d6..000000000000
--- a/acct-group/geoclue/geoclue-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=351
diff --git a/acct-group/gerbera/gerbera-0-r1.ebuild b/acct-group/gerbera/gerbera-0-r1.ebuild
deleted file mode 100644
index f23b0d544613..000000000000
--- a/acct-group/gerbera/gerbera-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Gerbera UPnP Media Server group"
-ACCT_GROUP_ID=429
diff --git a/acct-group/gerbera/gerbera-0-r3.ebuild b/acct-group/gerbera/gerbera-0-r3.ebuild
new file mode 100644
index 000000000000..8d4b01ced571
--- /dev/null
+++ b/acct-group/gerbera/gerbera-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Gerbera UPnP Media Server group"
+ACCT_GROUP_ID=429
diff --git a/acct-group/gerbera/metadata.xml b/acct-group/gerbera/metadata.xml
index dbd6bb4f0ed4..115e9d64a669 100644
--- a/acct-group/gerbera/metadata.xml
+++ b/acct-group/gerbera/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>christian.tietz@mailbox.org</email>
- <name>Christian Tietz</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-group/git/git-0-r1.ebuild b/acct-group/git/git-0-r1.ebuild
deleted file mode 100644
index 21737c5dcdfe..000000000000
--- a/acct-group/git/git-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=196
diff --git a/acct-group/git/git-0-r3.ebuild b/acct-group/git/git-0-r3.ebuild
new file mode 100644
index 000000000000..46f0009200a3
--- /dev/null
+++ b/acct-group/git/git-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=196
diff --git a/acct-group/github-exporter/github-exporter-0-r2.ebuild b/acct-group/github-exporter/github-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ebf580991792
--- /dev/null
+++ b/acct-group/github-exporter/github-exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=238
diff --git a/acct-group/github-exporter/github-exporter-0.ebuild b/acct-group/github-exporter/github-exporter-0.ebuild
deleted file mode 100644
index e8bc30acd2f7..000000000000
--- a/acct-group/github-exporter/github-exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=238
diff --git a/acct-group/gitlab-runner/gitlab-runner-1-r2.ebuild b/acct-group/gitlab-runner/gitlab-runner-1-r2.ebuild
new file mode 100644
index 000000000000..2a48aaa0a275
--- /dev/null
+++ b/acct-group/gitlab-runner/gitlab-runner-1-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=510
diff --git a/acct-group/gitlab-runner/gitlab-runner-1.ebuild b/acct-group/gitlab-runner/gitlab-runner-1.ebuild
deleted file mode 100644
index 7a63620aefd8..000000000000
--- a/acct-group/gitlab-runner/gitlab-runner-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=510
diff --git a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild b/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
deleted file mode 100644
index b906a9c72ece..000000000000
--- a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=221
diff --git a/acct-group/gkrellmd/gkrellmd-0-r3.ebuild b/acct-group/gkrellmd/gkrellmd-0-r3.ebuild
new file mode 100644
index 000000000000..65ad5716b852
--- /dev/null
+++ b/acct-group/gkrellmd/gkrellmd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=221
diff --git a/acct-group/gkrellmd/metadata.xml b/acct-group/gkrellmd/metadata.xml
index 115e9d64a669..641cbd3703e7 100644
--- a/acct-group/gkrellmd/metadata.xml
+++ b/acct-group/gkrellmd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/glance/glance-0-r1.ebuild b/acct-group/glance/glance-0-r1.ebuild
deleted file mode 100644
index 88a844125280..000000000000
--- a/acct-group/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=443
diff --git a/acct-group/glance/metadata.xml b/acct-group/glance/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/glance/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/gluster/gluster-0-r1.ebuild b/acct-group/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index d79d97827530..000000000000
--- a/acct-group/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=416
diff --git a/acct-group/gluster/gluster-0-r3.ebuild b/acct-group/gluster/gluster-0-r3.ebuild
new file mode 100644
index 000000000000..a3c90c1c1f3d
--- /dev/null
+++ b/acct-group/gluster/gluster-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=416
diff --git a/acct-group/gns3/gns3-0-r1.ebuild b/acct-group/gns3/gns3-0-r1.ebuild
new file mode 100644
index 000000000000..f3d20c0d3135
--- /dev/null
+++ b/acct-group/gns3/gns3-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=522
diff --git a/acct-group/gns3/gns3-0.ebuild b/acct-group/gns3/gns3-0.ebuild
deleted file mode 100644
index e4605b5610ef..000000000000
--- a/acct-group/gns3/gns3-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=522
diff --git a/acct-group/gnump3d/gnump3d-0-r2.ebuild b/acct-group/gnump3d/gnump3d-0-r2.ebuild
new file mode 100644
index 000000000000..adce1112e84a
--- /dev/null
+++ b/acct-group/gnump3d/gnump3d-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/gnump3d"
+
+ACCT_GROUP_ID="160"
diff --git a/acct-group/gnump3d/gnump3d-0.ebuild b/acct-group/gnump3d/gnump3d-0.ebuild
deleted file mode 100644
index 3c4504e2ac75..000000000000
--- a/acct-group/gnump3d/gnump3d-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/gnump3d"
-
-ACCT_GROUP_ID="160"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..e78454b53417
--- /dev/null
+++ b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
deleted file mode 100644
index e70168f79161..000000000000
--- a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r2.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r2.ebuild
new file mode 100644
index 000000000000..86b84e02069c
--- /dev/null
+++ b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="373"
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
deleted file mode 100644
index bc56160394b8..000000000000
--- a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="373"
diff --git a/acct-group/goaccess/goaccess-0-r1.ebuild b/acct-group/goaccess/goaccess-0-r1.ebuild
new file mode 100644
index 000000000000..5b8bc4733418
--- /dev/null
+++ b/acct-group/goaccess/goaccess-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=523
diff --git a/acct-group/goaccess/goaccess-0.ebuild b/acct-group/goaccess/goaccess-0.ebuild
deleted file mode 100644
index e8027df04f52..000000000000
--- a/acct-group/goaccess/goaccess-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=523
diff --git a/acct-group/gopher/gopher-0-r2.ebuild b/acct-group/gopher/gopher-0-r2.ebuild
new file mode 100644
index 000000000000..9215ed0277fa
--- /dev/null
+++ b/acct-group/gopher/gopher-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=287
diff --git a/acct-group/gopher/gopher-0.ebuild b/acct-group/gopher/gopher-0.ebuild
deleted file mode 100644
index ea85d8185e0c..000000000000
--- a/acct-group/gopher/gopher-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=287
diff --git a/acct-group/gopherd/gopherd-0-r2.ebuild b/acct-group/gopherd/gopherd-0-r2.ebuild
new file mode 100644
index 000000000000..5b840efe95ab
--- /dev/null
+++ b/acct-group/gopherd/gopherd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/geomyidae"
+
+ACCT_GROUP_ID="132"
diff --git a/acct-group/gopherd/gopherd-0.ebuild b/acct-group/gopherd/gopherd-0.ebuild
deleted file mode 100644
index 7c433e9e43e0..000000000000
--- a/acct-group/gopherd/gopherd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/geomyidae"
-
-ACCT_GROUP_ID="132"
diff --git a/acct-group/gpib/gpib-0-r1.ebuild b/acct-group/gpib/gpib-0-r1.ebuild
deleted file mode 100644
index 88caead90e5e..000000000000
--- a/acct-group/gpib/gpib-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=409
diff --git a/acct-group/gpib/gpib-0-r3.ebuild b/acct-group/gpib/gpib-0-r3.ebuild
new file mode 100644
index 000000000000..66238a6f692b
--- /dev/null
+++ b/acct-group/gpib/gpib-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=409
diff --git a/acct-group/gpio/gpio-0.ebuild b/acct-group/gpio/gpio-0.ebuild
deleted file mode 100644
index 9f8e9a3621d1..000000000000
--- a/acct-group/gpio/gpio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="225"
diff --git a/acct-group/gpio/metadata.xml b/acct-group/gpio/metadata.xml
deleted file mode 100644
index b810f29cf12e..000000000000
--- a/acct-group/gpio/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>crabbedhaloablution@icloud.com</email>
- <name>Peter Alfredsen</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/grafana/grafana-0-r1.ebuild b/acct-group/grafana/grafana-0-r1.ebuild
deleted file mode 100644
index ab11061926b1..000000000000
--- a/acct-group/grafana/grafana-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="grafana program group"
-
-ACCT_GROUP_ID=389
diff --git a/acct-group/grafana/grafana-0-r3.ebuild b/acct-group/grafana/grafana-0-r3.ebuild
new file mode 100644
index 000000000000..415401dfa0ab
--- /dev/null
+++ b/acct-group/grafana/grafana-0-r3.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-group
+
+DESCRIPTION="grafana program group"
+
+ACCT_GROUP_ID=389
diff --git a/acct-group/graylog/graylog-0-r1.ebuild b/acct-group/graylog/graylog-0-r1.ebuild
deleted file mode 100644
index 23ff1b46e12a..000000000000
--- a/acct-group/graylog/graylog-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Graylog program group"
-ACCT_GROUP_ID=478
diff --git a/acct-group/graylog/graylog-0-r3.ebuild b/acct-group/graylog/graylog-0-r3.ebuild
new file mode 100644
index 000000000000..198779b0eb79
--- /dev/null
+++ b/acct-group/graylog/graylog-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Graylog program group"
+ACCT_GROUP_ID=478
diff --git a/acct-group/greetd/greetd-0-r1.ebuild b/acct-group/greetd/greetd-0-r1.ebuild
deleted file mode 100644
index defd4a7f1809..000000000000
--- a/acct-group/greetd/greetd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=396
-DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/greetd/greetd-0-r3.ebuild b/acct-group/greetd/greetd-0-r3.ebuild
new file mode 100644
index 000000000000..26f599495a9c
--- /dev/null
+++ b/acct-group/greetd/greetd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=396
+DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/grok_exporter/grok_exporter-0-r2.ebuild b/acct-group/grok_exporter/grok_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ba07953faacc
--- /dev/null
+++ b/acct-group/grok_exporter/grok_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/grok_exporter"
+
+ACCT_GROUP_ID="104"
diff --git a/acct-group/grok_exporter/grok_exporter-0.ebuild b/acct-group/grok_exporter/grok_exporter-0.ebuild
deleted file mode 100644
index ff2c696b3fb0..000000000000
--- a/acct-group/grok_exporter/grok_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/grok_exporter"
-
-ACCT_GROUP_ID="104"
diff --git a/acct-group/groonga/groonga-0-r2.ebuild b/acct-group/groonga/groonga-0-r2.ebuild
new file mode 100644
index 000000000000..c90446fd8c73
--- /dev/null
+++ b/acct-group/groonga/groonga-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-text/groonga"
+
+ACCT_GROUP_ID="266"
diff --git a/acct-group/groonga/groonga-0.ebuild b/acct-group/groonga/groonga-0.ebuild
deleted file mode 100644
index 347d9c9825d7..000000000000
--- a/acct-group/groonga/groonga-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-text/groonga"
-
-ACCT_GROUP_ID="266"
diff --git a/acct-group/gvm/gvm-0-r1.ebuild b/acct-group/gvm/gvm-0-r1.ebuild
deleted file mode 100644
index 1416f062f155..000000000000
--- a/acct-group/gvm/gvm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Greenbone vulnerability management program group"
-ACCT_GROUP_ID=495
diff --git a/acct-group/gvm/gvm-0-r3.ebuild b/acct-group/gvm/gvm-0-r3.ebuild
new file mode 100644
index 000000000000..ad6c8849d980
--- /dev/null
+++ b/acct-group/gvm/gvm-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Greenbone vulnerability management program group"
+ACCT_GROUP_ID=495
diff --git a/acct-group/h2o/h2o-0-r2.ebuild b/acct-group/h2o/h2o-0-r2.ebuild
new file mode 100644
index 000000000000..c5f171ca640b
--- /dev/null
+++ b/acct-group/h2o/h2o-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/h2o"
+
+ACCT_GROUP_ID="141"
diff --git a/acct-group/h2o/h2o-0.ebuild b/acct-group/h2o/h2o-0.ebuild
deleted file mode 100644
index 210bbacb211f..000000000000
--- a/acct-group/h2o/h2o-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/h2o"
-
-ACCT_GROUP_ID="141"
diff --git a/acct-group/haclient/haclient-0-r2.ebuild b/acct-group/haclient/haclient-0-r2.ebuild
new file mode 100644
index 000000000000..a195b45010d8
--- /dev/null
+++ b/acct-group/haclient/haclient-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/cluster-glue"
+
+ACCT_GROUP_ID="204"
diff --git a/acct-group/haclient/haclient-0.ebuild b/acct-group/haclient/haclient-0.ebuild
deleted file mode 100644
index 26dcd63c48e7..000000000000
--- a/acct-group/haclient/haclient-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-cluster/cluster-glue"
-
-ACCT_GROUP_ID="204"
diff --git a/acct-group/haproxy/haproxy-0-r1.ebuild b/acct-group/haproxy/haproxy-0-r1.ebuild
deleted file mode 100644
index 230356aa82f1..000000000000
--- a/acct-group/haproxy/haproxy-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=188
diff --git a/acct-group/haproxy/haproxy-0-r3.ebuild b/acct-group/haproxy/haproxy-0-r3.ebuild
new file mode 100644
index 000000000000..4670a8f5e3b7
--- /dev/null
+++ b/acct-group/haproxy/haproxy-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=188
diff --git a/acct-group/havp/havp-0-r2.ebuild b/acct-group/havp/havp-0-r2.ebuild
new file mode 100644
index 000000000000..13e3b77d0e72
--- /dev/null
+++ b/acct-group/havp/havp-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/havp"
+
+ACCT_GROUP_ID="254"
diff --git a/acct-group/havp/havp-0.ebuild b/acct-group/havp/havp-0.ebuild
deleted file mode 100644
index 52ce5f9ab38c..000000000000
--- a/acct-group/havp/havp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/havp"
-
-ACCT_GROUP_ID="254"
diff --git a/acct-group/headscale/headscale-0-r1.ebuild b/acct-group/headscale/headscale-0-r1.ebuild
new file mode 100644
index 000000000000..a1ad07a64135
--- /dev/null
+++ b/acct-group/headscale/headscale-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=514
diff --git a/acct-group/headscale/headscale-0.ebuild b/acct-group/headscale/headscale-0.ebuild
deleted file mode 100644
index 73623757f6d6..000000000000
--- a/acct-group/headscale/headscale-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=514
diff --git a/acct-group/heat/heat-0-r1.ebuild b/acct-group/heat/heat-0-r1.ebuild
deleted file mode 100644
index d3e6b1b93a80..000000000000
--- a/acct-group/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=444
diff --git a/acct-group/heat/metadata.xml b/acct-group/heat/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/heat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/hsqldb/hsqldb-0-r2.ebuild b/acct-group/hsqldb/hsqldb-0-r2.ebuild
new file mode 100644
index 000000000000..6a36c91930a2
--- /dev/null
+++ b/acct-group/hsqldb/hsqldb-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for hsqldb"
+ACCT_GROUP_ID=217
diff --git a/acct-group/hsqldb/hsqldb-0.ebuild b/acct-group/hsqldb/hsqldb-0.ebuild
deleted file mode 100644
index 041bb24be52a..000000000000
--- a/acct-group/hsqldb/hsqldb-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for hsqldb"
-ACCT_GROUP_ID=217
diff --git a/acct-group/http/http-0-r2.ebuild b/acct-group/http/http-0-r2.ebuild
new file mode 100644
index 000000000000..3442955b21b3
--- /dev/null
+++ b/acct-group/http/http-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=297
diff --git a/acct-group/http/http-0.ebuild b/acct-group/http/http-0.ebuild
deleted file mode 100644
index 6e855875b1d8..000000000000
--- a/acct-group/http/http-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=297
diff --git a/acct-group/i2c/i2c-0-r2.ebuild b/acct-group/i2c/i2c-0-r2.ebuild
new file mode 100644
index 000000000000..d013f8147798
--- /dev/null
+++ b/acct-group/i2c/i2c-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="226"
diff --git a/acct-group/i2c/i2c-0.ebuild b/acct-group/i2c/i2c-0.ebuild
deleted file mode 100644
index 9318389c592c..000000000000
--- a/acct-group/i2c/i2c-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="226"
diff --git a/acct-group/i2p/i2p-0-r1.ebuild b/acct-group/i2p/i2p-0-r1.ebuild
deleted file mode 100644
index 9fa033395b17..000000000000
--- a/acct-group/i2p/i2p-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-vpn/i2p"
-ACCT_GROUP_ID=471
diff --git a/acct-group/i2p/i2p-0-r3.ebuild b/acct-group/i2p/i2p-0-r3.ebuild
new file mode 100644
index 000000000000..b2649e8b803f
--- /dev/null
+++ b/acct-group/i2p/i2p-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-vpn/i2p"
+ACCT_GROUP_ID=471
diff --git a/acct-group/i2pd/i2pd-0-r1.ebuild b/acct-group/i2pd/i2pd-0-r1.ebuild
deleted file mode 100644
index 2258cde77ad8..000000000000
--- a/acct-group/i2pd/i2pd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
-ACCT_GROUP_ID=470
diff --git a/acct-group/i2pd/i2pd-0-r3.ebuild b/acct-group/i2pd/i2pd-0-r3.ebuild
new file mode 100644
index 000000000000..059bc29c5ee0
--- /dev/null
+++ b/acct-group/i2pd/i2pd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
+ACCT_GROUP_ID=470
diff --git a/acct-group/icecast/icecast-0-r2.ebuild b/acct-group/icecast/icecast-0-r2.ebuild
new file mode 100644
index 000000000000..6e20c4d00aaf
--- /dev/null
+++ b/acct-group/icecast/icecast-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/icecast"
+
+ACCT_GROUP_ID="131"
diff --git a/acct-group/icecast/icecast-0.ebuild b/acct-group/icecast/icecast-0.ebuild
deleted file mode 100644
index 8e91828cfb66..000000000000
--- a/acct-group/icecast/icecast-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/icecast"
-
-ACCT_GROUP_ID="131"
diff --git a/acct-group/icecream/icecream-0-r2.ebuild b/acct-group/icecream/icecream-0-r2.ebuild
new file mode 100644
index 000000000000..4373bfec7e39
--- /dev/null
+++ b/acct-group/icecream/icecream-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-devel/icecream"
+
+ACCT_GROUP_ID="145"
diff --git a/acct-group/icecream/icecream-0.ebuild b/acct-group/icecream/icecream-0.ebuild
deleted file mode 100644
index 08f8a89a7b97..000000000000
--- a/acct-group/icecream/icecream-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-devel/icecream"
-
-ACCT_GROUP_ID="145"
diff --git a/acct-group/ices/ices-0-r2.ebuild b/acct-group/ices/ices-0-r2.ebuild
new file mode 100644
index 000000000000..eff4a325c60c
--- /dev/null
+++ b/acct-group/ices/ices-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ices"
+
+ACCT_GROUP_ID="162"
diff --git a/acct-group/ices/ices-0.ebuild b/acct-group/ices/ices-0.ebuild
deleted file mode 100644
index 0efbe032797f..000000000000
--- a/acct-group/ices/ices-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/ices"
-
-ACCT_GROUP_ID="162"
diff --git a/acct-group/icinga/icinga-0-r1.ebuild b/acct-group/icinga/icinga-0-r1.ebuild
deleted file mode 100644
index f14f8c10b01a..000000000000
--- a/acct-group/icinga/icinga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=457
diff --git a/acct-group/icinga/icinga-0-r3.ebuild b/acct-group/icinga/icinga-0-r3.ebuild
new file mode 100644
index 000000000000..a9fd8edd36c8
--- /dev/null
+++ b/acct-group/icinga/icinga-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=457
diff --git a/acct-group/icingacmd/icingacmd-0-r1.ebuild b/acct-group/icingacmd/icingacmd-0-r1.ebuild
deleted file mode 100644
index 342794ce41e0..000000000000
--- a/acct-group/icingacmd/icingacmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=458
diff --git a/acct-group/icingacmd/icingacmd-0-r3.ebuild b/acct-group/icingacmd/icingacmd-0-r3.ebuild
new file mode 100644
index 000000000000..1ada740de349
--- /dev/null
+++ b/acct-group/icingacmd/icingacmd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=458
diff --git a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild b/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
deleted file mode 100644
index e2660fdb4be5..000000000000
--- a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=241
diff --git a/acct-group/icingaweb2/icingaweb2-0-r3.ebuild b/acct-group/icingaweb2/icingaweb2-0-r3.ebuild
new file mode 100644
index 000000000000..cfbb93e9cb84
--- /dev/null
+++ b/acct-group/icingaweb2/icingaweb2-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=241
diff --git a/acct-group/inadyn/inadyn-0-r1.ebuild b/acct-group/inadyn/inadyn-0-r1.ebuild
new file mode 100644
index 000000000000..1b0c291e1034
--- /dev/null
+++ b/acct-group/inadyn/inadyn-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="529"
diff --git a/acct-group/jabber/metadata.xml b/acct-group/inadyn/metadata.xml
index c07e13d4a6bd..c07e13d4a6bd 100644
--- a/acct-group/jabber/metadata.xml
+++ b/acct-group/inadyn/metadata.xml
diff --git a/acct-group/incus-admin/incus-admin-0.ebuild b/acct-group/incus-admin/incus-admin-0.ebuild
new file mode 100644
index 000000000000..ee18e2282ca2
--- /dev/null
+++ b/acct-group/incus-admin/incus-admin-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=533
+DESCRIPTION="Group for app-containers/incus"
diff --git a/acct-group/incus-admin/metadata.xml b/acct-group/incus-admin/metadata.xml
new file mode 100644
index 000000000000..5d32dd6c55b4
--- /dev/null
+++ b/acct-group/incus-admin/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>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-group/incus/incus-0.ebuild b/acct-group/incus/incus-0.ebuild
new file mode 100644
index 000000000000..e5f45afcdc9f
--- /dev/null
+++ b/acct-group/incus/incus-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=532
+DESCRIPTION="Group for app-containers/incus"
diff --git a/acct-group/incus/metadata.xml b/acct-group/incus/metadata.xml
new file mode 100644
index 000000000000..5d32dd6c55b4
--- /dev/null
+++ b/acct-group/incus/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>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/acct-group/influxdb/influxdb-0-r1.ebuild b/acct-group/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 8b693e17a672..000000000000
--- a/acct-group/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=342
diff --git a/acct-group/influxdb/influxdb-0-r3.ebuild b/acct-group/influxdb/influxdb-0-r3.ebuild
new file mode 100644
index 000000000000..90c3e31dab3a
--- /dev/null
+++ b/acct-group/influxdb/influxdb-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=342
diff --git a/acct-group/input/input-0-r1.ebuild b/acct-group/input/input-0-r1.ebuild
deleted file mode 100644
index 9ef06e8444a4..000000000000
--- a/acct-group/input/input-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=97
diff --git a/acct-group/input/input-0-r3.ebuild b/acct-group/input/input-0-r3.ebuild
new file mode 100644
index 000000000000..c36cb568afc9
--- /dev/null
+++ b/acct-group/input/input-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=97
diff --git a/acct-group/inspircd/inspircd-0-r1.ebuild b/acct-group/inspircd/inspircd-0-r1.ebuild
deleted file mode 100644
index 6d4c94d302ac..000000000000
--- a/acct-group/inspircd/inspircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# Port 6667 % 500
-ACCT_GROUP_ID=167
diff --git a/acct-group/inspircd/inspircd-0-r3.ebuild b/acct-group/inspircd/inspircd-0-r3.ebuild
new file mode 100644
index 000000000000..726d6425d855
--- /dev/null
+++ b/acct-group/inspircd/inspircd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+# Port 6667 % 500
+ACCT_GROUP_ID=167
diff --git a/acct-group/ipfs/ipfs-0-r1.ebuild b/acct-group/ipfs/ipfs-0-r1.ebuild
deleted file mode 100644
index 503f9d4c1a2f..000000000000
--- a/acct-group/ipfs/ipfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
-ACCT_GROUP_ID=484
diff --git a/acct-group/ipfs/ipfs-0-r3.ebuild b/acct-group/ipfs/ipfs-0-r3.ebuild
new file mode 100644
index 000000000000..40b308e4e7a7
--- /dev/null
+++ b/acct-group/ipfs/ipfs-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
+ACCT_GROUP_ID=484
diff --git a/acct-group/ipsec/ipsec-0-r2.ebuild b/acct-group/ipsec/ipsec-0-r2.ebuild
new file mode 100644
index 000000000000..edf068da7665
--- /dev/null
+++ b/acct-group/ipsec/ipsec-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-group
+
+DESCRIPTION="ipsec (strongswan) program group"
+
+ACCT_GROUP_ID=199
diff --git a/acct-group/ipsec/ipsec-0.ebuild b/acct-group/ipsec/ipsec-0.ebuild
deleted file mode 100644
index d0716459d75e..000000000000
--- a/acct-group/ipsec/ipsec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="ipsec (strongswan) program group"
-
-ACCT_GROUP_ID=199
diff --git a/acct-group/ipsentinel/ipsentinel-0-r2.ebuild b/acct-group/ipsentinel/ipsentinel-0-r2.ebuild
new file mode 100644
index 000000000000..14611f8dbd1e
--- /dev/null
+++ b/acct-group/ipsentinel/ipsentinel-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ip-sentinel"
+
+ACCT_GROUP_ID="163"
diff --git a/acct-group/ipsentinel/ipsentinel-0.ebuild b/acct-group/ipsentinel/ipsentinel-0.ebuild
deleted file mode 100644
index 0ab3a10e014b..000000000000
--- a/acct-group/ipsentinel/ipsentinel-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/ip-sentinel"
-
-ACCT_GROUP_ID="163"
diff --git a/acct-group/iroffer/iroffer-0-r2.ebuild b/acct-group/iroffer/iroffer-0-r2.ebuild
new file mode 100644
index 000000000000..07e349e494ec
--- /dev/null
+++ b/acct-group/iroffer/iroffer-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=187
diff --git a/acct-group/iroffer/iroffer-0.ebuild b/acct-group/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 2e3c37129e70..000000000000
--- a/acct-group/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=187
diff --git a/acct-group/iroffer/metadata.xml b/acct-group/iroffer/metadata.xml
index b5bcfc16d776..115e9d64a669 100644
--- a/acct-group/iroffer/metadata.xml
+++ b/acct-group/iroffer/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/jabber/jabber-0.ebuild b/acct-group/jabber/jabber-0.ebuild
deleted file mode 100644
index 506bd4f43bc4..000000000000
--- a/acct-group/jabber/jabber-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for various jabber services"
-
-ACCT_GROUP_ID="379"
diff --git a/acct-group/jackett/jackett-0-r1.ebuild b/acct-group/jackett/jackett-0-r1.ebuild
new file mode 100644
index 000000000000..69d083205e05
--- /dev/null
+++ b/acct-group/jackett/jackett-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=531
diff --git a/acct-group/jackett/metadata.xml b/acct-group/jackett/metadata.xml
new file mode 100644
index 000000000000..7b06c9eb2c55
--- /dev/null
+++ b/acct-group/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-group/jellyfin/jellyfin-0-r1.ebuild b/acct-group/jellyfin/jellyfin-0-r1.ebuild
new file mode 100644
index 000000000000..b2f88b650218
--- /dev/null
+++ b/acct-group/jellyfin/jellyfin-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=518
diff --git a/acct-group/jellyfin/jellyfin-0.ebuild b/acct-group/jellyfin/jellyfin-0.ebuild
deleted file mode 100644
index 9d952362cfe2..000000000000
--- a/acct-group/jellyfin/jellyfin-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=518
diff --git a/acct-group/jenkins/jenkins-0-r2.ebuild b/acct-group/jenkins/jenkins-0-r2.ebuild
new file mode 100644
index 000000000000..2bc90921c127
--- /dev/null
+++ b/acct-group/jenkins/jenkins-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Jenkins program group"
+
+ACCT_GROUP_ID=473
diff --git a/acct-group/jenkins/jenkins-0.ebuild b/acct-group/jenkins/jenkins-0.ebuild
deleted file mode 100644
index c90523f69b2b..000000000000
--- a/acct-group/jenkins/jenkins-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Jenkins program group"
-
-ACCT_GROUP_ID=473
diff --git a/acct-group/kafka/kafka-0-r1.ebuild b/acct-group/kafka/kafka-0-r1.ebuild
deleted file mode 100644
index 6d08891db8e6..000000000000
--- a/acct-group/kafka/kafka-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=425
diff --git a/acct-group/kafka/kafka-0-r3.ebuild b/acct-group/kafka/kafka-0-r3.ebuild
new file mode 100644
index 000000000000..9e45cc67dbf5
--- /dev/null
+++ b/acct-group/kafka/kafka-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=425
diff --git a/acct-group/kapacitor/kapacitor-0-r1.ebuild b/acct-group/kapacitor/kapacitor-0-r1.ebuild
deleted file mode 100644
index 3e998f71108a..000000000000
--- a/acct-group/kapacitor/kapacitor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=343
diff --git a/acct-group/kapacitor/kapacitor-0-r3.ebuild b/acct-group/kapacitor/kapacitor-0-r3.ebuild
new file mode 100644
index 000000000000..d0003ed7f992
--- /dev/null
+++ b/acct-group/kapacitor/kapacitor-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=343
diff --git a/acct-group/karma/karma-0-r2.ebuild b/acct-group/karma/karma-0-r2.ebuild
new file mode 100644
index 000000000000..7e4df0eb0bdf
--- /dev/null
+++ b/acct-group/karma/karma-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/karma-bin"
+
+ACCT_GROUP_ID="118"
diff --git a/acct-group/karma/karma-0.ebuild b/acct-group/karma/karma-0.ebuild
deleted file mode 100644
index 1631d655b6bf..000000000000
--- a/acct-group/karma/karma-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/karma-bin"
-
-ACCT_GROUP_ID="118"
diff --git a/acct-group/keystone/keystone-0-r1.ebuild b/acct-group/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 06d95b537d6f..000000000000
--- a/acct-group/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=445
diff --git a/acct-group/keystone/metadata.xml b/acct-group/keystone/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/keystone/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/kibana/kibana-0-r1.ebuild b/acct-group/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index 936486fe4773..000000000000
--- a/acct-group/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Kibana program group"
-ACCT_GROUP_ID=269
diff --git a/acct-group/kibana/kibana-0-r3.ebuild b/acct-group/kibana/kibana-0-r3.ebuild
new file mode 100644
index 000000000000..75f399d6edca
--- /dev/null
+++ b/acct-group/kibana/kibana-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Kibana program group"
+ACCT_GROUP_ID=269
diff --git a/acct-group/kismet/kismet-0-r1.ebuild b/acct-group/kismet/kismet-0-r1.ebuild
deleted file mode 100644
index cd8df0799bdb..000000000000
--- a/acct-group/kismet/kismet-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="net-wireless/kismet"
-ACCT_GROUP_ID="388"
diff --git a/acct-group/kismet/kismet-0-r3.ebuild b/acct-group/kismet/kismet-0-r3.ebuild
new file mode 100644
index 000000000000..17bd7e8a9cf3
--- /dev/null
+++ b/acct-group/kismet/kismet-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_GROUP_ID="388"
diff --git a/acct-group/kmem/kmem-0-r1.ebuild b/acct-group/kmem/kmem-0-r1.ebuild
deleted file mode 100644
index b07239c3b2ab..000000000000
--- a/acct-group/kmem/kmem-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=9
diff --git a/acct-group/kmem/kmem-0-r3.ebuild b/acct-group/kmem/kmem-0-r3.ebuild
new file mode 100644
index 000000000000..5f002bfa09de
--- /dev/null
+++ b/acct-group/kmem/kmem-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=9
diff --git a/acct-group/knot-resolver/knot-resolver-0-r1.ebuild b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
new file mode 100644
index 000000000000..cd9132400076
--- /dev/null
+++ b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=525
diff --git a/acct-group/knot-resolver/metadata.xml b/acct-group/knot-resolver/metadata.xml
new file mode 100644
index 000000000000..e91ef31902f9
--- /dev/null
+++ b/acct-group/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-group/knot/knot-0-r1.ebuild b/acct-group/knot/knot-0-r1.ebuild
deleted file mode 100644
index f35128d81950..000000000000
--- a/acct-group/knot/knot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=53
diff --git a/acct-group/knot/knot-0-r3.ebuild b/acct-group/knot/knot-0-r3.ebuild
new file mode 100644
index 000000000000..4d993124c032
--- /dev/null
+++ b/acct-group/knot/knot-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=53
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
deleted file mode 100644
index 52abae9b534e..000000000000
--- a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=432
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r3.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r3.ebuild
new file mode 100644
index 000000000000..a463c0e4ca1d
--- /dev/null
+++ b/acct-group/kube-apiserver/kube-apiserver-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=432
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
deleted file mode 100644
index 7fc976b63174..000000000000
--- a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=433
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r3.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r3.ebuild
new file mode 100644
index 000000000000..c77d290da863
--- /dev/null
+++ b/acct-group/kube-controller-manager/kube-controller-manager-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=433
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
deleted file mode 100644
index 1b61e2a92b1f..000000000000
--- a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=434
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r3.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r3.ebuild
new file mode 100644
index 000000000000..ea4f92b812ac
--- /dev/null
+++ b/acct-group/kube-scheduler/kube-scheduler-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=434
diff --git a/acct-group/kvm/kvm-0-r1.ebuild b/acct-group/kvm/kvm-0-r1.ebuild
deleted file mode 100644
index eadc9b037d32..000000000000
--- a/acct-group/kvm/kvm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=78
diff --git a/acct-group/kvm/kvm-0-r3.ebuild b/acct-group/kvm/kvm-0-r3.ebuild
new file mode 100644
index 000000000000..d73a52a713ec
--- /dev/null
+++ b/acct-group/kvm/kvm-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=78
diff --git a/acct-group/ldap/ldap-0-r2.ebuild b/acct-group/ldap/ldap-0-r2.ebuild
new file mode 100644
index 000000000000..d5677d8b4469
--- /dev/null
+++ b/acct-group/ldap/ldap-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=439
diff --git a/acct-group/ldap/ldap-0.ebuild b/acct-group/ldap/ldap-0.ebuild
deleted file mode 100644
index 88f92a325683..000000000000
--- a/acct-group/ldap/ldap-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=439
diff --git a/acct-group/ldap/metadata.xml b/acct-group/ldap/metadata.xml
index 2c47fcf00594..115e9d64a669 100644
--- a/acct-group/ldap/metadata.xml
+++ b/acct-group/ldap/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/libreoffice/libreoffice-0-r1.ebuild b/acct-group/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..8d9a73b20e9f
--- /dev/null
+++ b/acct-group/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="512"
diff --git a/acct-group/libreoffice/libreoffice-0.ebuild b/acct-group/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index bf052171998d..000000000000
--- a/acct-group/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="512"
diff --git a/acct-group/libvirt/libvirt-0-r1.ebuild b/acct-group/libvirt/libvirt-0-r1.ebuild
deleted file mode 100644
index d9d2709c5851..000000000000
--- a/acct-group/libvirt/libvirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=79
diff --git a/acct-group/libvirt/libvirt-0-r3.ebuild b/acct-group/libvirt/libvirt-0-r3.ebuild
new file mode 100644
index 000000000000..444fa1ba0155
--- /dev/null
+++ b/acct-group/libvirt/libvirt-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=79
diff --git a/acct-group/lidarr/lidarr-0-r1.ebuild b/acct-group/lidarr/lidarr-0-r1.ebuild
new file mode 100644
index 000000000000..6dddb430cc16
--- /dev/null
+++ b/acct-group/lidarr/lidarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=530
diff --git a/acct-group/lidarr/metadata.xml b/acct-group/lidarr/metadata.xml
new file mode 100644
index 000000000000..65c6cb6b33aa
--- /dev/null
+++ b/acct-group/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-group/lightdm/lightdm-0-r1.ebuild b/acct-group/lightdm/lightdm-0-r1.ebuild
deleted file mode 100644
index e2adc778ff71..000000000000
--- a/acct-group/lightdm/lightdm-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/lightdm"
-
-ACCT_GROUP_ID="134"
diff --git a/acct-group/lightdm/lightdm-0-r2.ebuild b/acct-group/lightdm/lightdm-0-r2.ebuild
new file mode 100644
index 000000000000..45f3a67230aa
--- /dev/null
+++ b/acct-group/lightdm/lightdm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/lightdm"
+
+ACCT_GROUP_ID="134"
diff --git a/acct-group/lighttpd/lighttpd-0-r1.ebuild b/acct-group/lighttpd/lighttpd-0-r1.ebuild
deleted file mode 100644
index 16dac2e24281..000000000000
--- a/acct-group/lighttpd/lighttpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=302
diff --git a/acct-group/lighttpd/lighttpd-0-r3.ebuild b/acct-group/lighttpd/lighttpd-0-r3.ebuild
new file mode 100644
index 000000000000..2e713731cdbf
--- /dev/null
+++ b/acct-group/lighttpd/lighttpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=302
diff --git a/acct-group/lighttpd/metadata.xml b/acct-group/lighttpd/metadata.xml
index 115e9d64a669..38bfb729261e 100644
--- a/acct-group/lighttpd/metadata.xml
+++ b/acct-group/lighttpd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/litecoin/litecoin-0.ebuild b/acct-group/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 05549b4b53e9..000000000000
--- a/acct-group/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/litecoind"
-
-ACCT_GROUP_ID="256"
diff --git a/acct-group/litecoin/metadata.xml b/acct-group/litecoin/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/litecoin/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-group/lldpd/lldpd-0-r1.ebuild b/acct-group/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 7482f9b79142..000000000000
--- a/acct-group/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=315
diff --git a/acct-group/lldpd/lldpd-0-r3.ebuild b/acct-group/lldpd/lldpd-0-r3.ebuild
new file mode 100644
index 000000000000..4431d6585f39
--- /dev/null
+++ b/acct-group/lldpd/lldpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=315
diff --git a/acct-group/locate/locate-0-r1.ebuild b/acct-group/locate/locate-0-r1.ebuild
deleted file mode 100644
index 59071dc6b158..000000000000
--- a/acct-group/locate/locate-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=245
diff --git a/acct-group/locate/locate-0-r3.ebuild b/acct-group/locate/locate-0-r3.ebuild
new file mode 100644
index 000000000000..791bc456ed84
--- /dev/null
+++ b/acct-group/locate/locate-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=245
diff --git a/acct-group/logcheck/logcheck-0-r2.ebuild b/acct-group/logcheck/logcheck-0-r2.ebuild
new file mode 100644
index 000000000000..93c098e69c52
--- /dev/null
+++ b/acct-group/logcheck/logcheck-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logcheck"
+
+ACCT_GROUP_ID="284"
diff --git a/acct-group/logcheck/logcheck-0.ebuild b/acct-group/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 13e5e4692590..000000000000
--- a/acct-group/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logcheck"
-
-ACCT_GROUP_ID="284"
diff --git a/acct-group/logcheck/metadata.xml b/acct-group/logcheck/metadata.xml
index 115e9d64a669..7530d08266f4 100644
--- a/acct-group/logcheck/metadata.xml
+++ b/acct-group/logcheck/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>foti.giuseppe@gmail.com</email>
+ <name>Giuseppe Foti</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-group/logstash/logstash-0-r1.ebuild b/acct-group/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 8253d88b5c0d..000000000000
--- a/acct-group/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Logstash program group"
-ACCT_GROUP_ID=270
diff --git a/acct-group/logstash/logstash-0-r3.ebuild b/acct-group/logstash/logstash-0-r3.ebuild
new file mode 100644
index 000000000000..a2cdfb0a44db
--- /dev/null
+++ b/acct-group/logstash/logstash-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Logstash program group"
+ACCT_GROUP_ID=270
diff --git a/acct-group/logsurfer/logsurfer-0-r2.ebuild b/acct-group/logsurfer/logsurfer-0-r2.ebuild
new file mode 100644
index 000000000000..5b5d9d3d6494
--- /dev/null
+++ b/acct-group/logsurfer/logsurfer-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logsurfer"
+
+ACCT_GROUP_ID="249"
diff --git a/acct-group/logsurfer/logsurfer-0.ebuild b/acct-group/logsurfer/logsurfer-0.ebuild
deleted file mode 100644
index eedfe2f2838e..000000000000
--- a/acct-group/logsurfer/logsurfer-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logsurfer"
-
-ACCT_GROUP_ID="249"
diff --git a/acct-group/lp/lp-0-r1.ebuild b/acct-group/lp/lp-0-r1.ebuild
deleted file mode 100644
index 9af7c058ba87..000000000000
--- a/acct-group/lp/lp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=7
diff --git a/acct-group/lp/lp-0-r3.ebuild b/acct-group/lp/lp-0-r3.ebuild
new file mode 100644
index 000000000000..1c71c87752be
--- /dev/null
+++ b/acct-group/lp/lp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=7
diff --git a/acct-group/lpadmin/lpadmin-0-r1.ebuild b/acct-group/lpadmin/lpadmin-0-r1.ebuild
deleted file mode 100644
index 3eede12f4ab7..000000000000
--- a/acct-group/lpadmin/lpadmin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=106
diff --git a/acct-group/lpadmin/lpadmin-0-r3.ebuild b/acct-group/lpadmin/lpadmin-0-r3.ebuild
new file mode 100644
index 000000000000..25e40d2f0da3
--- /dev/null
+++ b/acct-group/lpadmin/lpadmin-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=106
diff --git a/acct-group/lxc/lxc-0-r2.ebuild b/acct-group/lxc/lxc-0-r2.ebuild
new file mode 100644
index 000000000000..c2f7cd728e64
--- /dev/null
+++ b/acct-group/lxc/lxc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=358
+DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxc/lxc-0.ebuild b/acct-group/lxc/lxc-0.ebuild
deleted file mode 100644
index 5a4d8a9ffcdc..000000000000
--- a/acct-group/lxc/lxc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=358
-DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxd/lxd-0-r1.ebuild b/acct-group/lxd/lxd-0-r1.ebuild
deleted file mode 100644
index 4277214c445a..000000000000
--- a/acct-group/lxd/lxd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=402
-DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/lxd/lxd-0-r3.ebuild b/acct-group/lxd/lxd-0-r3.ebuild
new file mode 100644
index 000000000000..0a7b074ee124
--- /dev/null
+++ b/acct-group/lxd/lxd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=402
+DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/mail/mail-0-r1.ebuild b/acct-group/mail/mail-0-r1.ebuild
deleted file mode 100644
index 009cc32b854b..000000000000
--- a/acct-group/mail/mail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mail program group"
-ACCT_GROUP_ID=12
diff --git a/acct-group/mail/mail-0-r3.ebuild b/acct-group/mail/mail-0-r3.ebuild
new file mode 100644
index 000000000000..10aa566c31d3
--- /dev/null
+++ b/acct-group/mail/mail-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Mail program group"
+ACCT_GROUP_ID=12
diff --git a/acct-group/man/man-0-r1.ebuild b/acct-group/man/man-0-r1.ebuild
deleted file mode 100644
index 77c58e22ae04..000000000000
--- a/acct-group/man/man-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=15
diff --git a/acct-group/man/man-0-r3.ebuild b/acct-group/man/man-0-r3.ebuild
new file mode 100644
index 000000000000..a30608f304f4
--- /dev/null
+++ b/acct-group/man/man-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=15
diff --git a/acct-group/maradns/maradns-0-r1.ebuild b/acct-group/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index 95932e13cd11..000000000000
--- a/acct-group/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=99
diff --git a/acct-group/maradns/maradns-0-r3.ebuild b/acct-group/maradns/maradns-0-r3.ebuild
new file mode 100644
index 000000000000..15e43c2d718f
--- /dev/null
+++ b/acct-group/maradns/maradns-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=99
diff --git a/acct-group/maradns/metadata.xml b/acct-group/maradns/metadata.xml
index 8ac26ba5990d..115e9d64a669 100644
--- a/acct-group/maradns/metadata.xml
+++ b/acct-group/maradns/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slashbeast@gentoo.org</email>
- <name>Piotr Karbowski</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/memcached/memcached-0-r1.ebuild b/acct-group/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 02291b5e7a48..000000000000
--- a/acct-group/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=441
diff --git a/acct-group/memcached/memcached-0-r3.ebuild b/acct-group/memcached/memcached-0-r3.ebuild
new file mode 100644
index 000000000000..59df670d17c7
--- /dev/null
+++ b/acct-group/memcached/memcached-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=441
diff --git a/acct-group/memcached_exporter/memcached_exporter-0-r2.ebuild b/acct-group/memcached_exporter/memcached_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4307fbd4e949
--- /dev/null
+++ b/acct-group/memcached_exporter/memcached_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=234
diff --git a/acct-group/memcached_exporter/memcached_exporter-0.ebuild b/acct-group/memcached_exporter/memcached_exporter-0.ebuild
deleted file mode 100644
index 294122b7d637..000000000000
--- a/acct-group/memcached_exporter/memcached_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=234
diff --git a/acct-group/messagebus/messagebus-0-r1.ebuild b/acct-group/messagebus/messagebus-0-r1.ebuild
deleted file mode 100644
index 3e335b806835..000000000000
--- a/acct-group/messagebus/messagebus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=101
diff --git a/acct-group/messagebus/messagebus-0-r3.ebuild b/acct-group/messagebus/messagebus-0-r3.ebuild
new file mode 100644
index 000000000000..082e60cc4a96
--- /dev/null
+++ b/acct-group/messagebus/messagebus-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=101
diff --git a/acct-group/metadata.xml b/acct-group/metadata.xml
index c5fd7d27ec87..b1b906cdea3c 100644
--- a/acct-group/metadata.xml
+++ b/acct-group/metadata.xml
@@ -4,4 +4,7 @@
<longdescription lang="en">
The acct-group category contains packages for system groups.
</longdescription>
+ <longdescription lang="de">
+ Die Kategorie acct-group enthält Pakete für System-Gruppen.
+ </longdescription>
</catmetadata>
diff --git a/acct-group/mgraph/mgraph-0-r2.ebuild b/acct-group/mgraph/mgraph-0-r2.ebuild
new file mode 100644
index 000000000000..94a9ca8ec946
--- /dev/null
+++ b/acct-group/mgraph/mgraph-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/mailgraph"
+ACCT_GROUP_ID=376
diff --git a/acct-group/mgraph/mgraph-0.ebuild b/acct-group/mgraph/mgraph-0.ebuild
deleted file mode 100644
index 04e2463215b2..000000000000
--- a/acct-group/mgraph/mgraph-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/mailgraph"
-ACCT_GROUP_ID=376
diff --git a/acct-group/milter-regex/metadata.xml b/acct-group/milter-regex/metadata.xml
index c654517b25d5..115e9d64a669 100644
--- a/acct-group/milter-regex/metadata.xml
+++ b/acct-group/milter-regex/metadata.xml
@@ -1,12 +1,5 @@
<?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@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-group/milter-regex/milter-regex-0-r1.ebuild b/acct-group/milter-regex/milter-regex-0-r1.ebuild
deleted file mode 100644
index 0cf264ba6eb6..000000000000
--- a/acct-group/milter-regex/milter-regex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/milter-regex"
-ACCT_GROUP_ID=438
diff --git a/acct-group/milter-regex/milter-regex-0-r3.ebuild b/acct-group/milter-regex/milter-regex-0-r3.ebuild
new file mode 100644
index 000000000000..286213fbc310
--- /dev/null
+++ b/acct-group/milter-regex/milter-regex-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/milter-regex"
+ACCT_GROUP_ID=438
diff --git a/acct-group/minbif/metadata.xml b/acct-group/minbif/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/minbif/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-group/minbif/minbif-0.ebuild b/acct-group/minbif/minbif-0.ebuild
deleted file mode 100644
index f5157fcd399b..000000000000
--- a/acct-group/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/minbif"
-
-ACCT_GROUP_ID="260"
diff --git a/acct-group/minecraft/minecraft-0-r1.ebuild b/acct-group/minecraft/minecraft-0-r1.ebuild
deleted file mode 100644
index c09dd13e6cbc..000000000000
--- a/acct-group/minecraft/minecraft-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft server"
-
-ACCT_GROUP_ID="490"
diff --git a/acct-group/minecraft/minecraft-0-r3.ebuild b/acct-group/minecraft/minecraft-0-r3.ebuild
new file mode 100644
index 000000000000..0c2bfddc89de
--- /dev/null
+++ b/acct-group/minecraft/minecraft-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft server"
+
+ACCT_GROUP_ID="490"
diff --git a/acct-group/minetest/minetest-0-r1.ebuild b/acct-group/minetest/minetest-0-r1.ebuild
deleted file mode 100644
index 7a81fdf38907..000000000000
--- a/acct-group/minetest/minetest-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minetest server"
-
-ACCT_GROUP_ID="480"
diff --git a/acct-group/minetest/minetest-0-r3.ebuild b/acct-group/minetest/minetest-0-r3.ebuild
new file mode 100644
index 000000000000..4ae667496298
--- /dev/null
+++ b/acct-group/minetest/minetest-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minetest server"
+
+ACCT_GROUP_ID="480"
diff --git a/acct-group/minidlna/minidlna-0-r2.ebuild b/acct-group/minidlna/minidlna-0-r2.ebuild
new file mode 100644
index 000000000000..e8a9ebe67679
--- /dev/null
+++ b/acct-group/minidlna/minidlna-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=339
diff --git a/acct-group/minidlna/minidlna-0.ebuild b/acct-group/minidlna/minidlna-0.ebuild
deleted file mode 100644
index b6f116a6d174..000000000000
--- a/acct-group/minidlna/minidlna-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=339
diff --git a/acct-group/minio/metadata.xml b/acct-group/minio/metadata.xml
deleted file mode 100644
index 2c47fcf00594..000000000000
--- a/acct-group/minio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/minio/minio-0.ebuild b/acct-group/minio/minio-0.ebuild
deleted file mode 100644
index 692376c4968f..000000000000
--- a/acct-group/minio/minio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=309
diff --git a/acct-group/mogile/mogile-0-r2.ebuild b/acct-group/mogile/mogile-0-r2.ebuild
new file mode 100644
index 000000000000..b08046581733
--- /dev/null
+++ b/acct-group/mogile/mogile-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="MogileFS group"
+ACCT_GROUP_ID=231
diff --git a/acct-group/mogile/mogile-0.ebuild b/acct-group/mogile/mogile-0.ebuild
deleted file mode 100644
index 7774948b6b0c..000000000000
--- a/acct-group/mogile/mogile-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MogileFS group"
-ACCT_GROUP_ID=231
diff --git a/acct-group/mongodb/mongodb-0-r1.ebuild b/acct-group/mongodb/mongodb-0-r1.ebuild
deleted file mode 100644
index 72c2f3ebbfbd..000000000000
--- a/acct-group/mongodb/mongodb-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MongoDB program group"
-ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb/mongodb-0-r3.ebuild b/acct-group/mongodb/mongodb-0-r3.ebuild
new file mode 100644
index 000000000000..a98136928c49
--- /dev/null
+++ b/acct-group/mongodb/mongodb-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="MongoDB program group"
+ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0-r2.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7f2d700f9c30
--- /dev/null
+++ b/acct-group/mongodb_exporter/mongodb_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=277
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
deleted file mode 100644
index 946813661ba4..000000000000
--- a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=277
diff --git a/acct-group/monitorix/monitorix-0-r1.ebuild b/acct-group/monitorix/monitorix-0-r1.ebuild
deleted file mode 100644
index f3a179de66cd..000000000000
--- a/acct-group/monitorix/monitorix-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Monitorix system tool group"
-ACCT_GROUP_ID=401
diff --git a/acct-group/monitorix/monitorix-0-r3.ebuild b/acct-group/monitorix/monitorix-0-r3.ebuild
new file mode 100644
index 000000000000..cce945850f0c
--- /dev/null
+++ b/acct-group/monitorix/monitorix-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Monitorix system tool group"
+ACCT_GROUP_ID=401
diff --git a/acct-group/monkeyd/metadata.xml b/acct-group/monkeyd/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/monkeyd/metadata.xml
+++ b/acct-group/monkeyd/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/monkeyd/monkeyd-0-r2.ebuild b/acct-group/monkeyd/monkeyd-0-r2.ebuild
new file mode 100644
index 000000000000..6a354f9e11e3
--- /dev/null
+++ b/acct-group/monkeyd/monkeyd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/monkeyd"
+
+ACCT_GROUP_ID="149"
diff --git a/acct-group/monkeyd/monkeyd-0.ebuild b/acct-group/monkeyd/monkeyd-0.ebuild
deleted file mode 100644
index 6869bd2a7451..000000000000
--- a/acct-group/monkeyd/monkeyd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/monkeyd"
-
-ACCT_GROUP_ID="149"
diff --git a/acct-group/monkeysphere/monkeysphere-0-r1.ebuild b/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
deleted file mode 100644
index dbbab8a361de..000000000000
--- a/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="monkeysphere program group"
-
-ACCT_GROUP_ID=390
diff --git a/acct-group/monkeysphere/monkeysphere-0-r3.ebuild b/acct-group/monkeysphere/monkeysphere-0-r3.ebuild
new file mode 100644
index 000000000000..fc6a3bda190a
--- /dev/null
+++ b/acct-group/monkeysphere/monkeysphere-0-r3.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-group
+
+DESCRIPTION="monkeysphere program group"
+
+ACCT_GROUP_ID=390
diff --git a/acct-group/mosquitto/mosquitto-0-r1.ebuild b/acct-group/mosquitto/mosquitto-0-r1.ebuild
deleted file mode 100644
index 7c23d70d81c7..000000000000
--- a/acct-group/mosquitto/mosquitto-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the mosquitto MQTT broker"
-ACCT_GROUP_ID=482
diff --git a/acct-group/mosquitto/mosquitto-0-r3.ebuild b/acct-group/mosquitto/mosquitto-0-r3.ebuild
new file mode 100644
index 000000000000..ed4039baf4c3
--- /dev/null
+++ b/acct-group/mosquitto/mosquitto-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the mosquitto MQTT broker"
+ACCT_GROUP_ID=482
diff --git a/acct-group/motion/motion-0-r1.ebuild b/acct-group/motion/motion-0-r1.ebuild
deleted file mode 100644
index 596311157273..000000000000
--- a/acct-group/motion/motion-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=395
diff --git a/acct-group/motion/motion-0-r3.ebuild b/acct-group/motion/motion-0-r3.ebuild
new file mode 100644
index 000000000000..eae62b8e7e5c
--- /dev/null
+++ b/acct-group/motion/motion-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=395
diff --git a/acct-group/msmtpd/msmtpd-0-r1.ebuild b/acct-group/msmtpd/msmtpd-0-r1.ebuild
deleted file mode 100644
index 42d6078fc96f..000000000000
--- a/acct-group/msmtpd/msmtpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=222
diff --git a/acct-group/msmtpd/msmtpd-0-r3.ebuild b/acct-group/msmtpd/msmtpd-0-r3.ebuild
new file mode 100644
index 000000000000..eae3b7d5858c
--- /dev/null
+++ b/acct-group/msmtpd/msmtpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=222
diff --git a/acct-group/munge/munge-0-r2.ebuild b/acct-group/munge/munge-0-r2.ebuild
new file mode 100644
index 000000000000..cb5cff2ebbc4
--- /dev/null
+++ b/acct-group/munge/munge-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/munge"
+
+ACCT_GROUP_ID="144"
diff --git a/acct-group/munge/munge-0.ebuild b/acct-group/munge/munge-0.ebuild
deleted file mode 100644
index d51744087c22..000000000000
--- a/acct-group/munge/munge-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-auth/munge"
-
-ACCT_GROUP_ID="144"
diff --git a/acct-group/munin/munin-0-r1.ebuild b/acct-group/munin/munin-0-r1.ebuild
deleted file mode 100644
index 0a7dafb4a9d9..000000000000
--- a/acct-group/munin/munin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=177
diff --git a/acct-group/munin/munin-0-r3.ebuild b/acct-group/munin/munin-0-r3.ebuild
new file mode 100644
index 000000000000..22f2d7a9e412
--- /dev/null
+++ b/acct-group/munin/munin-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=177
diff --git a/acct-group/murmur/murmur-0-r1.ebuild b/acct-group/murmur/murmur-0-r1.ebuild
deleted file mode 100644
index 301727364fea..000000000000
--- a/acct-group/murmur/murmur-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=122
diff --git a/acct-group/murmur/murmur-0-r3.ebuild b/acct-group/murmur/murmur-0-r3.ebuild
new file mode 100644
index 000000000000..4e827ecab78c
--- /dev/null
+++ b/acct-group/murmur/murmur-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=122
diff --git a/acct-group/mysql/mysql-0-r1.ebuild b/acct-group/mysql/mysql-0-r1.ebuild
deleted file mode 100644
index 872b4a6bb7d8..000000000000
--- a/acct-group/mysql/mysql-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MySQL program group"
-ACCT_GROUP_ID=60
-SLOT="0"
diff --git a/acct-group/mysql/mysql-0-r3.ebuild b/acct-group/mysql/mysql-0-r3.ebuild
new file mode 100644
index 000000000000..906ae9a827f9
--- /dev/null
+++ b/acct-group/mysql/mysql-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="MySQL program group"
+ACCT_GROUP_ID=60
+SLOT="0"
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
deleted file mode 100644
index 4b0688ae2798..000000000000
--- a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=308
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r3.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..acb8f27034db
--- /dev/null
+++ b/acct-group/mysqld_exporter/mysqld_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=308
diff --git a/acct-group/mythtv/mythtv-0-r1.ebuild b/acct-group/mythtv/mythtv-0-r1.ebuild
deleted file mode 100644
index ef82259b7b02..000000000000
--- a/acct-group/mythtv/mythtv-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mythtv mythbackend server/deamon group"
-
-ACCT_GROUP_ID=117
diff --git a/acct-group/mythtv/mythtv-0-r3.ebuild b/acct-group/mythtv/mythtv-0-r3.ebuild
new file mode 100644
index 000000000000..557810aaa058
--- /dev/null
+++ b/acct-group/mythtv/mythtv-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Mythtv mythbackend server/deamon group"
+
+ACCT_GROUP_ID=117
diff --git a/acct-group/nagios/nagios-0-r1.ebuild b/acct-group/nagios/nagios-0-r1.ebuild
deleted file mode 100644
index 4d2ee9d295ea..000000000000
--- a/acct-group/nagios/nagios-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=436
diff --git a/acct-group/nagios/nagios-0-r3.ebuild b/acct-group/nagios/nagios-0-r3.ebuild
new file mode 100644
index 000000000000..4b2b6c8cc3a8
--- /dev/null
+++ b/acct-group/nagios/nagios-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=436
diff --git a/acct-group/named/metadata.xml b/acct-group/named/metadata.xml
index 71c314fa6ea3..bd6443d4a375 100644
--- a/acct-group/named/metadata.xml
+++ b/acct-group/named/metadata.xml
@@ -2,10 +2,6 @@
<!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>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
diff --git a/acct-group/named/named-0-r1.ebuild b/acct-group/named/named-0-r1.ebuild
deleted file mode 100644
index fb6bcdd96000..000000000000
--- a/acct-group/named/named-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=40
diff --git a/acct-group/named/named-0-r3.ebuild b/acct-group/named/named-0-r3.ebuild
new file mode 100644
index 000000000000..c0f364f83622
--- /dev/null
+++ b/acct-group/named/named-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=40
diff --git a/acct-group/netbox/metadata.xml b/acct-group/netbox/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/netbox/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-group/netbox/netbox-0-r1.ebuild b/acct-group/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 84d5f36743b9..000000000000
--- a/acct-group/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=431
diff --git a/acct-group/netdata/netdata-0-r1.ebuild b/acct-group/netdata/netdata-0-r1.ebuild
deleted file mode 100644
index 7cb3b1013662..000000000000
--- a/acct-group/netdata/netdata-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=290
diff --git a/acct-group/netdata/netdata-0-r3.ebuild b/acct-group/netdata/netdata-0-r3.ebuild
new file mode 100644
index 000000000000..55b8cfbd40b6
--- /dev/null
+++ b/acct-group/netdata/netdata-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=290
diff --git a/acct-group/netdev/metadata.xml b/acct-group/netdev/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/netdev/metadata.xml
+++ b/acct-group/netdev/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/netdev/netdev-0-r1.ebuild b/acct-group/netdev/netdev-0-r1.ebuild
deleted file mode 100644
index 9dbe3bcb29fb..000000000000
--- a/acct-group/netdev/netdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for netdev (avahi)"
-ACCT_GROUP_ID=64
diff --git a/acct-group/netdev/netdev-0-r3.ebuild b/acct-group/netdev/netdev-0-r3.ebuild
new file mode 100644
index 000000000000..4807a4d9f64c
--- /dev/null
+++ b/acct-group/netdev/netdev-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for netdev (avahi)"
+ACCT_GROUP_ID=64
diff --git a/acct-group/netperf/netperf-0-r2.ebuild b/acct-group/netperf/netperf-0-r2.ebuild
new file mode 100644
index 000000000000..6a82538c18dc
--- /dev/null
+++ b/acct-group/netperf/netperf-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/netperf"
+
+ACCT_GROUP_ID="168"
diff --git a/acct-group/netperf/netperf-0.ebuild b/acct-group/netperf/netperf-0.ebuild
deleted file mode 100644
index f4a3499b161f..000000000000
--- a/acct-group/netperf/netperf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/netperf"
-
-ACCT_GROUP_ID="168"
diff --git a/acct-group/neutron/metadata.xml b/acct-group/neutron/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/neutron/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/neutron/neutron-0-r1.ebuild b/acct-group/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 90ea9e731a2d..000000000000
--- a/acct-group/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=446
diff --git a/acct-group/nginx-unit/metadata.xml b/acct-group/nginx-unit/metadata.xml
new file mode 100644
index 000000000000..694b1295412e
--- /dev/null
+++ b/acct-group/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-group/nginx-unit/nginx-unit-0-r1.ebuild b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
new file mode 100644
index 000000000000..004f55765547
--- /dev/null
+++ b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx-unit"
+
+ACCT_GROUP_ID="527"
diff --git a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
deleted file mode 100644
index 07125df90248..000000000000
--- a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=354
diff --git a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
new file mode 100644
index 000000000000..b4b89009ca9c
--- /dev/null
+++ b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=354
diff --git a/acct-group/nginx/nginx-0-r1.ebuild b/acct-group/nginx/nginx-0-r1.ebuild
deleted file mode 100644
index b326e769a163..000000000000
--- a/acct-group/nginx/nginx-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/nginx"
-
-ACCT_GROUP_ID="82"
diff --git a/acct-group/nginx/nginx-0-r2.ebuild b/acct-group/nginx/nginx-0-r2.ebuild
new file mode 100644
index 000000000000..bca1e3ecda27
--- /dev/null
+++ b/acct-group/nginx/nginx-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx"
+
+ACCT_GROUP_ID="82"
diff --git a/acct-group/ngircd/ngircd-0-r1.ebuild b/acct-group/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 54e757d68d33..000000000000
--- a/acct-group/ngircd/ngircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for ngircd (IRC daemon)"
-ACCT_GROUP_ID=413
diff --git a/acct-group/ngircd/ngircd-0-r2.ebuild b/acct-group/ngircd/ngircd-0-r2.ebuild
new file mode 100644
index 000000000000..ea2849f0ea6d
--- /dev/null
+++ b/acct-group/ngircd/ngircd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for ngircd (IRC daemon)"
+ACCT_GROUP_ID=413
diff --git a/acct-group/ngrep/ngrep-0-r1.ebuild b/acct-group/ngrep/ngrep-0-r1.ebuild
deleted file mode 100644
index c01e5f34d05e..000000000000
--- a/acct-group/ngrep/ngrep-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/ngrep"
-
-ACCT_GROUP_ID="185"
diff --git a/acct-group/ngrep/ngrep-0-r3.ebuild b/acct-group/ngrep/ngrep-0-r3.ebuild
new file mode 100644
index 000000000000..8c92555008f4
--- /dev/null
+++ b/acct-group/ngrep/ngrep-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/ngrep"
+
+ACCT_GROUP_ID="185"
diff --git a/acct-group/nm-openconnect/nm-openconnect-0-r2.ebuild b/acct-group/nm-openconnect/nm-openconnect-0-r2.ebuild
new file mode 100644
index 000000000000..902e6c623eb9
--- /dev/null
+++ b/acct-group/nm-openconnect/nm-openconnect-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
+
+ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openconnect/nm-openconnect-0.ebuild b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
deleted file mode 100644
index cf11b4322042..000000000000
--- a/acct-group/nm-openconnect/nm-openconnect-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
-
-ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openvpn/nm-openvpn-0-r2.ebuild b/acct-group/nm-openvpn/nm-openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..32f04ed316d9
--- /dev/null
+++ b/acct-group/nm-openvpn/nm-openvpn-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
+
+ACCT_GROUP_ID="143"
diff --git a/acct-group/nm-openvpn/nm-openvpn-0.ebuild b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
deleted file mode 100644
index 2c34fcd00534..000000000000
--- a/acct-group/nm-openvpn/nm-openvpn-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
-
-ACCT_GROUP_ID="143"
diff --git a/acct-group/nobody/nobody-0-r2.ebuild b/acct-group/nobody/nobody-0-r2.ebuild
new file mode 100644
index 000000000000..faac9ac0b18e
--- /dev/null
+++ b/acct-group/nobody/nobody-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=65534
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/nobody/nobody-0.ebuild b/acct-group/nobody/nobody-0.ebuild
deleted file mode 100644
index 29b11e8db9d2..000000000000
--- a/acct-group/nobody/nobody-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=65534
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/node_exporter/node_exporter-0-r1.ebuild b/acct-group/node_exporter/node_exporter-0-r1.ebuild
deleted file mode 100644
index 7faae92e4669..000000000000
--- a/acct-group/node_exporter/node_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=459
diff --git a/acct-group/node_exporter/node_exporter-0-r3.ebuild b/acct-group/node_exporter/node_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..53f27856de90
--- /dev/null
+++ b/acct-group/node_exporter/node_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=459
diff --git a/acct-group/nofiles/nofiles-0-r1.ebuild b/acct-group/nofiles/nofiles-0-r1.ebuild
deleted file mode 100644
index 7f42c5050e80..000000000000
--- a/acct-group/nofiles/nofiles-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=200
diff --git a/acct-group/nofiles/nofiles-0-r3.ebuild b/acct-group/nofiles/nofiles-0-r3.ebuild
new file mode 100644
index 000000000000..08a5d0246053
--- /dev/null
+++ b/acct-group/nofiles/nofiles-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=200
diff --git a/acct-group/notary/notary-0-r2.ebuild b/acct-group/notary/notary-0-r2.ebuild
new file mode 100644
index 000000000000..5018baa8ab27
--- /dev/null
+++ b/acct-group/notary/notary-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-misc/notary"
+
+ACCT_GROUP_ID="280"
diff --git a/acct-group/notary/notary-0.ebuild b/acct-group/notary/notary-0.ebuild
deleted file mode 100644
index fb865b1555cc..000000000000
--- a/acct-group/notary/notary-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-misc/notary"
-
-ACCT_GROUP_ID="280"
diff --git a/acct-group/nova/metadata.xml b/acct-group/nova/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/nova/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/nova/nova-0-r1.ebuild b/acct-group/nova/nova-0-r1.ebuild
deleted file mode 100644
index 076e02d12e40..000000000000
--- a/acct-group/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=447
diff --git a/acct-group/nsd/metadata.xml b/acct-group/nsd/metadata.xml
index 115e9d64a669..7d193f313526 100644
--- a/acct-group/nsd/metadata.xml
+++ b/acct-group/nsd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>kumba@gentoo.org</email>
+ <name>Joshua Kinard</name>
+ </maintainer>
</pkgmetadata>
diff --git a/acct-group/nsd/nsd-0-r1.ebuild b/acct-group/nsd/nsd-0-r1.ebuild
deleted file mode 100644
index 3fd399f2dcf7..000000000000
--- a/acct-group/nsd/nsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=223
diff --git a/acct-group/nsd/nsd-0-r3.ebuild b/acct-group/nsd/nsd-0-r3.ebuild
new file mode 100644
index 000000000000..871b935a1775
--- /dev/null
+++ b/acct-group/nsd/nsd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=223
diff --git a/acct-group/nslcd/nslcd-0-r1.ebuild b/acct-group/nslcd/nslcd-0-r1.ebuild
deleted file mode 100644
index 6e4738a45005..000000000000
--- a/acct-group/nslcd/nslcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=357
diff --git a/acct-group/nslcd/nslcd-0-r3.ebuild b/acct-group/nslcd/nslcd-0-r3.ebuild
new file mode 100644
index 000000000000..aaaca3e8204d
--- /dev/null
+++ b/acct-group/nslcd/nslcd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=357
diff --git a/acct-group/ntopng/ntopng-0-r2.ebuild b/acct-group/ntopng/ntopng-0-r2.ebuild
new file mode 100644
index 000000000000..a6e114615bcb
--- /dev/null
+++ b/acct-group/ntopng/ntopng-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=296
diff --git a/acct-group/ntopng/ntopng-0.ebuild b/acct-group/ntopng/ntopng-0.ebuild
deleted file mode 100644
index e64f641de3d7..000000000000
--- a/acct-group/ntopng/ntopng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=296
diff --git a/acct-group/ntp/ntp-0-r1.ebuild b/acct-group/ntp/ntp-0-r1.ebuild
deleted file mode 100644
index d8f17217cd8d..000000000000
--- a/acct-group/ntp/ntp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=123
diff --git a/acct-group/ntp/ntp-0-r3.ebuild b/acct-group/ntp/ntp-0-r3.ebuild
new file mode 100644
index 000000000000..48e56ec9111f
--- /dev/null
+++ b/acct-group/ntp/ntp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=123
diff --git a/acct-group/nullmail/nullmail-0-r2.ebuild b/acct-group/nullmail/nullmail-0-r2.ebuild
new file mode 100644
index 000000000000..140048d5d67d
--- /dev/null
+++ b/acct-group/nullmail/nullmail-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the nullmailer"
+
+ACCT_GROUP_ID="88"
diff --git a/acct-group/nullmail/nullmail-0.ebuild b/acct-group/nullmail/nullmail-0.ebuild
deleted file mode 100644
index 24f773d248c5..000000000000
--- a/acct-group/nullmail/nullmail-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the nullmailer"
-
-ACCT_GROUP_ID="88"
diff --git a/acct-group/nut/nut-0-r2.ebuild b/acct-group/nut/nut-0-r2.ebuild
new file mode 100644
index 000000000000..e29f6b91ca9a
--- /dev/null
+++ b/acct-group/nut/nut-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Network-UPS Tools"
+
+ACCT_GROUP_ID="84"
diff --git a/acct-group/nut/nut-0.ebuild b/acct-group/nut/nut-0.ebuild
deleted file mode 100644
index e54ff2647200..000000000000
--- a/acct-group/nut/nut-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Network-UPS Tools"
-
-ACCT_GROUP_ID="84"
diff --git a/acct-group/nzbget/nzbget-0-r2.ebuild b/acct-group/nzbget/nzbget-0-r2.ebuild
new file mode 100644
index 000000000000..7d0b786580d8
--- /dev/null
+++ b/acct-group/nzbget/nzbget-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nntp/nzbget"
+ACCT_GROUP_ID=398
diff --git a/acct-group/nzbget/nzbget-0.ebuild b/acct-group/nzbget/nzbget-0.ebuild
deleted file mode 100644
index c0dae092d2b2..000000000000
--- a/acct-group/nzbget/nzbget-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nntp/nzbget"
-ACCT_GROUP_ID=398
diff --git a/acct-group/oidentd/oidentd-0-r1.ebuild b/acct-group/oidentd/oidentd-0-r1.ebuild
deleted file mode 100644
index dadd950f9544..000000000000
--- a/acct-group/oidentd/oidentd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=493
diff --git a/acct-group/oidentd/oidentd-0-r3.ebuild b/acct-group/oidentd/oidentd-0-r3.ebuild
new file mode 100644
index 000000000000..17779fa5c4fe
--- /dev/null
+++ b/acct-group/oidentd/oidentd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=493
diff --git a/acct-group/openct/metadata.xml b/acct-group/openct/metadata.xml
index 2c47fcf00594..115e9d64a669 100644
--- a/acct-group/openct/metadata.xml
+++ b/acct-group/openct/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/openct/openct-0-r1.ebuild b/acct-group/openct/openct-0-r1.ebuild
deleted file mode 100644
index 256a6212aaef..000000000000
--- a/acct-group/openct/openct-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=46
diff --git a/acct-group/openct/openct-0-r3.ebuild b/acct-group/openct/openct-0-r3.ebuild
new file mode 100644
index 000000000000..17c82955be9e
--- /dev/null
+++ b/acct-group/openct/openct-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=46
diff --git a/acct-group/opendkim/metadata.xml b/acct-group/opendkim/metadata.xml
index 1ab88f92ef4a..c85e8ec7c3b4 100644
--- a/acct-group/opendkim/metadata.xml
+++ b/acct-group/opendkim/metadata.xml
@@ -1,10 +1,6 @@
<?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@seichter.de</email>
- <name>Ralph Seichter</name>
- </maintainer>
<maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
diff --git a/acct-group/opendkim/opendkim-0-r1.ebuild b/acct-group/opendkim/opendkim-0-r1.ebuild
deleted file mode 100644
index 984414e1f114..000000000000
--- a/acct-group/opendkim/opendkim-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for OpenDKIM"
-ACCT_GROUP_ID=334
diff --git a/acct-group/opendkim/opendkim-0-r3.ebuild b/acct-group/opendkim/opendkim-0-r3.ebuild
new file mode 100644
index 000000000000..3e963e6ae49a
--- /dev/null
+++ b/acct-group/opendkim/opendkim-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for OpenDKIM"
+ACCT_GROUP_ID=334
diff --git a/acct-group/opendmarc/opendmarc-1-r1.ebuild b/acct-group/opendmarc/opendmarc-1-r1.ebuild
new file mode 100644
index 000000000000..fd6d9faa1c13
--- /dev/null
+++ b/acct-group/opendmarc/opendmarc-1-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/opendmarc"
+ACCT_GROUP_ID=244
diff --git a/acct-group/opendmarc/opendmarc-1.ebuild b/acct-group/opendmarc/opendmarc-1.ebuild
deleted file mode 100644
index 87306502f6d3..000000000000
--- a/acct-group/opendmarc/opendmarc-1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/opendmarc"
-ACCT_GROUP_ID=244
diff --git a/acct-group/opendnssec/opendnssec-0-r2.ebuild b/acct-group/opendnssec/opendnssec-0-r2.ebuild
new file mode 100644
index 000000000000..d69ac5763c91
--- /dev/null
+++ b/acct-group/opendnssec/opendnssec-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/opendnssec"
+
+ACCT_GROUP_ID="151"
diff --git a/acct-group/opendnssec/opendnssec-0.ebuild b/acct-group/opendnssec/opendnssec-0.ebuild
deleted file mode 100644
index b1ab40784094..000000000000
--- a/acct-group/opendnssec/opendnssec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/opendnssec"
-
-ACCT_GROUP_ID="151"
diff --git a/acct-group/openhab/metadata.xml b/acct-group/openhab/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-group/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-group/openhab/openhab-0.ebuild b/acct-group/openhab/openhab-0.ebuild
new file mode 100644
index 000000000000..472c92df8b38
--- /dev/null
+++ b/acct-group/openhab/openhab-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=537
diff --git a/acct-group/openntpd/openntpd-0-r1.ebuild b/acct-group/openntpd/openntpd-0-r1.ebuild
deleted file mode 100644
index 26450b27e0f8..000000000000
--- a/acct-group/openntpd/openntpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=321
diff --git a/acct-group/openntpd/openntpd-0-r3.ebuild b/acct-group/openntpd/openntpd-0-r3.ebuild
new file mode 100644
index 000000000000..332a61fa9496
--- /dev/null
+++ b/acct-group/openntpd/openntpd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=321
diff --git a/acct-group/openrct2/openrct2-0-r1.ebuild b/acct-group/openrct2/openrct2-0-r1.ebuild
deleted file mode 100644
index 234d39ba1ebd..000000000000
--- a/acct-group/openrct2/openrct2-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the OpenRCT2 dedicated server"
-
-ACCT_GROUP_ID="479"
diff --git a/acct-group/openrct2/openrct2-0-r3.ebuild b/acct-group/openrct2/openrct2-0-r3.ebuild
new file mode 100644
index 000000000000..2e282663a02f
--- /dev/null
+++ b/acct-group/openrct2/openrct2-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the OpenRCT2 dedicated server"
+
+ACCT_GROUP_ID="479"
diff --git a/acct-group/openttd/openttd-0-r1.ebuild b/acct-group/openttd/openttd-0-r1.ebuild
new file mode 100644
index 000000000000..0bcd30d046a1
--- /dev/null
+++ b/acct-group/openttd/openttd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for games-simulation/openttd"
+
+ACCT_GROUP_ID="513"
diff --git a/acct-group/openttd/openttd-0.ebuild b/acct-group/openttd/openttd-0.ebuild
deleted file mode 100644
index 1d9a13b5160b..000000000000
--- a/acct-group/openttd/openttd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for games-simulation/openttd"
-
-ACCT_GROUP_ID="513"
diff --git a/acct-group/openvpn/openvpn-0-r1.ebuild b/acct-group/openvpn/openvpn-0-r1.ebuild
deleted file mode 100644
index 0abedcd63903..000000000000
--- a/acct-group/openvpn/openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn/openvpn-0-r3.ebuild b/acct-group/openvpn/openvpn-0-r3.ebuild
new file mode 100644
index 000000000000..0e692961c792
--- /dev/null
+++ b/acct-group/openvpn/openvpn-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
deleted file mode 100644
index f950a40c2758..000000000000
--- a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=355
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r3.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..122b2acf6f07
--- /dev/null
+++ b/acct-group/openvpn_exporter/openvpn_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=355
diff --git a/acct-group/opm/opm-0-r1.ebuild b/acct-group/opm/opm-0-r1.ebuild
new file mode 100644
index 000000000000..ef89d5cd2cc5
--- /dev/null
+++ b/acct-group/opm/opm-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for an open proxy monitor"
+ACCT_GROUP_ID=127
diff --git a/acct-group/opm/opm-0.ebuild b/acct-group/opm/opm-0.ebuild
deleted file mode 100644
index 155f6374c269..000000000000
--- a/acct-group/opm/opm-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for an open proxy monitor"
-ACCT_GROUP_ID=127
diff --git a/acct-group/oprofile/metadata.xml b/acct-group/oprofile/metadata.xml
index 4c44ad858639..bef24d2c2337 100644
--- a/acct-group/oprofile/metadata.xml
+++ b/acct-group/oprofile/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/oprofile/oprofile-0-r1.ebuild b/acct-group/oprofile/oprofile-0-r1.ebuild
deleted file mode 100644
index 2b203421271c..000000000000
--- a/acct-group/oprofile/oprofile-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-util/oprofile JIT code processing"
-ACCT_GROUP_ID=492
diff --git a/acct-group/oprofile/oprofile-0-r3.ebuild b/acct-group/oprofile/oprofile-0-r3.ebuild
new file mode 100644
index 000000000000..b968e6eb2efb
--- /dev/null
+++ b/acct-group/oprofile/oprofile-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/oprofile JIT code processing"
+ACCT_GROUP_ID=492
diff --git a/acct-group/oragono/oragono-0-r1.ebuild b/acct-group/oragono/oragono-0-r1.ebuild
new file mode 100644
index 000000000000..9595ed9beec8
--- /dev/null
+++ b/acct-group/oragono/oragono-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the Oragono IRC server"
+ACCT_GROUP_ID=324
diff --git a/acct-group/oragono/oragono-0.ebuild b/acct-group/oragono/oragono-0.ebuild
deleted file mode 100644
index 2566e7772276..000000000000
--- a/acct-group/oragono/oragono-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the Oragono IRC server"
-ACCT_GROUP_ID=324
diff --git a/acct-group/ossec/metadata.xml b/acct-group/ossec/metadata.xml
index c654517b25d5..115e9d64a669 100644
--- a/acct-group/ossec/metadata.xml
+++ b/acct-group/ossec/metadata.xml
@@ -1,12 +1,5 @@
<?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@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-group/ossec/ossec-0-r1.ebuild b/acct-group/ossec/ossec-0-r1.ebuild
deleted file mode 100644
index 591266c60294..000000000000
--- a/acct-group/ossec/ossec-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=330
-DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/ossec/ossec-0-r3.ebuild b/acct-group/ossec/ossec-0-r3.ebuild
new file mode 100644
index 000000000000..9b1dd90ec3c0
--- /dev/null
+++ b/acct-group/ossec/ossec-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=330
+DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/owntracks/owntracks-0-r1.ebuild b/acct-group/owntracks/owntracks-0-r1.ebuild
new file mode 100644
index 000000000000..fe5d67599e48
--- /dev/null
+++ b/acct-group/owntracks/owntracks-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
+ACCT_GROUP_ID=524
diff --git a/acct-group/owntracks/owntracks-0.ebuild b/acct-group/owntracks/owntracks-0.ebuild
deleted file mode 100644
index 10c2ac74184e..000000000000
--- a/acct-group/owntracks/owntracks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
-ACCT_GROUP_ID=524
diff --git a/acct-group/p2p/p2p-0-r2.ebuild b/acct-group/p2p/p2p-0-r2.ebuild
new file mode 100644
index 000000000000..e728557556a5
--- /dev/null
+++ b/acct-group/p2p/p2p-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mldonkey"
+ACCT_GROUP_ID=378
diff --git a/acct-group/p2p/p2p-0.ebuild b/acct-group/p2p/p2p-0.ebuild
deleted file mode 100644
index 682fd4cc07bc..000000000000
--- a/acct-group/p2p/p2p-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mldonkey"
-ACCT_GROUP_ID=378
diff --git a/acct-group/partimag/partimag-0-r1.ebuild b/acct-group/partimag/partimag-0-r1.ebuild
deleted file mode 100644
index d1c1482d6ab5..000000000000
--- a/acct-group/partimag/partimag-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-block/partimage"
-
-ACCT_GROUP_ID="91"
diff --git a/acct-group/partimag/partimag-0-r2.ebuild b/acct-group/partimag/partimag-0-r2.ebuild
new file mode 100644
index 000000000000..1b3b59f53e25
--- /dev/null
+++ b/acct-group/partimag/partimag-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-block/partimage"
+
+ACCT_GROUP_ID="91"
diff --git a/acct-group/pcap/metadata.xml b/acct-group/pcap/metadata.xml
index b75adbf441ef..641cbd3703e7 100644
--- a/acct-group/pcap/metadata.xml
+++ b/acct-group/pcap/metadata.xml
@@ -2,10 +2,6 @@
<!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>sam@gentoo.org</email>
<name>Sam James</name>
</maintainer>
diff --git a/acct-group/pcap/pcap-0-r1.ebuild b/acct-group/pcap/pcap-0-r1.ebuild
new file mode 100644
index 000000000000..7bb74847aafc
--- /dev/null
+++ b/acct-group/pcap/pcap-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for capturing network traffic"
+ACCT_GROUP_ID=377
diff --git a/acct-group/pcap/pcap-0.ebuild b/acct-group/pcap/pcap-0.ebuild
deleted file mode 100644
index 7c6ece39614e..000000000000
--- a/acct-group/pcap/pcap-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for capturing network traffic"
-ACCT_GROUP_ID=377
diff --git a/acct-group/pcscd/metadata.xml b/acct-group/pcscd/metadata.xml
index 2c47fcf00594..115e9d64a669 100644
--- a/acct-group/pcscd/metadata.xml
+++ b/acct-group/pcscd/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/pcscd/pcscd-0-r1.ebuild b/acct-group/pcscd/pcscd-0-r1.ebuild
deleted file mode 100644
index b2d98afd01e9..000000000000
--- a/acct-group/pcscd/pcscd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=47
diff --git a/acct-group/pcscd/pcscd-0-r3.ebuild b/acct-group/pcscd/pcscd-0-r3.ebuild
new file mode 100644
index 000000000000..a1c6a5d0d49c
--- /dev/null
+++ b/acct-group/pcscd/pcscd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=47
diff --git a/acct-group/pdns/pdns-0-r1.ebuild b/acct-group/pdns/pdns-0-r1.ebuild
deleted file mode 100644
index 4f9392b371a0..000000000000
--- a/acct-group/pdns/pdns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=423
diff --git a/acct-group/pdns/pdns-0-r3.ebuild b/acct-group/pdns/pdns-0-r3.ebuild
new file mode 100644
index 000000000000..59700d1e0f99
--- /dev/null
+++ b/acct-group/pdns/pdns-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=423
diff --git a/acct-group/pdnsd/pdnsd-0-r1.ebuild b/acct-group/pdnsd/pdnsd-0-r1.ebuild
deleted file mode 100644
index 6c6a29d76f0d..000000000000
--- a/acct-group/pdnsd/pdnsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=184
diff --git a/acct-group/pdnsd/pdnsd-0-r3.ebuild b/acct-group/pdnsd/pdnsd-0-r3.ebuild
new file mode 100644
index 000000000000..9feda48fa4ce
--- /dev/null
+++ b/acct-group/pdnsd/pdnsd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=184
diff --git a/acct-group/pgagent/pgagent-0-r2.ebuild b/acct-group/pgagent/pgagent-0-r2.ebuild
new file mode 100644
index 000000000000..204a47362fee
--- /dev/null
+++ b/acct-group/pgagent/pgagent-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/pgagent"
+
+ACCT_GROUP_ID="135"
diff --git a/acct-group/pgagent/pgagent-0.ebuild b/acct-group/pgagent/pgagent-0.ebuild
deleted file mode 100644
index a5716bd1cb4d..000000000000
--- a/acct-group/pgagent/pgagent-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/pgagent"
-
-ACCT_GROUP_ID="135"
diff --git a/acct-group/pipewire/metadata.xml b/acct-group/pipewire/metadata.xml
index b32edab9c8df..4c3f19b6393d 100644
--- a/acct-group/pipewire/metadata.xml
+++ b/acct-group/pipewire/metadata.xml
@@ -1,12 +1,12 @@
<?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>
<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-group/pipewire/pipewire-0-r2.ebuild b/acct-group/pipewire/pipewire-0-r2.ebuild
new file mode 100644
index 000000000000..5d2a1f3c26fe
--- /dev/null
+++ b/acct-group/pipewire/pipewire-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=509
diff --git a/acct-group/pipewire/pipewire-0.ebuild b/acct-group/pipewire/pipewire-0.ebuild
deleted file mode 100644
index c21081d66ed0..000000000000
--- a/acct-group/pipewire/pipewire-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=509
diff --git a/acct-group/pkcs11/pkcs11-0-r2.ebuild b/acct-group/pkcs11/pkcs11-0-r2.ebuild
new file mode 100644
index 000000000000..52fd77d253b8
--- /dev/null
+++ b/acct-group/pkcs11/pkcs11-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-libs/opencryptoki"
+
+ACCT_GROUP_ID="331"
diff --git a/acct-group/pkcs11/pkcs11-0.ebuild b/acct-group/pkcs11/pkcs11-0.ebuild
deleted file mode 100644
index bd2c78e56eca..000000000000
--- a/acct-group/pkcs11/pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-libs/opencryptoki"
-
-ACCT_GROUP_ID="331"
diff --git a/acct-group/placement/metadata.xml b/acct-group/placement/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/placement/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/placement/placement-0-r1.ebuild b/acct-group/placement/placement-0-r1.ebuild
deleted file mode 100644
index 4fb6ed986132..000000000000
--- a/acct-group/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=448
diff --git a/acct-group/plex/plex-0-r1.ebuild b/acct-group/plex/plex-0-r1.ebuild
deleted file mode 100644
index ec85c721a861..000000000000
--- a/acct-group/plex/plex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Plex Media Server group"
-ACCT_GROUP_ID=103
diff --git a/acct-group/plex/plex-0-r3.ebuild b/acct-group/plex/plex-0-r3.ebuild
new file mode 100644
index 000000000000..33679112f7dd
--- /dev/null
+++ b/acct-group/plex/plex-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Plex Media Server group"
+ACCT_GROUP_ID=103
diff --git a/acct-group/plugdev/plugdev-0-r1.ebuild b/acct-group/plugdev/plugdev-0-r1.ebuild
deleted file mode 100644
index 66735a7fc0ff..000000000000
--- a/acct-group/plugdev/plugdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group controlling access to removable media"
-ACCT_GROUP_ID=272
diff --git a/acct-group/plugdev/plugdev-0-r3.ebuild b/acct-group/plugdev/plugdev-0-r3.ebuild
new file mode 100644
index 000000000000..736ae40ab371
--- /dev/null
+++ b/acct-group/plugdev/plugdev-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group controlling access to removable media"
+ACCT_GROUP_ID=272
diff --git a/acct-group/polkitd/polkitd-0-r1.ebuild b/acct-group/polkitd/polkitd-0-r1.ebuild
deleted file mode 100644
index 7e7baeaeb481..000000000000
--- a/acct-group/polkitd/polkitd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=102
diff --git a/acct-group/polkitd/polkitd-0-r3.ebuild b/acct-group/polkitd/polkitd-0-r3.ebuild
new file mode 100644
index 000000000000..641e5053822c
--- /dev/null
+++ b/acct-group/polkitd/polkitd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=102
diff --git a/acct-group/polw/polw-0-r2.ebuild b/acct-group/polw/polw-0-r2.ebuild
new file mode 100644
index 000000000000..b30f19ad980f
--- /dev/null
+++ b/acct-group/polw/polw-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/policyd-weight"
+
+ACCT_GROUP_ID="263"
diff --git a/acct-group/polw/polw-0.ebuild b/acct-group/polw/polw-0.ebuild
deleted file mode 100644
index 66480cce7428..000000000000
--- a/acct-group/polw/polw-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/policyd-weight"
-
-ACCT_GROUP_ID="263"
diff --git a/acct-group/popa3d/popa3d-0-r2.ebuild b/acct-group/popa3d/popa3d-0-r2.ebuild
new file mode 100644
index 000000000000..e57cae22efa7
--- /dev/null
+++ b/acct-group/popa3d/popa3d-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/popa3d"
+ACCT_GROUP_ID=375
diff --git a/acct-group/popa3d/popa3d-0.ebuild b/acct-group/popa3d/popa3d-0.ebuild
deleted file mode 100644
index d3620c927b38..000000000000
--- a/acct-group/popa3d/popa3d-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/popa3d"
-ACCT_GROUP_ID=375
diff --git a/acct-group/portage/portage-0-r2.ebuild b/acct-group/portage/portage-0-r2.ebuild
new file mode 100644
index 000000000000..2e50f8235fc0
--- /dev/null
+++ b/acct-group/portage/portage-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=250
diff --git a/acct-group/portage/portage-0.ebuild b/acct-group/portage/portage-0.ebuild
deleted file mode 100644
index 802a74d18716..000000000000
--- a/acct-group/portage/portage-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=250
diff --git a/acct-group/postdrop/postdrop-0-r1.ebuild b/acct-group/postdrop/postdrop-0-r1.ebuild
deleted file mode 100644
index 2898ed6fb8ec..000000000000
--- a/acct-group/postdrop/postdrop-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=208
diff --git a/acct-group/postdrop/postdrop-0-r3.ebuild b/acct-group/postdrop/postdrop-0-r3.ebuild
new file mode 100644
index 000000000000..052fdce27fe1
--- /dev/null
+++ b/acct-group/postdrop/postdrop-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=208
diff --git a/acct-group/postfix/postfix-0-r1.ebuild b/acct-group/postfix/postfix-0-r1.ebuild
deleted file mode 100644
index 3ee20e0cc981..000000000000
--- a/acct-group/postfix/postfix-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=207
diff --git a/acct-group/postfix/postfix-0-r3.ebuild b/acct-group/postfix/postfix-0-r3.ebuild
new file mode 100644
index 000000000000..5303a6f072de
--- /dev/null
+++ b/acct-group/postfix/postfix-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=207
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
deleted file mode 100644
index 4b924be02018..000000000000
--- a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=356
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r3.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r3.ebuild
new file mode 100644
index 000000000000..24fa7c36dc56
--- /dev/null
+++ b/acct-group/postfix_exporter/postfix_exporter-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=356
diff --git a/acct-group/postfwd/postfwd-0-r2.ebuild b/acct-group/postfwd/postfwd-0-r2.ebuild
new file mode 100644
index 000000000000..a4d8e9b314d8
--- /dev/null
+++ b/acct-group/postfwd/postfwd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/postfwd"
+
+ACCT_GROUP_ID="189"
diff --git a/acct-group/postfwd/postfwd-0.ebuild b/acct-group/postfwd/postfwd-0.ebuild
deleted file mode 100644
index a912e8aeb7fb..000000000000
--- a/acct-group/postfwd/postfwd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for mail-filter/postfwd"
-
-ACCT_GROUP_ID="189"
diff --git a/acct-group/postgres/postgres-0-r1.ebuild b/acct-group/postgres/postgres-0-r1.ebuild
deleted file mode 100644
index 979541863f53..000000000000
--- a/acct-group/postgres/postgres-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="PostgreSQL program group"
-ACCT_GROUP_ID=70
-SLOT="0"
diff --git a/acct-group/postgres/postgres-0-r3.ebuild b/acct-group/postgres/postgres-0-r3.ebuild
new file mode 100644
index 000000000000..614bccd53afc
--- /dev/null
+++ b/acct-group/postgres/postgres-0-r3.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-group
+
+DESCRIPTION="PostgreSQL program group"
+ACCT_GROUP_ID=70
+SLOT="0"
diff --git a/acct-group/postgres_exporter/postgres_exporter-0-r2.ebuild b/acct-group/postgres_exporter/postgres_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..65d7da901c58
--- /dev/null
+++ b/acct-group/postgres_exporter/postgres_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=233
diff --git a/acct-group/postgres_exporter/postgres_exporter-0.ebuild b/acct-group/postgres_exporter/postgres_exporter-0.ebuild
deleted file mode 100644
index 06302af88d1e..000000000000
--- a/acct-group/postgres_exporter/postgres_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=233
diff --git a/acct-group/postgrey/postgrey-0-r1.ebuild b/acct-group/postgrey/postgrey-0-r1.ebuild
new file mode 100644
index 000000000000..9aace7c3955d
--- /dev/null
+++ b/acct-group/postgrey/postgrey-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the postgrey mail daemon"
+ACCT_GROUP_ID=360
diff --git a/acct-group/postgrey/postgrey-0.ebuild b/acct-group/postgrey/postgrey-0.ebuild
deleted file mode 100644
index ff132477a3d6..000000000000
--- a/acct-group/postgrey/postgrey-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the postgrey mail daemon"
-ACCT_GROUP_ID=360
diff --git a/acct-group/privoxy/metadata.xml b/acct-group/privoxy/metadata.xml
index 4c44ad858639..1ab427e8f0b6 100644
--- a/acct-group/privoxy/metadata.xml
+++ b/acct-group/privoxy/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/privoxy/privoxy-0-r1.ebuild b/acct-group/privoxy/privoxy-0-r1.ebuild
deleted file mode 100644
index c45bf8db39b2..000000000000
--- a/acct-group/privoxy/privoxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A privoxy: privacy oriented web proxy group"
-ACCT_GROUP_ID=392
diff --git a/acct-group/privoxy/privoxy-0-r3.ebuild b/acct-group/privoxy/privoxy-0-r3.ebuild
new file mode 100644
index 000000000000..9f5cfde348c4
--- /dev/null
+++ b/acct-group/privoxy/privoxy-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A privoxy: privacy oriented web proxy group"
+ACCT_GROUP_ID=392
diff --git a/acct-group/prometheus/prometheus-0-r1.ebuild b/acct-group/prometheus/prometheus-0-r1.ebuild
deleted file mode 100644
index 9a19925826cc..000000000000
--- a/acct-group/prometheus/prometheus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=430
diff --git a/acct-group/prometheus/prometheus-0-r3.ebuild b/acct-group/prometheus/prometheus-0-r3.ebuild
new file mode 100644
index 000000000000..abdb21af92ef
--- /dev/null
+++ b/acct-group/prometheus/prometheus-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=430
diff --git a/acct-group/prosody/prosody-0-r1.ebuild b/acct-group/prosody/prosody-0-r1.ebuild
new file mode 100644
index 000000000000..f90772575391
--- /dev/null
+++ b/acct-group/prosody/prosody-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/prosody"
+
+ACCT_GROUP_ID="115"
diff --git a/acct-group/prosody/prosody-0.ebuild b/acct-group/prosody/prosody-0.ebuild
deleted file mode 100644
index 9baa70ab7f70..000000000000
--- a/acct-group/prosody/prosody-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/prosody"
-
-ACCT_GROUP_ID="115"
diff --git a/acct-group/prowlarr/prowlarr-0-r1.ebuild b/acct-group/prowlarr/prowlarr-0-r1.ebuild
new file mode 100644
index 000000000000..fe67ad261fe3
--- /dev/null
+++ b/acct-group/prowlarr/prowlarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=517
diff --git a/acct-group/prowlarr/prowlarr-0.ebuild b/acct-group/prowlarr/prowlarr-0.ebuild
deleted file mode 100644
index 5ea7e36d2c6b..000000000000
--- a/acct-group/prowlarr/prowlarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=517
diff --git a/acct-group/psybnc/psybnc-0-r2.ebuild b/acct-group/psybnc/psybnc-0-r2.ebuild
new file mode 100644
index 000000000000..9fce853e0a30
--- /dev/null
+++ b/acct-group/psybnc/psybnc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/psybnc"
+
+ACCT_GROUP_ID="259"
diff --git a/acct-group/psybnc/psybnc-0.ebuild b/acct-group/psybnc/psybnc-0.ebuild
deleted file mode 100644
index bde356121739..000000000000
--- a/acct-group/psybnc/psybnc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/psybnc"
-
-ACCT_GROUP_ID="259"
diff --git a/acct-group/pulse-access/pulse-access-0-r2.ebuild b/acct-group/pulse-access/pulse-access-0-r2.ebuild
new file mode 100644
index 000000000000..1cc6e470116d
--- /dev/null
+++ b/acct-group/pulse-access/pulse-access-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=172
diff --git a/acct-group/pulse-access/pulse-access-0.ebuild b/acct-group/pulse-access/pulse-access-0.ebuild
deleted file mode 100644
index 700feb5f191b..000000000000
--- a/acct-group/pulse-access/pulse-access-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=172
diff --git a/acct-group/pulse/pulse-0-r2.ebuild b/acct-group/pulse/pulse-0-r2.ebuild
new file mode 100644
index 000000000000..b8cb5ea79343
--- /dev/null
+++ b/acct-group/pulse/pulse-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=171
diff --git a/acct-group/pulse/pulse-0.ebuild b/acct-group/pulse/pulse-0.ebuild
deleted file mode 100644
index 5b0084f6f4f1..000000000000
--- a/acct-group/pulse/pulse-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=171
diff --git a/acct-group/puppet/puppet-0-r1.ebuild b/acct-group/puppet/puppet-0-r1.ebuild
deleted file mode 100644
index cf9422869bf9..000000000000
--- a/acct-group/puppet/puppet-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=455
diff --git a/acct-group/puppet/puppet-0-r3.ebuild b/acct-group/puppet/puppet-0-r3.ebuild
new file mode 100644
index 000000000000..27966cb04d1b
--- /dev/null
+++ b/acct-group/puppet/puppet-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=455
diff --git a/acct-group/puppetdb/puppetdb-0-r1.ebuild b/acct-group/puppetdb/puppetdb-0-r1.ebuild
deleted file mode 100644
index 55e4b42af293..000000000000
--- a/acct-group/puppetdb/puppetdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=456
diff --git a/acct-group/puppetdb/puppetdb-0-r3.ebuild b/acct-group/puppetdb/puppetdb-0-r3.ebuild
new file mode 100644
index 000000000000..5b34683a921f
--- /dev/null
+++ b/acct-group/puppetdb/puppetdb-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=456
diff --git a/acct-group/pushgateway/pushgateway-0-r2.ebuild b/acct-group/pushgateway/pushgateway-0-r2.ebuild
new file mode 100644
index 000000000000..0569bc148740
--- /dev/null
+++ b/acct-group/pushgateway/pushgateway-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/pushgateway"
+
+ACCT_GROUP_ID="288"
diff --git a/acct-group/pushgateway/pushgateway-0.ebuild b/acct-group/pushgateway/pushgateway-0.ebuild
deleted file mode 100644
index c064f6390f10..000000000000
--- a/acct-group/pushgateway/pushgateway-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/pushgateway"
-
-ACCT_GROUP_ID="288"
diff --git a/acct-group/pvpgn/pvpgn-0-r2.ebuild b/acct-group/pvpgn/pvpgn-0-r2.ebuild
new file mode 100644
index 000000000000..714bb3940b9c
--- /dev/null
+++ b/acct-group/pvpgn/pvpgn-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
+ACCT_GROUP_ID=285
diff --git a/acct-group/pvpgn/pvpgn-0.ebuild b/acct-group/pvpgn/pvpgn-0.ebuild
deleted file mode 100644
index 0a8c0d6e5da8..000000000000
--- a/acct-group/pvpgn/pvpgn-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
-ACCT_GROUP_ID=285
diff --git a/acct-group/qbittorrent/metadata.xml b/acct-group/qbittorrent/metadata.xml
new file mode 100644
index 000000000000..82cc3c6e83ab
--- /dev/null
+++ b/acct-group/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-group/qbittorrent/qbittorrent-0.ebuild b/acct-group/qbittorrent/qbittorrent-0.ebuild
new file mode 100644
index 000000000000..7c12e684ae50
--- /dev/null
+++ b/acct-group/qbittorrent/qbittorrent-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/qbittorrent server"
+ACCT_GROUP_ID=534
diff --git a/acct-group/qemu/qemu-0-r1.ebuild b/acct-group/qemu/qemu-0-r1.ebuild
deleted file mode 100644
index bfa7c828015d..000000000000
--- a/acct-group/qemu/qemu-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=77
diff --git a/acct-group/qemu/qemu-0-r3.ebuild b/acct-group/qemu/qemu-0-r3.ebuild
new file mode 100644
index 000000000000..085fbdd27637
--- /dev/null
+++ b/acct-group/qemu/qemu-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=77
diff --git a/acct-group/qmail/qmail-0-r1.ebuild b/acct-group/qmail/qmail-0-r1.ebuild
deleted file mode 100644
index 86f1ae5e27f3..000000000000
--- a/acct-group/qmail/qmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=201
diff --git a/acct-group/qmail/qmail-0-r3.ebuild b/acct-group/qmail/qmail-0-r3.ebuild
new file mode 100644
index 000000000000..3e555ecef9d7
--- /dev/null
+++ b/acct-group/qmail/qmail-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=201
diff --git a/acct-group/quagga/metadata.xml b/acct-group/quagga/metadata.xml
deleted file mode 100644
index b3726e9bf59e..000000000000
--- a/acct-group/quagga/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <name>Sergey Popov</name>
- <email>pinkbyte@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/quagga/quagga-0-r1.ebuild b/acct-group/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index 104f8007e235..000000000000
--- a/acct-group/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=424
diff --git a/acct-group/quassel/quassel-0-r1.ebuild b/acct-group/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index e700412c050b..000000000000
--- a/acct-group/quassel/quassel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=472
diff --git a/acct-group/quassel/quassel-0-r2.ebuild b/acct-group/quassel/quassel-0-r2.ebuild
new file mode 100644
index 000000000000..ed73341e1622
--- /dev/null
+++ b/acct-group/quassel/quassel-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=472
diff --git a/acct-group/rabbitmq/rabbitmq-0-r2.ebuild b/acct-group/rabbitmq/rabbitmq-0-r2.ebuild
new file mode 100644
index 000000000000..2248165b4cfe
--- /dev/null
+++ b/acct-group/rabbitmq/rabbitmq-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/rabbitmq-server"
+
+ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq/rabbitmq-0.ebuild b/acct-group/rabbitmq/rabbitmq-0.ebuild
deleted file mode 100644
index 58c6c1ee1b21..000000000000
--- a/acct-group/rabbitmq/rabbitmq-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/rabbitmq-server"
-
-ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..88ef35c418d1
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
+
+ACCT_GROUP_ID="107"
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
deleted file mode 100644
index bd882d0b8866..000000000000
--- a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
-
-ACCT_GROUP_ID="107"
diff --git a/acct-group/radarr/radarr-0-r1.ebuild b/acct-group/radarr/radarr-0-r1.ebuild
new file mode 100644
index 000000000000..521778e8e827
--- /dev/null
+++ b/acct-group/radarr/radarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=516
diff --git a/acct-group/radarr/radarr-0.ebuild b/acct-group/radarr/radarr-0.ebuild
deleted file mode 100644
index 1437f0ef9d20..000000000000
--- a/acct-group/radarr/radarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=516
diff --git a/acct-group/radicale/radicale-0-r1.ebuild b/acct-group/radicale/radicale-0-r1.ebuild
deleted file mode 100644
index a2150f5982d2..000000000000
--- a/acct-group/radicale/radicale-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the www-apps/radicale"
-ACCT_GROUP_ID=327
diff --git a/acct-group/radicale/radicale-0-r3.ebuild b/acct-group/radicale/radicale-0-r3.ebuild
new file mode 100644
index 000000000000..ea28c24a5cbf
--- /dev/null
+++ b/acct-group/radicale/radicale-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the www-apps/radicale"
+ACCT_GROUP_ID=327
diff --git a/acct-group/radius/radius-0-r1.ebuild b/acct-group/radius/radius-0-r1.ebuild
deleted file mode 100644
index 78aaa17a382f..000000000000
--- a/acct-group/radius/radius-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="FreeRadius program group"
-ACCT_GROUP_ID=95
diff --git a/acct-group/radius/radius-0-r3.ebuild b/acct-group/radius/radius-0-r3.ebuild
new file mode 100644
index 000000000000..7ac0d3197b26
--- /dev/null
+++ b/acct-group/radius/radius-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="FreeRadius program group"
+ACCT_GROUP_ID=95
diff --git a/acct-group/radvd/radvd-0-r2.ebuild b/acct-group/radvd/radvd-0-r2.ebuild
new file mode 100644
index 000000000000..ce66be82a53c
--- /dev/null
+++ b/acct-group/radvd/radvd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Router Advertisement Daemon"
+
+ACCT_GROUP_ID="215"
diff --git a/acct-group/radvd/radvd-0.ebuild b/acct-group/radvd/radvd-0.ebuild
deleted file mode 100644
index 36fff292c554..000000000000
--- a/acct-group/radvd/radvd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Router Advertisement Daemon"
-
-ACCT_GROUP_ID="215"
diff --git a/acct-group/rbldns/rbldns-0-r1.ebuild b/acct-group/rbldns/rbldns-0-r1.ebuild
deleted file mode 100644
index 6a70e0c3be3d..000000000000
--- a/acct-group/rbldns/rbldns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=153
diff --git a/acct-group/rbldns/rbldns-0-r3.ebuild b/acct-group/rbldns/rbldns-0-r3.ebuild
new file mode 100644
index 000000000000..92264ce9cde4
--- /dev/null
+++ b/acct-group/rbldns/rbldns-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=153
diff --git a/acct-group/rbot/rbot-0-r2.ebuild b/acct-group/rbot/rbot-0-r2.ebuild
new file mode 100644
index 000000000000..160c88cbe598
--- /dev/null
+++ b/acct-group/rbot/rbot-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-irc/rbot"
+
+ACCT_GROUP_ID="129"
diff --git a/acct-group/rbot/rbot-0.ebuild b/acct-group/rbot/rbot-0.ebuild
deleted file mode 100644
index 2e26e14ae37f..000000000000
--- a/acct-group/rbot/rbot-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-irc/rbot"
-
-ACCT_GROUP_ID="129"
diff --git a/acct-group/readarr/readarr-0-r1.ebuild b/acct-group/readarr/readarr-0-r1.ebuild
new file mode 100644
index 000000000000..7035a70d4581
--- /dev/null
+++ b/acct-group/readarr/readarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=521
diff --git a/acct-group/readarr/readarr-0.ebuild b/acct-group/readarr/readarr-0.ebuild
deleted file mode 100644
index 24ba49a36df4..000000000000
--- a/acct-group/readarr/readarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=521
diff --git a/acct-group/realtime/realtime-0-r2.ebuild b/acct-group/realtime/realtime-0-r2.ebuild
new file mode 100644
index 000000000000..c93574cef25c
--- /dev/null
+++ b/acct-group/realtime/realtime-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="realtime privileges group"
+
+ACCT_GROUP_ID=206
diff --git a/acct-group/realtime/realtime-0.ebuild b/acct-group/realtime/realtime-0.ebuild
deleted file mode 100644
index eb80c1e91091..000000000000
--- a/acct-group/realtime/realtime-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="realtime privileges group"
-
-ACCT_GROUP_ID=206
diff --git a/acct-group/redis/redis-0-r1.ebuild b/acct-group/redis/redis-0-r1.ebuild
deleted file mode 100644
index 83f725cd298c..000000000000
--- a/acct-group/redis/redis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Redis program group"
-ACCT_GROUP_ID=75
diff --git a/acct-group/redis/redis-0-r2.ebuild b/acct-group/redis/redis-0-r2.ebuild
new file mode 100644
index 000000000000..0b0048c13fa7
--- /dev/null
+++ b/acct-group/redis/redis-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Redis program group"
+ACCT_GROUP_ID=75
diff --git a/acct-group/redis_exporter/redis_exporter-0-r2.ebuild b/acct-group/redis_exporter/redis_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..cfe71b383b27
--- /dev/null
+++ b/acct-group/redis_exporter/redis_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=298
diff --git a/acct-group/redis_exporter/redis_exporter-0.ebuild b/acct-group/redis_exporter/redis_exporter-0.ebuild
deleted file mode 100644
index 89b3cb579f87..000000000000
--- a/acct-group/redis_exporter/redis_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=298
diff --git a/acct-group/redmine/redmine-0-r1.ebuild b/acct-group/redmine/redmine-0-r1.ebuild
deleted file mode 100644
index 73e968b837a7..000000000000
--- a/acct-group/redmine/redmine-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=451
diff --git a/acct-group/redmine/redmine-0-r3.ebuild b/acct-group/redmine/redmine-0-r3.ebuild
new file mode 100644
index 000000000000..4f6db2798ca1
--- /dev/null
+++ b/acct-group/redmine/redmine-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=451
diff --git a/acct-group/redsocks/redsocks-0-r1.ebuild b/acct-group/redsocks/redsocks-0-r1.ebuild
deleted file mode 100644
index 376e5708d210..000000000000
--- a/acct-group/redsocks/redsocks-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-proxy/redsocks"
-
-ACCT_GROUP_ID="154"
diff --git a/acct-group/redsocks/redsocks-0-r3.ebuild b/acct-group/redsocks/redsocks-0-r3.ebuild
new file mode 100644
index 000000000000..28d999f1d109
--- /dev/null
+++ b/acct-group/redsocks/redsocks-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/redsocks"
+
+ACCT_GROUP_ID="154"
diff --git a/acct-group/reg/reg-0-r1.ebuild b/acct-group/reg/reg-0-r1.ebuild
deleted file mode 100644
index 8bc51aa11edc..000000000000
--- a/acct-group/reg/reg-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-containers/reg"
-
-ACCT_GROUP_ID="503"
diff --git a/acct-group/reg/reg-0-r3.ebuild b/acct-group/reg/reg-0-r3.ebuild
new file mode 100644
index 000000000000..e11738f13e87
--- /dev/null
+++ b/acct-group/reg/reg-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/reg"
+
+ACCT_GROUP_ID="503"
diff --git a/acct-group/registry/registry-0-r2.ebuild b/acct-group/registry/registry-0-r2.ebuild
new file mode 100644
index 000000000000..6a7122d86c6e
--- /dev/null
+++ b/acct-group/registry/registry-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/docker-registry"
+
+ACCT_GROUP_ID="295"
diff --git a/acct-group/registry/registry-0.ebuild b/acct-group/registry/registry-0.ebuild
deleted file mode 100644
index 6da5197ae7ec..000000000000
--- a/acct-group/registry/registry-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-containers/docker-registry"
-
-ACCT_GROUP_ID="295"
diff --git a/acct-group/render/render-0-r1.ebuild b/acct-group/render/render-0-r1.ebuild
deleted file mode 100644
index 6e31b1326308..000000000000
--- a/acct-group/render/render-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=28
diff --git a/acct-group/render/render-0-r3.ebuild b/acct-group/render/render-0-r3.ebuild
new file mode 100644
index 000000000000..e119bdb21cfb
--- /dev/null
+++ b/acct-group/render/render-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=28
diff --git a/acct-group/resin/metadata.xml b/acct-group/resin/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/acct-group/resin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/resin/resin-0.ebuild b/acct-group/resin/resin-0.ebuild
deleted file mode 100644
index 110eae9c3c1a..000000000000
--- a/acct-group/resin/resin-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/resin"
-
-ACCT_GROUP_ID="140"
diff --git a/acct-group/roccat/roccat-0-r2.ebuild b/acct-group/roccat/roccat-0-r2.ebuild
new file mode 100644
index 000000000000..65c89ad287bb
--- /dev/null
+++ b/acct-group/roccat/roccat-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-apps/roccat-tools"
+
+ACCT_GROUP_ID="203"
diff --git a/acct-group/roccat/roccat-0.ebuild b/acct-group/roccat/roccat-0.ebuild
deleted file mode 100644
index 8c8638f0a4e2..000000000000
--- a/acct-group/roccat/roccat-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-apps/roccat-tools"
-
-ACCT_GROUP_ID="203"
diff --git a/acct-group/root/root-0-r2.ebuild b/acct-group/root/root-0-r2.ebuild
new file mode 100644
index 000000000000..6c40cd3e5449
--- /dev/null
+++ b/acct-group/root/root-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=0
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/root/root-0.ebuild b/acct-group/root/root-0.ebuild
deleted file mode 100644
index 4c5ed4b34698..000000000000
--- a/acct-group/root/root-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=0
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/ros/metadata.xml b/acct-group/ros/metadata.xml
deleted file mode 100644
index 7dc81cf30285..000000000000
--- a/acct-group/ros/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>ros@gentoo.org</email>
- <name>Gentoo ROS Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/ros/ros-0.ebuild b/acct-group/ros/ros-0.ebuild
deleted file mode 100644
index 373c97151c4e..000000000000
--- a/acct-group/ros/ros-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-ros/roslaunch"
-
-ACCT_GROUP_ID="130"
diff --git a/acct-group/rplayd/metadata.xml b/acct-group/rplayd/metadata.xml
deleted file mode 100644
index 93423219a5bc..000000000000
--- a/acct-group/rplayd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sound@gentoo.org</email>
- <name>Gentoo Sound project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/rplayd/rplayd-0.ebuild b/acct-group/rplayd/rplayd-0.ebuild
deleted file mode 100644
index 744523e8b26c..000000000000
--- a/acct-group/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/rplay"
-
-ACCT_GROUP_ID="161"
diff --git a/acct-group/rrdcached/rrdcached-0-r1.ebuild b/acct-group/rrdcached/rrdcached-0-r1.ebuild
new file mode 100644
index 000000000000..bc2e20332168
--- /dev/null
+++ b/acct-group/rrdcached/rrdcached-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="511"
diff --git a/acct-group/rrdcached/rrdcached-0.ebuild b/acct-group/rrdcached/rrdcached-0.ebuild
deleted file mode 100644
index 1f28f6225226..000000000000
--- a/acct-group/rrdcached/rrdcached-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="511"
diff --git a/acct-group/rslsync/rslsync-0-r2.ebuild b/acct-group/rslsync/rslsync-0-r2.ebuild
new file mode 100644
index 000000000000..fdece579ddd1
--- /dev/null
+++ b/acct-group/rslsync/rslsync-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/resilio-sync"
+
+ACCT_GROUP_ID="175"
diff --git a/acct-group/rslsync/rslsync-0.ebuild b/acct-group/rslsync/rslsync-0.ebuild
deleted file mode 100644
index c4e17e79078d..000000000000
--- a/acct-group/rslsync/rslsync-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-p2p/resilio-sync"
-
-ACCT_GROUP_ID="175"
diff --git a/acct-group/rspamd/metadata.xml b/acct-group/rspamd/metadata.xml
index 79c983af8c3e..3128bc705301 100644
--- a/acct-group/rspamd/metadata.xml
+++ b/acct-group/rspamd/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/rspamd/rspamd-0-r1.ebuild b/acct-group/rspamd/rspamd-0-r1.ebuild
deleted file mode 100644
index 338cfd3414a7..000000000000
--- a/acct-group/rspamd/rspamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for rspamd - Rapid spam filtering system"
-ACCT_GROUP_ID=237
diff --git a/acct-group/rspamd/rspamd-0-r3.ebuild b/acct-group/rspamd/rspamd-0-r3.ebuild
new file mode 100644
index 000000000000..663efde6d291
--- /dev/null
+++ b/acct-group/rspamd/rspamd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for rspamd - Rapid spam filtering system"
+ACCT_GROUP_ID=237
diff --git a/acct-group/rstudio-server/metadata.xml b/acct-group/rstudio-server/metadata.xml
deleted file mode 100644
index 0aa68b1689b9..000000000000
--- a/acct-group/rstudio-server/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>gienah@gentoo.org</email>
- <name>Mark Wright</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild b/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index 1d702c365cb5..000000000000
--- a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for sci-mathematics/rstudio"
-ACCT_GROUP_ID=466
diff --git a/acct-group/rt/rt-0-r1.ebuild b/acct-group/rt/rt-0-r1.ebuild
deleted file mode 100644
index 5f188764ed44..000000000000
--- a/acct-group/rt/rt-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/rt"
-
-ACCT_GROUP_ID="126"
diff --git a/acct-group/rt/rt-0-r2.ebuild b/acct-group/rt/rt-0-r2.ebuild
new file mode 100644
index 000000000000..88c03248cb24
--- /dev/null
+++ b/acct-group/rt/rt-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/rt"
+
+ACCT_GROUP_ID="126"
diff --git a/acct-group/rtkit/rtkit-0-r1.ebuild b/acct-group/rtkit/rtkit-0-r1.ebuild
deleted file mode 100644
index 5f92c0a646b5..000000000000
--- a/acct-group/rtkit/rtkit-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
-ACCT_GROUP_ID=133
diff --git a/acct-group/rtkit/rtkit-0-r3.ebuild b/acct-group/rtkit/rtkit-0-r3.ebuild
new file mode 100644
index 000000000000..620c967dc9a3
--- /dev/null
+++ b/acct-group/rtkit/rtkit-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
+ACCT_GROUP_ID=133
diff --git a/acct-group/rundeck/metadata.xml b/acct-group/rundeck/metadata.xml
deleted file mode 100644
index c53c3f73d6b3..000000000000
--- a/acct-group/rundeck/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>williamh@gentoo.org</email>
- <name>William Hubbs</name>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Gentoo Java team</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/rundeck/rundeck-0.ebuild b/acct-group/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9a51c176b28f..000000000000
--- a/acct-group/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/rundeck-bin"
-
-ACCT_GROUP_ID="109"
diff --git a/acct-group/rwhoisd/rwhoisd-0-r2.ebuild b/acct-group/rwhoisd/rwhoisd-0-r2.ebuild
new file mode 100644
index 000000000000..2935c33d2ba0
--- /dev/null
+++ b/acct-group/rwhoisd/rwhoisd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/rwhoisd"
+
+ACCT_GROUP_ID="258"
diff --git a/acct-group/rwhoisd/rwhoisd-0.ebuild b/acct-group/rwhoisd/rwhoisd-0.ebuild
deleted file mode 100644
index efc2c2e69a79..000000000000
--- a/acct-group/rwhoisd/rwhoisd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/rwhoisd"
-
-ACCT_GROUP_ID="258"
diff --git a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild b/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
deleted file mode 100644
index 4f1a3726241b..000000000000
--- a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="SABnzbd program group"
-
-ACCT_GROUP_ID=397
diff --git a/acct-group/sabnzbd/sabnzbd-0-r3.ebuild b/acct-group/sabnzbd/sabnzbd-0-r3.ebuild
new file mode 100644
index 000000000000..6c9175b97074
--- /dev/null
+++ b/acct-group/sabnzbd/sabnzbd-0-r3.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-group
+
+DESCRIPTION="SABnzbd program group"
+
+ACCT_GROUP_ID=397
diff --git a/acct-group/sagan/sagan-0-r2.ebuild b/acct-group/sagan/sagan-0-r2.ebuild
new file mode 100644
index 000000000000..a61ec8911461
--- /dev/null
+++ b/acct-group/sagan/sagan-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the Sagan log monitoring system"
+ACCT_GROUP_ID=317
diff --git a/acct-group/sagan/sagan-0.ebuild b/acct-group/sagan/sagan-0.ebuild
deleted file mode 100644
index 18b52fedf006..000000000000
--- a/acct-group/sagan/sagan-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Sagan log monitoring system"
-ACCT_GROUP_ID=317
diff --git a/acct-group/samplicator/samplicator-0-r2.ebuild b/acct-group/samplicator/samplicator-0-r2.ebuild
new file mode 100644
index 000000000000..d9a31eef9b8f
--- /dev/null
+++ b/acct-group/samplicator/samplicator-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/samplicator"
+
+ACCT_GROUP_ID="179"
diff --git a/acct-group/samplicator/samplicator-0.ebuild b/acct-group/samplicator/samplicator-0.ebuild
deleted file mode 100644
index 7e5219d58e15..000000000000
--- a/acct-group/samplicator/samplicator-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/samplicator"
-
-ACCT_GROUP_ID="179"
diff --git a/acct-group/sancp/sancp-0-r2.ebuild b/acct-group/sancp/sancp-0-r2.ebuild
new file mode 100644
index 000000000000..ecea1d91cc49
--- /dev/null
+++ b/acct-group/sancp/sancp-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-group
+
+DESCRIPTION="gid for net-analyzer/sancp"
+
+ACCT_GROUP_ID=382
diff --git a/acct-group/sancp/sancp-0.ebuild b/acct-group/sancp/sancp-0.ebuild
deleted file mode 100644
index b273bc3c0ea2..000000000000
--- a/acct-group/sancp/sancp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/sancp"
-
-ACCT_GROUP_ID=382
diff --git a/acct-group/sandmann/metadata.xml b/acct-group/sandmann/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-group/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-group/sandmann/sandmann-0.ebuild b/acct-group/sandmann/sandmann-0.ebuild
new file mode 100644
index 000000000000..f27a5eb8715b
--- /dev/null
+++ b/acct-group/sandmann/sandmann-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=535
diff --git a/acct-group/sanlock/sanlock-0-r1.ebuild b/acct-group/sanlock/sanlock-0-r1.ebuild
deleted file mode 100644
index c0d196eb8395..000000000000
--- a/acct-group/sanlock/sanlock-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="shared storage lock manager"
-ACCT_GROUP_ID=340
diff --git a/acct-group/sanlock/sanlock-0-r3.ebuild b/acct-group/sanlock/sanlock-0-r3.ebuild
new file mode 100644
index 000000000000..ea77b16f3bf4
--- /dev/null
+++ b/acct-group/sanlock/sanlock-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="shared storage lock manager"
+ACCT_GROUP_ID=340
diff --git a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild b/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
deleted file mode 100644
index 2312bc0e37e2..000000000000
--- a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
-ACCT_GROUP_ID=286
diff --git a/acct-group/sauerbraten/sauerbraten-0-r3.ebuild b/acct-group/sauerbraten/sauerbraten-0-r3.ebuild
new file mode 100644
index 000000000000..b24a0c328d4e
--- /dev/null
+++ b/acct-group/sauerbraten/sauerbraten-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
+ACCT_GROUP_ID=286
diff --git a/acct-group/scanlogd/scanlogd-0-r2.ebuild b/acct-group/scanlogd/scanlogd-0-r2.ebuild
new file mode 100644
index 000000000000..a1e9c3be2a29
--- /dev/null
+++ b/acct-group/scanlogd/scanlogd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/scanlogd"
+
+ACCT_GROUP_ID="166"
diff --git a/acct-group/scanlogd/scanlogd-0.ebuild b/acct-group/scanlogd/scanlogd-0.ebuild
deleted file mode 100644
index ba71638b34cd..000000000000
--- a/acct-group/scanlogd/scanlogd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/scanlogd"
-
-ACCT_GROUP_ID="166"
diff --git a/acct-group/scanner/scanner-0-r2.ebuild b/acct-group/scanner/scanner-0-r2.ebuild
new file mode 100644
index 000000000000..232a874cb5f6
--- /dev/null
+++ b/acct-group/scanner/scanner-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for media-gfx/sane-backends"
+
+ACCT_GROUP_ID="332"
diff --git a/acct-group/scanner/scanner-0.ebuild b/acct-group/scanner/scanner-0.ebuild
deleted file mode 100644
index 41c58ed07571..000000000000
--- a/acct-group/scanner/scanner-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for media-gfx/sane-backends"
-
-ACCT_GROUP_ID="332"
diff --git a/acct-group/scponly/scponly-0-r1.ebuild b/acct-group/scponly/scponly-0-r1.ebuild
deleted file mode 100644
index c0418d2599cc..000000000000
--- a/acct-group/scponly/scponly-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for scponly"
-ACCT_GROUP_ID=239
diff --git a/acct-group/scponly/scponly-0-r3.ebuild b/acct-group/scponly/scponly-0-r3.ebuild
new file mode 100644
index 000000000000..be9382651f79
--- /dev/null
+++ b/acct-group/scponly/scponly-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for scponly"
+ACCT_GROUP_ID=239
diff --git a/acct-group/scsi/scsi-0-r2.ebuild b/acct-group/scsi/scsi-0-r2.ebuild
new file mode 100644
index 000000000000..258996ea78d1
--- /dev/null
+++ b/acct-group/scsi/scsi-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=415
diff --git a/acct-group/scsi/scsi-0.ebuild b/acct-group/scsi/scsi-0.ebuild
deleted file mode 100644
index e87f4b7b1c8d..000000000000
--- a/acct-group/scsi/scsi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=415
diff --git a/acct-group/sddm/sddm-0-r1.ebuild b/acct-group/sddm/sddm-0-r1.ebuild
new file mode 100644
index 000000000000..44ec1b3df484
--- /dev/null
+++ b/acct-group/sddm/sddm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/sddm"
+
+ACCT_GROUP_ID="219"
diff --git a/acct-group/sddm/sddm-0.ebuild b/acct-group/sddm/sddm-0.ebuild
deleted file mode 100644
index 26a7d184213b..000000000000
--- a/acct-group/sddm/sddm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/sddm"
-
-ACCT_GROUP_ID="219"
diff --git a/acct-group/seat/seat-0-r1.ebuild b/acct-group/seat/seat-0-r1.ebuild
new file mode 100644
index 000000000000..5feb719c5fdb
--- /dev/null
+++ b/acct-group/seat/seat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-auth/seatd"
+ACCT_GROUP_ID=202
diff --git a/acct-group/seat/seat-0.ebuild b/acct-group/seat/seat-0.ebuild
deleted file mode 100644
index b5c12d09822b..000000000000
--- a/acct-group/seat/seat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-auth/seatd"
-ACCT_GROUP_ID=202
diff --git a/acct-group/serf/serf-0-r2.ebuild b/acct-group/serf/serf-0-r2.ebuild
new file mode 100644
index 000000000000..fa1fb5349552
--- /dev/null
+++ b/acct-group/serf/serf-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/serf"
+
+ACCT_GROUP_ID="314"
diff --git a/acct-group/serf/serf-0.ebuild b/acct-group/serf/serf-0.ebuild
deleted file mode 100644
index 00c3f9c40c85..000000000000
--- a/acct-group/serf/serf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-admin/serf"
-
-ACCT_GROUP_ID="314"
diff --git a/acct-group/sguil/metadata.xml b/acct-group/sguil/metadata.xml
deleted file mode 100644
index d5af4bcfaf13..000000000000
--- a/acct-group/sguil/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/sguil/sguil-0.ebuild b/acct-group/sguil/sguil-0.ebuild
deleted file mode 100644
index 15fbe00afd0d..000000000000
--- a/acct-group/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/sguil-sensor"
-
-ACCT_GROUP_ID="165"
diff --git a/acct-group/sgx/sgx-0-r2.ebuild b/acct-group/sgx/sgx-0-r2.ebuild
new file mode 100644
index 000000000000..7fa33b984480
--- /dev/null
+++ b/acct-group/sgx/sgx-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="System group: used for SGX enclaves"
+
+ACCT_GROUP_ID=405
diff --git a/acct-group/sgx/sgx-0.ebuild b/acct-group/sgx/sgx-0.ebuild
deleted file mode 100644
index 6a9d9ac0c9d8..000000000000
--- a/acct-group/sgx/sgx-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="System group: used for SGX enclaves"
-
-ACCT_GROUP_ID=405
diff --git a/acct-group/shellinaboxd/metadata.xml b/acct-group/shellinaboxd/metadata.xml
deleted file mode 100644
index 65be4a236db7..000000000000
--- a/acct-group/shellinaboxd/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 type="project">
- <email>shell-tools@gentoo.org</email>
- <name>Gentoo Shell Tools Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/shellinaboxd/shellinaboxd-0-r1.ebuild b/acct-group/shellinaboxd/shellinaboxd-0-r1.ebuild
deleted file mode 100644
index ecd1ca8bae43..000000000000
--- a/acct-group/shellinaboxd/shellinaboxd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="shellinabox group"
-ACCT_GROUP_ID=139
diff --git a/acct-group/sigh/metadata.xml b/acct-group/sigh/metadata.xml
deleted file mode 100644
index f63250c09310..000000000000
--- a/acct-group/sigh/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>mschiff@gentoo.org</email>
- <name>Marc Schiffbauer</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/sigh/sigh-0.ebuild b/acct-group/sigh/sigh-0.ebuild
deleted file mode 100644
index 82133b99b3ca..000000000000
--- a/acct-group/sigh/sigh-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=363
diff --git a/acct-group/simplevirt/metadata.xml b/acct-group/simplevirt/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/simplevirt/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-group/simplevirt/simplevirt-0-r1.ebuild b/acct-group/simplevirt/simplevirt-0-r1.ebuild
deleted file mode 100644
index 6d4d4ffbc136..000000000000
--- a/acct-group/simplevirt/simplevirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=404
diff --git a/acct-group/sispmctl/sispmctl-0-r2.ebuild b/acct-group/sispmctl/sispmctl-0-r2.ebuild
new file mode 100644
index 000000000000..cfdd67e8622b
--- /dev/null
+++ b/acct-group/sispmctl/sispmctl-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-power/sispmctl"
+
+ACCT_GROUP_ID="173"
diff --git a/acct-group/sispmctl/sispmctl-0.ebuild b/acct-group/sispmctl/sispmctl-0.ebuild
deleted file mode 100644
index 1dcdaedb2271..000000000000
--- a/acct-group/sispmctl/sispmctl-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-power/sispmctl"
-
-ACCT_GROUP_ID="173"
diff --git a/acct-group/sks/sks-0-r2.ebuild b/acct-group/sks/sks-0-r2.ebuild
new file mode 100644
index 000000000000..1bf1f311e958
--- /dev/null
+++ b/acct-group/sks/sks-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for SKS OpenPGP keyserver"
+ACCT_GROUP_ID=370
diff --git a/acct-group/sks/sks-0.ebuild b/acct-group/sks/sks-0.ebuild
deleted file mode 100644
index 0304197a7063..000000000000
--- a/acct-group/sks/sks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SKS OpenPGP keyserver"
-ACCT_GROUP_ID=370
diff --git a/acct-group/slurm/slurm-0-r1.ebuild b/acct-group/slurm/slurm-0-r1.ebuild
deleted file mode 100644
index a77214a6d765..000000000000
--- a/acct-group/slurm/slurm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
-ACCT_GROUP_ID=400
diff --git a/acct-group/slurm/slurm-0-r3.ebuild b/acct-group/slurm/slurm-0-r3.ebuild
new file mode 100644
index 000000000000..9bd00de4ddc2
--- /dev/null
+++ b/acct-group/slurm/slurm-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
+ACCT_GROUP_ID=400
diff --git a/acct-group/smmsp/smmsp-0-r1.ebuild b/acct-group/smmsp/smmsp-0-r1.ebuild
deleted file mode 100644
index 8e0821713295..000000000000
--- a/acct-group/smmsp/smmsp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=209
diff --git a/acct-group/smmsp/smmsp-0-r3.ebuild b/acct-group/smmsp/smmsp-0-r3.ebuild
new file mode 100644
index 000000000000..50afe1912aed
--- /dev/null
+++ b/acct-group/smmsp/smmsp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=209
diff --git a/acct-group/smokeping/metadata.xml b/acct-group/smokeping/metadata.xml
deleted file mode 100644
index d5af4bcfaf13..000000000000
--- a/acct-group/smokeping/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/smokeping/smokeping-0.ebuild b/acct-group/smokeping/smokeping-0.ebuild
deleted file mode 100644
index 0d00bb46fcb0..000000000000
--- a/acct-group/smokeping/smokeping-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/smokeping"
-
-ACCT_GROUP_ID="164"
diff --git a/acct-group/sms/sms-0-r2.ebuild b/acct-group/sms/sms-0-r2.ebuild
new file mode 100644
index 000000000000..c487d421c714
--- /dev/null
+++ b/acct-group/sms/sms-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=359
diff --git a/acct-group/sms/sms-0.ebuild b/acct-group/sms/sms-0.ebuild
deleted file mode 100644
index dea788cbae76..000000000000
--- a/acct-group/sms/sms-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=359
diff --git a/acct-group/smtpd/smtpd-0-r1.ebuild b/acct-group/smtpd/smtpd-0-r1.ebuild
deleted file mode 100644
index b09abd76d858..000000000000
--- a/acct-group/smtpd/smtpd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="daemon group for smtpd"
-ACCT_GROUP_ID=25
diff --git a/acct-group/smtpd/smtpd-0-r3.ebuild b/acct-group/smtpd/smtpd-0-r3.ebuild
new file mode 100644
index 000000000000..96fb28b15fed
--- /dev/null
+++ b/acct-group/smtpd/smtpd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="daemon group for smtpd"
+ACCT_GROUP_ID=25
diff --git a/acct-group/smtpq/smtpq-0-r1.ebuild b/acct-group/smtpq/smtpq-0-r1.ebuild
deleted file mode 100644
index 8797fef847fb..000000000000
--- a/acct-group/smtpq/smtpq-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="queue group for smtpd"
-ACCT_GROUP_ID=252
diff --git a/acct-group/smtpq/smtpq-0-r3.ebuild b/acct-group/smtpq/smtpq-0-r3.ebuild
new file mode 100644
index 000000000000..92f7ff2b5fcd
--- /dev/null
+++ b/acct-group/smtpq/smtpq-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="queue group for smtpd"
+ACCT_GROUP_ID=252
diff --git a/acct-group/snapserver/snapserver-0-r2.ebuild b/acct-group/snapserver/snapserver-0-r2.ebuild
new file mode 100644
index 000000000000..bba8052c19a3
--- /dev/null
+++ b/acct-group/snapserver/snapserver-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Server group for media-sound/snapcast"
+ACCT_GROUP_ID=374
diff --git a/acct-group/snapserver/snapserver-0.ebuild b/acct-group/snapserver/snapserver-0.ebuild
deleted file mode 100644
index 7a224e941124..000000000000
--- a/acct-group/snapserver/snapserver-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Server group for media-sound/snapcast"
-ACCT_GROUP_ID=374
diff --git a/acct-group/sniproxy/sniproxy-0-r2.ebuild b/acct-group/sniproxy/sniproxy-0-r2.ebuild
new file mode 100644
index 000000000000..0fdcd080d067
--- /dev/null
+++ b/acct-group/sniproxy/sniproxy-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=366
diff --git a/acct-group/sniproxy/sniproxy-0.ebuild b/acct-group/sniproxy/sniproxy-0.ebuild
deleted file mode 100644
index 526eb45957e2..000000000000
--- a/acct-group/sniproxy/sniproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=366
diff --git a/acct-group/snmp_exporter/snmp_exporter-0-r2.ebuild b/acct-group/snmp_exporter/snmp_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..899c7c85e40d
--- /dev/null
+++ b/acct-group/snmp_exporter/snmp_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/snmp_exporter"
+
+ACCT_GROUP_ID="108"
diff --git a/acct-group/snmp_exporter/snmp_exporter-0.ebuild b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
deleted file mode 100644
index 52cf4f2d532e..000000000000
--- a/acct-group/snmp_exporter/snmp_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/snmp_exporter"
-
-ACCT_GROUP_ID="108"
diff --git a/acct-group/snort/snort-0-r2.ebuild b/acct-group/snort/snort-0-r2.ebuild
new file mode 100644
index 000000000000..eb66852afa54
--- /dev/null
+++ b/acct-group/snort/snort-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=328
diff --git a/acct-group/snort/snort-0.ebuild b/acct-group/snort/snort-0.ebuild
deleted file mode 100644
index 95dcdd566680..000000000000
--- a/acct-group/snort/snort-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=328
diff --git a/acct-group/sobby/metadata.xml b/acct-group/sobby/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/sobby/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-group/sobby/sobby-0.ebuild b/acct-group/sobby/sobby-0.ebuild
deleted file mode 100644
index 0f95a3ce6461..000000000000
--- a/acct-group/sobby/sobby-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=322
diff --git a/acct-group/sobexsrv/metadata.xml b/acct-group/sobexsrv/metadata.xml
index 4c44ad858639..bef24d2c2337 100644
--- a/acct-group/sobexsrv/metadata.xml
+++ b/acct-group/sobexsrv/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/sobexsrv/sobexsrv-0-r2.ebuild b/acct-group/sobexsrv/sobexsrv-0-r2.ebuild
new file mode 100644
index 000000000000..31ec2b5a2276
--- /dev/null
+++ b/acct-group/sobexsrv/sobexsrv-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sobexsrv: a secure OBEX server"
+ACCT_GROUP_ID=387
diff --git a/acct-group/sobexsrv/sobexsrv-0.ebuild b/acct-group/sobexsrv/sobexsrv-0.ebuild
deleted file mode 100644
index a91907f84e21..000000000000
--- a/acct-group/sobexsrv/sobexsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sobexsrv: a secure OBEX server"
-ACCT_GROUP_ID=387
diff --git a/acct-group/sockd/sockd-0-r2.ebuild b/acct-group/sockd/sockd-0-r2.ebuild
new file mode 100644
index 000000000000..40ae4042f312
--- /dev/null
+++ b/acct-group/sockd/sockd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/dante"
+
+ACCT_GROUP_ID="214"
diff --git a/acct-group/sockd/sockd-0.ebuild b/acct-group/sockd/sockd-0.ebuild
deleted file mode 100644
index deebd843ff19..000000000000
--- a/acct-group/sockd/sockd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-proxy/dante"
-
-ACCT_GROUP_ID="214"
diff --git a/acct-group/sogo/sogo-0-r1.ebuild b/acct-group/sogo/sogo-0-r1.ebuild
deleted file mode 100644
index d23c3bef7ff9..000000000000
--- a/acct-group/sogo/sogo-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for gnustep-apps/sogo"
-ACCT_GROUP_ID=475
diff --git a/acct-group/sogo/sogo-0-r3.ebuild b/acct-group/sogo/sogo-0-r3.ebuild
new file mode 100644
index 000000000000..50caf4678247
--- /dev/null
+++ b/acct-group/sogo/sogo-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for gnustep-apps/sogo"
+ACCT_GROUP_ID=475
diff --git a/acct-group/soju/metadata.xml b/acct-group/soju/metadata.xml
new file mode 100644
index 000000000000..d8299f5a010f
--- /dev/null
+++ b/acct-group/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-group/soju/soju-0-r1.ebuild b/acct-group/soju/soju-0-r1.ebuild
new file mode 100644
index 000000000000..66cd1ad30d26
--- /dev/null
+++ b/acct-group/soju/soju-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_GROUP_ID=526
diff --git a/acct-group/sonarr/sonarr-0-r1.ebuild b/acct-group/sonarr/sonarr-0-r1.ebuild
new file mode 100644
index 000000000000..bea9a228c69b
--- /dev/null
+++ b/acct-group/sonarr/sonarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=515
diff --git a/acct-group/sonarr/sonarr-0.ebuild b/acct-group/sonarr/sonarr-0.ebuild
deleted file mode 100644
index c40efb6d7a67..000000000000
--- a/acct-group/sonarr/sonarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=515
diff --git a/acct-group/spamd/spamd-0-r1.ebuild b/acct-group/spamd/spamd-0-r1.ebuild
deleted file mode 100644
index d995a905a5ce..000000000000
--- a/acct-group/spamd/spamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the SpamAssassin daemon"
-ACCT_GROUP_ID=337
diff --git a/acct-group/spamd/spamd-0-r3.ebuild b/acct-group/spamd/spamd-0-r3.ebuild
new file mode 100644
index 000000000000..c868dd100372
--- /dev/null
+++ b/acct-group/spamd/spamd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the SpamAssassin daemon"
+ACCT_GROUP_ID=337
diff --git a/acct-group/spectrum/spectrum-0-r1.ebuild b/acct-group/spectrum/spectrum-0-r1.ebuild
deleted file mode 100644
index be11afecfee1..000000000000
--- a/acct-group/spectrum/spectrum-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Spectrum messaging transport"
-
-ACCT_GROUP_ID="486"
diff --git a/acct-group/spectrum/spectrum-0-r3.ebuild b/acct-group/spectrum/spectrum-0-r3.ebuild
new file mode 100644
index 000000000000..df991ed0f6b9
--- /dev/null
+++ b/acct-group/spectrum/spectrum-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the Spectrum messaging transport"
+
+ACCT_GROUP_ID="486"
diff --git a/acct-group/spi/metadata.xml b/acct-group/spi/metadata.xml
deleted file mode 100644
index b810f29cf12e..000000000000
--- a/acct-group/spi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>crabbedhaloablution@icloud.com</email>
- <name>Peter Alfredsen</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/spi/spi-0.ebuild b/acct-group/spi/spi-0.ebuild
deleted file mode 100644
index 88be21fa31f0..000000000000
--- a/acct-group/spi/spi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="227"
diff --git a/acct-group/spire/spire-0-r1.ebuild b/acct-group/spire/spire-0-r1.ebuild
deleted file mode 100644
index 6bb96c368ca5..000000000000
--- a/acct-group/spire/spire-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=271
diff --git a/acct-group/spire/spire-0-r3.ebuild b/acct-group/spire/spire-0-r3.ebuild
new file mode 100644
index 000000000000..0d6ea0374f1e
--- /dev/null
+++ b/acct-group/spire/spire-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=271
diff --git a/acct-group/spread/metadata.xml b/acct-group/spread/metadata.xml
deleted file mode 100644
index f460837e12d5..000000000000
--- a/acct-group/spread/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>kumba@gentoo.org</email>
- <name>Joshua Kinard</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/spread/spread-0.ebuild b/acct-group/spread/spread-0.ebuild
deleted file mode 100644
index 7bbdd3539cd6..000000000000
--- a/acct-group/spread/spread-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/spread"
-
-ACCT_GROUP_ID="159"
diff --git a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild b/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
deleted file mode 100644
index 895ee6873352..000000000000
--- a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SQLGrey"
-ACCT_GROUP_ID=336
diff --git a/acct-group/sqlgrey/sqlgrey-0-r3.ebuild b/acct-group/sqlgrey/sqlgrey-0-r3.ebuild
new file mode 100644
index 000000000000..36f39da12db3
--- /dev/null
+++ b/acct-group/sqlgrey/sqlgrey-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for SQLGrey"
+ACCT_GROUP_ID=336
diff --git a/acct-group/squid/metadata.xml b/acct-group/squid/metadata.xml
index 2c47fcf00594..64b269faa688 100644
--- a/acct-group/squid/metadata.xml
+++ b/acct-group/squid/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/squid/squid-0-r1.ebuild b/acct-group/squid/squid-0-r1.ebuild
deleted file mode 100644
index 7295f3099cd9..000000000000
--- a/acct-group/squid/squid-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=301
diff --git a/acct-group/squid/squid-0-r3.ebuild b/acct-group/squid/squid-0-r3.ebuild
new file mode 100644
index 000000000000..7aa69fd432f6
--- /dev/null
+++ b/acct-group/squid/squid-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=301
diff --git a/acct-group/sshd/sshd-0-r1.ebuild b/acct-group/sshd/sshd-0-r1.ebuild
deleted file mode 100644
index d54032fc8a6b..000000000000
--- a/acct-group/sshd/sshd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=22
diff --git a/acct-group/sshd/sshd-0-r3.ebuild b/acct-group/sshd/sshd-0-r3.ebuild
new file mode 100644
index 000000000000..8c6e5d5da485
--- /dev/null
+++ b/acct-group/sshd/sshd-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=22
diff --git a/acct-group/ssmtp/ssmtp-0-r2.ebuild b/acct-group/ssmtp/ssmtp-0-r2.ebuild
new file mode 100644
index 000000000000..2f49395099bc
--- /dev/null
+++ b/acct-group/ssmtp/ssmtp-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-mta/ssmtp"
+
+ACCT_GROUP_ID="299"
diff --git a/acct-group/ssmtp/ssmtp-0.ebuild b/acct-group/ssmtp/ssmtp-0.ebuild
deleted file mode 100644
index 6ad46f6347f0..000000000000
--- a/acct-group/ssmtp/ssmtp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-mta/ssmtp"
-
-ACCT_GROUP_ID="299"
diff --git a/acct-group/sstpc/sstpc-0-r2.ebuild b/acct-group/sstpc/sstpc-0-r2.ebuild
new file mode 100644
index 000000000000..9c81bf83fc1f
--- /dev/null
+++ b/acct-group/sstpc/sstpc-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/sstp-client"
+
+ACCT_GROUP_ID="257"
diff --git a/acct-group/sstpc/sstpc-0.ebuild b/acct-group/sstpc/sstpc-0.ebuild
deleted file mode 100644
index 6d41098780cd..000000000000
--- a/acct-group/sstpc/sstpc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/sstp-client"
-
-ACCT_GROUP_ID="257"
diff --git a/acct-group/stapdev/stapdev-0-r2.ebuild b/acct-group/stapdev/stapdev-0-r2.ebuild
new file mode 100644
index 000000000000..1845a9d59991
--- /dev/null
+++ b/acct-group/stapdev/stapdev-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=158
diff --git a/acct-group/stapdev/stapdev-0.ebuild b/acct-group/stapdev/stapdev-0.ebuild
deleted file mode 100644
index b964a19dcabe..000000000000
--- a/acct-group/stapdev/stapdev-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=158
diff --git a/acct-group/stapsys/stapsys-0-r2.ebuild b/acct-group/stapsys/stapsys-0-r2.ebuild
new file mode 100644
index 000000000000..c65bcda5bd2e
--- /dev/null
+++ b/acct-group/stapsys/stapsys-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=157
diff --git a/acct-group/stapsys/stapsys-0.ebuild b/acct-group/stapsys/stapsys-0.ebuild
deleted file mode 100644
index 82e1d15cc0b8..000000000000
--- a/acct-group/stapsys/stapsys-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=157
diff --git a/acct-group/stapusr/stapusr-0-r2.ebuild b/acct-group/stapusr/stapusr-0-r2.ebuild
new file mode 100644
index 000000000000..2c47c78ef7b6
--- /dev/null
+++ b/acct-group/stapusr/stapusr-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=156
diff --git a/acct-group/stapusr/stapusr-0.ebuild b/acct-group/stapusr/stapusr-0.ebuild
deleted file mode 100644
index 386b74e9c57b..000000000000
--- a/acct-group/stapusr/stapusr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=156
diff --git a/acct-group/steamcmd/steamcmd-0-r1.ebuild b/acct-group/steamcmd/steamcmd-0-r1.ebuild
deleted file mode 100644
index f2ddf2b44fb6..000000000000
--- a/acct-group/steamcmd/steamcmd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the SteamCMD server"
-
-ACCT_GROUP_ID="489"
diff --git a/acct-group/steamcmd/steamcmd-0-r3.ebuild b/acct-group/steamcmd/steamcmd-0-r3.ebuild
new file mode 100644
index 000000000000..ec41a6c6b715
--- /dev/null
+++ b/acct-group/steamcmd/steamcmd-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the SteamCMD server"
+
+ACCT_GROUP_ID="489"
diff --git a/acct-group/stg/metadata.xml b/acct-group/stg/metadata.xml
deleted file mode 100644
index 7e33eb1e0776..000000000000
--- a/acct-group/stg/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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-group/stg/stg-0.ebuild b/acct-group/stg/stg-0.ebuild
deleted file mode 100644
index cd405cbaf857..000000000000
--- a/acct-group/stg/stg-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-misc/stargazer"
-
-ACCT_GROUP_ID="176"
diff --git a/acct-group/stubby/metadata.xml b/acct-group/stubby/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/stubby/metadata.xml
+++ b/acct-group/stubby/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/stubby/stubby-0-r1.ebuild b/acct-group/stubby/stubby-0-r1.ebuild
deleted file mode 100644
index 13e45d99fbec..000000000000
--- a/acct-group/stubby/stubby-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Stubby program group (from net-dns/getdns)"
-ACCT_GROUP_ID=476
diff --git a/acct-group/stubby/stubby-0-r3.ebuild b/acct-group/stubby/stubby-0-r3.ebuild
new file mode 100644
index 000000000000..78a7d23e7625
--- /dev/null
+++ b/acct-group/stubby/stubby-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Stubby program group (from net-dns/getdns)"
+ACCT_GROUP_ID=476
diff --git a/acct-group/stunnel/metadata.xml b/acct-group/stunnel/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/stunnel/metadata.xml
+++ b/acct-group/stunnel/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/stunnel/stunnel-0-r1.ebuild b/acct-group/stunnel/stunnel-0-r1.ebuild
deleted file mode 100644
index 47360c73c9b6..000000000000
--- a/acct-group/stunnel/stunnel-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for stunnel"
-ACCT_GROUP_ID=341
diff --git a/acct-group/stunnel/stunnel-0-r3.ebuild b/acct-group/stunnel/stunnel-0-r3.ebuild
new file mode 100644
index 000000000000..06adffbb0eb5
--- /dev/null
+++ b/acct-group/stunnel/stunnel-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for stunnel"
+ACCT_GROUP_ID=341
diff --git a/acct-group/subsonic/subsonic-0-r2.ebuild b/acct-group/subsonic/subsonic-0-r2.ebuild
new file mode 100644
index 000000000000..c3679fce4f3e
--- /dev/null
+++ b/acct-group/subsonic/subsonic-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/subsonic-bin"
+
+ACCT_GROUP_ID="136"
diff --git a/acct-group/subsonic/subsonic-0.ebuild b/acct-group/subsonic/subsonic-0.ebuild
deleted file mode 100644
index 95e9e9317296..000000000000
--- a/acct-group/subsonic/subsonic-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/subsonic-bin"
-
-ACCT_GROUP_ID="136"
diff --git a/acct-group/supervisor/supervisor-0-r1.ebuild b/acct-group/supervisor/supervisor-0-r1.ebuild
deleted file mode 100644
index 4890748ecbfe..000000000000
--- a/acct-group/supervisor/supervisor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group to grant access to app-admin/supervisor's management"
-ACCT_GROUP_ID=463
diff --git a/acct-group/supervisor/supervisor-0-r3.ebuild b/acct-group/supervisor/supervisor-0-r3.ebuild
new file mode 100644
index 000000000000..219841f99d95
--- /dev/null
+++ b/acct-group/supervisor/supervisor-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group to grant access to app-admin/supervisor's management"
+ACCT_GROUP_ID=463
diff --git a/acct-group/suricata/suricata-0-r1.ebuild b/acct-group/suricata/suricata-0-r1.ebuild
deleted file mode 100644
index c9ad4e167661..000000000000
--- a/acct-group/suricata/suricata-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Suricata IDS"
-ACCT_GROUP_ID=477
diff --git a/acct-group/suricata/suricata-0-r3.ebuild b/acct-group/suricata/suricata-0-r3.ebuild
new file mode 100644
index 000000000000..03acf179a233
--- /dev/null
+++ b/acct-group/suricata/suricata-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Suricata IDS"
+ACCT_GROUP_ID=477
diff --git a/acct-group/svnusers/metadata.xml b/acct-group/svnusers/metadata.xml
index efd4c7942ac7..aea3dcbecde2 100644
--- a/acct-group/svnusers/metadata.xml
+++ b/acct-group/svnusers/metadata.xml
@@ -5,8 +5,4 @@
<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-group/svnusers/svnusers-0-r1.ebuild b/acct-group/svnusers/svnusers-0-r1.ebuild
deleted file mode 100644
index 0a1c980c6503..000000000000
--- a/acct-group/svnusers/svnusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=399
diff --git a/acct-group/svnusers/svnusers-0-r3.ebuild b/acct-group/svnusers/svnusers-0-r3.ebuild
new file mode 100644
index 000000000000..5fc0c83c0c1e
--- /dev/null
+++ b/acct-group/svnusers/svnusers-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=399
diff --git a/acct-group/svxlink/svxlink-0-r2.ebuild b/acct-group/svxlink/svxlink-0-r2.ebuild
new file mode 100644
index 000000000000..e868e7be23a8
--- /dev/null
+++ b/acct-group/svxlink/svxlink-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the svxlink server"
+ACCT_GROUP_ID=247
diff --git a/acct-group/svxlink/svxlink-0.ebuild b/acct-group/svxlink/svxlink-0.ebuild
deleted file mode 100644
index 73dbcd6e5c15..000000000000
--- a/acct-group/svxlink/svxlink-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the svxlink server"
-ACCT_GROUP_ID=247
diff --git a/acct-group/swift/metadata.xml b/acct-group/swift/metadata.xml
deleted file mode 100644
index 5c76f7a3fc67..000000000000
--- a/acct-group/swift/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/swift/swift-0-r1.ebuild b/acct-group/swift/swift-0-r1.ebuild
deleted file mode 100644
index 02bd773b31ab..000000000000
--- a/acct-group/swift/swift-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=449
diff --git a/acct-group/synapse/metadata.xml b/acct-group/synapse/metadata.xml
index c74515d20dbe..15cf2ff7a521 100644
--- a/acct-group/synapse/metadata.xml
+++ b/acct-group/synapse/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/synapse/synapse-0-r1.ebuild b/acct-group/synapse/synapse-0-r1.ebuild
new file mode 100644
index 000000000000..ce4c5e9bfbf0
--- /dev/null
+++ b/acct-group/synapse/synapse-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/synapse"
+ACCT_GROUP_ID=519
diff --git a/acct-group/synapse/synapse-0.ebuild b/acct-group/synapse/synapse-0.ebuild
deleted file mode 100644
index 0f7e576bb55a..000000000000
--- a/acct-group/synapse/synapse-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/synapse"
-ACCT_GROUP_ID=519
diff --git a/acct-group/syncthing/syncthing-0-r1.ebuild b/acct-group/syncthing/syncthing-0-r1.ebuild
deleted file mode 100644
index 2c7a7840c246..000000000000
--- a/acct-group/syncthing/syncthing-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
-ACCT_GROUP_ID=499
diff --git a/acct-group/syncthing/syncthing-0-r3.ebuild b/acct-group/syncthing/syncthing-0-r3.ebuild
new file mode 100644
index 000000000000..f8e67d201edc
--- /dev/null
+++ b/acct-group/syncthing/syncthing-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
+ACCT_GROUP_ID=499
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
deleted file mode 100644
index 118999609538..000000000000
--- a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r3.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r3.ebuild
new file mode 100644
index 000000000000..e90b60fad0e0
--- /dev/null
+++ b/acct-group/systemd-coredump/systemd-coredump-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-hostname/metadata.xml b/acct-group/systemd-hostname/metadata.xml
deleted file mode 100644
index 31123d01cb4d..000000000000
--- a/acct-group/systemd-hostname/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>systemd@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild b/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
deleted file mode 100644
index 24f44986f516..000000000000
--- a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=505
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
deleted file mode 100644
index 8ddee6ec320f..000000000000
--- a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
new file mode 100644
index 000000000000..747c4643e742
--- /dev/null
+++ b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild b/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
deleted file mode 100644
index c439156e2f63..000000000000
--- a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-journal/systemd-journal-0-r3.ebuild b/acct-group/systemd-journal/systemd-journal-0-r3.ebuild
new file mode 100644
index 000000000000..123a0ce62fb0
--- /dev/null
+++ b/acct-group/systemd-journal/systemd-journal-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-network/systemd-network-0-r1.ebuild b/acct-group/systemd-network/systemd-network-0-r1.ebuild
deleted file mode 100644
index 6f88d3ca9895..000000000000
--- a/acct-group/systemd-network/systemd-network-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-network/systemd-network-0-r3.ebuild b/acct-group/systemd-network/systemd-network-0-r3.ebuild
new file mode 100644
index 000000000000..a8bd4128f2c1
--- /dev/null
+++ b/acct-group/systemd-network/systemd-network-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-oom/systemd-oom-0-r2.ebuild b/acct-group/systemd-oom/systemd-oom-0-r2.ebuild
new file mode 100644
index 000000000000..5af0fb5e734c
--- /dev/null
+++ b/acct-group/systemd-oom/systemd-oom-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-oom/systemd-oom-0.ebuild b/acct-group/systemd-oom/systemd-oom-0.ebuild
deleted file mode 100644
index 175d26d66eb5..000000000000
--- a/acct-group/systemd-oom/systemd-oom-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
deleted file mode 100644
index 903603df6230..000000000000
--- a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r3.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r3.ebuild
new file mode 100644
index 000000000000..b201257ce596
--- /dev/null
+++ b/acct-group/systemd-resolve/systemd-resolve-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
deleted file mode 100644
index 50abd9371502..000000000000
--- a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=195
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r3.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r3.ebuild
new file mode 100644
index 000000000000..f0e27bd89598
--- /dev/null
+++ b/acct-group/systemd-timesync/systemd-timesync-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=195
diff --git a/acct-group/tape/tape-0-r1.ebuild b/acct-group/tape/tape-0-r1.ebuild
deleted file mode 100644
index e7aa561286dd..000000000000
--- a/acct-group/tape/tape-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=26
diff --git a/acct-group/tape/tape-0-r3.ebuild b/acct-group/tape/tape-0-r3.ebuild
new file mode 100644
index 000000000000..52b016f26fc8
--- /dev/null
+++ b/acct-group/tape/tape-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=26
diff --git a/acct-group/taskd/taskd-0-r2.ebuild b/acct-group/taskd/taskd-0-r2.ebuild
new file mode 100644
index 000000000000..daa10d6df9b1
--- /dev/null
+++ b/acct-group/taskd/taskd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/taskd"
+
+ACCT_GROUP_ID="152"
diff --git a/acct-group/taskd/taskd-0.ebuild b/acct-group/taskd/taskd-0.ebuild
deleted file mode 100644
index 16ca38a8ade9..000000000000
--- a/acct-group/taskd/taskd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/taskd"
-
-ACCT_GROUP_ID="152"
diff --git a/acct-group/teamspeak/teamspeak-0-r1.ebuild b/acct-group/teamspeak/teamspeak-0-r1.ebuild
deleted file mode 100644
index 05f5b6fd1ea8..000000000000
--- a/acct-group/teamspeak/teamspeak-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the TeamSpeak server"
-
-ACCT_GROUP_ID="488"
diff --git a/acct-group/teamspeak/teamspeak-0-r3.ebuild b/acct-group/teamspeak/teamspeak-0-r3.ebuild
new file mode 100644
index 000000000000..58a4fc1e1d9d
--- /dev/null
+++ b/acct-group/teamspeak/teamspeak-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the TeamSpeak server"
+
+ACCT_GROUP_ID="488"
diff --git a/acct-group/telegraf/telegraf-0-r1.ebuild b/acct-group/telegraf/telegraf-0-r1.ebuild
deleted file mode 100644
index c7a063da8332..000000000000
--- a/acct-group/telegraf/telegraf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=428
diff --git a/acct-group/telegraf/telegraf-0-r3.ebuild b/acct-group/telegraf/telegraf-0-r3.ebuild
new file mode 100644
index 000000000000..7e21326907a1
--- /dev/null
+++ b/acct-group/telegraf/telegraf-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=428
diff --git a/acct-group/tenshi/tenshi-0-r2.ebuild b/acct-group/tenshi/tenshi-0-r2.ebuild
new file mode 100644
index 000000000000..137aa247862b
--- /dev/null
+++ b/acct-group/tenshi/tenshi-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/tenshi"
+
+ACCT_GROUP_ID="283"
diff --git a/acct-group/tenshi/tenshi-0.ebuild b/acct-group/tenshi/tenshi-0.ebuild
deleted file mode 100644
index 4ca858e2c78d..000000000000
--- a/acct-group/tenshi/tenshi-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/tenshi"
-
-ACCT_GROUP_ID="283"
diff --git a/acct-group/thttpd/metadata.xml b/acct-group/thttpd/metadata.xml
deleted file mode 100644
index 489e730c1c90..000000000000
--- a/acct-group/thttpd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/thttpd/thttpd-0.ebuild b/acct-group/thttpd/thttpd-0.ebuild
deleted file mode 100644
index f30403a01946..000000000000
--- a/acct-group/thttpd/thttpd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/thttpd"
-
-ACCT_GROUP_ID="155"
diff --git a/acct-group/tinyproxy/tinyproxy-0-r2.ebuild b/acct-group/tinyproxy/tinyproxy-0-r2.ebuild
new file mode 100644
index 000000000000..117d3f6feede
--- /dev/null
+++ b/acct-group/tinyproxy/tinyproxy-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-group
+
+DESCRIPTION="gid for net-proxy/tinyproxy"
+
+ACCT_GROUP_ID=186
diff --git a/acct-group/tinyproxy/tinyproxy-0.ebuild b/acct-group/tinyproxy/tinyproxy-0.ebuild
deleted file mode 100644
index 24a884b47c59..000000000000
--- a/acct-group/tinyproxy/tinyproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-proxy/tinyproxy"
-
-ACCT_GROUP_ID=186
diff --git a/acct-group/tomcat/tomcat-0-r2.ebuild b/acct-group/tomcat/tomcat-0-r2.ebuild
new file mode 100644
index 000000000000..97379c2748f1
--- /dev/null
+++ b/acct-group/tomcat/tomcat-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Apache Tomcat"
+ACCT_GROUP_ID=265
diff --git a/acct-group/tomcat/tomcat-0.ebuild b/acct-group/tomcat/tomcat-0.ebuild
deleted file mode 100644
index ddef1fa45694..000000000000
--- a/acct-group/tomcat/tomcat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Apache Tomcat"
-ACCT_GROUP_ID=265
diff --git a/acct-group/tor/metadata.xml b/acct-group/tor/metadata.xml
index 489e730c1c90..d59234f9f101 100644
--- a/acct-group/tor/metadata.xml
+++ b/acct-group/tor/metadata.xml
@@ -2,7 +2,11 @@
<!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-group/tor/tor-0-r1.ebuild b/acct-group/tor/tor-0-r1.ebuild
deleted file mode 100644
index 0fe44e122b31..000000000000
--- a/acct-group/tor/tor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for tor daemon"
-ACCT_GROUP_ID=43
diff --git a/acct-group/tor/tor-0-r3.ebuild b/acct-group/tor/tor-0-r3.ebuild
new file mode 100644
index 000000000000..88d38d9bfa89
--- /dev/null
+++ b/acct-group/tor/tor-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for tor daemon"
+ACCT_GROUP_ID=43
diff --git a/acct-group/tox/tox-0-r1.ebuild b/acct-group/tox/tox-0-r1.ebuild
deleted file mode 100644
index e50b936945ed..000000000000
--- a/acct-group/tox/tox-0-r1.ebuild
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-group
-DESCRIPTION="Group management for package net-libs/tox"
-ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tox/tox-0-r3.ebuild b/acct-group/tox/tox-0-r3.ebuild
new file mode 100644
index 000000000000..c2718143e11e
--- /dev/null
+++ b/acct-group/tox/tox-0-r3.ebuild
@@ -0,0 +1,7 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit acct-group
+DESCRIPTION="Group management for package net-libs/tox"
+ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tpm/metadata.xml b/acct-group/tpm/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/tpm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-group/tpm/tpm-0.ebuild b/acct-group/tpm/tpm-0.ebuild
deleted file mode 100644
index 78bf604298a0..000000000000
--- a/acct-group/tpm/tpm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=347
diff --git a/acct-group/transmission/transmission-0-r1.ebuild b/acct-group/transmission/transmission-0-r1.ebuild
deleted file mode 100644
index 682145cd09be..000000000000
--- a/acct-group/transmission/transmission-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=169
diff --git a/acct-group/transmission/transmission-0-r3.ebuild b/acct-group/transmission/transmission-0-r3.ebuild
new file mode 100644
index 000000000000..84a48da79986
--- /dev/null
+++ b/acct-group/transmission/transmission-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=169
diff --git a/acct-group/trickster/trickster-0-r2.ebuild b/acct-group/trickster/trickster-0-r2.ebuild
new file mode 100644
index 000000000000..563175bbb774
--- /dev/null
+++ b/acct-group/trickster/trickster-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/trickster"
+
+ACCT_GROUP_ID="119"
diff --git a/acct-group/trickster/trickster-0.ebuild b/acct-group/trickster/trickster-0.ebuild
deleted file mode 100644
index fa5e88995312..000000000000
--- a/acct-group/trickster/trickster-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/trickster"
-
-ACCT_GROUP_ID="119"
diff --git a/acct-group/trojan/trojan-0-r2.ebuild b/acct-group/trojan/trojan-0-r2.ebuild
new file mode 100644
index 000000000000..8d8aa02e3984
--- /dev/null
+++ b/acct-group/trojan/trojan-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=326
diff --git a/acct-group/trojan/trojan-0.ebuild b/acct-group/trojan/trojan-0.ebuild
deleted file mode 100644
index e3af9f513f48..000000000000
--- a/acct-group/trojan/trojan-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=326
diff --git a/acct-group/tsm/tsm-0-r1.ebuild b/acct-group/tsm/tsm-0-r1.ebuild
deleted file mode 100644
index 117a3a3bde45..000000000000
--- a/acct-group/tsm/tsm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=465
diff --git a/acct-group/tsm/tsm-0-r3.ebuild b/acct-group/tsm/tsm-0-r3.ebuild
new file mode 100644
index 000000000000..06786eb47f3d
--- /dev/null
+++ b/acct-group/tsm/tsm-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=465
diff --git a/acct-group/tss/tss-0-r1.ebuild b/acct-group/tss/tss-0-r1.ebuild
deleted file mode 100644
index 3ecc4e54949c..000000000000
--- a/acct-group/tss/tss-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Trusted Software Stack for TPMs group"
-ACCT_GROUP_ID=59
diff --git a/acct-group/tss/tss-0-r3.ebuild b/acct-group/tss/tss-0-r3.ebuild
new file mode 100644
index 000000000000..70875fc89c8e
--- /dev/null
+++ b/acct-group/tss/tss-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Trusted Software Stack for TPMs group"
+ACCT_GROUP_ID=59
diff --git a/acct-group/ttrssd/ttrssd-0-r2.ebuild b/acct-group/ttrssd/ttrssd-0-r2.ebuild
new file mode 100644
index 000000000000..ca7b68e26c37
--- /dev/null
+++ b/acct-group/ttrssd/ttrssd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for www-apps/tt-rss"
+ACCT_GROUP_ID=386
diff --git a/acct-group/ttrssd/ttrssd-0.ebuild b/acct-group/ttrssd/ttrssd-0.ebuild
deleted file mode 100644
index 1d5fcc70b9ab..000000000000
--- a/acct-group/ttrssd/ttrssd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-apps/tt-rss"
-ACCT_GROUP_ID=386
diff --git a/acct-group/tty/tty-0-r1.ebuild b/acct-group/tty/tty-0-r1.ebuild
deleted file mode 100644
index 2133d92cfa3b..000000000000
--- a/acct-group/tty/tty-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=5
diff --git a/acct-group/tty/tty-0-r3.ebuild b/acct-group/tty/tty-0-r3.ebuild
new file mode 100644
index 000000000000..9d2bce0646a3
--- /dev/null
+++ b/acct-group/tty/tty-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=5
diff --git a/acct-group/turnserver/metadata.xml b/acct-group/turnserver/metadata.xml
index e8de1c56b30f..115e9d64a669 100644
--- a/acct-group/turnserver/metadata.xml
+++ b/acct-group/turnserver/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>nativemad@gentoo.org</email>
- <name>Andreas Schuerch</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/turnserver/turnserver-0-r1.ebuild b/acct-group/turnserver/turnserver-0-r1.ebuild
deleted file mode 100644
index 37a44ee01058..000000000000
--- a/acct-group/turnserver/turnserver-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for a turn server like coturn"
-
-ACCT_GROUP_ID="235"
diff --git a/acct-group/turnserver/turnserver-0-r3.ebuild b/acct-group/turnserver/turnserver-0-r3.ebuild
new file mode 100644
index 000000000000..bad6fb14e84b
--- /dev/null
+++ b/acct-group/turnserver/turnserver-0-r3.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-group
+
+DESCRIPTION="A group for a turn server like coturn"
+
+ACCT_GROUP_ID="235"
diff --git a/acct-group/ubridge/ubridge-0-r1.ebuild b/acct-group/ubridge/ubridge-0-r1.ebuild
deleted file mode 100644
index 6d79fba1f383..000000000000
--- a/acct-group/ubridge/ubridge-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/ubridge"
-ACCT_GROUP_ID=461
diff --git a/acct-group/ubridge/ubridge-0-r3.ebuild b/acct-group/ubridge/ubridge-0-r3.ebuild
new file mode 100644
index 000000000000..527e6c949c15
--- /dev/null
+++ b/acct-group/ubridge/ubridge-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/ubridge"
+ACCT_GROUP_ID=461
diff --git a/acct-group/ulogd/ulogd-0-r2.ebuild b/acct-group/ulogd/ulogd-0-r2.ebuild
new file mode 100644
index 000000000000..bf6696c9432a
--- /dev/null
+++ b/acct-group/ulogd/ulogd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for ulogd"
+ACCT_GROUP_ID=311
diff --git a/acct-group/ulogd/ulogd-0.ebuild b/acct-group/ulogd/ulogd-0.ebuild
deleted file mode 100644
index d9c49c9aff0e..000000000000
--- a/acct-group/ulogd/ulogd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ulogd"
-ACCT_GROUP_ID=311
diff --git a/acct-group/ultimaker/metadata.xml b/acct-group/ultimaker/metadata.xml
deleted file mode 100644
index 99a1a1a79a2a..000000000000
--- a/acct-group/ultimaker/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>3dprint@gentoo.org</email>
- <name>Gentoo 3D Printer Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/acct-group/ultimaker/ultimaker-0-r1.ebuild b/acct-group/ultimaker/ultimaker-0-r1.ebuild
deleted file mode 100644
index af415ea3785f..000000000000
--- a/acct-group/ultimaker/ultimaker-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ultimaker"
-ACCT_GROUP_ID=369
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0-r2.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0-r2.ebuild
new file mode 100644
index 000000000000..37d8549b2a9a
--- /dev/null
+++ b/acct-group/unbound-telemetry/unbound-telemetry-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=279
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
deleted file mode 100644
index 7cf4cee045e4..000000000000
--- a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=279
diff --git a/acct-group/unbound/unbound-0-r1.ebuild b/acct-group/unbound/unbound-0-r1.ebuild
deleted file mode 100644
index 4a2eab027793..000000000000
--- a/acct-group/unbound/unbound-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="unbound program group"
-
-ACCT_GROUP_ID=391
diff --git a/acct-group/unbound/unbound-0-r3.ebuild b/acct-group/unbound/unbound-0-r3.ebuild
new file mode 100644
index 000000000000..0b76ff60af6b
--- /dev/null
+++ b/acct-group/unbound/unbound-0-r3.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-group
+
+DESCRIPTION="unbound program group"
+
+ACCT_GROUP_ID=391
diff --git a/acct-group/unifi-video/unifi-video-0-r2.ebuild b/acct-group/unifi-video/unifi-video-0-r2.ebuild
new file mode 100644
index 000000000000..cbe292142236
--- /dev/null
+++ b/acct-group/unifi-video/unifi-video-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Unifi Video"
+ACCT_GROUP_ID=348
diff --git a/acct-group/unifi-video/unifi-video-0.ebuild b/acct-group/unifi-video/unifi-video-0.ebuild
deleted file mode 100644
index 39344e103ea3..000000000000
--- a/acct-group/unifi-video/unifi-video-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Unifi Video"
-ACCT_GROUP_ID=348
diff --git a/acct-group/unifi/metadata.xml b/acct-group/unifi/metadata.xml
index fbc6b65e9f02..caeb3a8449dc 100644
--- a/acct-group/unifi/metadata.xml
+++ b/acct-group/unifi/metadata.xml
@@ -2,10 +2,6 @@
<!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-group/unifi/unifi-0-r1.ebuild b/acct-group/unifi/unifi-0-r1.ebuild
deleted file mode 100644
index f4db39318eb5..000000000000
--- a/acct-group/unifi/unifi-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the UniFi controller"
-
-ACCT_GROUP_ID="113"
diff --git a/acct-group/unifi/unifi-0-r3.ebuild b/acct-group/unifi/unifi-0-r3.ebuild
new file mode 100644
index 000000000000..da21782da096
--- /dev/null
+++ b/acct-group/unifi/unifi-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the UniFi controller"
+
+ACCT_GROUP_ID="113"
diff --git a/acct-group/unrealircd/metadata.xml b/acct-group/unrealircd/metadata.xml
index ebced1b9146f..641cbd3703e7 100644
--- a/acct-group/unrealircd/metadata.xml
+++ b/acct-group/unrealircd/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>kensington@gentoo.org</email>
- <name>Michael Palimaka</name>
- </maintainer>
- <maintainer type="person">
<email>sam@gentoo.org</email>
<name>Sam James</name>
</maintainer>
diff --git a/acct-group/unrealircd/unrealircd-0-r1.ebuild b/acct-group/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index 70f925a3cf58..000000000000
--- a/acct-group/unrealircd/unrealircd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=494
diff --git a/acct-group/unrealircd/unrealircd-0-r2.ebuild b/acct-group/unrealircd/unrealircd-0-r2.ebuild
new file mode 100644
index 000000000000..6e9905dda3ca
--- /dev/null
+++ b/acct-group/unrealircd/unrealircd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=494
diff --git a/acct-group/upmpdcli/upmpdcli-0-r2.ebuild b/acct-group/upmpdcli/upmpdcli-0-r2.ebuild
new file mode 100644
index 000000000000..bb0ab71e98fb
--- /dev/null
+++ b/acct-group/upmpdcli/upmpdcli-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for upmpdcli"
+ACCT_GROUP_ID=372
diff --git a/acct-group/upmpdcli/upmpdcli-0.ebuild b/acct-group/upmpdcli/upmpdcli-0.ebuild
deleted file mode 100644
index 1b73dccb8d2f..000000000000
--- a/acct-group/upmpdcli/upmpdcli-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for upmpdcli"
-ACCT_GROUP_ID=372
diff --git a/acct-group/uptimed/uptimed-0-r2.ebuild b/acct-group/uptimed/uptimed-0-r2.ebuild
deleted file mode 100644
index 1934484e34a1..000000000000
--- a/acct-group/uptimed/uptimed-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="220"
diff --git a/acct-group/uptimed/uptimed-0-r3.ebuild b/acct-group/uptimed/uptimed-0-r3.ebuild
new file mode 100644
index 000000000000..9e862e5c5de5
--- /dev/null
+++ b/acct-group/uptimed/uptimed-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="220"
diff --git a/acct-group/usb/metadata.xml b/acct-group/usb/metadata.xml
index 2c47fcf00594..115e9d64a669 100644
--- a/acct-group/usb/metadata.xml
+++ b/acct-group/usb/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/usb/usb-0-r1.ebuild b/acct-group/usb/usb-0-r1.ebuild
deleted file mode 100644
index 4655512049db..000000000000
--- a/acct-group/usb/usb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=85
diff --git a/acct-group/usb/usb-0-r3.ebuild b/acct-group/usb/usb-0-r3.ebuild
new file mode 100644
index 000000000000..f7d9798c06cf
--- /dev/null
+++ b/acct-group/usb/usb-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=85
diff --git a/acct-group/users/users-0-r2.ebuild b/acct-group/users/users-0-r2.ebuild
new file mode 100644
index 000000000000..e54d2837d148
--- /dev/null
+++ b/acct-group/users/users-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=100
diff --git a/acct-group/users/users-0.ebuild b/acct-group/users/users-0.ebuild
deleted file mode 100644
index 50b573c2629d..000000000000
--- a/acct-group/users/users-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=100
diff --git a/acct-group/ushare/ushare-0-r2.ebuild b/acct-group/ushare/ushare-0-r2.ebuild
new file mode 100644
index 000000000000..89a643abcf84
--- /dev/null
+++ b/acct-group/ushare/ushare-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for uShare"
+ACCT_GROUP_ID=349
diff --git a/acct-group/ushare/ushare-0.ebuild b/acct-group/ushare/ushare-0.ebuild
deleted file mode 100644
index 43678d459806..000000000000
--- a/acct-group/ushare/ushare-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for uShare"
-ACCT_GROUP_ID=349
diff --git a/acct-group/utmp/utmp-0-r1.ebuild b/acct-group/utmp/utmp-0-r1.ebuild
deleted file mode 100644
index 24664616643a..000000000000
--- a/acct-group/utmp/utmp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=406
diff --git a/acct-group/utmp/utmp-0-r3.ebuild b/acct-group/utmp/utmp-0-r3.ebuild
new file mode 100644
index 000000000000..0c9596d87dee
--- /dev/null
+++ b/acct-group/utmp/utmp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=406
diff --git a/acct-group/uucp/uucp-0-r1.ebuild b/acct-group/uucp/uucp-0-r1.ebuild
deleted file mode 100644
index e2e32b62e410..000000000000
--- a/acct-group/uucp/uucp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=14
diff --git a/acct-group/uucp/uucp-0-r3.ebuild b/acct-group/uucp/uucp-0-r3.ebuild
new file mode 100644
index 000000000000..ca0aa96d1ea8
--- /dev/null
+++ b/acct-group/uucp/uucp-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=14
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..cb8885374b40
--- /dev/null
+++ b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/uwsgi_exporter"
+
+ACCT_GROUP_ID="289"
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
deleted file mode 100644
index 4c7c20d457ec..000000000000
--- a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/uwsgi_exporter"
-
-ACCT_GROUP_ID="289"
diff --git a/acct-group/vacation/vacation-0-r2.ebuild b/acct-group/vacation/vacation-0-r2.ebuild
new file mode 100644
index 000000000000..bc00a8b9dc98
--- /dev/null
+++ b/acct-group/vacation/vacation-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/postfixadmin"
+
+ACCT_GROUP_ID="125"
diff --git a/acct-group/vacation/vacation-0.ebuild b/acct-group/vacation/vacation-0.ebuild
deleted file mode 100644
index 94ef2caa53ed..000000000000
--- a/acct-group/vacation/vacation-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/postfixadmin"
-
-ACCT_GROUP_ID="125"
diff --git a/acct-group/varnish/metadata.xml b/acct-group/varnish/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/varnish/metadata.xml
+++ b/acct-group/varnish/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/acct-group/varnish/varnish-0-r1.ebuild b/acct-group/varnish/varnish-0-r1.ebuild
deleted file mode 100644
index 9fbcc6472b4e..000000000000
--- a/acct-group/varnish/varnish-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for varnish"
-ACCT_GROUP_ID=474
diff --git a/acct-group/varnish/varnish-0-r3.ebuild b/acct-group/varnish/varnish-0-r3.ebuild
new file mode 100644
index 000000000000..500b2966ff59
--- /dev/null
+++ b/acct-group/varnish/varnish-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for varnish"
+ACCT_GROUP_ID=474
diff --git a/acct-group/vault/vault-0-r1.ebuild b/acct-group/vault/vault-0-r1.ebuild
deleted file mode 100644
index 518aa5cb3111..000000000000
--- a/acct-group/vault/vault-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=410
diff --git a/acct-group/vault/vault-0-r3.ebuild b/acct-group/vault/vault-0-r3.ebuild
new file mode 100644
index 000000000000..6eecdb882a13
--- /dev/null
+++ b/acct-group/vault/vault-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=410
diff --git a/acct-group/vault_exporter/vault_exporter-0-r2.ebuild b/acct-group/vault_exporter/vault_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..77da12a31c43
--- /dev/null
+++ b/acct-group/vault_exporter/vault_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/vault_exporter"
+
+ACCT_GROUP_ID="323"
diff --git a/acct-group/vault_exporter/vault_exporter-0.ebuild b/acct-group/vault_exporter/vault_exporter-0.ebuild
deleted file mode 100644
index e808ce81aad1..000000000000
--- a/acct-group/vault_exporter/vault_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-metrics/vault_exporter"
-
-ACCT_GROUP_ID="323"
diff --git a/acct-group/vboxguest/vboxguest-0-r1.ebuild b/acct-group/vboxguest/vboxguest-0-r1.ebuild
deleted file mode 100644
index 8f7c117f5882..000000000000
--- a/acct-group/vboxguest/vboxguest-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=305
diff --git a/acct-group/vboxguest/vboxguest-0-r3.ebuild b/acct-group/vboxguest/vboxguest-0-r3.ebuild
new file mode 100644
index 000000000000..1d3eafbbbc16
--- /dev/null
+++ b/acct-group/vboxguest/vboxguest-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=305
diff --git a/acct-group/vboxsf/vboxsf-0-r1.ebuild b/acct-group/vboxsf/vboxsf-0-r1.ebuild
deleted file mode 100644
index 6b6336afa19f..000000000000
--- a/acct-group/vboxsf/vboxsf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=306
diff --git a/acct-group/vboxsf/vboxsf-0-r3.ebuild b/acct-group/vboxsf/vboxsf-0-r3.ebuild
new file mode 100644
index 000000000000..e910cc5e3e08
--- /dev/null
+++ b/acct-group/vboxsf/vboxsf-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=306
diff --git a/acct-group/vboxusers/vboxusers-0-r1.ebuild b/acct-group/vboxusers/vboxusers-0-r1.ebuild
deleted file mode 100644
index ce349b0fcdf7..000000000000
--- a/acct-group/vboxusers/vboxusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=304
diff --git a/acct-group/vboxusers/vboxusers-0-r3.ebuild b/acct-group/vboxusers/vboxusers-0-r3.ebuild
new file mode 100644
index 000000000000..ce3ed3b28e42
--- /dev/null
+++ b/acct-group/vboxusers/vboxusers-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=304
diff --git a/acct-group/vdr/vdr-0-r1.ebuild b/acct-group/vdr/vdr-0-r1.ebuild
deleted file mode 100644
index b150a48a3abe..000000000000
--- a/acct-group/vdr/vdr-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
-
-ACCT_GROUP_ID="452"
diff --git a/acct-group/vdr/vdr-0-r3.ebuild b/acct-group/vdr/vdr-0-r3.ebuild
new file mode 100644
index 000000000000..f8863791446e
--- /dev/null
+++ b/acct-group/vdr/vdr-0-r3.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
+
+ACCT_GROUP_ID="452"
diff --git a/acct-group/vdradmin/vdradmin-0-r1.ebuild b/acct-group/vdradmin/vdradmin-0-r1.ebuild
deleted file mode 100644
index 458e6b888862..000000000000
--- a/acct-group/vdradmin/vdradmin-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-misc/vdradmin-am"
-
-ACCT_GROUP_ID=453
diff --git a/acct-group/vdradmin/vdradmin-0-r3.ebuild b/acct-group/vdradmin/vdradmin-0-r3.ebuild
new file mode 100644
index 000000000000..4dbd3738ba1f
--- /dev/null
+++ b/acct-group/vdradmin/vdradmin-0-r3.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-group
+
+DESCRIPTION="Group for www-misc/vdradmin-am"
+
+ACCT_GROUP_ID=453
diff --git a/acct-group/video/video-0-r1.ebuild b/acct-group/video/video-0-r1.ebuild
deleted file mode 100644
index 3b06b5be9d79..000000000000
--- a/acct-group/video/video-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=27
diff --git a/acct-group/video/video-0-r3.ebuild b/acct-group/video/video-0-r3.ebuild
new file mode 100644
index 000000000000..dff475349405
--- /dev/null
+++ b/acct-group/video/video-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=27
diff --git a/acct-group/vlock/vlock-0-r2.ebuild b/acct-group/vlock/vlock-0-r2.ebuild
new file mode 100644
index 000000000000..4ce0fd00783f
--- /dev/null
+++ b/acct-group/vlock/vlock-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/vlock"
+
+ACCT_GROUP_ID="178"
diff --git a/acct-group/vlock/vlock-0.ebuild b/acct-group/vlock/vlock-0.ebuild
deleted file mode 100644
index 5f73550404af..000000000000
--- a/acct-group/vlock/vlock-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for app-misc/vlock"
-
-ACCT_GROUP_ID="178"
diff --git a/acct-group/vnstat/vnstat-0-r1.ebuild b/acct-group/vnstat/vnstat-0-r1.ebuild
new file mode 100644
index 000000000000..d33a0de72d50
--- /dev/null
+++ b/acct-group/vnstat/vnstat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for vnstat network monitoring"
+ACCT_GROUP_ID=229
diff --git a/acct-group/vnstat/vnstat-0.ebuild b/acct-group/vnstat/vnstat-0.ebuild
deleted file mode 100644
index 9eba86cbc629..000000000000
--- a/acct-group/vnstat/vnstat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for vnstat network monitoring"
-ACCT_GROUP_ID=229
diff --git a/acct-group/vpopmail/vpopmail-0-r1.ebuild b/acct-group/vpopmail/vpopmail-0-r1.ebuild
deleted file mode 100644
index 05fca0f655ee..000000000000
--- a/acct-group/vpopmail/vpopmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=89
diff --git a/acct-group/vpopmail/vpopmail-0-r3.ebuild b/acct-group/vpopmail/vpopmail-0-r3.ebuild
new file mode 100644
index 000000000000..0fbffb112f25
--- /dev/null
+++ b/acct-group/vpopmail/vpopmail-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=89
diff --git a/acct-group/wesnoth/wesnoth-0-r1.ebuild b/acct-group/wesnoth/wesnoth-0-r1.ebuild
deleted file mode 100644
index 434362fd312c..000000000000
--- a/acct-group/wesnoth/wesnoth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=419
diff --git a/acct-group/wesnoth/wesnoth-0-r3.ebuild b/acct-group/wesnoth/wesnoth-0-r3.ebuild
new file mode 100644
index 000000000000..b639e69c68bc
--- /dev/null
+++ b/acct-group/wesnoth/wesnoth-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=419
diff --git a/acct-group/wheel/wheel-0-r1.ebuild b/acct-group/wheel/wheel-0-r1.ebuild
deleted file mode 100644
index 8f5f3e4f88b7..000000000000
--- a/acct-group/wheel/wheel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=10
diff --git a/acct-group/wheel/wheel-0-r3.ebuild b/acct-group/wheel/wheel-0-r3.ebuild
new file mode 100644
index 000000000000..e06f86e95533
--- /dev/null
+++ b/acct-group/wheel/wheel-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=10
diff --git a/acct-group/wwwoffle/wwwoffle-0-r2.ebuild b/acct-group/wwwoffle/wwwoffle-0-r2.ebuild
new file mode 100644
index 000000000000..700f853b33ea
--- /dev/null
+++ b/acct-group/wwwoffle/wwwoffle-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/wwwoffle"
+
+ACCT_GROUP_ID="251"
diff --git a/acct-group/wwwoffle/wwwoffle-0.ebuild b/acct-group/wwwoffle/wwwoffle-0.ebuild
deleted file mode 100644
index 05d1c23d5ebb..000000000000
--- a/acct-group/wwwoffle/wwwoffle-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/wwwoffle"
-
-ACCT_GROUP_ID="251"
diff --git a/acct-group/x2goprint/x2goprint-0-r1.ebuild b/acct-group/x2goprint/x2goprint-0-r1.ebuild
deleted file mode 100644
index c81c3e3ac695..000000000000
--- a/acct-group/x2goprint/x2goprint-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=292
diff --git a/acct-group/x2goprint/x2goprint-0-r3.ebuild b/acct-group/x2goprint/x2goprint-0-r3.ebuild
new file mode 100644
index 000000000000..c2fa21f4f67e
--- /dev/null
+++ b/acct-group/x2goprint/x2goprint-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=292
diff --git a/acct-group/x2gouser/x2gouser-0-r1.ebuild b/acct-group/x2gouser/x2gouser-0-r1.ebuild
deleted file mode 100644
index 7e838501eee0..000000000000
--- a/acct-group/x2gouser/x2gouser-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=291
diff --git a/acct-group/x2gouser/x2gouser-0-r3.ebuild b/acct-group/x2gouser/x2gouser-0-r3.ebuild
new file mode 100644
index 000000000000..b31d6f51fc54
--- /dev/null
+++ b/acct-group/x2gouser/x2gouser-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=291
diff --git a/acct-group/xpra/xpra-0-r2.ebuild b/acct-group/xpra/xpra-0-r2.ebuild
new file mode 100644
index 000000000000..23b641671d34
--- /dev/null
+++ b/acct-group/xpra/xpra-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="group for x11-wm/xpra"
+ACCT_GROUP_ID=462
diff --git a/acct-group/xpra/xpra-0.ebuild b/acct-group/xpra/xpra-0.ebuild
deleted file mode 100644
index 282cee0f5757..000000000000
--- a/acct-group/xpra/xpra-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for x11-wm/xpra"
-ACCT_GROUP_ID=462
diff --git a/acct-group/xrootd/xrootd-0-r1.ebuild b/acct-group/xrootd/xrootd-0-r1.ebuild
deleted file mode 100644
index 15cdbba956eb..000000000000
--- a/acct-group/xrootd/xrootd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the XRootD server"
-ACCT_GROUP_ID=469
diff --git a/acct-group/xrootd/xrootd-0-r3.ebuild b/acct-group/xrootd/xrootd-0-r3.ebuild
new file mode 100644
index 000000000000..d03f0eecb488
--- /dev/null
+++ b/acct-group/xrootd/xrootd-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the XRootD server"
+ACCT_GROUP_ID=469
diff --git a/acct-group/xwax/xwax-0-r2.ebuild b/acct-group/xwax/xwax-0-r2.ebuild
new file mode 100644
index 000000000000..6b67a3f8520b
--- /dev/null
+++ b/acct-group/xwax/xwax-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/xwax"
+
+ACCT_GROUP_ID="205"
diff --git a/acct-group/xwax/xwax-0.ebuild b/acct-group/xwax/xwax-0.ebuild
deleted file mode 100644
index fa5f01bc8577..000000000000
--- a/acct-group/xwax/xwax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for media-sound/xwax"
-
-ACCT_GROUP_ID="205"
diff --git a/acct-group/yubihsm-connector/metadata.xml b/acct-group/yubihsm-connector/metadata.xml
new file mode 100644
index 000000000000..4d1e1ea205c7
--- /dev/null
+++ b/acct-group/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-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
new file mode 100644
index 000000000000..8f606cd32c80
--- /dev/null
+++ b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=528
diff --git a/acct-group/zabbix/zabbix-0-r2.ebuild b/acct-group/zabbix/zabbix-0-r2.ebuild
new file mode 100644
index 000000000000..320984b106c5
--- /dev/null
+++ b/acct-group/zabbix/zabbix-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Zabbix"
+ACCT_GROUP_ID=329
diff --git a/acct-group/zabbix/zabbix-0.ebuild b/acct-group/zabbix/zabbix-0.ebuild
deleted file mode 100644
index 73561e628222..000000000000
--- a/acct-group/zabbix/zabbix-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Zabbix"
-ACCT_GROUP_ID=329
diff --git a/acct-group/zeppelin/metadata.xml b/acct-group/zeppelin/metadata.xml
index 2f535cdc3293..e0caff1748fa 100644
--- a/acct-group/zeppelin/metadata.xml
+++ b/acct-group/zeppelin/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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-group/zeppelin/zeppelin-0-r1.ebuild b/acct-group/zeppelin/zeppelin-0-r1.ebuild
deleted file mode 100644
index d65d1aed6485..000000000000
--- a/acct-group/zeppelin/zeppelin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
-ACCT_GROUP_ID=224
diff --git a/acct-group/zeppelin/zeppelin-0-r3.ebuild b/acct-group/zeppelin/zeppelin-0-r3.ebuild
new file mode 100644
index 000000000000..1da03a61cd9e
--- /dev/null
+++ b/acct-group/zeppelin/zeppelin-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
+ACCT_GROUP_ID=224
diff --git a/acct-group/zetcd/zetcd-0-r2.ebuild b/acct-group/zetcd/zetcd-0-r2.ebuild
new file mode 100644
index 000000000000..a95becae3515
--- /dev/null
+++ b/acct-group/zetcd/zetcd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-cluster/zetcd"
+
+ACCT_GROUP_ID="253"
diff --git a/acct-group/zetcd/zetcd-0.ebuild b/acct-group/zetcd/zetcd-0.ebuild
deleted file mode 100644
index 1c35fc9add9a..000000000000
--- a/acct-group/zetcd/zetcd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-cluster/zetcd"
-
-ACCT_GROUP_ID="253"
diff --git a/acct-group/ziproxy/ziproxy-0-r2.ebuild b/acct-group/ziproxy/ziproxy-0-r2.ebuild
new file mode 100644
index 000000000000..4998bf71fe10
--- /dev/null
+++ b/acct-group/ziproxy/ziproxy-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=367
diff --git a/acct-group/ziproxy/ziproxy-0.ebuild b/acct-group/ziproxy/ziproxy-0.ebuild
deleted file mode 100644
index 2a615442577d..000000000000
--- a/acct-group/ziproxy/ziproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=367
diff --git a/acct-group/znc/znc-0-r1.ebuild b/acct-group/znc/znc-0-r1.ebuild
deleted file mode 100644
index 513803e86f5c..000000000000
--- a/acct-group/znc/znc-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/znc"
-ACCT_GROUP_ID=421
diff --git a/acct-group/znc/znc-0-r3.ebuild b/acct-group/znc/znc-0-r3.ebuild
new file mode 100644
index 000000000000..c49700746a35
--- /dev/null
+++ b/acct-group/znc/znc-0-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/znc"
+ACCT_GROUP_ID=421
diff --git a/acct-group/zookeeper/zookeeper-0-r2.ebuild b/acct-group/zookeeper/zookeeper-0-r2.ebuild
new file mode 100644
index 000000000000..49601e8da8c1
--- /dev/null
+++ b/acct-group/zookeeper/zookeeper-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/zookeeper-bin"
+
+ACCT_GROUP_ID="211"
diff --git a/acct-group/zookeeper/zookeeper-0.ebuild b/acct-group/zookeeper/zookeeper-0.ebuild
deleted file mode 100644
index c45af2d2d110..000000000000
--- a/acct-group/zookeeper/zookeeper-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-cluster/zookeeper-bin"
-
-ACCT_GROUP_ID="211"