summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:55:10 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commit8849b098c085c07e4ac1257e5b39df35d98c3c58 (patch)
tree02d93ae662fb1a813380775612e35e819d67e303 /app-crypt
parentRemove explicit uses of disbanded herd e-mails from metadata.xml (diff)
downloadgentoo-8849b098c085c07e4ac1257e5b39df35d98c3c58.tar.gz
gentoo-8849b098c085c07e4ac1257e5b39df35d98c3c58.tar.bz2
gentoo-8849b098c085c07e4ac1257e5b39df35d98c3c58.zip
Set appropriate maintainer types in metadata.xml (GLEP 67)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/WiRouterKeyRec/metadata.xml2
-rw-r--r--app-crypt/acme/metadata.xml2
-rw-r--r--app-crypt/acr38u/metadata.xml8
-rw-r--r--app-crypt/aescrypt/metadata.xml2
-rw-r--r--app-crypt/aespipe/metadata.xml2
-rw-r--r--app-crypt/af_alg/metadata.xml2
-rw-r--r--app-crypt/asedriveiiie-serial/metadata.xml2
-rw-r--r--app-crypt/asedriveiiie-usb/metadata.xml2
-rw-r--r--app-crypt/asekey/metadata.xml2
-rw-r--r--app-crypt/bcrypt/metadata.xml2
-rw-r--r--app-crypt/bcwipe/metadata.xml2
-rw-r--r--app-crypt/bestcrypt/metadata.xml2
-rw-r--r--app-crypt/bsign/metadata.xml2
-rw-r--r--app-crypt/cardpeek/metadata.xml2
-rw-r--r--app-crypt/ccid/metadata.xml2
-rw-r--r--app-crypt/ccrypt/metadata.xml2
-rw-r--r--app-crypt/chntpw/metadata.xml2
-rw-r--r--app-crypt/ckpass/metadata.xml2
-rw-r--r--app-crypt/codecrypt/metadata.xml4
-rw-r--r--app-crypt/codegroup/metadata.xml2
-rw-r--r--app-crypt/coolkey/metadata.xml2
-rw-r--r--app-crypt/crackpkcs12/metadata.xml2
-rw-r--r--app-crypt/cryptkeeper/metadata.xml4
-rw-r--r--app-crypt/dieharder/metadata.xml2
-rw-r--r--app-crypt/dirmngr/metadata.xml2
-rw-r--r--app-crypt/easy-rsa/metadata.xml2
-rw-r--r--app-crypt/efitools/metadata.xml2
-rw-r--r--app-crypt/eid-mw/metadata.xml6
-rw-r--r--app-crypt/ekeyd/metadata.xml2
-rw-r--r--app-crypt/elettra/metadata.xml2
-rw-r--r--app-crypt/etcd-ca/metadata.xml2
-rw-r--r--app-crypt/fcrackzip/metadata.xml4
-rw-r--r--app-crypt/gcr/metadata.xml2
-rw-r--r--app-crypt/gentoo-keys/metadata.xml2
-rw-r--r--app-crypt/gkeys-gen/metadata.xml2
-rw-r--r--app-crypt/gkeys/metadata.xml2
-rw-r--r--app-crypt/gnupg-pkcs11-scd/metadata.xml2
-rw-r--r--app-crypt/gnupg/metadata.xml2
-rw-r--r--app-crypt/gorilla/metadata.xml2
-rw-r--r--app-crypt/gpa/metadata.xml2
-rw-r--r--app-crypt/gpg-ringmgr/metadata.xml2
-rw-r--r--app-crypt/gpgme/metadata.xml2
-rw-r--r--app-crypt/gpgstats/metadata.xml4
-rw-r--r--app-crypt/hashalot/metadata.xml2
-rw-r--r--app-crypt/hashcat-bin/metadata.xml4
-rw-r--r--app-crypt/hashcat-gui/metadata.xml4
-rw-r--r--app-crypt/heimdal/metadata.xml2
-rw-r--r--app-crypt/hmaccalc/metadata.xml2
-rw-r--r--app-crypt/ima-evm-utils/metadata.xml4
-rw-r--r--app-crypt/jacksum/metadata.xml2
-rw-r--r--app-crypt/johntheripper/metadata.xml4
-rw-r--r--app-crypt/kencfs/metadata.xml2
-rw-r--r--app-crypt/keybase/metadata.xml2
-rw-r--r--app-crypt/kstart/metadata.xml2
-rw-r--r--app-crypt/letsencrypt-apache/metadata.xml2
-rw-r--r--app-crypt/letsencrypt/metadata.xml2
-rw-r--r--app-crypt/libscrypt/metadata.xml2
-rw-r--r--app-crypt/libsecret/metadata.xml2
-rw-r--r--app-crypt/libu2f-host/metadata.xml4
-rw-r--r--app-crypt/libykneomgr/metadata.xml4
-rw-r--r--app-crypt/loop-aes-losetup/metadata.xml2
-rw-r--r--app-crypt/mcrypt/metadata.xml4
-rw-r--r--app-crypt/md4sum/metadata.xml2
-rw-r--r--app-crypt/md5deep/metadata.xml2
-rw-r--r--app-crypt/md6sum/metadata.xml2
-rw-r--r--app-crypt/mdcrack/metadata.xml2
-rw-r--r--app-crypt/mhash/metadata.xml2
-rw-r--r--app-crypt/mit-krb5-appl/metadata.xml2
-rw-r--r--app-crypt/mit-krb5/metadata.xml2
-rw-r--r--app-crypt/monkeysign/metadata.xml2
-rw-r--r--app-crypt/monkeysphere/metadata.xml2
-rw-r--r--app-crypt/nasty/metadata.xml4
-rw-r--r--app-crypt/nwipe/metadata.xml4
-rw-r--r--app-crypt/oclhashcat-lite-bin/metadata.xml4
-rw-r--r--app-crypt/oclhashcat-plus-bin/metadata.xml4
-rw-r--r--app-crypt/onak/metadata.xml4
-rw-r--r--app-crypt/openssl-blacklist/metadata.xml2
-rw-r--r--app-crypt/openssl-tpm-engine/metadata.xml2
-rw-r--r--app-crypt/openvpn-blacklist/metadata.xml2
-rw-r--r--app-crypt/ophcrack-tables/metadata.xml2
-rw-r--r--app-crypt/ophcrack/metadata.xml2
-rw-r--r--app-crypt/osslsigncode/metadata.xml2
-rw-r--r--app-crypt/p11-kit/metadata.xml2
-rw-r--r--app-crypt/paperkey/metadata.xml2
-rw-r--r--app-crypt/pdfcrack/metadata.xml2
-rw-r--r--app-crypt/pesign/metadata.xml2
-rw-r--r--app-crypt/pgpdump/metadata.xml2
-rw-r--r--app-crypt/pinentry/metadata.xml2
-rw-r--r--app-crypt/pius/metadata.xml4
-rw-r--r--app-crypt/pkcrack/metadata.xml2
-rw-r--r--app-crypt/pkcs11-data/metadata.xml2
-rw-r--r--app-crypt/pkcs11-dump/metadata.xml2
-rw-r--r--app-crypt/qca/metadata.xml6
-rw-r--r--app-crypt/quickcrypt/metadata.xml4
-rw-r--r--app-crypt/rainbowcrack/metadata.xml2
-rw-r--r--app-crypt/sbsigntool/metadata.xml2
-rw-r--r--app-crypt/scl011-bin/metadata.xml8
-rw-r--r--app-crypt/scrypt/metadata.xml2
-rw-r--r--app-crypt/scute/metadata.xml8
-rw-r--r--app-crypt/seahorse-sharing/metadata.xml2
-rw-r--r--app-crypt/seahorse/metadata.xml2
-rw-r--r--app-crypt/sgeps/metadata.xml6
-rw-r--r--app-crypt/shash/metadata.xml2
-rw-r--r--app-crypt/shishi/metadata.xml2
-rw-r--r--app-crypt/sign/metadata.xml2
-rw-r--r--app-crypt/signing-party/metadata.xml2
-rw-r--r--app-crypt/simple-tpm-pk11/metadata.xml2
-rw-r--r--app-crypt/ssdeep/metadata.xml2
-rw-r--r--app-crypt/ssh-multiadd/metadata.xml2
-rw-r--r--app-crypt/stan/metadata.xml2
-rw-r--r--app-crypt/tc-play/metadata.xml2
-rw-r--r--app-crypt/tinyca/metadata.xml2
-rw-r--r--app-crypt/tpm-emulator/metadata.xml2
-rw-r--r--app-crypt/tpm-tools/metadata.xml2
-rw-r--r--app-crypt/trousers/metadata.xml2
-rw-r--r--app-crypt/truecrypt/metadata.xml2
-rw-r--r--app-crypt/xca/metadata.xml2
-rw-r--r--app-crypt/yubikey-neo-manager/metadata.xml4
-rw-r--r--app-crypt/zuluCrypt/metadata.xml2
119 files changed, 153 insertions, 153 deletions
diff --git a/app-crypt/WiRouterKeyRec/metadata.xml b/app-crypt/WiRouterKeyRec/metadata.xml
index 5f8f14891a95..4eceb317f22e 100644
--- a/app-crypt/WiRouterKeyRec/metadata.xml
+++ b/app-crypt/WiRouterKeyRec/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>ago@gentoo.org</email>
<name>Agostino Sarubbo</name>
</maintainer>
diff --git a/app-crypt/acme/metadata.xml b/app-crypt/acme/metadata.xml
index bee609a81206..4abf4071d74d 100644
--- a/app-crypt/acme/metadata.xml
+++ b/app-crypt/acme/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
index 0382b9ccbaa9..e7bba68d3545 100644
--- a/app-crypt/acr38u/metadata.xml
+++ b/app-crypt/acr38u/metadata.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>vincent.hardy.be@gmail.com</email>
<description>Proxied maintainer, assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
<description>Proxy-maintainer, CC him on bugs</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-crypt/aescrypt/metadata.xml b/app-crypt/aescrypt/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/aescrypt/metadata.xml
+++ b/app-crypt/aescrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
index 419b426b7726..d2cd61583aae 100644
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/af_alg/metadata.xml b/app-crypt/af_alg/metadata.xml
index ec7c7fc8ec69..435ff298aa21 100644
--- a/app-crypt/af_alg/metadata.xml
+++ b/app-crypt/af_alg/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
diff --git a/app-crypt/asedriveiiie-serial/metadata.xml b/app-crypt/asedriveiiie-serial/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/asedriveiiie-serial/metadata.xml
+++ b/app-crypt/asedriveiiie-serial/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/asedriveiiie-usb/metadata.xml b/app-crypt/asedriveiiie-usb/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/asedriveiiie-usb/metadata.xml
+++ b/app-crypt/asedriveiiie-usb/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/asekey/metadata.xml b/app-crypt/asekey/metadata.xml
index 5fe73717c767..040cba5f7c5b 100644
--- a/app-crypt/asekey/metadata.xml
+++ b/app-crypt/asekey/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/bcrypt/metadata.xml b/app-crypt/bcrypt/metadata.xml
index 3936e5d1afee..71c61515eae3 100644
--- a/app-crypt/bcrypt/metadata.xml
+++ b/app-crypt/bcrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/bcwipe/metadata.xml b/app-crypt/bcwipe/metadata.xml
index 5fe73717c767..040cba5f7c5b 100644
--- a/app-crypt/bcwipe/metadata.xml
+++ b/app-crypt/bcwipe/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/bestcrypt/metadata.xml
+++ b/app-crypt/bestcrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/bsign/metadata.xml b/app-crypt/bsign/metadata.xml
index 96f22ad3288c..a79daae298c8 100644
--- a/app-crypt/bsign/metadata.xml
+++ b/app-crypt/bsign/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/cardpeek/metadata.xml b/app-crypt/cardpeek/metadata.xml
index 0e0fc8aee596..4f6e28828f65 100644
--- a/app-crypt/cardpeek/metadata.xml
+++ b/app-crypt/cardpeek/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/ccid/metadata.xml b/app-crypt/ccid/metadata.xml
index c6d705bef2cd..c0423396ac62 100644
--- a/app-crypt/ccid/metadata.xml
+++ b/app-crypt/ccid/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/ccrypt/metadata.xml b/app-crypt/ccrypt/metadata.xml
index e9f74243cae2..05b829a9bab6 100644
--- a/app-crypt/ccrypt/metadata.xml
+++ b/app-crypt/ccrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/chntpw/metadata.xml b/app-crypt/chntpw/metadata.xml
index 5fe73717c767..040cba5f7c5b 100644
--- a/app-crypt/chntpw/metadata.xml
+++ b/app-crypt/chntpw/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/ckpass/metadata.xml b/app-crypt/ckpass/metadata.xml
index 90b0f372afc0..3ac2ca61ae35 100644
--- a/app-crypt/ckpass/metadata.xml
+++ b/app-crypt/ckpass/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>joker@gentoo.org</email>
<name>Christian Birchinger</name>
</maintainer>
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
index 2c1faaa31d00..01d16a9aa658 100644
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>exa.exa@gmail.com</email>
<name>Mirek Kratochvil</name>
<description>Proxied Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-crypt/codegroup/metadata.xml b/app-crypt/codegroup/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/app-crypt/codegroup/metadata.xml
+++ b/app-crypt/codegroup/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/app-crypt/coolkey/metadata.xml b/app-crypt/coolkey/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/coolkey/metadata.xml
+++ b/app-crypt/coolkey/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/crackpkcs12/metadata.xml b/app-crypt/crackpkcs12/metadata.xml
index 33c685bf362c..3c8846617c3f 100644
--- a/app-crypt/crackpkcs12/metadata.xml
+++ b/app-crypt/crackpkcs12/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>vapier@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/app-crypt/cryptkeeper/metadata.xml b/app-crypt/cryptkeeper/metadata.xml
index 51c5ddfd9894..848a7fb6da62 100644
--- a/app-crypt/cryptkeeper/metadata.xml
+++ b/app-crypt/cryptkeeper/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>phobosk@fastmail.fm</email>
<name>PhobosK</name>
<description>Proxy maintainer. Assign bugs to him.</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-crypt/dieharder/metadata.xml b/app-crypt/dieharder/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/dieharder/metadata.xml
+++ b/app-crypt/dieharder/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/dirmngr/metadata.xml b/app-crypt/dirmngr/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/dirmngr/metadata.xml
+++ b/app-crypt/dirmngr/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/easy-rsa/metadata.xml b/app-crypt/easy-rsa/metadata.xml
index 169b8535ec00..6decea118949 100644
--- a/app-crypt/easy-rsa/metadata.xml
+++ b/app-crypt/easy-rsa/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index 6b2229b74c9d..a07164c44449 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>gregkh@gentoo.org</email>
<description>do whatever</description>
</maintainer>
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 5708416de1fd..8af6d04ad1f2 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>vincent.hardy.be@gmail.com</email>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-crypt/ekeyd/metadata.xml b/app-crypt/ekeyd/metadata.xml
index 61422f7efc04..e97586d5296e 100644
--- a/app-crypt/ekeyd/metadata.xml
+++ b/app-crypt/ekeyd/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>k_f@gentoo.org</email>
<name>Kristian Fiskerstrand</name>
</maintainer>
diff --git a/app-crypt/elettra/metadata.xml b/app-crypt/elettra/metadata.xml
index 6eb35690d41d..dccede93222c 100644
--- a/app-crypt/elettra/metadata.xml
+++ b/app-crypt/elettra/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>lu_zero@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-crypt/etcd-ca/metadata.xml b/app-crypt/etcd-ca/metadata.xml
index 6a37ab4bc329..b81d9fd5bac8 100644
--- a/app-crypt/etcd-ca/metadata.xml
+++ b/app-crypt/etcd-ca/metadata.xml
@@ -7,7 +7,7 @@
<doc>https://github.com/coreos/etcd-ca/blob/master/README.md</doc>
<remote-id type="github">coreos/etcd-ca</remote-id>
</upstream>
- <maintainer>
+ <maintainer type="person">
<email>zmedico@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-crypt/fcrackzip/metadata.xml b/app-crypt/fcrackzip/metadata.xml
index a56b4dcf193e..221d23fbc081 100644
--- a/app-crypt/fcrackzip/metadata.xml
+++ b/app-crypt/fcrackzip/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/gcr/metadata.xml b/app-crypt/gcr/metadata.xml
index fe3dc94b2bcd..39980802b1da 100644
--- a/app-crypt/gcr/metadata.xml
+++ b/app-crypt/gcr/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/app-crypt/gentoo-keys/metadata.xml b/app-crypt/gentoo-keys/metadata.xml
index cdb5f20cd868..1937e8c82b4b 100644
--- a/app-crypt/gentoo-keys/metadata.xml
+++ b/app-crypt/gentoo-keys/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>gkeys@gentoo.org</email>
<name>Gentoo-keys Project Team</name>
</maintainer>
diff --git a/app-crypt/gkeys-gen/metadata.xml b/app-crypt/gkeys-gen/metadata.xml
index cdb5f20cd868..1937e8c82b4b 100644
--- a/app-crypt/gkeys-gen/metadata.xml
+++ b/app-crypt/gkeys-gen/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>gkeys@gentoo.org</email>
<name>Gentoo-keys Project Team</name>
</maintainer>
diff --git a/app-crypt/gkeys/metadata.xml b/app-crypt/gkeys/metadata.xml
index cdb5f20cd868..1937e8c82b4b 100644
--- a/app-crypt/gkeys/metadata.xml
+++ b/app-crypt/gkeys/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>gkeys@gentoo.org</email>
<name>Gentoo-keys Project Team</name>
</maintainer>
diff --git a/app-crypt/gnupg-pkcs11-scd/metadata.xml b/app-crypt/gnupg-pkcs11-scd/metadata.xml
index 48f391d24df2..fbb727174792 100644
--- a/app-crypt/gnupg-pkcs11-scd/metadata.xml
+++ b/app-crypt/gnupg-pkcs11-scd/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 99c3652db47b..044fd43416a3 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/gorilla/metadata.xml b/app-crypt/gorilla/metadata.xml
index a7e9dbdcf257..a01eddb96726 100644
--- a/app-crypt/gorilla/metadata.xml
+++ b/app-crypt/gorilla/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
diff --git a/app-crypt/gpa/metadata.xml b/app-crypt/gpa/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/gpa/metadata.xml
+++ b/app-crypt/gpa/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/gpg-ringmgr/metadata.xml b/app-crypt/gpg-ringmgr/metadata.xml
index a732fd8b2f03..a4e0d354f696 100644
--- a/app-crypt/gpg-ringmgr/metadata.xml
+++ b/app-crypt/gpg-ringmgr/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
index 1f249d901339..89e984954f11 100644
--- a/app-crypt/gpgme/metadata.xml
+++ b/app-crypt/gpgme/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/gpgstats/metadata.xml b/app-crypt/gpgstats/metadata.xml
index 78ae252e12b0..0106d597ab3c 100644
--- a/app-crypt/gpgstats/metadata.xml
+++ b/app-crypt/gpgstats/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/hashalot/metadata.xml b/app-crypt/hashalot/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/app-crypt/hashalot/metadata.xml
+++ b/app-crypt/hashalot/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/app-crypt/hashcat-bin/metadata.xml b/app-crypt/hashcat-bin/metadata.xml
index cb486049f3a4..38ec8cc659e2 100644
--- a/app-crypt/hashcat-bin/metadata.xml
+++ b/app-crypt/hashcat-bin/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/hashcat-gui/metadata.xml b/app-crypt/hashcat-gui/metadata.xml
index 80cda834d168..cab803d79fea 100644
--- a/app-crypt/hashcat-gui/metadata.xml
+++ b/app-crypt/hashcat-gui/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
index de7d5daa815f..07c197abd32c 100644
--- a/app-crypt/heimdal/metadata.xml
+++ b/app-crypt/heimdal/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>kerberos@gentoo.org</email>
<name>Kerberos</name>
</maintainer>
diff --git a/app-crypt/hmaccalc/metadata.xml b/app-crypt/hmaccalc/metadata.xml
index c0bfd8062c08..6557d925ad15 100644
--- a/app-crypt/hmaccalc/metadata.xml
+++ b/app-crypt/hmaccalc/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
index d7fe9af0fd3c..8d9db951aca3 100644
--- a/app-crypt/ima-evm-utils/metadata.xml
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>swift@gentoo.org</email>
<name>Sven Vermeulen</name>
<description>Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>hardened@gentoo.org</email>
<name>Gentoo Hardened</name>
</maintainer>
diff --git a/app-crypt/jacksum/metadata.xml b/app-crypt/jacksum/metadata.xml
index 777fd17e154b..897e2a4d8850 100644
--- a/app-crypt/jacksum/metadata.xml
+++ b/app-crypt/jacksum/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index abb26ed52c84..ea96d4b19271 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
<description>Any and all help appreciated</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
index e218a13609c3..2fdbf33d963d 100644
--- a/app-crypt/kencfs/metadata.xml
+++ b/app-crypt/kencfs/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/app-crypt/keybase/metadata.xml b/app-crypt/keybase/metadata.xml
index 27b73883188c..5a46be00f249 100644
--- a/app-crypt/keybase/metadata.xml
+++ b/app-crypt/keybase/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>nicolasbock@gentoo.org</email>
<name>Nicolas Bock</name>
</maintainer>
diff --git a/app-crypt/kstart/metadata.xml b/app-crypt/kstart/metadata.xml
index fb8bc868cccf..0a3c1226d1c1 100644
--- a/app-crypt/kstart/metadata.xml
+++ b/app-crypt/kstart/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>kerberos@gentoo.org</email>
<name>Kerberos</name>
</maintainer>
diff --git a/app-crypt/letsencrypt-apache/metadata.xml b/app-crypt/letsencrypt-apache/metadata.xml
index bfcb6974f1c4..97df2a00971b 100644
--- a/app-crypt/letsencrypt-apache/metadata.xml
+++ b/app-crypt/letsencrypt-apache/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/app-crypt/letsencrypt/metadata.xml b/app-crypt/letsencrypt/metadata.xml
index bee609a81206..4abf4071d74d 100644
--- a/app-crypt/letsencrypt/metadata.xml
+++ b/app-crypt/letsencrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/app-crypt/libscrypt/metadata.xml b/app-crypt/libscrypt/metadata.xml
index 5afd4895b479..576146f2c144 100644
--- a/app-crypt/libscrypt/metadata.xml
+++ b/app-crypt/libscrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index c81875abf349..25f333c316c4 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/app-crypt/libu2f-host/metadata.xml b/app-crypt/libu2f-host/metadata.xml
index 7d2ec9c205ad..f504c47b235a 100644
--- a/app-crypt/libu2f-host/metadata.xml
+++ b/app-crypt/libu2f-host/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/libykneomgr/metadata.xml b/app-crypt/libykneomgr/metadata.xml
index fa660d8b11a1..148a313bbafd 100644
--- a/app-crypt/libykneomgr/metadata.xml
+++ b/app-crypt/libykneomgr/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index 737d82b3bbd3..12925882c9ff 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
index bfafe385a333..eda7111ebfd8 100644
--- a/app-crypt/mcrypt/metadata.xml
+++ b/app-crypt/mcrypt/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/md4sum/metadata.xml b/app-crypt/md4sum/metadata.xml
index 8cb548491f4e..28ef3c7b080f 100644
--- a/app-crypt/md4sum/metadata.xml
+++ b/app-crypt/md4sum/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>hanno@gentoo.org</email></maintainer>
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/app-crypt/md5deep/metadata.xml b/app-crypt/md5deep/metadata.xml
index faeae31bc89d..40844ada042e 100644
--- a/app-crypt/md5deep/metadata.xml
+++ b/app-crypt/md5deep/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
diff --git a/app-crypt/md6sum/metadata.xml b/app-crypt/md6sum/metadata.xml
index 71af1cefdf3d..44a179ab29cf 100644
--- a/app-crypt/md6sum/metadata.xml
+++ b/app-crypt/md6sum/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/mdcrack/metadata.xml b/app-crypt/mdcrack/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/mdcrack/metadata.xml
+++ b/app-crypt/mdcrack/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/mhash/metadata.xml b/app-crypt/mhash/metadata.xml
index e9f4f0002de5..1efa45b7d735 100644
--- a/app-crypt/mhash/metadata.xml
+++ b/app-crypt/mhash/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
diff --git a/app-crypt/mit-krb5-appl/metadata.xml b/app-crypt/mit-krb5-appl/metadata.xml
index 2a1e1d958528..b02e0cad4528 100644
--- a/app-crypt/mit-krb5-appl/metadata.xml
+++ b/app-crypt/mit-krb5-appl/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>kerberos@gentoo.org</email>
<name>Kerberos</name>
</maintainer>
diff --git a/app-crypt/mit-krb5/metadata.xml b/app-crypt/mit-krb5/metadata.xml
index 0d59724ab52b..f28c118a58e3 100644
--- a/app-crypt/mit-krb5/metadata.xml
+++ b/app-crypt/mit-krb5/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>kerberos@gentoo.org</email>
<name>Kerberos</name>
</maintainer>
diff --git a/app-crypt/monkeysign/metadata.xml b/app-crypt/monkeysign/metadata.xml
index fc6ccc280409..91439c59951d 100644
--- a/app-crypt/monkeysign/metadata.xml
+++ b/app-crypt/monkeysign/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>k_f@gentoo.org</email>
<name>Kristian Fiskerstrand</name>
</maintainer>
diff --git a/app-crypt/monkeysphere/metadata.xml b/app-crypt/monkeysphere/metadata.xml
index fc6ccc280409..91439c59951d 100644
--- a/app-crypt/monkeysphere/metadata.xml
+++ b/app-crypt/monkeysphere/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>k_f@gentoo.org</email>
<name>Kristian Fiskerstrand</name>
</maintainer>
diff --git a/app-crypt/nasty/metadata.xml b/app-crypt/nasty/metadata.xml
index 78ae252e12b0..0106d597ab3c 100644
--- a/app-crypt/nasty/metadata.xml
+++ b/app-crypt/nasty/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 02986dea1093..80760693141b 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/oclhashcat-lite-bin/metadata.xml b/app-crypt/oclhashcat-lite-bin/metadata.xml
index 5ace541b2f5b..3bc548461ef3 100644
--- a/app-crypt/oclhashcat-lite-bin/metadata.xml
+++ b/app-crypt/oclhashcat-lite-bin/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/oclhashcat-plus-bin/metadata.xml b/app-crypt/oclhashcat-plus-bin/metadata.xml
index 5ace541b2f5b..3bc548461ef3 100644
--- a/app-crypt/oclhashcat-plus-bin/metadata.xml
+++ b/app-crypt/oclhashcat-plus-bin/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/onak/metadata.xml b/app-crypt/onak/metadata.xml
index 78ae252e12b0..0106d597ab3c 100644
--- a/app-crypt/onak/metadata.xml
+++ b/app-crypt/onak/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/openssl-blacklist/metadata.xml b/app-crypt/openssl-blacklist/metadata.xml
index bc1e2719c4da..2a593dc51c9b 100644
--- a/app-crypt/openssl-blacklist/metadata.xml
+++ b/app-crypt/openssl-blacklist/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/app-crypt/openssl-tpm-engine/metadata.xml b/app-crypt/openssl-tpm-engine/metadata.xml
index 77526511d451..7b14326dd1a6 100644
--- a/app-crypt/openssl-tpm-engine/metadata.xml
+++ b/app-crypt/openssl-tpm-engine/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/openvpn-blacklist/metadata.xml b/app-crypt/openvpn-blacklist/metadata.xml
index 8cb548491f4e..28ef3c7b080f 100644
--- a/app-crypt/openvpn-blacklist/metadata.xml
+++ b/app-crypt/openvpn-blacklist/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>hanno@gentoo.org</email></maintainer>
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/app-crypt/ophcrack-tables/metadata.xml b/app-crypt/ophcrack-tables/metadata.xml
index 313e0c3144ec..3316e0db9ad7 100644
--- a/app-crypt/ophcrack-tables/metadata.xml
+++ b/app-crypt/ophcrack-tables/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>ikelos@gentoo.org</email>
<name>Mike Auty</name>
</maintainer>
diff --git a/app-crypt/ophcrack/metadata.xml b/app-crypt/ophcrack/metadata.xml
index e0d1ea68d0d6..cf1f547e6447 100644
--- a/app-crypt/ophcrack/metadata.xml
+++ b/app-crypt/ophcrack/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>ikelos@gentoo.org</email>
<name>Mike Auty</name>
</maintainer>
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index f8958dea6d9d..060befc39aac 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>vapier@gentoo.org</email>
<description>do whatever</description>
</maintainer>
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index 5459c732c3b2..526448b5e558 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/paperkey/metadata.xml b/app-crypt/paperkey/metadata.xml
index bfcb6974f1c4..97df2a00971b 100644
--- a/app-crypt/paperkey/metadata.xml
+++ b/app-crypt/paperkey/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/app-crypt/pdfcrack/metadata.xml b/app-crypt/pdfcrack/metadata.xml
index a19553b069f0..e76ba30337e1 100644
--- a/app-crypt/pdfcrack/metadata.xml
+++ b/app-crypt/pdfcrack/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/pesign/metadata.xml b/app-crypt/pesign/metadata.xml
index 3d054ecd92f9..a90d7b928882 100644
--- a/app-crypt/pesign/metadata.xml
+++ b/app-crypt/pesign/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>gregkh@gentoo.org</email>
<description>do whatever</description>
</maintainer>
diff --git a/app-crypt/pgpdump/metadata.xml b/app-crypt/pgpdump/metadata.xml
index 37437f1622ac..2f7dfb2b0ade 100644
--- a/app-crypt/pgpdump/metadata.xml
+++ b/app-crypt/pgpdump/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index 64b9acb1b900..675913ea2c1a 100644
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 32a17f5a15ac..41aa1a90c241 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>tomk@gentoo.org</email>
<name>Tom Knight</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/pkcrack/metadata.xml b/app-crypt/pkcrack/metadata.xml
index f989417c39d0..2507c03b02ab 100644
--- a/app-crypt/pkcrack/metadata.xml
+++ b/app-crypt/pkcrack/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/pkcs11-data/metadata.xml b/app-crypt/pkcs11-data/metadata.xml
index 33f3ef97e521..c0ff61e1535f 100644
--- a/app-crypt/pkcs11-data/metadata.xml
+++ b/app-crypt/pkcs11-data/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/pkcs11-dump/metadata.xml b/app-crypt/pkcs11-dump/metadata.xml
index 33f3ef97e521..c0ff61e1535f 100644
--- a/app-crypt/pkcs11-dump/metadata.xml
+++ b/app-crypt/pkcs11-dump/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index f0ad47ae9349..a92ea3e2cd6a 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/app-crypt/quickcrypt/metadata.xml b/app-crypt/quickcrypt/metadata.xml
index 78ae252e12b0..0106d597ab3c 100644
--- a/app-crypt/quickcrypt/metadata.xml
+++ b/app-crypt/quickcrypt/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/rainbowcrack/metadata.xml b/app-crypt/rainbowcrack/metadata.xml
index 3b5de509f72c..861e967436b6 100644
--- a/app-crypt/rainbowcrack/metadata.xml
+++ b/app-crypt/rainbowcrack/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/sbsigntool/metadata.xml b/app-crypt/sbsigntool/metadata.xml
index 5deed91a82bb..9587e657a214 100644
--- a/app-crypt/sbsigntool/metadata.xml
+++ b/app-crypt/sbsigntool/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>vapier@gentoo.org</email>
<description>do whatever</description>
</maintainer>
diff --git a/app-crypt/scl011-bin/metadata.xml b/app-crypt/scl011-bin/metadata.xml
index 7ccd5f3a1c29..957e62ad0564 100644
--- a/app-crypt/scl011-bin/metadata.xml
+++ b/app-crypt/scl011-bin/metadata.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>egore@gmx.de</email>
<description>Proxied maintainer, assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
<description>Proxy-maintainer, CC him on bugs</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/scute/metadata.xml b/app-crypt/scute/metadata.xml
index be6c1ee6e158..a5c9d6ebf9eb 100644
--- a/app-crypt/scute/metadata.xml
+++ b/app-crypt/scute/metadata.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>lucas.yamanishi@gmail.com</email>
<name>Lucas Yamanishi</name>
<description>Proxy maintainer.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
<description>Proxying maintainer.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-crypt/seahorse-sharing/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
index fe3dc94b2bcd..39980802b1da 100644
--- a/app-crypt/seahorse-sharing/metadata.xml
+++ b/app-crypt/seahorse-sharing/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index 02290ce08069..6789dec723b8 100644
--- a/app-crypt/seahorse/metadata.xml
+++ b/app-crypt/seahorse/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/app-crypt/sgeps/metadata.xml b/app-crypt/sgeps/metadata.xml
index 27d1a82ec8bd..897d091c94ea 100644
--- a/app-crypt/sgeps/metadata.xml
+++ b/app-crypt/sgeps/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>enrico.tagliavini@gmail.com</email>
<name>Enrico Tagliavini</name>
<description>Proxied co-maintainer</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-crypt/shash/metadata.xml b/app-crypt/shash/metadata.xml
index c6d43950d7ad..3b9877fc08c3 100644
--- a/app-crypt/shash/metadata.xml
+++ b/app-crypt/shash/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>swegener@gentoo.org</email>
<name>Sven Wegener</name>
<description>primary maintainer</description>
diff --git a/app-crypt/shishi/metadata.xml b/app-crypt/shishi/metadata.xml
index aaf62386ee12..c178f1043237 100644
--- a/app-crypt/shishi/metadata.xml
+++ b/app-crypt/shishi/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>kerberos@gentoo.org</email>
<name>Kerberos</name>
</maintainer>
diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml
index d27c6c5ab2ee..eac2478a0ac2 100644
--- a/app-crypt/sign/metadata.xml
+++ b/app-crypt/sign/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>alicef@gentoo.org</email>
<name>Alice Ferrazzi</name>
<description>Assign bugs to me.</description>
diff --git a/app-crypt/signing-party/metadata.xml b/app-crypt/signing-party/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/signing-party/metadata.xml
+++ b/app-crypt/signing-party/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/simple-tpm-pk11/metadata.xml b/app-crypt/simple-tpm-pk11/metadata.xml
index 1ce8da6c4fe9..44b53b64f090 100644
--- a/app-crypt/simple-tpm-pk11/metadata.xml
+++ b/app-crypt/simple-tpm-pk11/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>perfinion@gentoo.org</email>
</maintainer>
<longdescription>A simple library for using the TPM chip to secure SSH keys</longdescription>
diff --git a/app-crypt/ssdeep/metadata.xml b/app-crypt/ssdeep/metadata.xml
index b3789a469fb6..ce7e1f31f036 100644
--- a/app-crypt/ssdeep/metadata.xml
+++ b/app-crypt/ssdeep/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/ssh-multiadd/metadata.xml b/app-crypt/ssh-multiadd/metadata.xml
index 1828ec211c31..3cd7a5726f55 100644
--- a/app-crypt/ssh-multiadd/metadata.xml
+++ b/app-crypt/ssh-multiadd/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>idella4@gentoo.org</email>
<name>Ian Delaney</name>
</maintainer>
diff --git a/app-crypt/stan/metadata.xml b/app-crypt/stan/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/stan/metadata.xml
+++ b/app-crypt/stan/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/tc-play/metadata.xml b/app-crypt/tc-play/metadata.xml
index e5798161f15b..bd7d1f05fe43 100644
--- a/app-crypt/tc-play/metadata.xml
+++ b/app-crypt/tc-play/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/tinyca/metadata.xml b/app-crypt/tinyca/metadata.xml
index dd564d89eb81..f1c3d59fb213 100644
--- a/app-crypt/tinyca/metadata.xml
+++ b/app-crypt/tinyca/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/tpm-emulator/metadata.xml b/app-crypt/tpm-emulator/metadata.xml
index 6c84d442c31a..e3da96029705 100644
--- a/app-crypt/tpm-emulator/metadata.xml
+++ b/app-crypt/tpm-emulator/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index 34b3582d73a2..31ebf3b6ac32 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml
index 79bd01a98cbb..090e56fab7c0 100644
--- a/app-crypt/trousers/metadata.xml
+++ b/app-crypt/trousers/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/truecrypt/metadata.xml b/app-crypt/truecrypt/metadata.xml
index 804ea089f0e9..ae09eee9c58c 100644
--- a/app-crypt/truecrypt/metadata.xml
+++ b/app-crypt/truecrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/xca/metadata.xml b/app-crypt/xca/metadata.xml
index 5f08cba81271..27fe33dd45b0 100644
--- a/app-crypt/xca/metadata.xml
+++ b/app-crypt/xca/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/yubikey-neo-manager/metadata.xml b/app-crypt/yubikey-neo-manager/metadata.xml
index 3f2834d05381..e660b92fd940 100644
--- a/app-crypt/yubikey-neo-manager/metadata.xml
+++ b/app-crypt/yubikey-neo-manager/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>crypto@gentoo.org</email>
<name>Crypto</name>
</maintainer>
diff --git a/app-crypt/zuluCrypt/metadata.xml b/app-crypt/zuluCrypt/metadata.xml
index 7d506ef91e7a..d92eeeafccdd 100644
--- a/app-crypt/zuluCrypt/metadata.xml
+++ b/app-crypt/zuluCrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
</maintainer>