summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /sys-auth
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no maintainers in case of herds requested to be disbanded.
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/keystone/metadata.xml5
-rw-r--r--sys-auth/libnss-mysql/metadata.xml5
-rw-r--r--sys-auth/libnss-pgsql/metadata.xml5
-rw-r--r--sys-auth/libyubikey/metadata.xml5
-rw-r--r--sys-auth/munge/metadata.xml5
-rw-r--r--sys-auth/nss-myhostname/metadata.xml5
-rw-r--r--sys-auth/oath-toolkit/metadata.xml5
-rw-r--r--sys-auth/openpam/metadata.xml5
-rw-r--r--sys-auth/pam-afs-session/metadata.xml5
-rw-r--r--sys-auth/pam-pgsql/metadata.xml1
-rw-r--r--sys-auth/pam_abl/metadata.xml10
-rw-r--r--sys-auth/pam_blue/metadata.xml5
-rw-r--r--sys-auth/pam_chroot/metadata.xml5
-rw-r--r--sys-auth/pam_dotfile/metadata.xml1
-rw-r--r--sys-auth/pam_keystore/metadata.xml5
-rw-r--r--sys-auth/pam_krb5/metadata.xml5
-rw-r--r--sys-auth/pam_ldap/metadata.xml1
-rw-r--r--sys-auth/pam_mktemp/metadata.xml5
-rw-r--r--sys-auth/pam_mysql/metadata.xml5
-rw-r--r--sys-auth/pam_p11/metadata.xml10
-rw-r--r--sys-auth/pam_passwdqc/metadata.xml1
-rw-r--r--sys-auth/pam_pkcs11/metadata.xml10
-rw-r--r--sys-auth/pam_radius/metadata.xml5
-rw-r--r--sys-auth/pam_skey/metadata.xml5
-rw-r--r--sys-auth/pam_ssh/metadata.xml1
-rw-r--r--sys-auth/pam_ssh_agent_auth/metadata.xml1
-rw-r--r--sys-auth/pam_usb/metadata.xml5
-rw-r--r--sys-auth/pambase/metadata.xml1
-rw-r--r--sys-auth/passwdqc/metadata.xml1
-rw-r--r--sys-auth/polkit-kde-agent/metadata.xml5
-rw-r--r--sys-auth/polkit-pkla-compat/metadata.xml1
-rw-r--r--sys-auth/polkit-qt/metadata.xml5
-rw-r--r--sys-auth/polkit/metadata.xml1
-rw-r--r--sys-auth/realtime-base/metadata.xml5
-rw-r--r--sys-auth/thinkfinger/metadata.xml5
-rw-r--r--sys-auth/ykclient/metadata.xml5
-rw-r--r--sys-auth/ykpers/metadata.xml5
37 files changed, 120 insertions, 40 deletions
diff --git a/sys-auth/keystone/metadata.xml b/sys-auth/keystone/metadata.xml
index 02cace46cf7..bfaf2ee9fc8 100644
--- a/sys-auth/keystone/metadata.xml
+++ b/sys-auth/keystone/metadata.xml
@@ -5,11 +5,14 @@
<flag name="memcached">Installs dependencies needed for using memcached as a backend</flag>
<flag name="mongo">Installs dependencies needed for using mongo as a backend</flag>
</use>
- <herd>openstack</herd>
<maintainer>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+ <maintainer>
+ <email>openstack@gentoo.org</email>
+ <name>Openstack</name>
+ </maintainer>
<longdescription lang="en">
Keystone is the Openstack authentication, authorization, and service
catalog written in Python.
diff --git a/sys-auth/libnss-mysql/metadata.xml b/sys-auth/libnss-mysql/metadata.xml
index ddc62a95e82..d26b5c63ff9 100644
--- a/sys-auth/libnss-mysql/metadata.xml
+++ b/sys-auth/libnss-mysql/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>mysql</herd>
<maintainer>
<email>hanno@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>mysql-bugs@gentoo.org</email>
+ <name>MySQL</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libnss-mysql</remote-id>
</upstream>
diff --git a/sys-auth/libnss-pgsql/metadata.xml b/sys-auth/libnss-pgsql/metadata.xml
index 309b51e9a96..64b4ee529f9 100644
--- a/sys-auth/libnss-pgsql/metadata.xml
+++ b/sys-auth/libnss-pgsql/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>postgresql</herd>
+<maintainer>
+ <email>pgsql-bugs@gentoo.org</email>
+ <name>PostgreSQL and Related Package Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-auth/libyubikey/metadata.xml b/sys-auth/libyubikey/metadata.xml
index 86aee3bb63d..c4be2836e1a 100644
--- a/sys-auth/libyubikey/metadata.xml
+++ b/sys-auth/libyubikey/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>brant@gurganus.name</email>
<name>Brant Gurganus</name>
@@ -12,6 +11,10 @@
<name>Diego Elio Pettenò</name>
<description>Proxy maintainer, CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">yubico-c</remote-id>
<remote-id type="github">Yubico/yubico-c</remote-id>
diff --git a/sys-auth/munge/metadata.xml b/sys-auth/munge/metadata.xml
index 428b6306955..559c6dcb543 100644
--- a/sys-auth/munge/metadata.xml
+++ b/sys-auth/munge/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cluster</herd>
<maintainer>
<email>jsbronder@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
<use>
<flag name="gcrypt">Use libgcrypt instead of openssl</flag>
</use>
diff --git a/sys-auth/nss-myhostname/metadata.xml b/sys-auth/nss-myhostname/metadata.xml
index 1aba3db38f0..1503754c204 100644
--- a/sys-auth/nss-myhostname/metadata.xml
+++ b/sys-auth/nss-myhostname/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>freedesktop</herd>
+<maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+</maintainer>
<longdescription lang="en">
nss-myhostname is a plugin for the GNU Name Service Switch (NSS) functionality
of the GNU C Library (glibc) providing host name resolution for the locally
diff --git a/sys-auth/oath-toolkit/metadata.xml b/sys-auth/oath-toolkit/metadata.xml
index c09b1c0e5c8..3f271d7b7fb 100644
--- a/sys-auth/oath-toolkit/metadata.xml
+++ b/sys-auth/oath-toolkit/metadata.xml
@@ -4,7 +4,10 @@
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<use>
<flag name="pskc">Build tools &amp; library for the Portable Symmetric Key Container (PSKC) format per RFC6030</flag>
<flag name="pam">Build PAM module for pluggable login authentication for OATH</flag>
diff --git a/sys-auth/openpam/metadata.xml b/sys-auth/openpam/metadata.xml
index 35d02a20bf1..8ff192ce505 100644
--- a/sys-auth/openpam/metadata.xml
+++ b/sys-auth/openpam/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>bsd</herd>
+ <maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">openpam</remote-id>
</upstream>
diff --git a/sys-auth/pam-afs-session/metadata.xml b/sys-auth/pam-afs-session/metadata.xml
index 81ada335fc9..4b454fe6789 100644
--- a/sys-auth/pam-afs-session/metadata.xml
+++ b/sys-auth/pam-afs-session/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>pam</herd>
+<maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-auth/pam-pgsql/metadata.xml b/sys-auth/pam-pgsql/metadata.xml
index 4b531216ac2..c7ba5af8d42 100644
--- a/sys-auth/pam-pgsql/metadata.xml
+++ b/sys-auth/pam-pgsql/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/pam_abl/metadata.xml b/sys-auth/pam_abl/metadata.xml
index b0b1e5478f5..4b39b68981f 100644
--- a/sys-auth/pam_abl/metadata.xml
+++ b/sys-auth/pam_abl/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>swapon@gmail.com</email>
<name>Alessio Cassibba</name>
</maintainer>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
PAM module that provides auto blacklisting of hosts and users responsible for repeated failed authentication attempts.
Once a host is blacklisted it is guaranteed to fail authentication even if the correct credentials are provided.
diff --git a/sys-auth/pam_blue/metadata.xml b/sys-auth/pam_blue/metadata.xml
index faf0bf05443..374ab48f001 100644
--- a/sys-auth/pam_blue/metadata.xml
+++ b/sys-auth/pam_blue/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
<longdescription lang="en">
Bluepam is an extension for the common pam modules, give the user the
ability for authenticaten via a bluetooth compatible device like a cell
diff --git a/sys-auth/pam_chroot/metadata.xml b/sys-auth/pam_chroot/metadata.xml
index 24210a5eee4..ec253c8703b 100644
--- a/sys-auth/pam_chroot/metadata.xml
+++ b/sys-auth/pam_chroot/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pam-chroot</remote-id>
</upstream>
diff --git a/sys-auth/pam_dotfile/metadata.xml b/sys-auth/pam_dotfile/metadata.xml
index 55ce0267ecc..ecfbc0ef523 100644
--- a/sys-auth/pam_dotfile/metadata.xml
+++ b/sys-auth/pam_dotfile/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/pam_keystore/metadata.xml b/sys-auth/pam_keystore/metadata.xml
index 81ada335fc9..4b454fe6789 100644
--- a/sys-auth/pam_keystore/metadata.xml
+++ b/sys-auth/pam_keystore/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>pam</herd>
+<maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-auth/pam_krb5/metadata.xml b/sys-auth/pam_krb5/metadata.xml
index e8a4773c1a0..e46024cbbff 100644
--- a/sys-auth/pam_krb5/metadata.xml
+++ b/sys-auth/pam_krb5/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kerberos</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
@@ -9,4 +8,8 @@
<email>eras@gentoo.org</email>
<name>Eray Aslan</name>
</maintainer>
+<maintainer>
+ <email>kerberos@gentoo.org</email>
+ <name>Kerberos</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-auth/pam_ldap/metadata.xml b/sys-auth/pam_ldap/metadata.xml
index b3bf86cd59b..43430c17aee 100644
--- a/sys-auth/pam_ldap/metadata.xml
+++ b/sys-auth/pam_ldap/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/pam_mktemp/metadata.xml b/sys-auth/pam_mktemp/metadata.xml
index 1cafb2c2d13..e8a84d6583a 100644
--- a/sys-auth/pam_mktemp/metadata.xml
+++ b/sys-auth/pam_mktemp/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>pam</herd>
<maintainer>
<email>swegener@gentoo.org</email>
</maintainer>
+<maintainer>
+<email>pam-bugs@gentoo.org</email>
+<name>Pluggable Authentication Method maintenance</name>
+</maintainer>
<use>
<flag name="prevent-removal">If supported, set EXT2_APPEND_FL on /tmp/.private to prevent temporary directories from being removed</flag>
</use>
diff --git a/sys-auth/pam_mysql/metadata.xml b/sys-auth/pam_mysql/metadata.xml
index 54820a93fe8..c5e0a3ac183 100644
--- a/sys-auth/pam_mysql/metadata.xml
+++ b/sys-auth/pam_mysql/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>mysql</herd>
+ <maintainer>
+ <email>mysql-bugs@gentoo.org</email>
+ <name>MySQL</name>
+ </maintainer>
<use>
<flag name="openssl">Use OpenSSL for md5 and sha1 support</flag>
</use>
diff --git a/sys-auth/pam_p11/metadata.xml b/sys-auth/pam_p11/metadata.xml
index 241f5bf2327..5b74bc1b441 100644
--- a/sys-auth/pam_p11/metadata.xml
+++ b/sys-auth/pam_p11/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>crypto</herd>
- <herd>pam</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">opensc</remote-id>
<remote-id type="github">opensc/pam_p11</remote-id>
diff --git a/sys-auth/pam_passwdqc/metadata.xml b/sys-auth/pam_passwdqc/metadata.xml
index 21d4ed40d84..cbadff0b314 100644
--- a/sys-auth/pam_passwdqc/metadata.xml
+++ b/sys-auth/pam_passwdqc/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/pam_pkcs11/metadata.xml b/sys-auth/pam_pkcs11/metadata.xml
index 4b954a4e72f..714dd5a4bf9 100644
--- a/sys-auth/pam_pkcs11/metadata.xml
+++ b/sys-auth/pam_pkcs11/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>crypto</herd>
- <herd>pam</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
<use>
<flag name="pcsc-lite">
Build the card_eventmanager binary used to detect card removal and lock the sessions. This
diff --git a/sys-auth/pam_radius/metadata.xml b/sys-auth/pam_radius/metadata.xml
index 5cd8bc96fe0..6dcb08bd076 100644
--- a/sys-auth/pam_radius/metadata.xml
+++ b/sys-auth/pam_radius/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
<longdescription>
This is the PAM to RADIUS authentication module. It allows any
PAM-capable machine to become a RADIUS client for authentication
diff --git a/sys-auth/pam_skey/metadata.xml b/sys-auth/pam_skey/metadata.xml
index f6bcd796289..ce8bbd0250c 100644
--- a/sys-auth/pam_skey/metadata.xml
+++ b/sys-auth/pam_skey/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
<maintainer>
<email>ulm@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
<upstream>
<remote-id type="freshmeat">pam_skey</remote-id>
</upstream>
diff --git a/sys-auth/pam_ssh/metadata.xml b/sys-auth/pam_ssh/metadata.xml
index 66fb0a248b3..c1b76ff9e16 100644
--- a/sys-auth/pam_ssh/metadata.xml
+++ b/sys-auth/pam_ssh/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/pam_ssh_agent_auth/metadata.xml b/sys-auth/pam_ssh_agent_auth/metadata.xml
index aba6c2cb4c1..c500fa9eafd 100644
--- a/sys-auth/pam_ssh_agent_auth/metadata.xml
+++ b/sys-auth/pam_ssh_agent_auth/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/pam_usb/metadata.xml b/sys-auth/pam_usb/metadata.xml
index 9ea5fa40735..cb5507e979b 100644
--- a/sys-auth/pam_usb/metadata.xml
+++ b/sys-auth/pam_usb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
+ <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer>
<longdescription>
A PAM module that enables authentication using a USB-Storage device (such as a USB Pen) through DSA private/public keys.
</longdescription>
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 97d83d57b2d..6d3b73e7b9e 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/passwdqc/metadata.xml b/sys-auth/passwdqc/metadata.xml
index 23134a29e13..984c90d1e72 100644
--- a/sys-auth/passwdqc/metadata.xml
+++ b/sys-auth/passwdqc/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/polkit-kde-agent/metadata.xml b/sys-auth/polkit-kde-agent/metadata.xml
index ab3442450ed..3c79bef46a9 100644
--- a/sys-auth/polkit-kde-agent/metadata.xml
+++ b/sys-auth/polkit-kde-agent/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">ubuntu</remote-id>
</upstream>
diff --git a/sys-auth/polkit-pkla-compat/metadata.xml b/sys-auth/polkit-pkla-compat/metadata.xml
index c03b663ea9f..409a64f16e1 100644
--- a/sys-auth/polkit-pkla-compat/metadata.xml
+++ b/sys-auth/polkit-pkla-compat/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/polkit-qt/metadata.xml b/sys-auth/polkit-qt/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/sys-auth/polkit-qt/metadata.xml
+++ b/sys-auth/polkit-qt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
index 8e318bf1533..8231229d43d 100644
--- a/sys-auth/polkit/metadata.xml
+++ b/sys-auth/polkit/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-auth/realtime-base/metadata.xml b/sys-auth/realtime-base/metadata.xml
index af0275e2998..7ae4362bbf0 100644
--- a/sys-auth/realtime-base/metadata.xml
+++ b/sys-auth/realtime-base/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-auth/thinkfinger/metadata.xml b/sys-auth/thinkfinger/metadata.xml
index b641a547771..6d9f25ed0d6 100644
--- a/sys-auth/thinkfinger/metadata.xml
+++ b/sys-auth/thinkfinger/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>victor.quicksilver@gmail.com</email>
<name>Víctor Enríquez Miguel</name>
@@ -11,6 +10,10 @@
<name>Michael Weber</name>
<description>Proxy Maintainer</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">ThinkFinger</remote-id>
</upstream>
diff --git a/sys-auth/ykclient/metadata.xml b/sys-auth/ykclient/metadata.xml
index 7f3c0757e2a..9f7b97fedbf 100644
--- a/sys-auth/ykclient/metadata.xml
+++ b/sys-auth/ykclient/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>brant@gurganus.name</email>
<name>Brant Gurganus</name>
@@ -12,6 +11,10 @@
<name>Diego Elio Pettenò</name>
<description>Proxy maintainer, CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">yubico-c-client</remote-id>
<remote-id type="github">Yubico/yubico-c-client</remote-id>
diff --git a/sys-auth/ykpers/metadata.xml b/sys-auth/ykpers/metadata.xml
index 3a896d143b2..29d5977cd59 100644
--- a/sys-auth/ykpers/metadata.xml
+++ b/sys-auth/ykpers/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>brant@gurganus.name</email>
<name>Brant Gurganus</name>
@@ -12,6 +11,10 @@
<name>Diego Elio Pettenò</name>
<description>Proxy maintainer, CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">Yubico/yubikey-personalization</remote-id>
<bugs-to>https://github.com/Yubico/yubikey-personalization/issues</bugs-to>