diff --git a/acct-group/at/metadata.xml b/acct-group/at/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/at/metadata.xml
+++ b/acct-group/at/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-group/cron/metadata.xml b/acct-group/cron/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/cron/metadata.xml
+++ b/acct-group/cron/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-group/thttpd/metadata.xml b/acct-group/thttpd/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/thttpd/metadata.xml
+++ b/acct-group/thttpd/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-group/tor/metadata.xml b/acct-group/tor/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-group/tor/metadata.xml
+++ b/acct-group/tor/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
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 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/at/metadata.xml b/acct-user/at/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/at/metadata.xml
+++ b/acct-user/at/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/avahi-autoipd/metadata.xml b/acct-user/avahi-autoipd/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/avahi-autoipd/metadata.xml
+++ b/acct-user/avahi-autoipd/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/avahi/metadata.xml b/acct-user/avahi/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/avahi/metadata.xml
+++ b/acct-user/avahi/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/axtls/metadata.xml b/acct-user/axtls/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/axtls/metadata.xml
+++ b/acct-user/axtls/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/bitflu/metadata.xml b/acct-user/bitflu/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/bitflu/metadata.xml
+++ b/acct-user/bitflu/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/cron/metadata.xml b/acct-user/cron/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/cron/metadata.xml
+++ b/acct-user/cron/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/fcron/metadata.xml b/acct-user/fcron/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/fcron/metadata.xml
+++ b/acct-user/fcron/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/monkeyd/metadata.xml b/acct-user/monkeyd/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/monkeyd/metadata.xml
+++ b/acct-user/monkeyd/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/stubby/metadata.xml b/acct-user/stubby/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/stubby/metadata.xml
+++ b/acct-user/stubby/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/stunnel/metadata.xml b/acct-user/stunnel/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/stunnel/metadata.xml
+++ b/acct-user/stunnel/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/thttpd/metadata.xml b/acct-user/thttpd/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/thttpd/metadata.xml
+++ b/acct-user/thttpd/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/tor/metadata.xml b/acct-user/tor/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/tor/metadata.xml
+++ b/acct-user/tor/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/acct-user/varnish/metadata.xml b/acct-user/varnish/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/acct-user/varnish/metadata.xml
+++ b/acct-user/varnish/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/app-admin/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
index b71a39733eba..e57f785d5475 100644
--- a/app-admin/paxtest/metadata.xml
+++ b/app-admin/paxtest/metadata.xml
@@ -1,9 +1,6 @@
-
- blueness@gentoo.org
-
hardened@gentoo.org
Gentoo Hardened
diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml
index 71d2ae1f8349..1a74f43590a2 100644
--- a/app-admin/webalizer/metadata.xml
+++ b/app-admin/webalizer/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
web-apps@gentoo.org
Gentoo Webapps
diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml
index 949760b7e483..8f01c97867d4 100644
--- a/app-backup/borgbackup/metadata.xml
+++ b/app-backup/borgbackup/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
slashbeast@gentoo.org
Piotr Karbowski
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
index dbe82fa71f5b..241786761ce2 100644
--- a/app-backup/spideroak-bin/metadata.xml
+++ b/app-backup/spideroak-bin/metadata.xml
@@ -5,8 +5,4 @@
lucianposton@pm.me
Lucian Poston
-
- blueness@gentoo.org
- Anthony G. Basile
-
diff --git a/app-benchmarks/libc-bench/metadata.xml b/app-benchmarks/libc-bench/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/app-benchmarks/libc-bench/metadata.xml
+++ b/app-benchmarks/libc-bench/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/app-crypt/libscrypt/metadata.xml b/app-crypt/libscrypt/metadata.xml
index 51b9982be959..44f2dd04edb6 100644
--- a/app-crypt/libscrypt/metadata.xml
+++ b/app-crypt/libscrypt/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
technion/libscrypt
diff --git a/app-crypt/md5deep/metadata.xml b/app-crypt/md5deep/metadata.xml
index 152115b31c60..a6f43809217d 100644
--- a/app-crypt/md5deep/metadata.xml
+++ b/app-crypt/md5deep/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
jessek/hashdeep
md5deep
diff --git a/app-doc/halibut/metadata.xml b/app-doc/halibut/metadata.xml
index 25cdb479cbf6..85e4ed814fa2 100644
--- a/app-doc/halibut/metadata.xml
+++ b/app-doc/halibut/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/app-forensics/unhide/metadata.xml b/app-forensics/unhide/metadata.xml
index 1d95e1e021dc..1865cca9a9a5 100644
--- a/app-forensics/unhide/metadata.xml
+++ b/app-forensics/unhide/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
unhide
diff --git a/app-shells/squirrelsh/metadata.xml b/app-shells/squirrelsh/metadata.xml
index b056271824c9..4edd6feec5e8 100644
--- a/app-shells/squirrelsh/metadata.xml
+++ b/app-shells/squirrelsh/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
squirrelsh
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/app-text/xapian-omega/metadata.xml
+++ b/app-text/xapian-omega/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/dev-libs/libbase58/metadata.xml b/dev-libs/libbase58/metadata.xml
index c8ade03b78c8..16c55fc2d041 100644
--- a/dev-libs/libbase58/metadata.xml
+++ b/dev-libs/libbase58/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
luke-jr+gentoobugs@utopios.org
Luke Dashjr
diff --git a/dev-libs/libcgroup/metadata.xml b/dev-libs/libcgroup/metadata.xml
index c66a006f7ab5..3774350655b5 100644
--- a/dev-libs/libcgroup/metadata.xml
+++ b/dev-libs/libcgroup/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
This package provides configuration and command-line tools, as well as a
rules processing daemon for working with kernel control groups.
diff --git a/dev-libs/libelf/metadata.xml b/dev-libs/libelf/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/dev-libs/libelf/metadata.xml
+++ b/dev-libs/libelf/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/dev-libs/libgpiod/metadata.xml b/dev-libs/libgpiod/metadata.xml
index 4585540f4cb7..259f300149e2 100644
--- a/dev-libs/libgpiod/metadata.xml
+++ b/dev-libs/libgpiod/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/dev-libs/libretls/metadata.xml b/dev-libs/libretls/metadata.xml
index efda1b9881c9..076793e3f54b 100644
--- a/dev-libs/libretls/metadata.xml
+++ b/dev-libs/libretls/metadata.xml
@@ -5,8 +5,4 @@
mgorny@gentoo.org
Michał Górny
-
- blueness@gentoo.org
- Anthony G. Basile
-
diff --git a/dev-libs/xapian-bindings/metadata.xml b/dev-libs/xapian-bindings/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/dev-libs/xapian-bindings/metadata.xml
+++ b/dev-libs/xapian-bindings/metadata.xml
@@ -1,8 +1,5 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index 0ca12a77b8ac..883360ac2aee 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
Xapian is an Open Source Probabilistic Information Retrieval library,
released under the GPL. It's written in C++, with bindings to allow use
diff --git a/dev-lua/luaevent/metadata.xml b/dev-lua/luaevent/metadata.xml
index c840ef4192fe..d7c18c6176c1 100644
--- a/dev-lua/luaevent/metadata.xml
+++ b/dev-lua/luaevent/metadata.xml
@@ -1,9 +1,6 @@
-
- blueness@gentoo.org
-
conikost@gentoo.org
Conrad Kostecki
diff --git a/dev-perl/Search-Xapian/metadata.xml b/dev-perl/Search-Xapian/metadata.xml
index d2bff04b2bbd..e96bb3605ed6 100644
--- a/dev-perl/Search-Xapian/metadata.xml
+++ b/dev-perl/Search-Xapian/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
Search-Xapian
Search::Xapian
diff --git a/dev-python/cgroup-utils/metadata.xml b/dev-python/cgroup-utils/metadata.xml
index 7c2d555581c7..7514082d5c59 100644
--- a/dev-python/cgroup-utils/metadata.xml
+++ b/dev-python/cgroup-utils/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
python@gentoo.org
Python
diff --git a/dev-python/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
index 2576adc22d09..1697504e5439 100644
--- a/dev-python/jsonrpclib/metadata.xml
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
python@gentoo.org
Python
diff --git a/dev-python/pyaes/metadata.xml b/dev-python/pyaes/metadata.xml
index 7a9279e479c4..b34955aad167 100644
--- a/dev-python/pyaes/metadata.xml
+++ b/dev-python/pyaes/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
python@gentoo.org
diff --git a/dev-python/pypax/metadata.xml b/dev-python/pypax/metadata.xml
index a34830423158..a985f69a43ad 100644
--- a/dev-python/pypax/metadata.xml
+++ b/dev-python/pypax/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
hardened@gentoo.org
Gentoo Hardened
diff --git a/dev-python/pyqt-distutils/metadata.xml b/dev-python/pyqt-distutils/metadata.xml
index ec182cbf511a..5fbf45f5d41c 100644
--- a/dev-python/pyqt-distutils/metadata.xml
+++ b/dev-python/pyqt-distutils/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
pyqt-distutils
ColinDuquesnoy/pyqt_distutils
diff --git a/dev-python/whoosh/metadata.xml b/dev-python/whoosh/metadata.xml
index 88829be92af2..b9cc86e3cca8 100644
--- a/dev-python/whoosh/metadata.xml
+++ b/dev-python/whoosh/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
python@gentoo.org
Python
diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
index d302a06900da..cb304ac53e31 100644
--- a/dev-util/elfkickers/metadata.xml
+++ b/dev-util/elfkickers/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
hardened@gentoo.org
Gentoo Hardened
diff --git a/dev-util/gperf/metadata.xml b/dev-util/gperf/metadata.xml
index 8ec7a6f18641..e2399864e08e 100644
--- a/dev-util/gperf/metadata.xml
+++ b/dev-util/gperf/metadata.xml
@@ -1,9 +1,7 @@
-
- blueness@gentoo.org
-
+
gperf
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
index b2351ae81aee..5def1cdec590 100644
--- a/dev-util/plan9port/metadata.xml
+++ b/dev-util/plan9port/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
Plan9Port is a set of Plan 9 utilities ported to the POSIX
environment - also know as Plan 9 from User Space.
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
index e0de6e2950ab..4a0398bcef2c 100644
--- a/dev-util/valgrind/metadata.xml
+++ b/dev-util/valgrind/metadata.xml
@@ -1,10 +1,6 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
toolchain@gentoo.org
Gentoo Toolchain Project
diff --git a/games-misc/sound-of-sorting/metadata.xml b/games-misc/sound-of-sorting/metadata.xml
index e07ddb5da60a..a83238633903 100644
--- a/games-misc/sound-of-sorting/metadata.xml
+++ b/games-misc/sound-of-sorting/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
bingmann/sound-of-sorting
diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml
index 620d9c7161df..6a2729c60132 100644
--- a/net-analyzer/2ping/metadata.xml
+++ b/net-analyzer/2ping/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 6345117afbda..ff7fbb13b76b 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -1,10 +1,7 @@
-
- blueness@gentoo.org
- Anthony G. Basile
-
+