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 /dev-util
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 'dev-util')
-rw-r--r--dev-util/App-SVN-Bisect/metadata.xml2
-rw-r--r--dev-util/Orange/metadata.xml2
-rw-r--r--dev-util/aap/metadata.xml2
-rw-r--r--dev-util/abi-compliance-checker/metadata.xml2
-rw-r--r--dev-util/amtterm/metadata.xml2
-rw-r--r--dev-util/android-ndk/metadata.xml2
-rw-r--r--dev-util/android-sdk-update-manager/metadata.xml2
-rw-r--r--dev-util/android-studio/metadata.xml2
-rw-r--r--dev-util/android-tools/metadata.xml2
-rw-r--r--dev-util/anjuta/metadata.xml2
-rw-r--r--dev-util/antlrworks/metadata.xml2
-rw-r--r--dev-util/apitrace/metadata.xml2
-rw-r--r--dev-util/appdata-tools/metadata.xml4
-rw-r--r--dev-util/appinventor/metadata.xml6
-rw-r--r--dev-util/archdiff/metadata.xml2
-rw-r--r--dev-util/argouml/metadata.xml2
-rw-r--r--dev-util/aruba/metadata.xml2
-rw-r--r--dev-util/atomic-install/metadata.xml2
-rw-r--r--dev-util/automoc/metadata.xml2
-rw-r--r--dev-util/autoproject/metadata.xml2
-rw-r--r--dev-util/babeltrace/metadata.xml2
-rw-r--r--dev-util/bakefile/metadata.xml2
-rw-r--r--dev-util/bbe/metadata.xml2
-rw-r--r--dev-util/bdelta/metadata.xml4
-rw-r--r--dev-util/biew/metadata.xml2
-rw-r--r--dev-util/bin_replace_string/metadata.xml2
-rw-r--r--dev-util/bitcoin-tx/metadata.xml6
-rw-r--r--dev-util/bless/metadata.xml2
-rw-r--r--dev-util/bnfc/metadata.xml2
-rw-r--r--dev-util/boost-build/metadata.xml2
-rw-r--r--dev-util/bsdiff/metadata.xml2
-rw-r--r--dev-util/btyacc/metadata.xml6
-rw-r--r--dev-util/build/metadata.xml2
-rw-r--r--dev-util/buildbot-slave/metadata.xml2
-rw-r--r--dev-util/buildbot/metadata.xml2
-rw-r--r--dev-util/bumpversion/metadata.xml2
-rw-r--r--dev-util/bustle/metadata.xml2
-rw-r--r--dev-util/catalyst/metadata.xml4
-rw-r--r--dev-util/catfish/metadata.xml2
-rw-r--r--dev-util/catkin/metadata.xml2
-rw-r--r--dev-util/ccache/metadata.xml4
-rw-r--r--dev-util/ccglue/metadata.xml2
-rw-r--r--dev-util/cflow/metadata.xml2
-rw-r--r--dev-util/cgvg/metadata.xml2
-rw-r--r--dev-util/checkbashisms/metadata.xml4
-rw-r--r--dev-util/checkstyle/metadata.xml2
-rw-r--r--dev-util/cligh/metadata.xml4
-rw-r--r--dev-util/cloc/metadata.xml2
-rw-r--r--dev-util/cmake-fedora/metadata.xml2
-rw-r--r--dev-util/cmake/metadata.xml2
-rw-r--r--dev-util/cmdtest/metadata.xml2
-rw-r--r--dev-util/cmocka/metadata.xml4
-rw-r--r--dev-util/cmt/metadata.xml2
-rw-r--r--dev-util/coccigrep/metadata.xml2
-rw-r--r--dev-util/coccinelle/metadata.xml4
-rw-r--r--dev-util/codeblocks/metadata.xml2
-rw-r--r--dev-util/colm/metadata.xml2
-rw-r--r--dev-util/colorgcc/metadata.xml2
-rw-r--r--dev-util/comparator/metadata.xml2
-rw-r--r--dev-util/complexity/metadata.xml2
-rw-r--r--dev-util/confix-wrapper/metadata.xml2
-rw-r--r--dev-util/confix/metadata.xml2
-rw-r--r--dev-util/cppcheck/metadata.xml2
-rw-r--r--dev-util/cppi/metadata.xml2
-rw-r--r--dev-util/cpptest/metadata.xml2
-rw-r--r--dev-util/cppunit/metadata.xml2
-rw-r--r--dev-util/cpputest/metadata.xml2
-rw-r--r--dev-util/cpuinfo-collection/metadata.xml2
-rw-r--r--dev-util/crash/metadata.xml2
-rw-r--r--dev-util/creduce/metadata.xml2
-rw-r--r--dev-util/cscope/metadata.xml4
-rw-r--r--dev-util/csup/metadata.xml2
-rw-r--r--dev-util/ctags/metadata.xml2
-rw-r--r--dev-util/cucumber-core/metadata.xml2
-rw-r--r--dev-util/cucumber-rails/metadata.xml2
-rw-r--r--dev-util/cucumber/metadata.xml2
-rw-r--r--dev-util/cwdiff/metadata.xml2
-rw-r--r--dev-util/cyclo/metadata.xml4
-rw-r--r--dev-util/d-feet/metadata.xml4
-rw-r--r--dev-util/dbus-test-runner/metadata.xml2
-rw-r--r--dev-util/ddd/metadata.xml2
-rw-r--r--dev-util/debhelper/metadata.xml2
-rw-r--r--dev-util/debootstrap/metadata.xml4
-rw-r--r--dev-util/debugedit/metadata.xml2
-rw-r--r--dev-util/dejagnu/metadata.xml2
-rw-r--r--dev-util/desktop-file-utils/metadata.xml2
-rw-r--r--dev-util/deskzilla/metadata.xml2
-rw-r--r--dev-util/devhelp/metadata.xml2
-rw-r--r--dev-util/dialog/metadata.xml2
-rw-r--r--dev-util/diffball/metadata.xml2
-rw-r--r--dev-util/difffilter/metadata.xml2
-rw-r--r--dev-util/diffstat/metadata.xml2
-rw-r--r--dev-util/diffuse/metadata.xml2
-rw-r--r--dev-util/dmake/metadata.xml2
-rw-r--r--dev-util/dogtail/metadata.xml2
-rw-r--r--dev-util/dropwatch/metadata.xml2
-rw-r--r--dev-util/dwdiff/metadata.xml2
-rw-r--r--dev-util/eclipse-sdk/metadata.xml2
-rw-r--r--dev-util/elfkickers/metadata.xml4
-rw-r--r--dev-util/emilpro/metadata.xml2
-rw-r--r--dev-util/eric/metadata.xml2
-rw-r--r--dev-util/exmap/metadata.xml2
-rw-r--r--dev-util/fatrace/metadata.xml2
-rw-r--r--dev-util/febootstrap/metadata.xml6
-rw-r--r--dev-util/fhist/metadata.xml2
-rw-r--r--dev-util/findbugs/metadata.xml2
-rw-r--r--dev-util/fix-la-relink-command/metadata.xml4
-rw-r--r--dev-util/ftjam/metadata.xml2
-rw-r--r--dev-util/fuzz/metadata.xml2
-rw-r--r--dev-util/gdbus-codegen/metadata.xml2
-rw-r--r--dev-util/geany-plugins/metadata.xml2
-rw-r--r--dev-util/geany/metadata.xml2
-rw-r--r--dev-util/glade/metadata.xml2
-rw-r--r--dev-util/global/metadata.xml6
-rw-r--r--dev-util/gnome-devel-docs/metadata.xml2
-rw-r--r--dev-util/gob/metadata.xml2
-rw-r--r--dev-util/google-perftools/metadata.xml2
-rw-r--r--dev-util/gource/metadata.xml6
-rw-r--r--dev-util/gperf/metadata.xml2
-rw-r--r--dev-util/gprof2dot/metadata.xml2
-rw-r--r--dev-util/gtk-builder-convert/metadata.xml2
-rw-r--r--dev-util/gtk-doc-am/metadata.xml2
-rw-r--r--dev-util/gtk-doc/metadata.xml2
-rw-r--r--dev-util/gtk-update-icon-cache/metadata.xml2
-rw-r--r--dev-util/heaptrack/metadata.xml2
-rw-r--r--dev-util/howdoi/metadata.xml2
-rw-r--r--dev-util/hxtools/metadata.xml2
-rw-r--r--dev-util/icemon/metadata.xml4
-rw-r--r--dev-util/icmake/metadata.xml2
-rw-r--r--dev-util/idea-ultimate/metadata.xml6
-rw-r--r--dev-util/idutils/metadata.xml2
-rw-r--r--dev-util/igprof/metadata.xml2
-rw-r--r--dev-util/imediff2/metadata.xml2
-rw-r--r--dev-util/include-what-you-use/metadata.xml2
-rw-r--r--dev-util/indent/metadata.xml2
-rw-r--r--dev-util/intel-ocl-sdk/metadata.xml4
-rw-r--r--dev-util/intltool/metadata.xml2
-rw-r--r--dev-util/its4/metadata.xml2
-rw-r--r--dev-util/itstool/metadata.xml2
-rw-r--r--dev-util/jarwizard/metadata.xml2
-rw-r--r--dev-util/jay/metadata.xml4
-rw-r--r--dev-util/jconfig/metadata.xml2
-rw-r--r--dev-util/jenkins-bin/metadata.xml4
-rw-r--r--dev-util/kbuild/metadata.xml6
-rw-r--r--dev-util/kdbg/metadata.xml2
-rw-r--r--dev-util/kdevelop-pg-qt/metadata.xml2
-rw-r--r--dev-util/kdevelop-php-docs/metadata.xml2
-rw-r--r--dev-util/kdevelop-php/metadata.xml2
-rw-r--r--dev-util/kdevelop-python/metadata.xml2
-rw-r--r--dev-util/kdevelop-qmake/metadata.xml2
-rw-r--r--dev-util/kdevelop-qmljs/metadata.xml2
-rw-r--r--dev-util/kdevelop/metadata.xml2
-rw-r--r--dev-util/kdevplatform/metadata.xml2
-rw-r--r--dev-util/kelbt/metadata.xml4
-rw-r--r--dev-util/ketchup/metadata.xml2
-rw-r--r--dev-util/kscope/metadata.xml2
-rw-r--r--dev-util/kup/metadata.xml2
-rw-r--r--dev-util/leaktracer/metadata.xml2
-rw-r--r--dev-util/lttng-modules/metadata.xml2
-rw-r--r--dev-util/lttng-tools/metadata.xml2
-rw-r--r--dev-util/lttng-ust/metadata.xml2
-rw-r--r--dev-util/makeheaders/metadata.xml2
-rw-r--r--dev-util/makepp/metadata.xml2
-rw-r--r--dev-util/mdds/metadata.xml2
-rw-r--r--dev-util/meld/metadata.xml2
-rw-r--r--dev-util/mingw-runtime/metadata.xml2
-rw-r--r--dev-util/mingw64-runtime/metadata.xml2
-rw-r--r--dev-util/molecule-core/metadata.xml2
-rw-r--r--dev-util/molecule-plugins/metadata.xml2
-rw-r--r--dev-util/molecule/metadata.xml2
-rw-r--r--dev-util/monkeystudio/metadata.xml2
-rw-r--r--dev-util/mono-debugger/metadata.xml2
-rw-r--r--dev-util/monodevelop-database/metadata.xml2
-rw-r--r--dev-util/monodevelop-debugger-gdb/metadata.xml2
-rw-r--r--dev-util/monodevelop/metadata.xml2
-rw-r--r--dev-util/mpatch/metadata.xml2
-rw-r--r--dev-util/nemiver/metadata.xml2
-rw-r--r--dev-util/netbeans/metadata.xml4
-rw-r--r--dev-util/ninja-ide/metadata.xml6
-rw-r--r--dev-util/ninja/metadata.xml2
-rw-r--r--dev-util/nvidia-cuda-sdk/metadata.xml2
-rw-r--r--dev-util/nvidia-cuda-toolkit/metadata.xml2
-rw-r--r--dev-util/objconv/metadata.xml2
-rw-r--r--dev-util/obs-service-cpanspec/metadata.xml2
-rw-r--r--dev-util/obs-service-download_files/metadata.xml2
-rw-r--r--dev-util/obs-service-download_src_package/metadata.xml2
-rw-r--r--dev-util/obs-service-download_url/metadata.xml2
-rw-r--r--dev-util/obs-service-extract_file/metadata.xml2
-rw-r--r--dev-util/obs-service-format_spec_file/metadata.xml2
-rw-r--r--dev-util/obs-service-generator_driver_update_disk/metadata.xml2
-rw-r--r--dev-util/obs-service-git_tarballs/metadata.xml2
-rw-r--r--dev-util/obs-service-github_tarballs/metadata.xml2
-rw-r--r--dev-util/obs-service-meta/metadata.xml2
-rw-r--r--dev-util/obs-service-rearchive/metadata.xml2
-rw-r--r--dev-util/obs-service-recompress/metadata.xml2
-rw-r--r--dev-util/obs-service-set_version/metadata.xml2
-rw-r--r--dev-util/obs-service-source_validator/metadata.xml2
-rw-r--r--dev-util/obs-service-tar_scm/metadata.xml2
-rw-r--r--dev-util/obs-service-update_source/metadata.xml2
-rw-r--r--dev-util/obs-service-verify_file/metadata.xml2
-rw-r--r--dev-util/omake/metadata.xml2
-rw-r--r--dev-util/open-vcdiff/metadata.xml2
-rw-r--r--dev-util/oprofile/metadata.xml2
-rw-r--r--dev-util/osc/metadata.xml2
-rw-r--r--dev-util/patchelf/metadata.xml2
-rw-r--r--dev-util/patchutils/metadata.xml4
-rw-r--r--dev-util/peg/metadata.xml4
-rw-r--r--dev-util/perf/metadata.xml2
-rw-r--r--dev-util/pida/metadata.xml2
-rw-r--r--dev-util/pkgcheck/metadata.xml2
-rw-r--r--dev-util/pkgconf/metadata.xml6
-rw-r--r--dev-util/pkgconfig-openbsd/metadata.xml2
-rw-r--r--dev-util/pkgconfig/metadata.xml2
-rw-r--r--dev-util/plan9port/metadata.xml6
-rw-r--r--dev-util/pmd/metadata.xml2
-rw-r--r--dev-util/premake/metadata.xml2
-rw-r--r--dev-util/pscan/metadata.xml2
-rw-r--r--dev-util/pycharm-community/metadata.xml2
-rw-r--r--dev-util/pycharm-professional/metadata.xml2
-rw-r--r--dev-util/qbs/metadata.xml2
-rw-r--r--dev-util/qfsm/metadata.xml2
-rw-r--r--dev-util/qstlink2/metadata.xml4
-rw-r--r--dev-util/quilt/metadata.xml4
-rw-r--r--dev-util/radare2/metadata.xml2
-rw-r--r--dev-util/ragel/metadata.xml4
-rw-r--r--dev-util/rats/metadata.xml2
-rw-r--r--dev-util/rbtools/metadata.xml2
-rw-r--r--dev-util/re2c/metadata.xml4
-rw-r--r--dev-util/rebar/metadata.xml6
-rw-r--r--dev-util/regexxer/metadata.xml2
-rw-r--r--dev-util/rej/metadata.xml2
-rw-r--r--dev-util/reswrap/metadata.xml2
-rw-r--r--dev-util/reviewboard/metadata.xml2
-rw-r--r--dev-util/rosdep/metadata.xml2
-rw-r--r--dev-util/rosinstall/metadata.xml2
-rw-r--r--dev-util/rosinstall_generator/metadata.xml2
-rw-r--r--dev-util/rpmdevtools/metadata.xml2
-rw-r--r--dev-util/sasm/metadata.xml2
-rw-r--r--dev-util/scala-ide/metadata.xml4
-rw-r--r--dev-util/schroot/metadata.xml2
-rw-r--r--dev-util/scons/metadata.xml2
-rw-r--r--dev-util/sel/metadata.xml2
-rw-r--r--dev-util/setconf/metadata.xml6
-rw-r--r--dev-util/sgb/metadata.xml2
-rw-r--r--dev-util/shc/metadata.xml2
-rw-r--r--dev-util/shellcheck/metadata.xml2
-rw-r--r--dev-util/shelltestrunner/metadata.xml2
-rw-r--r--dev-util/shflags/metadata.xml4
-rw-r--r--dev-util/shunit2/metadata.xml2
-rw-r--r--dev-util/skipfish/metadata.xml6
-rw-r--r--dev-util/smem/metadata.xml2
-rw-r--r--dev-util/source-highlight/metadata.xml2
-rw-r--r--dev-util/spec-cleaner/metadata.xml2
-rw-r--r--dev-util/splint/metadata.xml2
-rw-r--r--dev-util/squashdelta/metadata.xml2
-rw-r--r--dev-util/squashmerge/metadata.xml2
-rw-r--r--dev-util/strace/metadata.xml2
-rw-r--r--dev-util/stressapptest/metadata.xml2
-rw-r--r--dev-util/stubgen/metadata.xml2
-rw-r--r--dev-util/suse-build/metadata.xml2
-rw-r--r--dev-util/sysdig/metadata.xml2
-rw-r--r--dev-util/sysprof/metadata.xml4
-rw-r--r--dev-util/systemtap/metadata.xml2
-rw-r--r--dev-util/tailor/metadata.xml2
-rw-r--r--dev-util/ticpp/metadata.xml2
-rw-r--r--dev-util/tkdiff/metadata.xml2
-rw-r--r--dev-util/trace-cmd/metadata.xml2
-rw-r--r--dev-util/treecc/metadata.xml2
-rw-r--r--dev-util/txt2regex/metadata.xml2
-rw-r--r--dev-util/uncrustify/metadata.xml4
-rw-r--r--dev-util/unifdef/metadata.xml2
-rw-r--r--dev-util/universalindentgui/metadata.xml4
-rw-r--r--dev-util/valgrind/metadata.xml2
-rw-r--r--dev-util/valkyrie/metadata.xml2
-rw-r--r--dev-util/vbindiff/metadata.xml2
-rw-r--r--dev-util/visual-regexp/metadata.xml4
-rw-r--r--dev-util/visualvm/metadata.xml2
-rw-r--r--dev-util/vmtouch/metadata.xml2
-rw-r--r--dev-util/w32api/metadata.xml2
-rw-r--r--dev-util/watchr/metadata.xml4
-rw-r--r--dev-util/webstorm/metadata.xml4
-rw-r--r--dev-util/weka/metadata.xml4
-rw-r--r--dev-util/wiggle/metadata.xml2
-rw-r--r--dev-util/wstool/metadata.xml2
-rw-r--r--dev-util/wxglade/metadata.xml2
-rw-r--r--dev-util/xdelta/metadata.xml2
-rw-r--r--dev-util/xfce4-dev-tools/metadata.xml2
-rw-r--r--dev-util/xxdi/metadata.xml4
-rw-r--r--dev-util/xxdiff/metadata.xml2
-rw-r--r--dev-util/yuicompressor/metadata.xml4
290 files changed, 355 insertions, 355 deletions
diff --git a/dev-util/App-SVN-Bisect/metadata.xml b/dev-util/App-SVN-Bisect/metadata.xml
index 028fc2d8085..8058de7ba30 100644
--- a/dev-util/App-SVN-Bisect/metadata.xml
+++ b/dev-util/App-SVN-Bisect/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
diff --git a/dev-util/Orange/metadata.xml b/dev-util/Orange/metadata.xml
index 8bf23c2b957..7554909395c 100644
--- a/dev-util/Orange/metadata.xml
+++ b/dev-util/Orange/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>amynka@gentoo.org</email>
</maintainer>
<use>
diff --git a/dev-util/aap/metadata.xml b/dev-util/aap/metadata.xml
index 574fdc0e717..9d9b2744bab 100644
--- a/dev-util/aap/metadata.xml
+++ b/dev-util/aap/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>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
diff --git a/dev-util/abi-compliance-checker/metadata.xml b/dev-util/abi-compliance-checker/metadata.xml
index ebccf8c1f2e..b35dc8d3f00 100644
--- a/dev-util/abi-compliance-checker/metadata.xml
+++ b/dev-util/abi-compliance-checker/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/dev-util/amtterm/metadata.xml b/dev-util/amtterm/metadata.xml
index 24cbb90cf0c..40aa45df2b0 100644
--- a/dev-util/amtterm/metadata.xml
+++ b/dev-util/amtterm/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/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml
index cdb306c9820..6c619474b28 100644
--- a/dev-util/android-ndk/metadata.xml
+++ b/dev-util/android-ndk/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>
<name>Jason Zaman</name>
</maintainer>
diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml
index 9f81922e601..e97c89c421c 100644
--- a/dev-util/android-sdk-update-manager/metadata.xml
+++ b/dev-util/android-sdk-update-manager/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>rich0@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml
index b8f80ceaee1..35dce41ecd4 100644
--- a/dev-util/android-studio/metadata.xml
+++ b/dev-util/android-studio/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>
</pkgmetadata>
diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
index c6894f04dc6..27a6743c270 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -8,7 +8,7 @@
<remote-id type="github">android/platform_system_core</remote-id>
<remote-id type="launchpad">ubuntu</remote-id>
</upstream>
- <maintainer>
+ <maintainer type="person">
<email>zmedico@gentoo.org</email>
<name>Zac Medico</name>
</maintainer>
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index d9b33c23953..0073ebca1b6 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/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/dev-util/antlrworks/metadata.xml b/dev-util/antlrworks/metadata.xml
index 83a85cf5a7b..00d9f93e90c 100644
--- a/dev-util/antlrworks/metadata.xml
+++ b/dev-util/antlrworks/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/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index fa13c0dcafc..e19b15bb661 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/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/dev-util/appdata-tools/metadata.xml b/dev-util/appdata-tools/metadata.xml
index 92e0eb58782..678390232d2 100644
--- a/dev-util/appdata-tools/metadata.xml
+++ b/dev-util/appdata-tools/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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
index a7911192c19..03536c100b7 100644
--- a/dev-util/appinventor/metadata.xml
+++ b/dev-util/appinventor/metadata.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>gentoo.power@gmail.com</email>
<name>Iván Atienza</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</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/dev-util/archdiff/metadata.xml b/dev-util/archdiff/metadata.xml
index 157326a7e89..78e64a5cf1a 100644
--- a/dev-util/archdiff/metadata.xml
+++ b/dev-util/archdiff/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/dev-util/argouml/metadata.xml b/dev-util/argouml/metadata.xml
index 6cb58e33adf..2444066aa02 100644
--- a/dev-util/argouml/metadata.xml
+++ b/dev-util/argouml/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/dev-util/aruba/metadata.xml b/dev-util/aruba/metadata.xml
index d9731d58853..3b124787be6 100644
--- a/dev-util/aruba/metadata.xml
+++ b/dev-util/aruba/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>graaff@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/atomic-install/metadata.xml b/dev-util/atomic-install/metadata.xml
index 1e50b7ed36c..92f08657ac2 100644
--- a/dev-util/atomic-install/metadata.xml
+++ b/dev-util/atomic-install/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/dev-util/automoc/metadata.xml b/dev-util/automoc/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/dev-util/automoc/metadata.xml
+++ b/dev-util/automoc/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/dev-util/autoproject/metadata.xml b/dev-util/autoproject/metadata.xml
index c9e13ee6a3c..56c12441305 100644
--- a/dev-util/autoproject/metadata.xml
+++ b/dev-util/autoproject/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/dev-util/babeltrace/metadata.xml b/dev-util/babeltrace/metadata.xml
index 0968da43259..f4dd282d520 100644
--- a/dev-util/babeltrace/metadata.xml
+++ b/dev-util/babeltrace/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/dev-util/bakefile/metadata.xml b/dev-util/bakefile/metadata.xml
index b059a78e457..58052d45a7e 100644
--- a/dev-util/bakefile/metadata.xml
+++ b/dev-util/bakefile/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>wxwidgets@gentoo.org</email>
<name>Gentoo wxWidgets Project</name>
</maintainer>
diff --git a/dev-util/bbe/metadata.xml b/dev-util/bbe/metadata.xml
index 1043bd2739b..ff635f4eb94 100644
--- a/dev-util/bbe/metadata.xml
+++ b/dev-util/bbe/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>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
</maintainer>
diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml
index ab05a514420..fcec0af2919 100644
--- a/dev-util/bdelta/metadata.xml
+++ b/dev-util/bdelta/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>slyfox@gentoo.org</email>
<name>Sergei Trofimovich</name>
<description>Primary Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>tools-portage@gentoo.org</email>
<name>Gentoo Portage tools team</name>
</maintainer>
diff --git a/dev-util/biew/metadata.xml b/dev-util/biew/metadata.xml
index 8c882ff26da..5894b06df22 100644
--- a/dev-util/biew/metadata.xml
+++ b/dev-util/biew/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/dev-util/bin_replace_string/metadata.xml b/dev-util/bin_replace_string/metadata.xml
index 548448307c1..b60e35ca9a7 100644
--- a/dev-util/bin_replace_string/metadata.xml
+++ b/dev-util/bin_replace_string/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/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index 237c631767c..7a8f5cb5bdc 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/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>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/bless/metadata.xml b/dev-util/bless/metadata.xml
index 8d616c9e423..586658b7e04 100644
--- a/dev-util/bless/metadata.xml
+++ b/dev-util/bless/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/dev-util/bnfc/metadata.xml b/dev-util/bnfc/metadata.xml
index 320f819da1e..b7878815d80 100644
--- a/dev-util/bnfc/metadata.xml
+++ b/dev-util/bnfc/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>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
index 914846767c7..ef3f9148d5a 100644
--- a/dev-util/boost-build/metadata.xml
+++ b/dev-util/boost-build/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>cpp@gentoo.org</email>
<name>Gentoo C++ Project</name>
</maintainer>
diff --git a/dev-util/bsdiff/metadata.xml b/dev-util/bsdiff/metadata.xml
index b6b8956cde3..5b159fbcadd 100644
--- a/dev-util/bsdiff/metadata.xml
+++ b/dev-util/bsdiff/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/dev-util/btyacc/metadata.xml b/dev-util/btyacc/metadata.xml
index b217ca6048c..adc9e63b1fd 100644
--- a/dev-util/btyacc/metadata.xml
+++ b/dev-util/btyacc/metadata.xml
@@ -1,17 +1,17 @@
<?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>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>wlt@obsidian-studios.com</email>
<name>William L. Thomson Jr.</name>
<description>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/dev-util/build/metadata.xml b/dev-util/build/metadata.xml
index 75dd2ca7d30..acd00be69f9 100644
--- a/dev-util/build/metadata.xml
+++ b/dev-util/build/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>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
diff --git a/dev-util/buildbot-slave/metadata.xml b/dev-util/buildbot-slave/metadata.xml
index 8249217c63d..1be5f0f1f5c 100644
--- a/dev-util/buildbot-slave/metadata.xml
+++ b/dev-util/buildbot-slave/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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index 1cd84ffdae7..9dc19b3eb0f 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
diff --git a/dev-util/bumpversion/metadata.xml b/dev-util/bumpversion/metadata.xml
index e4af3d00766..2ce01d484fe 100644
--- a/dev-util/bumpversion/metadata.xml
+++ b/dev-util/bumpversion/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>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index a7a50120b4b..ff21ef6ead6 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/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>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 06b9dcb5bd3..6c4b9cdbcce 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/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="project">
<email>catalyst@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>livecd@gentoo.org</email>
<name>Gentoo LiveCD Project</name>
</maintainer>
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
index 56cbdd9604a..0118196dd39 100644
--- a/dev-util/catfish/metadata.xml
+++ b/dev-util/catfish/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>desktop-misc@gentoo.org</email>
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
diff --git a/dev-util/catkin/metadata.xml b/dev-util/catkin/metadata.xml
index b839bb98e58..f8e179b359b 100644
--- a/dev-util/catkin/metadata.xml
+++ b/dev-util/catkin/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>ros@gentoo.org</email>
<name>Gentoo ROS Project</name>
</maintainer>
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index e245a1647c0..0d4a976163c 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/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>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
diff --git a/dev-util/ccglue/metadata.xml b/dev-util/ccglue/metadata.xml
index d05ffb595b8..c9fda525828 100644
--- a/dev-util/ccglue/metadata.xml
+++ b/dev-util/ccglue/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>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
diff --git a/dev-util/cflow/metadata.xml b/dev-util/cflow/metadata.xml
index 1db3f11c857..8e343daf615 100644
--- a/dev-util/cflow/metadata.xml
+++ b/dev-util/cflow/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>dev-zero@gentoo.org</email>
</maintainer>
<longdescription lang="en">
diff --git a/dev-util/cgvg/metadata.xml b/dev-util/cgvg/metadata.xml
index 8f41419457d..381922a7fb1 100644
--- a/dev-util/cgvg/metadata.xml
+++ b/dev-util/cgvg/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>
<name>Greg Kroah-Hartman</name>
</maintainer>
diff --git a/dev-util/checkbashisms/metadata.xml b/dev-util/checkbashisms/metadata.xml
index c02c04449e9..8491585905c 100644
--- a/dev-util/checkbashisms/metadata.xml
+++ b/dev-util/checkbashisms/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
index 05187eb3c57..6c0addb7ff0 100644
--- a/dev-util/checkstyle/metadata.xml
+++ b/dev-util/checkstyle/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/dev-util/cligh/metadata.xml b/dev-util/cligh/metadata.xml
index eb0517a431f..bee1c11df0c 100644
--- a/dev-util/cligh/metadata.xml
+++ b/dev-util/cligh/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>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
diff --git a/dev-util/cloc/metadata.xml b/dev-util/cloc/metadata.xml
index f778ee60d5d..f77e31c3787 100644
--- a/dev-util/cloc/metadata.xml
+++ b/dev-util/cloc/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>tamiko@gentoo.org</email>
<name>Matthias Maier</name>
</maintainer>
diff --git a/dev-util/cmake-fedora/metadata.xml b/dev-util/cmake-fedora/metadata.xml
index ac07e856ce8..74eccf1850f 100644
--- a/dev-util/cmake-fedora/metadata.xml
+++ b/dev-util/cmake-fedora/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>naota@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index 3ff2291a419..437189ffd4f 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/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/dev-util/cmdtest/metadata.xml b/dev-util/cmdtest/metadata.xml
index ea7bd021a21..ea6b59e7902 100644
--- a/dev-util/cmdtest/metadata.xml
+++ b/dev-util/cmdtest/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>mschiff@gentoo.org</email>
<name>Marc Schiffbauer</name>
</maintainer>
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
index fe25c1aec0a..b659c1627a3 100644
--- a/dev-util/cmocka/metadata.xml
+++ b/dev-util/cmocka/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>creffett@gentoo.org</email>
<name>Chris Reffett</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
index 53d37b8a512..d57bc4d86fd 100644
--- a/dev-util/cmt/metadata.xml
+++ b/dev-util/cmt/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>bicatali@gentoo.org</email>
</maintainer>
<longdescription lang="en">
diff --git a/dev-util/coccigrep/metadata.xml b/dev-util/coccigrep/metadata.xml
index c67c4ea9808..0c548f25bb2 100644
--- a/dev-util/coccigrep/metadata.xml
+++ b/dev-util/coccigrep/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/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
index b1f11ebb7b3..9e3f651e48b 100644
--- a/dev-util/coccinelle/metadata.xml
+++ b/dev-util/coccinelle/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>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 3eb9da8e975..147e365467f 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/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>wxwidgets@gentoo.org</email>
<name>Gentoo wxWidgets Project</name>
</maintainer>
diff --git a/dev-util/colm/metadata.xml b/dev-util/colm/metadata.xml
index 6719fcd2bb3..f3de5f693ed 100644
--- a/dev-util/colm/metadata.xml
+++ b/dev-util/colm/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/dev-util/colorgcc/metadata.xml b/dev-util/colorgcc/metadata.xml
index 32cb706ccf7..3cf14bf7463 100644
--- a/dev-util/colorgcc/metadata.xml
+++ b/dev-util/colorgcc/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/dev-util/comparator/metadata.xml b/dev-util/comparator/metadata.xml
index eb3a223072c..6ed3edf95f5 100644
--- a/dev-util/comparator/metadata.xml
+++ b/dev-util/comparator/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/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
index ef0483f9ff6..a8fb4331294 100644
--- a/dev-util/complexity/metadata.xml
+++ b/dev-util/complexity/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/dev-util/confix-wrapper/metadata.xml b/dev-util/confix-wrapper/metadata.xml
index a866b9c9413..94e0b5b7c91 100644
--- a/dev-util/confix-wrapper/metadata.xml
+++ b/dev-util/confix-wrapper/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>haubi@gentoo.org</email>
<name>Michael Haubenwallner</name>
</maintainer>
diff --git a/dev-util/confix/metadata.xml b/dev-util/confix/metadata.xml
index a866b9c9413..94e0b5b7c91 100644
--- a/dev-util/confix/metadata.xml
+++ b/dev-util/confix/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>haubi@gentoo.org</email>
<name>Michael Haubenwallner</name>
</maintainer>
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index 2da3ce1df0a..3bf4b78228a 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/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/dev-util/cppi/metadata.xml b/dev-util/cppi/metadata.xml
index c3a21340a39..f9f8bbfd940 100644
--- a/dev-util/cppi/metadata.xml
+++ b/dev-util/cppi/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/dev-util/cpptest/metadata.xml b/dev-util/cpptest/metadata.xml
index eaf162a17c2..42e4ae1c3bb 100644
--- a/dev-util/cpptest/metadata.xml
+++ b/dev-util/cpptest/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>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
diff --git a/dev-util/cppunit/metadata.xml b/dev-util/cppunit/metadata.xml
index f7aaafedf14..41cd682e0ec 100644
--- a/dev-util/cppunit/metadata.xml
+++ b/dev-util/cppunit/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>cpp@gentoo.org</email>
<name>Gentoo C++ Project</name>
</maintainer>
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index 43eb70620e8..abfba2deb92 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/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/dev-util/cpuinfo-collection/metadata.xml b/dev-util/cpuinfo-collection/metadata.xml
index c9e13ee6a3c..56c12441305 100644
--- a/dev-util/cpuinfo-collection/metadata.xml
+++ b/dev-util/cpuinfo-collection/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/dev-util/crash/metadata.xml b/dev-util/crash/metadata.xml
index d76a32fab0c..bfe00424921 100644
--- a/dev-util/crash/metadata.xml
+++ b/dev-util/crash/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>cardoe@gentoo.org</email>
<name>Doug Goldstein</name>
</maintainer>
diff --git a/dev-util/creduce/metadata.xml b/dev-util/creduce/metadata.xml
index 0cb5b5e2962..33cffc12a83 100644
--- a/dev-util/creduce/metadata.xml
+++ b/dev-util/creduce/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>rhill@gentoo.org</email>
<name>Ryan Hill</name>
</maintainer>
diff --git a/dev-util/cscope/metadata.xml b/dev-util/cscope/metadata.xml
index 6c0e2937ad0..84736c8c881 100644
--- a/dev-util/cscope/metadata.xml
+++ b/dev-util/cscope/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="project">
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>emacs@gentoo.org</email>
<name>Gentoo Emacs project</name>
</maintainer>
diff --git a/dev-util/csup/metadata.xml b/dev-util/csup/metadata.xml
index d7caf7d3b1d..a00f3aeb1f8 100644
--- a/dev-util/csup/metadata.xml
+++ b/dev-util/csup/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>bsd@gentoo.org</email>
<name>BSD Project</name>
</maintainer>
diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
index 4095bc5de56..30c6883c752 100644
--- a/dev-util/ctags/metadata.xml
+++ b/dev-util/ctags/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>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
diff --git a/dev-util/cucumber-core/metadata.xml b/dev-util/cucumber-core/metadata.xml
index ae454929f0f..06c13e2d2e3 100644
--- a/dev-util/cucumber-core/metadata.xml
+++ b/dev-util/cucumber-core/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>graaff@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/cucumber-rails/metadata.xml b/dev-util/cucumber-rails/metadata.xml
index 3e14dfac3e8..cc08d19c6f5 100644
--- a/dev-util/cucumber-rails/metadata.xml
+++ b/dev-util/cucumber-rails/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>graaff@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/cucumber/metadata.xml b/dev-util/cucumber/metadata.xml
index ae454929f0f..06c13e2d2e3 100644
--- a/dev-util/cucumber/metadata.xml
+++ b/dev-util/cucumber/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>graaff@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
index 2948ad17528..ea5fbfd0df8 100644
--- a/dev-util/cwdiff/metadata.xml
+++ b/dev-util/cwdiff/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>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
diff --git a/dev-util/cyclo/metadata.xml b/dev-util/cyclo/metadata.xml
index 232c1196025..aefcf1b1485 100644
--- a/dev-util/cyclo/metadata.xml
+++ b/dev-util/cyclo/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>nerdboy@gentoo.org</email>
<name>Steve Arnold</name>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml
index 3ab299ddfa6..bac79bab471 100644
--- a/dev-util/d-feet/metadata.xml
+++ b/dev-util/d-feet/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>cardoe@gentoo.org</email>
<name>Doug Goldstein</name>
<description>Feel free to bump or do any updates as needed</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/dev-util/dbus-test-runner/metadata.xml b/dev-util/dbus-test-runner/metadata.xml
index 4a660105b00..10ad7bb86af 100644
--- a/dev-util/dbus-test-runner/metadata.xml
+++ b/dev-util/dbus-test-runner/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/dev-util/ddd/metadata.xml b/dev-util/ddd/metadata.xml
index 8dbd141af8e..97858007ab0 100644
--- a/dev-util/ddd/metadata.xml
+++ b/dev-util/ddd/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>reavertm@gentoo.org</email>
<name>Maciej Mrozowski</name>
</maintainer>
diff --git a/dev-util/debhelper/metadata.xml b/dev-util/debhelper/metadata.xml
index 858d11e5074..6fcc384cc40 100644
--- a/dev-util/debhelper/metadata.xml
+++ b/dev-util/debhelper/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/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
index a234812e718..e058dc95a41 100644
--- a/dev-util/debootstrap/metadata.xml
+++ b/dev-util/debootstrap/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>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>deb-tools@gentoo.org</email>
<name>Gentoo Debian Tools Project</name>
</maintainer>
diff --git a/dev-util/debugedit/metadata.xml b/dev-util/debugedit/metadata.xml
index c9e13ee6a3c..56c12441305 100644
--- a/dev-util/debugedit/metadata.xml
+++ b/dev-util/debugedit/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/dev-util/dejagnu/metadata.xml b/dev-util/dejagnu/metadata.xml
index c04b07f5461..e396f375597 100644
--- a/dev-util/dejagnu/metadata.xml
+++ b/dev-util/dejagnu/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>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
diff --git a/dev-util/desktop-file-utils/metadata.xml b/dev-util/desktop-file-utils/metadata.xml
index ed32dba4140..fb76b944f2d 100644
--- a/dev-util/desktop-file-utils/metadata.xml
+++ b/dev-util/desktop-file-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>freedesktop-bugs@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/deskzilla/metadata.xml b/dev-util/deskzilla/metadata.xml
index 6cb58e33adf..2444066aa02 100644
--- a/dev-util/deskzilla/metadata.xml
+++ b/dev-util/deskzilla/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/dev-util/devhelp/metadata.xml b/dev-util/devhelp/metadata.xml
index 851334fc91f..04f1a3c98b5 100644
--- a/dev-util/devhelp/metadata.xml
+++ b/dev-util/devhelp/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/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index e8c7e9d7978..7c5b4a32485 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/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>livecd@gentoo.org</email>
<name>Gentoo LiveCD Project</name>
</maintainer>
diff --git a/dev-util/diffball/metadata.xml b/dev-util/diffball/metadata.xml
index 95bdedc84cc..70aa8c7d286 100644
--- a/dev-util/diffball/metadata.xml
+++ b/dev-util/diffball/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>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
diff --git a/dev-util/difffilter/metadata.xml b/dev-util/difffilter/metadata.xml
index 43866671d49..57ad2ed8189 100644
--- a/dev-util/difffilter/metadata.xml
+++ b/dev-util/difffilter/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>
<description>Upstream and maintainer. Assign bugs to him</description>
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
index 74be441f3aa..a657c717c2c 100644
--- a/dev-util/diffstat/metadata.xml
+++ b/dev-util/diffstat/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/dev-util/diffuse/metadata.xml b/dev-util/diffuse/metadata.xml
index 744ec303222..ef53d12f435 100644
--- a/dev-util/diffuse/metadata.xml
+++ b/dev-util/diffuse/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>grozin@gentoo.org</email>
<name>Andrey Grozin</name>
</maintainer>
diff --git a/dev-util/dmake/metadata.xml b/dev-util/dmake/metadata.xml
index 75e0c599178..03752c4d0da 100644
--- a/dev-util/dmake/metadata.xml
+++ b/dev-util/dmake/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>chithanh@gentoo.org</email>
<name>Chí-Thanh Christopher Nguyễn</name>
</maintainer>
diff --git a/dev-util/dogtail/metadata.xml b/dev-util/dogtail/metadata.xml
index d27adefecf3..996e7cacd21 100644
--- a/dev-util/dogtail/metadata.xml
+++ b/dev-util/dogtail/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/dev-util/dropwatch/metadata.xml b/dev-util/dropwatch/metadata.xml
index ee2fca9fb25..4343afde9aa 100644
--- a/dev-util/dropwatch/metadata.xml
+++ b/dev-util/dropwatch/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/dev-util/dwdiff/metadata.xml b/dev-util/dwdiff/metadata.xml
index 8653502db3f..294c350c696 100644
--- a/dev-util/dwdiff/metadata.xml
+++ b/dev-util/dwdiff/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>monsieurp@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml
index 56c0e5a80ab..b5a96e3145b 100644
--- a/dev-util/eclipse-sdk/metadata.xml
+++ b/dev-util/eclipse-sdk/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/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
index 542dca119f9..6f812ad378a 100644
--- a/dev-util/elfkickers/metadata.xml
+++ b/dev-util/elfkickers/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>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
<description>Primary Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>hardened@gentoo.org</email>
<name>Gentoo Hardened</name>
</maintainer>
diff --git a/dev-util/emilpro/metadata.xml b/dev-util/emilpro/metadata.xml
index 6151b9b6408..a25bb9d4e2d 100644
--- a/dev-util/emilpro/metadata.xml
+++ b/dev-util/emilpro/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/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
index 32512589c7d..5874de81251 100644
--- a/dev-util/eric/metadata.xml
+++ b/dev-util/eric/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>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
diff --git a/dev-util/exmap/metadata.xml b/dev-util/exmap/metadata.xml
index 5b80fb94c39..a535b885282 100644
--- a/dev-util/exmap/metadata.xml
+++ b/dev-util/exmap/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/dev-util/fatrace/metadata.xml b/dev-util/fatrace/metadata.xml
index c4dc617de58..1c2ccfe5c94 100644
--- a/dev-util/fatrace/metadata.xml
+++ b/dev-util/fatrace/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/dev-util/febootstrap/metadata.xml b/dev-util/febootstrap/metadata.xml
index cb771710453..977c819a556 100644
--- a/dev-util/febootstrap/metadata.xml
+++ b/dev-util/febootstrap/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>andreis.vinogradovs@gmail.com</email>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml
index 4ee1c17916a..71ffe3a34b2 100644
--- a/dev-util/fhist/metadata.xml
+++ b/dev-util/fhist/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/dev-util/findbugs/metadata.xml b/dev-util/findbugs/metadata.xml
index 549e98606b5..7f5d054caa9 100644
--- a/dev-util/findbugs/metadata.xml
+++ b/dev-util/findbugs/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/dev-util/fix-la-relink-command/metadata.xml b/dev-util/fix-la-relink-command/metadata.xml
index 88616e61d22..70d3e0dcf1d 100644
--- a/dev-util/fix-la-relink-command/metadata.xml
+++ b/dev-util/fix-la-relink-command/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>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/dev-util/ftjam/metadata.xml b/dev-util/ftjam/metadata.xml
index 12b33e7b322..ac75c379715 100644
--- a/dev-util/ftjam/metadata.xml
+++ b/dev-util/ftjam/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>rhill@gentoo.org</email>
<name>Ryan Hill</name>
</maintainer>
diff --git a/dev-util/fuzz/metadata.xml b/dev-util/fuzz/metadata.xml
index ecbc43d4a42..63084c2c1f4 100644
--- a/dev-util/fuzz/metadata.xml
+++ b/dev-util/fuzz/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/dev-util/gdbus-codegen/metadata.xml b/dev-util/gdbus-codegen/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/dev-util/gdbus-codegen/metadata.xml
+++ b/dev-util/gdbus-codegen/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/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index 628a1aba3f3..c7c61a47ae8 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/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/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
index 5989ba525e9..2231e497c97 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/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/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/dev-util/glade/metadata.xml
+++ b/dev-util/glade/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/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index d9adb36c4ec..6a4aed9a8e5 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>naota@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>arfrever.fta@gmail.com</email>
<description>Proxy maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/gnome-devel-docs/metadata.xml b/dev-util/gnome-devel-docs/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/dev-util/gnome-devel-docs/metadata.xml
+++ b/dev-util/gnome-devel-docs/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/dev-util/gob/metadata.xml b/dev-util/gob/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/dev-util/gob/metadata.xml
+++ b/dev-util/gob/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/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index e3c97b0b883..ea0e3840763 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/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>flameeyes@gentoo.org</email>
</maintainer>
<use>
diff --git a/dev-util/gource/metadata.xml b/dev-util/gource/metadata.xml
index 7acee17029e..517fa4b6cd9 100644
--- a/dev-util/gource/metadata.xml
+++ b/dev-util/gource/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>enrico.tagliavini@gmail.com</email>
<name>Enrico Tagliavini</name>
<description>Proxied co-maintainer</description>
</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/dev-util/gperf/metadata.xml b/dev-util/gperf/metadata.xml
index b6073e49aff..971fcb152d3 100644
--- a/dev-util/gperf/metadata.xml
+++ b/dev-util/gperf/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>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/gprof2dot/metadata.xml b/dev-util/gprof2dot/metadata.xml
index 2022c0142d5..8edef79c17e 100644
--- a/dev-util/gprof2dot/metadata.xml
+++ b/dev-util/gprof2dot/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>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
diff --git a/dev-util/gtk-builder-convert/metadata.xml b/dev-util/gtk-builder-convert/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/dev-util/gtk-builder-convert/metadata.xml
+++ b/dev-util/gtk-builder-convert/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/dev-util/gtk-doc-am/metadata.xml b/dev-util/gtk-doc-am/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/dev-util/gtk-doc-am/metadata.xml
+++ b/dev-util/gtk-doc-am/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/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
index 5ef9b83fa46..1a3871ad27f 100644
--- a/dev-util/gtk-doc/metadata.xml
+++ b/dev-util/gtk-doc/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/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml
index 249756658a7..3695848b8d2 100644
--- a/dev-util/gtk-update-icon-cache/metadata.xml
+++ b/dev-util/gtk-update-icon-cache/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/dev-util/heaptrack/metadata.xml b/dev-util/heaptrack/metadata.xml
index 9882e038896..d83ca74452a 100644
--- a/dev-util/heaptrack/metadata.xml
+++ b/dev-util/heaptrack/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>zzam@gentoo.org</email>
<name>Matthias Schwarzott</name>
</maintainer>
diff --git a/dev-util/howdoi/metadata.xml b/dev-util/howdoi/metadata.xml
index 13f75201385..4230aede62d 100644
--- a/dev-util/howdoi/metadata.xml
+++ b/dev-util/howdoi/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>kensington@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
index 7b3677c1cae..c7805271374 100644
--- a/dev-util/hxtools/metadata.xml
+++ b/dev-util/hxtools/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/icemon/metadata.xml b/dev-util/icemon/metadata.xml
index 2671205a8eb..f0b707735d3 100644
--- a/dev-util/icemon/metadata.xml
+++ b/dev-util/icemon/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="project">
<email>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/icmake/metadata.xml b/dev-util/icmake/metadata.xml
index ad041907d88..42bd66d89c3 100644
--- a/dev-util/icmake/metadata.xml
+++ b/dev-util/icmake/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/dev-util/idea-ultimate/metadata.xml b/dev-util/idea-ultimate/metadata.xml
index 9a75c1c3a23..68d7059facb 100644
--- a/dev-util/idea-ultimate/metadata.xml
+++ b/dev-util/idea-ultimate/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>gert@gepe-biljarts.be</email>
<name>Gert Pellin</name>
<description>Proxy maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>tomboy64@sina.cn</email>
<description>Proxied co-maintainer</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/idutils/metadata.xml b/dev-util/idutils/metadata.xml
index ad8adc2dd20..9c67f75d719 100644
--- a/dev-util/idutils/metadata.xml
+++ b/dev-util/idutils/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>
<longdescription>
diff --git a/dev-util/igprof/metadata.xml b/dev-util/igprof/metadata.xml
index 603285e3a42..38187d69118 100644
--- a/dev-util/igprof/metadata.xml
+++ b/dev-util/igprof/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>maksbotan@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 5b2a5c55470..5c23291b521 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/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>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
diff --git a/dev-util/include-what-you-use/metadata.xml b/dev-util/include-what-you-use/metadata.xml
index c489d743006..06df0e17b2d 100644
--- a/dev-util/include-what-you-use/metadata.xml
+++ b/dev-util/include-what-you-use/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>slyfox@gentoo.org</email>
<name>Sergei Trofimovich</name>
</maintainer>
diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
index c472d21a01a..88f8d1f6a59 100644
--- a/dev-util/indent/metadata.xml
+++ b/dev-util/indent/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/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index e157675557b..f694e9e2845 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/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>dev@kicherer.org</email>
<name>anYc</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml
index a554fc85968..525c1a60b10 100644
--- a/dev-util/intltool/metadata.xml
+++ b/dev-util/intltool/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>freedesktop-bugs@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/its4/metadata.xml b/dev-util/its4/metadata.xml
index 8d7b356d684..a2b4b8254df 100644
--- a/dev-util/its4/metadata.xml
+++ b/dev-util/its4/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>
<longdescription>
diff --git a/dev-util/itstool/metadata.xml b/dev-util/itstool/metadata.xml
index c5b83f7892b..90e918d8d5d 100644
--- a/dev-util/itstool/metadata.xml
+++ b/dev-util/itstool/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/dev-util/jarwizard/metadata.xml b/dev-util/jarwizard/metadata.xml
index 4902ef5f66c..6c927434833 100644
--- a/dev-util/jarwizard/metadata.xml
+++ b/dev-util/jarwizard/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/dev-util/jay/metadata.xml b/dev-util/jay/metadata.xml
index b526ceb6759..529fb7657b7 100644
--- a/dev-util/jay/metadata.xml
+++ b/dev-util/jay/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="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
diff --git a/dev-util/jconfig/metadata.xml b/dev-util/jconfig/metadata.xml
index 7866b51afe5..3e77b353bc2 100644
--- a/dev-util/jconfig/metadata.xml
+++ b/dev-util/jconfig/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/dev-util/jenkins-bin/metadata.xml b/dev-util/jenkins-bin/metadata.xml
index 858224bb483..42e3a9ff742 100644
--- a/dev-util/jenkins-bin/metadata.xml
+++ b/dev-util/jenkins-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>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
index c5788ae5878..ce0a75f5da7 100644
--- a/dev-util/kbuild/metadata.xml
+++ b/dev-util/kbuild/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>swapon@gmail.com</email>
<name>Alessio Cassibba</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/kdbg/metadata.xml b/dev-util/kdbg/metadata.xml
index 85453ce615a..4f0ec6acc3c 100644
--- a/dev-util/kdbg/metadata.xml
+++ b/dev-util/kdbg/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/dev-util/kdevelop-pg-qt/metadata.xml b/dev-util/kdevelop-pg-qt/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/dev-util/kdevelop-pg-qt/metadata.xml
+++ b/dev-util/kdevelop-pg-qt/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/dev-util/kdevelop-php-docs/metadata.xml b/dev-util/kdevelop-php-docs/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/dev-util/kdevelop-php-docs/metadata.xml
+++ b/dev-util/kdevelop-php-docs/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/dev-util/kdevelop-php/metadata.xml b/dev-util/kdevelop-php/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/dev-util/kdevelop-php/metadata.xml
+++ b/dev-util/kdevelop-php/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/dev-util/kdevelop-python/metadata.xml b/dev-util/kdevelop-python/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/dev-util/kdevelop-python/metadata.xml
+++ b/dev-util/kdevelop-python/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/dev-util/kdevelop-qmake/metadata.xml b/dev-util/kdevelop-qmake/metadata.xml
index a8c8aa529a5..5ab659eb686 100644
--- a/dev-util/kdevelop-qmake/metadata.xml
+++ b/dev-util/kdevelop-qmake/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/dev-util/kdevelop-qmljs/metadata.xml b/dev-util/kdevelop-qmljs/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/dev-util/kdevelop-qmljs/metadata.xml
+++ b/dev-util/kdevelop-qmljs/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/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 30c6eb413e4..e60001d7d06 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/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/dev-util/kdevplatform/metadata.xml b/dev-util/kdevplatform/metadata.xml
index bc0263a6355..4c99719020f 100644
--- a/dev-util/kdevplatform/metadata.xml
+++ b/dev-util/kdevplatform/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/dev-util/kelbt/metadata.xml b/dev-util/kelbt/metadata.xml
index 2ba6e4da9d2..1b032650794 100644
--- a/dev-util/kelbt/metadata.xml
+++ b/dev-util/kelbt/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>lu_zero@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/ketchup/metadata.xml b/dev-util/ketchup/metadata.xml
index 397dab6aa65..e335daf768d 100644
--- a/dev-util/ketchup/metadata.xml
+++ b/dev-util/ketchup/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>psomas@gentoo.org</email>
</maintainer>
<longdescription>
diff --git a/dev-util/kscope/metadata.xml b/dev-util/kscope/metadata.xml
index f3e45031512..4fc15baded9 100644
--- a/dev-util/kscope/metadata.xml
+++ b/dev-util/kscope/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/dev-util/kup/metadata.xml b/dev-util/kup/metadata.xml
index a44f8b1aad3..c1a7e1706e6 100644
--- a/dev-util/kup/metadata.xml
+++ b/dev-util/kup/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>
<name>Greg Kroah-Hartman</name>
</maintainer>
diff --git a/dev-util/leaktracer/metadata.xml b/dev-util/leaktracer/metadata.xml
index f7aaafedf14..41cd682e0ec 100644
--- a/dev-util/leaktracer/metadata.xml
+++ b/dev-util/leaktracer/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>cpp@gentoo.org</email>
<name>Gentoo C++ Project</name>
</maintainer>
diff --git a/dev-util/lttng-modules/metadata.xml b/dev-util/lttng-modules/metadata.xml
index 09cc9fe8072..26a5660b7e9 100644
--- a/dev-util/lttng-modules/metadata.xml
+++ b/dev-util/lttng-modules/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/dev-util/lttng-tools/metadata.xml b/dev-util/lttng-tools/metadata.xml
index 961887d25b0..94dfadace4f 100644
--- a/dev-util/lttng-tools/metadata.xml
+++ b/dev-util/lttng-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="person">
<email>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
index 8cd43e982af..6c50e470849 100644
--- a/dev-util/lttng-ust/metadata.xml
+++ b/dev-util/lttng-ust/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/dev-util/makeheaders/metadata.xml b/dev-util/makeheaders/metadata.xml
index 5b80fb94c39..a535b885282 100644
--- a/dev-util/makeheaders/metadata.xml
+++ b/dev-util/makeheaders/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/dev-util/makepp/metadata.xml b/dev-util/makepp/metadata.xml
index 7173de71c33..dabb537bfa7 100644
--- a/dev-util/makepp/metadata.xml
+++ b/dev-util/makepp/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/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
index 07a21f283ac..4bf2727332a 100644
--- a/dev-util/mdds/metadata.xml
+++ b/dev-util/mdds/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>office@gentoo.org</email>
<name>Gentoo Office project</name>
</maintainer>
diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml
index fe3dc94b2bc..39980802b1d 100644
--- a/dev-util/meld/metadata.xml
+++ b/dev-util/meld/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/dev-util/mingw-runtime/metadata.xml b/dev-util/mingw-runtime/metadata.xml
index 957427e97ce..6c377f90be9 100644
--- a/dev-util/mingw-runtime/metadata.xml
+++ b/dev-util/mingw-runtime/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>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index 30cad3a48ac..5d6c0c23c0d 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/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>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
diff --git a/dev-util/molecule-core/metadata.xml b/dev-util/molecule-core/metadata.xml
index 35e5f4052d9..1dcdca31d69 100644
--- a/dev-util/molecule-core/metadata.xml
+++ b/dev-util/molecule-core/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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
diff --git a/dev-util/molecule-plugins/metadata.xml b/dev-util/molecule-plugins/metadata.xml
index 084e4ee0d11..ba0420baf28 100644
--- a/dev-util/molecule-plugins/metadata.xml
+++ b/dev-util/molecule-plugins/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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
index 7a765c1f4c9..04a0cfa9f28 100644
--- a/dev-util/molecule/metadata.xml
+++ b/dev-util/molecule/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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
diff --git a/dev-util/monkeystudio/metadata.xml b/dev-util/monkeystudio/metadata.xml
index 96efff06bb5..e95a294636b 100644
--- a/dev-util/monkeystudio/metadata.xml
+++ b/dev-util/monkeystudio/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>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
diff --git a/dev-util/mono-debugger/metadata.xml b/dev-util/mono-debugger/metadata.xml
index 76cf08b1773..c99669dda12 100644
--- a/dev-util/mono-debugger/metadata.xml
+++ b/dev-util/mono-debugger/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>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
diff --git a/dev-util/monodevelop-database/metadata.xml b/dev-util/monodevelop-database/metadata.xml
index 76cf08b1773..c99669dda12 100644
--- a/dev-util/monodevelop-database/metadata.xml
+++ b/dev-util/monodevelop-database/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>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
diff --git a/dev-util/monodevelop-debugger-gdb/metadata.xml b/dev-util/monodevelop-debugger-gdb/metadata.xml
index b578be7f7b3..b0f3b749671 100644
--- a/dev-util/monodevelop-debugger-gdb/metadata.xml
+++ b/dev-util/monodevelop-debugger-gdb/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>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
diff --git a/dev-util/monodevelop/metadata.xml b/dev-util/monodevelop/metadata.xml
index 1d225a3d48e..941ce2b2687 100644
--- a/dev-util/monodevelop/metadata.xml
+++ b/dev-util/monodevelop/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>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
diff --git a/dev-util/mpatch/metadata.xml b/dev-util/mpatch/metadata.xml
index a732fd8b2f0..a4e0d354f69 100644
--- a/dev-util/mpatch/metadata.xml
+++ b/dev-util/mpatch/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/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
index eb9ad3b47a4..c61ba4c696b 100644
--- a/dev-util/nemiver/metadata.xml
+++ b/dev-util/nemiver/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/dev-util/netbeans/metadata.xml b/dev-util/netbeans/metadata.xml
index 20596a306b9..8834161921f 100644
--- a/dev-util/netbeans/metadata.xml
+++ b/dev-util/netbeans/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>fordfrog@gentoo.org</email>
<name>Miroslav Šulc</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/dev-util/ninja-ide/metadata.xml b/dev-util/ninja-ide/metadata.xml
index 292f7ff1b68..d65732c07fc 100644
--- a/dev-util/ninja-ide/metadata.xml
+++ b/dev-util/ninja-ide/metadata.xml
@@ -1,17 +1,17 @@
<?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>awol.lordofthepants@gmail.com</email>
<name>Aaron Burnett</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml
index a9eaca4f8eb..723d554b064 100644
--- a/dev-util/ninja/metadata.xml
+++ b/dev-util/ninja/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>chromium@gentoo.org</email>
<name>Chromium in Gentoo Project</name>
</maintainer>
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 499ed98be6a..9ab4f583a9c 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/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/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 48266d3c297..ede302cb485 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/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/dev-util/objconv/metadata.xml b/dev-util/objconv/metadata.xml
index 49bf44dac71..c5298995d2d 100644
--- a/dev-util/objconv/metadata.xml
+++ b/dev-util/objconv/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>slyfox@gentoo.org</email>
<name>Sergei Trofimovich</name>
</maintainer>
diff --git a/dev-util/obs-service-cpanspec/metadata.xml b/dev-util/obs-service-cpanspec/metadata.xml
index 5fb66fb52a1..0a8ff0aac5d 100644
--- a/dev-util/obs-service-cpanspec/metadata.xml
+++ b/dev-util/obs-service-cpanspec/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-download_files/metadata.xml b/dev-util/obs-service-download_files/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-download_files/metadata.xml
+++ b/dev-util/obs-service-download_files/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-download_src_package/metadata.xml b/dev-util/obs-service-download_src_package/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-download_src_package/metadata.xml
+++ b/dev-util/obs-service-download_src_package/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-download_url/metadata.xml b/dev-util/obs-service-download_url/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-download_url/metadata.xml
+++ b/dev-util/obs-service-download_url/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-extract_file/metadata.xml b/dev-util/obs-service-extract_file/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-extract_file/metadata.xml
+++ b/dev-util/obs-service-extract_file/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-format_spec_file/metadata.xml b/dev-util/obs-service-format_spec_file/metadata.xml
index 4c5f6d639d7..ee9110e7992 100644
--- a/dev-util/obs-service-format_spec_file/metadata.xml
+++ b/dev-util/obs-service-format_spec_file/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-generator_driver_update_disk/metadata.xml b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-generator_driver_update_disk/metadata.xml
+++ b/dev-util/obs-service-generator_driver_update_disk/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-git_tarballs/metadata.xml b/dev-util/obs-service-git_tarballs/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-git_tarballs/metadata.xml
+++ b/dev-util/obs-service-git_tarballs/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-github_tarballs/metadata.xml b/dev-util/obs-service-github_tarballs/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-github_tarballs/metadata.xml
+++ b/dev-util/obs-service-github_tarballs/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-meta/metadata.xml b/dev-util/obs-service-meta/metadata.xml
index 2cd2cffd90d..96cb567641f 100644
--- a/dev-util/obs-service-meta/metadata.xml
+++ b/dev-util/obs-service-meta/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-rearchive/metadata.xml b/dev-util/obs-service-rearchive/metadata.xml
index 5fb66fb52a1..0a8ff0aac5d 100644
--- a/dev-util/obs-service-rearchive/metadata.xml
+++ b/dev-util/obs-service-rearchive/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-recompress/metadata.xml b/dev-util/obs-service-recompress/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-recompress/metadata.xml
+++ b/dev-util/obs-service-recompress/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-set_version/metadata.xml b/dev-util/obs-service-set_version/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-set_version/metadata.xml
+++ b/dev-util/obs-service-set_version/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-source_validator/metadata.xml b/dev-util/obs-service-source_validator/metadata.xml
index 2cd2cffd90d..96cb567641f 100644
--- a/dev-util/obs-service-source_validator/metadata.xml
+++ b/dev-util/obs-service-source_validator/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-tar_scm/metadata.xml b/dev-util/obs-service-tar_scm/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-tar_scm/metadata.xml
+++ b/dev-util/obs-service-tar_scm/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-update_source/metadata.xml b/dev-util/obs-service-update_source/metadata.xml
index 5fb66fb52a1..0a8ff0aac5d 100644
--- a/dev-util/obs-service-update_source/metadata.xml
+++ b/dev-util/obs-service-update_source/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/obs-service-verify_file/metadata.xml b/dev-util/obs-service-verify_file/metadata.xml
index 59c876845c5..b2d1711cfd5 100644
--- a/dev-util/obs-service-verify_file/metadata.xml
+++ b/dev-util/obs-service-verify_file/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/omake/metadata.xml b/dev-util/omake/metadata.xml
index 3409127f534..ffac4d7ebc0 100644
--- a/dev-util/omake/metadata.xml
+++ b/dev-util/omake/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>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
diff --git a/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
index 5ee3b9c5330..13b5fd2a753 100644
--- a/dev-util/open-vcdiff/metadata.xml
+++ b/dev-util/open-vcdiff/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
index 33b97ddedc1..2a35c6646c1 100644
--- a/dev-util/oprofile/metadata.xml
+++ b/dev-util/oprofile/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/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 22fd6feb1d7..3e0165c6d2f 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/patchelf/metadata.xml b/dev-util/patchelf/metadata.xml
index 2a9ec3b85d5..1769853ef7e 100644
--- a/dev-util/patchelf/metadata.xml
+++ b/dev-util/patchelf/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>chewi@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
index 3fdd61f906d..9c3d7108c30 100644
--- a/dev-util/patchutils/metadata.xml
+++ b/dev-util/patchutils/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>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
diff --git a/dev-util/peg/metadata.xml b/dev-util/peg/metadata.xml
index 6971c1e1901..02e0a7f1c38 100644
--- a/dev-util/peg/metadata.xml
+++ b/dev-util/peg/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>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>jauhien@gentoo.org</email>
<name>Jauhien Piatlicki</name>
</maintainer>
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 978b7b72bfc..ec35d2efce9 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/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>naota@gentoo.org</email>
</maintainer>
<use>
diff --git a/dev-util/pida/metadata.xml b/dev-util/pida/metadata.xml
index 0637a538f8c..6b3721c531e 100644
--- a/dev-util/pida/metadata.xml
+++ b/dev-util/pida/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>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
index 9f0490ad304..025f517cf0e 100644
--- a/dev-util/pkgcheck/metadata.xml
+++ b/dev-util/pkgcheck/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/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index ab19a34f6cf..35ccd9202c9 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/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/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
index 896864e92c7..34ed7fc5075 100644
--- a/dev-util/pkgconfig-openbsd/metadata.xml
+++ b/dev-util/pkgconfig-openbsd/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/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
index e63116b87c6..feea3b542d9 100644
--- a/dev-util/pkgconfig/metadata.xml
+++ b/dev-util/pkgconfig/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>freedesktop-bugs@gentoo.org</email>
</maintainer>
<use>
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
index 3b4049cdb56..a7a12b6be4a 100644
--- a/dev-util/plan9port/metadata.xml
+++ b/dev-util/plan9port/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andy753421@gmail.com</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/pmd/metadata.xml b/dev-util/pmd/metadata.xml
index 90fac1dfb9a..f4e182129a3 100644
--- a/dev-util/pmd/metadata.xml
+++ b/dev-util/pmd/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/dev-util/premake/metadata.xml b/dev-util/premake/metadata.xml
index f5d04b333f6..798594dcbe6 100644
--- a/dev-util/premake/metadata.xml
+++ b/dev-util/premake/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>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
diff --git a/dev-util/pscan/metadata.xml b/dev-util/pscan/metadata.xml
index c6d862855eb..79d462e8557 100644
--- a/dev-util/pscan/metadata.xml
+++ b/dev-util/pscan/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/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
index 5b80fb94c39..a535b885282 100644
--- a/dev-util/pycharm-community/metadata.xml
+++ b/dev-util/pycharm-community/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/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
index 5b80fb94c39..a535b885282 100644
--- a/dev-util/pycharm-professional/metadata.xml
+++ b/dev-util/pycharm-professional/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/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 4f773f3cebf..32fe1293e9a 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/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>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
diff --git a/dev-util/qfsm/metadata.xml b/dev-util/qfsm/metadata.xml
index b125e2fd952..63d33d380dc 100644
--- a/dev-util/qfsm/metadata.xml
+++ b/dev-util/qfsm/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
index 90c791c1ab1..a8644ee61d1 100644
--- a/dev-util/qstlink2/metadata.xml
+++ b/dev-util/qstlink2/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>no111u3@gmail.com</email>
<name>Boris Vinogradov</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 3b08d4f9af2..8b375ab7cfb 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/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>mpagano@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index 9406077f08b..248be000563 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/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>slyfox@gentoo.org</email>
<name>Sergei Trofimovich</name>
<description>Primary Maintainer</description>
diff --git a/dev-util/ragel/metadata.xml b/dev-util/ragel/metadata.xml
index 2ba6e4da9d2..1b032650794 100644
--- a/dev-util/ragel/metadata.xml
+++ b/dev-util/ragel/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>lu_zero@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/rats/metadata.xml b/dev-util/rats/metadata.xml
index deb7defc384..d7aaff12cec 100644
--- a/dev-util/rats/metadata.xml
+++ b/dev-util/rats/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>
<longdescription>RATS - Rough Auditing Tool for Security - is an open source
diff --git a/dev-util/rbtools/metadata.xml b/dev-util/rbtools/metadata.xml
index e218a13609c..2fdbf33d963 100644
--- a/dev-util/rbtools/metadata.xml
+++ b/dev-util/rbtools/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/dev-util/re2c/metadata.xml b/dev-util/re2c/metadata.xml
index 9d22640988a..1fc58ccd41a 100644
--- a/dev-util/re2c/metadata.xml
+++ b/dev-util/re2c/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="person">
<email>slyfox@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/dev-util/rebar/metadata.xml b/dev-util/rebar/metadata.xml
index fd3275b550a..8ba22a2a150 100644
--- a/dev-util/rebar/metadata.xml
+++ b/dev-util/rebar/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>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>aranea@aixah.de</email>
<name>Luis Ressel</name>
<description>Proxy-maintainer, assign bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/regexxer/metadata.xml b/dev-util/regexxer/metadata.xml
index f6fee2ece64..b59e5c70aeb 100644
--- a/dev-util/regexxer/metadata.xml
+++ b/dev-util/regexxer/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>desktop-misc@gentoo.org</email>
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
diff --git a/dev-util/rej/metadata.xml b/dev-util/rej/metadata.xml
index ef0483f9ff6..a8fb4331294 100644
--- a/dev-util/rej/metadata.xml
+++ b/dev-util/rej/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/dev-util/reswrap/metadata.xml b/dev-util/reswrap/metadata.xml
index 00c1680ed45..e3117900640 100644
--- a/dev-util/reswrap/metadata.xml
+++ b/dev-util/reswrap/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>mabi@gentoo.org</email>
<name>Matti Bickel</name>
</maintainer>
diff --git a/dev-util/reviewboard/metadata.xml b/dev-util/reviewboard/metadata.xml
index a762b06c446..411f82cecba 100644
--- a/dev-util/reviewboard/metadata.xml
+++ b/dev-util/reviewboard/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/dev-util/rosdep/metadata.xml b/dev-util/rosdep/metadata.xml
index 8c2c7b468cb..d067e076ce7 100644
--- a/dev-util/rosdep/metadata.xml
+++ b/dev-util/rosdep/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>ros@gentoo.org</email>
<name>Gentoo ROS Project</name>
</maintainer>
diff --git a/dev-util/rosinstall/metadata.xml b/dev-util/rosinstall/metadata.xml
index a47c8afb126..22544f9d5e3 100644
--- a/dev-util/rosinstall/metadata.xml
+++ b/dev-util/rosinstall/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>ros@gentoo.org</email>
<name>Gentoo ROS Project</name>
</maintainer>
diff --git a/dev-util/rosinstall_generator/metadata.xml b/dev-util/rosinstall_generator/metadata.xml
index e645cad210a..b8df423a729 100644
--- a/dev-util/rosinstall_generator/metadata.xml
+++ b/dev-util/rosinstall_generator/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>ros@gentoo.org</email>
<name>Gentoo ROS Project</name>
</maintainer>
diff --git a/dev-util/rpmdevtools/metadata.xml b/dev-util/rpmdevtools/metadata.xml
index 52d257f5fc0..4babf4af678 100644
--- a/dev-util/rpmdevtools/metadata.xml
+++ b/dev-util/rpmdevtools/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>sochotnicky@gentoo.org</email>
<name>Stanislav Ochotnicky</name>
</maintainer>
diff --git a/dev-util/sasm/metadata.xml b/dev-util/sasm/metadata.xml
index 84daad14763..0dd346aa2e8 100644
--- a/dev-util/sasm/metadata.xml
+++ b/dev-util/sasm/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>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
index 01ad1fbd157..5352e92a2dc 100644
--- a/dev-util/scala-ide/metadata.xml
+++ b/dev-util/scala-ide/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>monsieurp@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index 7cd4c44b354..ad3df7dae4d 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/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>jcallen@gentoo.org</email>
<name>Jonathan Callen</name>
</maintainer>
diff --git a/dev-util/scons/metadata.xml b/dev-util/scons/metadata.xml
index af109b1694b..0016092bb1b 100644
--- a/dev-util/scons/metadata.xml
+++ b/dev-util/scons/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>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/dev-util/sel/metadata.xml b/dev-util/sel/metadata.xml
index b85f8c3dbf4..ac16aaf0a18 100644
--- a/dev-util/sel/metadata.xml
+++ b/dev-util/sel/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>wschlich@gentoo.org</email>
<name>Wolfram Schlich</name>
<description>Primary maintainer</description>
diff --git a/dev-util/setconf/metadata.xml b/dev-util/setconf/metadata.xml
index 30029adc6d7..66ea333970f 100644
--- a/dev-util/setconf/metadata.xml
+++ b/dev-util/setconf/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>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
diff --git a/dev-util/sgb/metadata.xml b/dev-util/sgb/metadata.xml
index c6d862855eb..79d462e8557 100644
--- a/dev-util/sgb/metadata.xml
+++ b/dev-util/sgb/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/dev-util/shc/metadata.xml b/dev-util/shc/metadata.xml
index 5e6ea6acc16..e057d190bf7 100644
--- a/dev-util/shc/metadata.xml
+++ b/dev-util/shc/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
index 7bc6ee8ea83..7c5a822d239 100644
--- a/dev-util/shellcheck/metadata.xml
+++ b/dev-util/shellcheck/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>jlec@gentoo.org</email>
<name>Justin Lecher</name>
</maintainer>
diff --git a/dev-util/shelltestrunner/metadata.xml b/dev-util/shelltestrunner/metadata.xml
index 7eb910daeb1..bc1b5fecdb5 100644
--- a/dev-util/shelltestrunner/metadata.xml
+++ b/dev-util/shelltestrunner/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>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index 7a53dbeb0ef..85002b3b83f 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/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>vapier@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
index 4276624f29e..3938129ac08 100644
--- a/dev-util/shunit2/metadata.xml
+++ b/dev-util/shunit2/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>dberkholz@gentoo.org</email>
<name>Donnie Berkholz</name>
</maintainer>
diff --git a/dev-util/skipfish/metadata.xml b/dev-util/skipfish/metadata.xml
index a9b2488a9be..c80219f90de 100644
--- a/dev-util/skipfish/metadata.xml
+++ b/dev-util/skipfish/metadata.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>givi-zurabovich@mail.ru</email>
<name>Georgy Kovtunov</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/smem/metadata.xml b/dev-util/smem/metadata.xml
index 9f002726a69..2d6b38fa05b 100644
--- a/dev-util/smem/metadata.xml
+++ b/dev-util/smem/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>flameeyes@gentoo.org</email>
<name>Diego Pettenò</name>
</maintainer>
diff --git a/dev-util/source-highlight/metadata.xml b/dev-util/source-highlight/metadata.xml
index 5b2a5c55470..5c23291b521 100644
--- a/dev-util/source-highlight/metadata.xml
+++ b/dev-util/source-highlight/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>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
index b5607a5f0fc..b6e67694494 100644
--- a/dev-util/spec-cleaner/metadata.xml
+++ b/dev-util/spec-cleaner/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/splint/metadata.xml b/dev-util/splint/metadata.xml
index c3a21340a39..f9f8bbfd940 100644
--- a/dev-util/splint/metadata.xml
+++ b/dev-util/splint/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/dev-util/squashdelta/metadata.xml b/dev-util/squashdelta/metadata.xml
index 9487ce93635..dc746925600 100644
--- a/dev-util/squashdelta/metadata.xml
+++ b/dev-util/squashdelta/metadata.xml
@@ -4,7 +4,7 @@
<use>
<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
</use>
- <maintainer>
+ <maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/dev-util/squashmerge/metadata.xml b/dev-util/squashmerge/metadata.xml
index 6973616f95c..7be942f1fb1 100644
--- a/dev-util/squashmerge/metadata.xml
+++ b/dev-util/squashmerge/metadata.xml
@@ -4,7 +4,7 @@
<use>
<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
</use>
- <maintainer>
+ <maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
index 9c35a4b7c9e..869980f0195 100644
--- a/dev-util/strace/metadata.xml
+++ b/dev-util/strace/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/dev-util/stressapptest/metadata.xml b/dev-util/stressapptest/metadata.xml
index 0947421cbd3..97f89a99b88 100644
--- a/dev-util/stressapptest/metadata.xml
+++ b/dev-util/stressapptest/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/dev-util/stubgen/metadata.xml b/dev-util/stubgen/metadata.xml
index fcc6fe99c20..5e1d792e4ba 100644
--- a/dev-util/stubgen/metadata.xml
+++ b/dev-util/stubgen/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/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
index bba503417c5..8b87c4da472 100644
--- a/dev-util/suse-build/metadata.xml
+++ b/dev-util/suse-build/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>suse@gentoo.org</email>
<name>SUSE</name>
</maintainer>
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index a05a63d2ecf..d888c821143 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/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/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index a5875336b19..472e9918b4c 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/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>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>leio@gentoo.org</email>
<description>Backup maintainer, CC on bugs and assign to remaining</description>
</maintainer>
diff --git a/dev-util/systemtap/metadata.xml b/dev-util/systemtap/metadata.xml
index 169842617ec..208c069b8e6 100644
--- a/dev-util/systemtap/metadata.xml
+++ b/dev-util/systemtap/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>
</maintainer>
</pkgmetadata>
diff --git a/dev-util/tailor/metadata.xml b/dev-util/tailor/metadata.xml
index e9b5d3c1976..fa4d08cf74a 100644
--- a/dev-util/tailor/metadata.xml
+++ b/dev-util/tailor/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>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/dev-util/ticpp/metadata.xml b/dev-util/ticpp/metadata.xml
index a0cb902846c..22534e587ae 100644
--- a/dev-util/ticpp/metadata.xml
+++ b/dev-util/ticpp/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/dev-util/tkdiff/metadata.xml b/dev-util/tkdiff/metadata.xml
index bb651e5939f..b2dc049fd07 100644
--- a/dev-util/tkdiff/metadata.xml
+++ b/dev-util/tkdiff/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>tcltk@gentoo.org</email>
<name>Gentoo Tcltk Project</name>
</maintainer>
diff --git a/dev-util/trace-cmd/metadata.xml b/dev-util/trace-cmd/metadata.xml
index 2bd7dc23471..d0ed66266c6 100644
--- a/dev-util/trace-cmd/metadata.xml
+++ b/dev-util/trace-cmd/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/dev-util/treecc/metadata.xml b/dev-util/treecc/metadata.xml
index 76cf08b1773..c99669dda12 100644
--- a/dev-util/treecc/metadata.xml
+++ b/dev-util/treecc/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>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml
index df953e8746e..5228121b668 100644
--- a/dev-util/txt2regex/metadata.xml
+++ b/dev-util/txt2regex/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/dev-util/uncrustify/metadata.xml b/dev-util/uncrustify/metadata.xml
index 3b0c76d926d..d0aa5981785 100644
--- a/dev-util/uncrustify/metadata.xml
+++ b/dev-util/uncrustify/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>grobian@gentoo.org</email>
<name>Fabian Groffen</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>alexxy@gentoo.org</email>
<name>Alexey Shvetosov</name>
</maintainer>
diff --git a/dev-util/unifdef/metadata.xml b/dev-util/unifdef/metadata.xml
index c9e13ee6a3c..56c12441305 100644
--- a/dev-util/unifdef/metadata.xml
+++ b/dev-util/unifdef/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/dev-util/universalindentgui/metadata.xml b/dev-util/universalindentgui/metadata.xml
index 24cee61bf4f..3ff436b7c1e 100644
--- a/dev-util/universalindentgui/metadata.xml
+++ b/dev-util/universalindentgui/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>wired@gentoo.org</email>
<name>Alex Alexander</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
index e20d0c3fba5..0bf3fac2660 100644
--- a/dev-util/valgrind/metadata.xml
+++ b/dev-util/valgrind/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/dev-util/valkyrie/metadata.xml b/dev-util/valkyrie/metadata.xml
index 5b80fb94c39..a535b885282 100644
--- a/dev-util/valkyrie/metadata.xml
+++ b/dev-util/valkyrie/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/dev-util/vbindiff/metadata.xml b/dev-util/vbindiff/metadata.xml
index 9f002726a69..2d6b38fa05b 100644
--- a/dev-util/vbindiff/metadata.xml
+++ b/dev-util/vbindiff/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>flameeyes@gentoo.org</email>
<name>Diego Pettenò</name>
</maintainer>
diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml
index 60240321844..61d19ccc4a5 100644
--- a/dev-util/visual-regexp/metadata.xml
+++ b/dev-util/visual-regexp/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>quentin@minster.io</email>
<name>Quentin Minster</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
index d39e9af86c8..d9f28df8af9 100644
--- a/dev-util/visualvm/metadata.xml
+++ b/dev-util/visualvm/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/dev-util/vmtouch/metadata.xml b/dev-util/vmtouch/metadata.xml
index 72646f6e164..d4b6bb25c49 100644
--- a/dev-util/vmtouch/metadata.xml
+++ b/dev-util/vmtouch/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/dev-util/w32api/metadata.xml b/dev-util/w32api/metadata.xml
index 957427e97ce..6c377f90be9 100644
--- a/dev-util/w32api/metadata.xml
+++ b/dev-util/w32api/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>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
diff --git a/dev-util/watchr/metadata.xml b/dev-util/watchr/metadata.xml
index 409d99ea230..9abf9c6b8ec 100644
--- a/dev-util/watchr/metadata.xml
+++ b/dev-util/watchr/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>graaff@gentoo.org</email></maintainer>
-<maintainer>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
<email>ruby@gentoo.org</email>
<name>Gentoo Ruby Project</name>
</maintainer>
diff --git a/dev-util/webstorm/metadata.xml b/dev-util/webstorm/metadata.xml
index 16839d5f714..51c6855d2b2 100644
--- a/dev-util/webstorm/metadata.xml
+++ b/dev-util/webstorm/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>gert@gepe-biljarts.be</email>
<name>Gert Pellin</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/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
index 771faa7ed81..6b75f30228e 100644
--- a/dev-util/weka/metadata.xml
+++ b/dev-util/weka/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>amynka@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/dev-util/wiggle/metadata.xml b/dev-util/wiggle/metadata.xml
index 557ca512951..483ee9fe589 100644
--- a/dev-util/wiggle/metadata.xml
+++ b/dev-util/wiggle/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/dev-util/wstool/metadata.xml b/dev-util/wstool/metadata.xml
index 012ea5f8a72..8df7d893c82 100644
--- a/dev-util/wstool/metadata.xml
+++ b/dev-util/wstool/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>ros@gentoo.org</email>
<name>Gentoo ROS Project</name>
</maintainer>
diff --git a/dev-util/wxglade/metadata.xml b/dev-util/wxglade/metadata.xml
index 0f042550d7d..a2cf0a120bb 100644
--- a/dev-util/wxglade/metadata.xml
+++ b/dev-util/wxglade/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>wxwidgets@gentoo.org</email>
<name>Gentoo wxWidgets Project</name>
</maintainer>
diff --git a/dev-util/xdelta/metadata.xml b/dev-util/xdelta/metadata.xml
index 50960a32284..132ebadbee2 100644
--- a/dev-util/xdelta/metadata.xml
+++ b/dev-util/xdelta/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/dev-util/xfce4-dev-tools/metadata.xml b/dev-util/xfce4-dev-tools/metadata.xml
index 008cf479f61..359901b31db 100644
--- a/dev-util/xfce4-dev-tools/metadata.xml
+++ b/dev-util/xfce4-dev-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>xfce@gentoo.org</email>
<name>XFCE Team</name>
</maintainer>
diff --git a/dev-util/xxdi/metadata.xml b/dev-util/xxdi/metadata.xml
index f4afb903d1d..5524e3485f7 100644
--- a/dev-util/xxdi/metadata.xml
+++ b/dev-util/xxdi/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>gregkh@gentoo.org</email>
<name>Greg Kroah-Hartman</name>
<description>Maintainer, assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
<description>Backup maintainer, CC him on bugs.</description>
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index 4f773f3cebf..32fe1293e9a 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/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>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
diff --git a/dev-util/yuicompressor/metadata.xml b/dev-util/yuicompressor/metadata.xml
index ba98006324a..5c7f3dccbe1 100644
--- a/dev-util/yuicompressor/metadata.xml
+++ b/dev-util/yuicompressor/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>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Proxy maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>