summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/advancecomp/metadata.xml2
-rw-r--r--app-arch/alien/metadata.xml4
-rw-r--r--app-arch/atool/metadata.xml4
-rw-r--r--app-arch/bloscpack/metadata.xml2
-rw-r--r--app-arch/bsdsfv/metadata.xml2
-rw-r--r--app-arch/bzip2/metadata.xml2
-rw-r--r--app-arch/cabextract/metadata.xml2
-rw-r--r--app-arch/cksfv/metadata.xml2
-rw-r--r--app-arch/cpio/metadata.xml2
-rw-r--r--app-arch/createrepo/metadata.xml2
-rw-r--r--app-arch/deb2targz/metadata.xml2
-rw-r--r--app-arch/defluff/metadata.xml4
-rw-r--r--app-arch/dpkg/metadata.xml2
-rw-r--r--app-arch/duff/metadata.xml2
-rw-r--r--app-arch/dump/metadata.xml2
-rw-r--r--app-arch/engrampa/metadata.xml2
-rw-r--r--app-arch/fastjar/metadata.xml2
-rw-r--r--app-arch/file-roller/metadata.xml2
-rw-r--r--app-arch/funzix/metadata.xml2
-rw-r--r--app-arch/gcab/metadata.xml2
-rw-r--r--app-arch/gzip/metadata.xml2
-rw-r--r--app-arch/hardlink/metadata.xml4
-rw-r--r--app-arch/innoextract/metadata.xml4
-rw-r--r--app-arch/ipkg-utils/metadata.xml4
-rw-r--r--app-arch/lbzip2/metadata.xml2
-rw-r--r--app-arch/lcab/metadata.xml4
-rw-r--r--app-arch/lha/metadata.xml4
-rw-r--r--app-arch/libarchive/metadata.xml4
-rw-r--r--app-arch/libpar2/metadata.xml2
-rw-r--r--app-arch/libzpaq/metadata.xml2
-rw-r--r--app-arch/lrzip/metadata.xml2
-rw-r--r--app-arch/lz4/metadata.xml2
-rw-r--r--app-arch/lzip/metadata.xml2
-rw-r--r--app-arch/lziprecover/metadata.xml2
-rw-r--r--app-arch/lzlib/metadata.xml2
-rw-r--r--app-arch/lzop/metadata.xml2
-rw-r--r--app-arch/mt-st/metadata.xml2
-rw-r--r--app-arch/ncompress/metadata.xml2
-rw-r--r--app-arch/p7zip/metadata.xml2
-rw-r--r--app-arch/par2cmdline/metadata.xml4
-rw-r--r--app-arch/pbzip2/metadata.xml2
-rw-r--r--app-arch/pdlzip/metadata.xml2
-rw-r--r--app-arch/pet2tgz/metadata.xml2
-rw-r--r--app-arch/pigz/metadata.xml2
-rw-r--r--app-arch/pixz/metadata.xml2
-rw-r--r--app-arch/plzip/metadata.xml2
-rw-r--r--app-arch/pxz/metadata.xml2
-rw-r--r--app-arch/rar/metadata.xml6
-rw-r--r--app-arch/rpm/metadata.xml4
-rw-r--r--app-arch/rpm2targz/metadata.xml2
-rw-r--r--app-arch/sharutils/metadata.xml2
-rw-r--r--app-arch/snappy/metadata.xml4
-rw-r--r--app-arch/star/metadata.xml2
-rw-r--r--app-arch/tapeutils/metadata.xml2
-rw-r--r--app-arch/tar/metadata.xml2
-rw-r--r--app-arch/tardelta/metadata.xml2
-rw-r--r--app-arch/unace/metadata.xml2
-rw-r--r--app-arch/unadf/metadata.xml2
-rw-r--r--app-arch/unar/metadata.xml2
-rw-r--r--app-arch/unarj/metadata.xml4
-rw-r--r--app-arch/unmakeself/metadata.xml2
-rw-r--r--app-arch/unp/metadata.xml2
-rw-r--r--app-arch/unrar-gpl/metadata.xml2
-rw-r--r--app-arch/unrar/metadata.xml2
-rw-r--r--app-arch/unrpa/metadata.xml2
-rw-r--r--app-arch/unshield/metadata.xml2
-rw-r--r--app-arch/unzip/metadata.xml2
-rw-r--r--app-arch/vimball/metadata.xml2
-rw-r--r--app-arch/xar/metadata.xml2
-rw-r--r--app-arch/xarchiver/metadata.xml2
-rw-r--r--app-arch/xz-utils/metadata.xml2
-rw-r--r--app-arch/zip/metadata.xml2
-rw-r--r--app-arch/zopfli/metadata.xml4
-rw-r--r--app-arch/zpaq-extras/metadata.xml2
-rw-r--r--app-arch/zpaq/metadata.xml2
-rw-r--r--app-arch/zpipe/metadata.xml2
76 files changed, 92 insertions, 92 deletions
diff --git a/app-arch/advancecomp/metadata.xml b/app-arch/advancecomp/metadata.xml
index 50789f6b11fe..720fffd5f61b 100644
--- a/app-arch/advancecomp/metadata.xml
+++ b/app-arch/advancecomp/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-arch/alien/metadata.xml b/app-arch/alien/metadata.xml
index 312ed3cbc3a1..04525ebf32af 100644
--- a/app-arch/alien/metadata.xml
+++ b/app-arch/alien/metadata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer><email>lordvan@gentoo.org</email></maintainer>
- <maintainer><email>monsieurp@gentoo.org</email></maintainer>
+ <maintainer type="person"><email>lordvan@gentoo.org</email></maintainer>
+ <maintainer type="person"><email>monsieurp@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/app-arch/atool/metadata.xml b/app-arch/atool/metadata.xml
index 27fecb98ed5a..fa1c2e6d8001 100644
--- a/app-arch/atool/metadata.xml
+++ b/app-arch/atool/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>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/app-arch/bloscpack/metadata.xml b/app-arch/bloscpack/metadata.xml
index 4c739e9b90c9..071ce698fc2d 100644
--- a/app-arch/bloscpack/metadata.xml
+++ b/app-arch/bloscpack/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>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</maintainer>
diff --git a/app-arch/bsdsfv/metadata.xml b/app-arch/bsdsfv/metadata.xml
index 81551492a11e..5f2e02ad0496 100644
--- a/app-arch/bsdsfv/metadata.xml
+++ b/app-arch/bsdsfv/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>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
index bf4b8e657d02..83d6d32d00a6 100644
--- a/app-arch/bzip2/metadata.xml
+++ b/app-arch/bzip2/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-arch/cabextract/metadata.xml b/app-arch/cabextract/metadata.xml
index bcb7f0d0ee2d..181a78d0cb21 100644
--- a/app-arch/cabextract/metadata.xml
+++ b/app-arch/cabextract/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>fonts@gentoo.org</email>
<name>Fonts</name>
</maintainer>
diff --git a/app-arch/cksfv/metadata.xml b/app-arch/cksfv/metadata.xml
index 01630d73a7f1..c2a628921b6a 100644
--- a/app-arch/cksfv/metadata.xml
+++ b/app-arch/cksfv/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>
<longdescription>A Simple file verification tool to ensure that the files you recieve are the same as the originals.</longdescription>
diff --git a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/app-arch/cpio/metadata.xml
+++ b/app-arch/cpio/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-arch/createrepo/metadata.xml b/app-arch/createrepo/metadata.xml
index 0e692af10e6c..cf9a9e94265f 100644
--- a/app-arch/createrepo/metadata.xml
+++ b/app-arch/createrepo/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>alonbl@gentoo.org</email>
<name>Alon Bar-Lev</name>
</maintainer>
diff --git a/app-arch/deb2targz/metadata.xml b/app-arch/deb2targz/metadata.xml
index 1db71bb6e0e4..c10b09fa8f36 100644
--- a/app-arch/deb2targz/metadata.xml
+++ b/app-arch/deb2targz/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>chainsaw@gentoo.org</email></maintainer>
+<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/app-arch/defluff/metadata.xml b/app-arch/defluff/metadata.xml
index d66da541cd75..d8922de7af93 100644
--- a/app-arch/defluff/metadata.xml
+++ b/app-arch/defluff/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>alex_y_xu@yahoo.ca</email>
<name>Alex Xu</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-arch/dpkg/metadata.xml b/app-arch/dpkg/metadata.xml
index 42826e4d8c57..029c83c94699 100644
--- a/app-arch/dpkg/metadata.xml
+++ b/app-arch/dpkg/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>deb-tools@gentoo.org</email>
<name>Gentoo Debian Tools Project</name>
</maintainer>
diff --git a/app-arch/duff/metadata.xml b/app-arch/duff/metadata.xml
index da9a0b9845f9..cd5e6341af23 100644
--- a/app-arch/duff/metadata.xml
+++ b/app-arch/duff/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>
</maintainer>
<upstream>
diff --git a/app-arch/dump/metadata.xml b/app-arch/dump/metadata.xml
index a5bb7eb45dfd..6cacb8a2f4b0 100644
--- a/app-arch/dump/metadata.xml
+++ b/app-arch/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index ad3d890fe078..18201ba90d03 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/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>mate@gentoo.org</email>
<name>Gentoo MATE Desktop</name>
</maintainer>
diff --git a/app-arch/fastjar/metadata.xml b/app-arch/fastjar/metadata.xml
index 35323c72d2da..0d201b2da538 100644
--- a/app-arch/fastjar/metadata.xml
+++ b/app-arch/fastjar/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-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml
index a7d2bed3ef41..a1511def35e7 100644
--- a/app-arch/file-roller/metadata.xml
+++ b/app-arch/file-roller/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-arch/funzix/metadata.xml b/app-arch/funzix/metadata.xml
index a3c636b4cc4d..6e64f69cd171 100644
--- a/app-arch/funzix/metadata.xml
+++ b/app-arch/funzix/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-arch/gcab/metadata.xml b/app-arch/gcab/metadata.xml
index fe3dc94b2bcd..39980802b1da 100644
--- a/app-arch/gcab/metadata.xml
+++ b/app-arch/gcab/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-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml
index 2303c0e6fc3e..bbcfb3d82afd 100644
--- a/app-arch/gzip/metadata.xml
+++ b/app-arch/gzip/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-arch/hardlink/metadata.xml b/app-arch/hardlink/metadata.xml
index d9d819757cde..3d6eb23ac199 100644
--- a/app-arch/hardlink/metadata.xml
+++ b/app-arch/hardlink/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>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
diff --git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml
index 61a03048ecf5..4b93f5df2fd9 100644
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/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>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>daniel@constexpr.org</email>
<name>Daniel Scharrer</name>
<description>Proxy maintainer. CC him on bugs</description>
diff --git a/app-arch/ipkg-utils/metadata.xml b/app-arch/ipkg-utils/metadata.xml
index 89ca65064a74..bbd0686ff3f8 100644
--- a/app-arch/ipkg-utils/metadata.xml
+++ b/app-arch/ipkg-utils/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>jnrowe@gmail.com</email>
<name>James Rowe</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-arch/lbzip2/metadata.xml b/app-arch/lbzip2/metadata.xml
index 9a8b216d2cb5..b2cb1790e34b 100644
--- a/app-arch/lbzip2/metadata.xml
+++ b/app-arch/lbzip2/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>mattst88@gentoo.org</email>
<name>Matt Turner</name>
</maintainer>
diff --git a/app-arch/lcab/metadata.xml b/app-arch/lcab/metadata.xml
index ededab1517b2..fe5ae1d67f7b 100644
--- a/app-arch/lcab/metadata.xml
+++ b/app-arch/lcab/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>vapier@gentoo.org</email>
<description>do whatever</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>binki@gentoo.org</email>
<name>Nathan Phillip Brink</name>
<description>Upstreamish</description>
diff --git a/app-arch/lha/metadata.xml b/app-arch/lha/metadata.xml
index 13d8924bd878..ee8ee630babf 100644
--- a/app-arch/lha/metadata.xml
+++ b/app-arch/lha/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>nitro@legroom.net</email>
<name>Jared B.</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index ffdea916c351..174e5bed4a94 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/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>bsd@gentoo.org</email>
<name>BSD Project</name>
</maintainer>
diff --git a/app-arch/libpar2/metadata.xml b/app-arch/libpar2/metadata.xml
index e20bf81c246e..1cb3032538b0 100644
--- a/app-arch/libpar2/metadata.xml
+++ b/app-arch/libpar2/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>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/app-arch/libzpaq/metadata.xml b/app-arch/libzpaq/metadata.xml
index c4c61007bcb5..c560fb5da271 100644
--- a/app-arch/libzpaq/metadata.xml
+++ b/app-arch/libzpaq/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-arch/lrzip/metadata.xml b/app-arch/lrzip/metadata.xml
index 47c8a7fd5cf7..d058e2831bdc 100644
--- a/app-arch/lrzip/metadata.xml
+++ b/app-arch/lrzip/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>yngwin@gentoo.org</email>
</maintainer>
<longdescription>
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index a69854a96fb1..b2d76c54ecc5 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/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>ryao@gentoo.org</email>
<name>Richard Yao</name>
</maintainer>
diff --git a/app-arch/lzip/metadata.xml b/app-arch/lzip/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/app-arch/lzip/metadata.xml
+++ b/app-arch/lzip/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-arch/lziprecover/metadata.xml b/app-arch/lziprecover/metadata.xml
index eb4dc77430b4..3345160047f6 100644
--- a/app-arch/lziprecover/metadata.xml
+++ b/app-arch/lziprecover/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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
diff --git a/app-arch/lzlib/metadata.xml b/app-arch/lzlib/metadata.xml
index 5cb9324943ab..0319eec4c8be 100644
--- a/app-arch/lzlib/metadata.xml
+++ b/app-arch/lzlib/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-arch/lzop/metadata.xml b/app-arch/lzop/metadata.xml
index 25907ed30810..3da3d63346cc 100644
--- a/app-arch/lzop/metadata.xml
+++ b/app-arch/lzop/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>binki@gentoo.org</email>
<name>Nathan Phillip Brink</name>
</maintainer>
diff --git a/app-arch/mt-st/metadata.xml b/app-arch/mt-st/metadata.xml
index 52363bff0cba..f8bd6f3f34f9 100644
--- a/app-arch/mt-st/metadata.xml
+++ b/app-arch/mt-st/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>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
diff --git a/app-arch/ncompress/metadata.xml b/app-arch/ncompress/metadata.xml
index b1e86a22c272..0d4bcdec12c1 100644
--- a/app-arch/ncompress/metadata.xml
+++ b/app-arch/ncompress/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-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index 727c6ba468c2..686e0639c24c 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/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>prometheanfire@gentoo.org</email>
<description>maintainer</description>
</maintainer>
diff --git a/app-arch/par2cmdline/metadata.xml b/app-arch/par2cmdline/metadata.xml
index 7f2c592e7507..3b1b52eb6776 100644
--- a/app-arch/par2cmdline/metadata.xml
+++ b/app-arch/par2cmdline/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>swegener@gentoo.org</email>
<description>Primary Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/app-arch/pbzip2/metadata.xml b/app-arch/pbzip2/metadata.xml
index 978e9e074f77..98d33df27533 100644
--- a/app-arch/pbzip2/metadata.xml
+++ b/app-arch/pbzip2/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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
diff --git a/app-arch/pdlzip/metadata.xml b/app-arch/pdlzip/metadata.xml
index 5cb9324943ab..0319eec4c8be 100644
--- a/app-arch/pdlzip/metadata.xml
+++ b/app-arch/pdlzip/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-arch/pet2tgz/metadata.xml b/app-arch/pet2tgz/metadata.xml
index 74382342e237..f1dd7a3da8e0 100644
--- a/app-arch/pet2tgz/metadata.xml
+++ b/app-arch/pet2tgz/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>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 56cd21a45bc2..478203e0a5c1 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/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>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/app-arch/pixz/metadata.xml b/app-arch/pixz/metadata.xml
index 3aa4e7544edf..233f56a7595f 100644
--- a/app-arch/pixz/metadata.xml
+++ b/app-arch/pixz/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>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
diff --git a/app-arch/plzip/metadata.xml b/app-arch/plzip/metadata.xml
index 5cb9324943ab..0319eec4c8be 100644
--- a/app-arch/plzip/metadata.xml
+++ b/app-arch/plzip/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-arch/pxz/metadata.xml b/app-arch/pxz/metadata.xml
index 5bb98fbfedc0..1d95e2b04b5d 100644
--- a/app-arch/pxz/metadata.xml
+++ b/app-arch/pxz/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>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index 07049b1e130b..621df28fc168 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>jdhore@gentoo.org</email>
<name>Jeff Horelick</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>elizabeth@interlinked.me</email>
<name>Elizabeth Myers</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index 4bf257548fb5..13a0efec2c18 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/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>sochotnicky@gentoo.org</email>
<name>Stanislav Ochotnicky</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/app-arch/rpm2targz/metadata.xml b/app-arch/rpm2targz/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/app-arch/rpm2targz/metadata.xml
+++ b/app-arch/rpm2targz/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-arch/sharutils/metadata.xml b/app-arch/sharutils/metadata.xml
index 88f875a020b4..92fa5463f2b2 100644
--- a/app-arch/sharutils/metadata.xml
+++ b/app-arch/sharutils/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-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index 6f51b18fd3e0..2baca78fab46 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/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>brendan@horan.hk</email>
<name>Brendan Horan</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-arch/star/metadata.xml b/app-arch/star/metadata.xml
index 17d8a589f717..5e16a72b054f 100644
--- a/app-arch/star/metadata.xml
+++ b/app-arch/star/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>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
diff --git a/app-arch/tapeutils/metadata.xml b/app-arch/tapeutils/metadata.xml
index a732fd8b2f03..a4e0d354f696 100644
--- a/app-arch/tapeutils/metadata.xml
+++ b/app-arch/tapeutils/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-arch/tar/metadata.xml b/app-arch/tar/metadata.xml
index 2c5ef31c04cc..c7c95933065b 100644
--- a/app-arch/tar/metadata.xml
+++ b/app-arch/tar/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-arch/tardelta/metadata.xml b/app-arch/tardelta/metadata.xml
index f5453e0a6cd0..727296200d6d 100644
--- a/app-arch/tardelta/metadata.xml
+++ b/app-arch/tardelta/metadata.xml
@@ -4,7 +4,7 @@
<upstream>
<remote-id type="github">zmedico/tardelta</remote-id>
</upstream>
- <maintainer>
+ <maintainer type="person">
<email>zmedico@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-arch/unace/metadata.xml b/app-arch/unace/metadata.xml
index 59d0590f95ec..538a6fc509dc 100644
--- a/app-arch/unace/metadata.xml
+++ b/app-arch/unace/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-arch/unadf/metadata.xml b/app-arch/unadf/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/app-arch/unadf/metadata.xml
+++ b/app-arch/unadf/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>
</maintainer>
</pkgmetadata>
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index 197a63b678b5..0cdd2da33f04 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/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-arch/unarj/metadata.xml b/app-arch/unarj/metadata.xml
index 6c62171fb4e8..e8c216b62618 100644
--- a/app-arch/unarj/metadata.xml
+++ b/app-arch/unarj/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>nitro@legroom.net</email>
<name>Jared B.</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-arch/unmakeself/metadata.xml b/app-arch/unmakeself/metadata.xml
index cc160542fb5e..e549dd86aed6 100644
--- a/app-arch/unmakeself/metadata.xml
+++ b/app-arch/unmakeself/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-arch/unp/metadata.xml b/app-arch/unp/metadata.xml
index 8cb548491f4e..28ef3c7b080f 100644
--- a/app-arch/unp/metadata.xml
+++ b/app-arch/unp/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-arch/unrar-gpl/metadata.xml b/app-arch/unrar-gpl/metadata.xml
index f187a7c8effb..b265683d48c5 100644
--- a/app-arch/unrar-gpl/metadata.xml
+++ b/app-arch/unrar-gpl/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>
</pkgmetadata>
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index da8e1f188d0d..07bf807b8d07 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/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-arch/unrpa/metadata.xml b/app-arch/unrpa/metadata.xml
index f35062a7ed79..ae6fe3733ede 100644
--- a/app-arch/unrpa/metadata.xml
+++ b/app-arch/unrpa/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>bircoph@gentoo.org</email>
<name>Andrew Savchenko</name>
</maintainer>
diff --git a/app-arch/unshield/metadata.xml b/app-arch/unshield/metadata.xml
index c904e10fbd93..bf899057c713 100644
--- a/app-arch/unshield/metadata.xml
+++ b/app-arch/unshield/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>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index 4a28de141ab3..564fd76677c8 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/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-arch/vimball/metadata.xml b/app-arch/vimball/metadata.xml
index fe150bdd9ce7..d32fca1cb55b 100644
--- a/app-arch/vimball/metadata.xml
+++ b/app-arch/vimball/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>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/app-arch/xar/metadata.xml b/app-arch/xar/metadata.xml
index 1babb0999ee5..3f12544c133d 100644
--- a/app-arch/xar/metadata.xml
+++ b/app-arch/xar/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>yngwin@gentoo.org</email>
</maintainer>
<longdescription lang="en">
diff --git a/app-arch/xarchiver/metadata.xml b/app-arch/xarchiver/metadata.xml
index 90fb5bcceaae..ef20bdef6b91 100644
--- a/app-arch/xarchiver/metadata.xml
+++ b/app-arch/xarchiver/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>xfce@gentoo.org</email>
<name>XFCE Team</name>
</maintainer>
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/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-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
index 18949809bb85..71d52343602a 100644
--- a/app-arch/zip/metadata.xml
+++ b/app-arch/zip/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-arch/zopfli/metadata.xml b/app-arch/zopfli/metadata.xml
index 9844e46647a8..55914e5e6bc5 100644
--- a/app-arch/zopfli/metadata.xml
+++ b/app-arch/zopfli/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>alex_y_xu@yahoo.ca</email>
<name>Alex Xu</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-arch/zpaq-extras/metadata.xml b/app-arch/zpaq-extras/metadata.xml
index 5cb9324943ab..0319eec4c8be 100644
--- a/app-arch/zpaq-extras/metadata.xml
+++ b/app-arch/zpaq-extras/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-arch/zpaq/metadata.xml b/app-arch/zpaq/metadata.xml
index 5cb9324943ab..0319eec4c8be 100644
--- a/app-arch/zpaq/metadata.xml
+++ b/app-arch/zpaq/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-arch/zpipe/metadata.xml b/app-arch/zpipe/metadata.xml
index 5cb9324943ab..0319eec4c8be 100644
--- a/app-arch/zpipe/metadata.xml
+++ b/app-arch/zpipe/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>